diff --git a/src/Notes-master3/.gradle/8.0/checksums/checksums.lock b/src/Notes-master3/.gradle/8.0/checksums/checksums.lock
index d1f4487..d9544d4 100644
Binary files a/src/Notes-master3/.gradle/8.0/checksums/checksums.lock and b/src/Notes-master3/.gradle/8.0/checksums/checksums.lock differ
diff --git a/src/Notes-master3/.gradle/8.0/checksums/md5-checksums.bin b/src/Notes-master3/.gradle/8.0/checksums/md5-checksums.bin
index 2dab378..ac16df0 100644
Binary files a/src/Notes-master3/.gradle/8.0/checksums/md5-checksums.bin and b/src/Notes-master3/.gradle/8.0/checksums/md5-checksums.bin differ
diff --git a/src/Notes-master3/.gradle/8.0/checksums/sha1-checksums.bin b/src/Notes-master3/.gradle/8.0/checksums/sha1-checksums.bin
index 37b16f0..c25257e 100644
Binary files a/src/Notes-master3/.gradle/8.0/checksums/sha1-checksums.bin and b/src/Notes-master3/.gradle/8.0/checksums/sha1-checksums.bin differ
diff --git a/src/Notes-master3/.gradle/8.0/executionHistory/executionHistory.bin b/src/Notes-master3/.gradle/8.0/executionHistory/executionHistory.bin
index 42944b3..5d606b2 100644
Binary files a/src/Notes-master3/.gradle/8.0/executionHistory/executionHistory.bin and b/src/Notes-master3/.gradle/8.0/executionHistory/executionHistory.bin differ
diff --git a/src/Notes-master3/.gradle/8.0/executionHistory/executionHistory.lock b/src/Notes-master3/.gradle/8.0/executionHistory/executionHistory.lock
index cfbdd1f..cac0cff 100644
Binary files a/src/Notes-master3/.gradle/8.0/executionHistory/executionHistory.lock and b/src/Notes-master3/.gradle/8.0/executionHistory/executionHistory.lock differ
diff --git a/src/Notes-master3/.gradle/8.0/fileHashes/fileHashes.bin b/src/Notes-master3/.gradle/8.0/fileHashes/fileHashes.bin
index 23da000..6c46a65 100644
Binary files a/src/Notes-master3/.gradle/8.0/fileHashes/fileHashes.bin and b/src/Notes-master3/.gradle/8.0/fileHashes/fileHashes.bin differ
diff --git a/src/Notes-master3/.gradle/8.0/fileHashes/fileHashes.lock b/src/Notes-master3/.gradle/8.0/fileHashes/fileHashes.lock
index 2ee7d7a..832b19f 100644
Binary files a/src/Notes-master3/.gradle/8.0/fileHashes/fileHashes.lock and b/src/Notes-master3/.gradle/8.0/fileHashes/fileHashes.lock differ
diff --git a/src/Notes-master3/.gradle/8.0/fileHashes/resourceHashesCache.bin b/src/Notes-master3/.gradle/8.0/fileHashes/resourceHashesCache.bin
index d42e223..9c2faf6 100644
Binary files a/src/Notes-master3/.gradle/8.0/fileHashes/resourceHashesCache.bin and b/src/Notes-master3/.gradle/8.0/fileHashes/resourceHashesCache.bin differ
diff --git a/src/Notes-master3/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/src/Notes-master3/.gradle/buildOutputCleanup/buildOutputCleanup.lock
index ec81e4e..3a80a69 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 51fdc3c..d06041b 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 47048c9..f16a9c1 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/.gradle/workspace-id.txt b/src/Notes-master3/.gradle/workspace-id.txt
new file mode 100644
index 0000000..4540639
Binary files /dev/null and b/src/Notes-master3/.gradle/workspace-id.txt differ
diff --git a/src/Notes-master3/.gradle/workspace-id.txt.lock b/src/Notes-master3/.gradle/workspace-id.txt.lock
new file mode 100644
index 0000000..bcc27a0
Binary files /dev/null and b/src/Notes-master3/.gradle/workspace-id.txt.lock differ
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 b9ed513..6adea37 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/assets/debug/font/STCAIYUN.TTF b/src/Notes-master3/app/build/intermediates/assets/debug/font/STCAIYUN.TTF
new file mode 100644
index 0000000..f2c31b3
Binary files /dev/null and b/src/Notes-master3/app/build/intermediates/assets/debug/font/STCAIYUN.TTF differ
diff --git a/src/Notes-master3/app/build/intermediates/assets/debug/font/STFANGSO.TTF b/src/Notes-master3/app/build/intermediates/assets/debug/font/STFANGSO.TTF
new file mode 100644
index 0000000..441f288
Binary files /dev/null and b/src/Notes-master3/app/build/intermediates/assets/debug/font/STFANGSO.TTF differ
diff --git a/src/Notes-master3/app/build/intermediates/assets/debug/font/STHUPO.TTF b/src/Notes-master3/app/build/intermediates/assets/debug/font/STHUPO.TTF
new file mode 100644
index 0000000..d1104b9
Binary files /dev/null and b/src/Notes-master3/app/build/intermediates/assets/debug/font/STHUPO.TTF differ
diff --git a/src/Notes-master3/app/build/intermediates/assets/debug/font/STKAITI.TTF b/src/Notes-master3/app/build/intermediates/assets/debug/font/STKAITI.TTF
new file mode 100644
index 0000000..5044116
Binary files /dev/null and b/src/Notes-master3/app/build/intermediates/assets/debug/font/STKAITI.TTF differ
diff --git a/src/Notes-master3/app/build/intermediates/assets/debug/font/STLITI.TTF b/src/Notes-master3/app/build/intermediates/assets/debug/font/STLITI.TTF
new file mode 100644
index 0000000..8ede20e
Binary files /dev/null and b/src/Notes-master3/app/build/intermediates/assets/debug/font/STLITI.TTF differ
diff --git a/src/Notes-master3/app/build/intermediates/assets/debug/font/simhei.ttf b/src/Notes-master3/app/build/intermediates/assets/debug/font/simhei.ttf
new file mode 100644
index 0000000..5bd4687
Binary files /dev/null and b/src/Notes-master3/app/build/intermediates/assets/debug/font/simhei.ttf differ
diff --git a/src/Notes-master3/app/build/intermediates/compile_and_runtime_not_namespaced_r_class_jar/debug/R.jar b/src/Notes-master3/app/build/intermediates/compile_and_runtime_not_namespaced_r_class_jar/debug/R.jar
index 02c04c7..6510061 100644
Binary files a/src/Notes-master3/app/build/intermediates/compile_and_runtime_not_namespaced_r_class_jar/debug/R.jar and b/src/Notes-master3/app/build/intermediates/compile_and_runtime_not_namespaced_r_class_jar/debug/R.jar differ
diff --git a/src/Notes-master3/app/build/intermediates/compile_app_classes_jar/debug/classes.jar b/src/Notes-master3/app/build/intermediates/compile_app_classes_jar/debug/classes.jar
index e1e3e9d..21068b3 100644
Binary files a/src/Notes-master3/app/build/intermediates/compile_app_classes_jar/debug/classes.jar and b/src/Notes-master3/app/build/intermediates/compile_app_classes_jar/debug/classes.jar differ
diff --git a/src/Notes-master3/app/build/intermediates/compressed_assets/debug/out/assets/font/STCAIYUN.TTF.jar b/src/Notes-master3/app/build/intermediates/compressed_assets/debug/out/assets/font/STCAIYUN.TTF.jar
new file mode 100644
index 0000000..208b8cf
Binary files /dev/null and b/src/Notes-master3/app/build/intermediates/compressed_assets/debug/out/assets/font/STCAIYUN.TTF.jar differ
diff --git a/src/Notes-master3/app/build/intermediates/compressed_assets/debug/out/assets/font/STFANGSO.TTF.jar b/src/Notes-master3/app/build/intermediates/compressed_assets/debug/out/assets/font/STFANGSO.TTF.jar
new file mode 100644
index 0000000..73b8784
Binary files /dev/null and b/src/Notes-master3/app/build/intermediates/compressed_assets/debug/out/assets/font/STFANGSO.TTF.jar differ
diff --git a/src/Notes-master3/app/build/intermediates/compressed_assets/debug/out/assets/font/STHUPO.TTF.jar b/src/Notes-master3/app/build/intermediates/compressed_assets/debug/out/assets/font/STHUPO.TTF.jar
new file mode 100644
index 0000000..27c00a1
Binary files /dev/null and b/src/Notes-master3/app/build/intermediates/compressed_assets/debug/out/assets/font/STHUPO.TTF.jar differ
diff --git a/src/Notes-master3/app/build/intermediates/compressed_assets/debug/out/assets/font/STKAITI.TTF.jar b/src/Notes-master3/app/build/intermediates/compressed_assets/debug/out/assets/font/STKAITI.TTF.jar
new file mode 100644
index 0000000..7e4b5fe
Binary files /dev/null and b/src/Notes-master3/app/build/intermediates/compressed_assets/debug/out/assets/font/STKAITI.TTF.jar differ
diff --git a/src/Notes-master3/app/build/intermediates/compressed_assets/debug/out/assets/font/STLITI.TTF.jar b/src/Notes-master3/app/build/intermediates/compressed_assets/debug/out/assets/font/STLITI.TTF.jar
new file mode 100644
index 0000000..e1aa3a1
Binary files /dev/null and b/src/Notes-master3/app/build/intermediates/compressed_assets/debug/out/assets/font/STLITI.TTF.jar differ
diff --git a/src/Notes-master3/app/build/intermediates/compressed_assets/debug/out/assets/font/simhei.ttf.jar b/src/Notes-master3/app/build/intermediates/compressed_assets/debug/out/assets/font/simhei.ttf.jar
new file mode 100644
index 0000000..0cf205e
Binary files /dev/null and b/src/Notes-master3/app/build/intermediates/compressed_assets/debug/out/assets/font/simhei.ttf.jar differ
diff --git a/src/Notes-master3/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_10/graph.bin b/src/Notes-master3/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_58ac417aab32fe8baaff547ba7247cc94da3cbfdfa14ec6f308b365c188a4cc2_bucket_0/graph.bin
similarity index 100%
rename from src/Notes-master3/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_10/graph.bin
rename to src/Notes-master3/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_58ac417aab32fe8baaff547ba7247cc94da3cbfdfa14ec6f308b365c188a4cc2_bucket_0/graph.bin
diff --git a/src/Notes-master3/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_11/graph.bin b/src/Notes-master3/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_58ac417aab32fe8baaff547ba7247cc94da3cbfdfa14ec6f308b365c188a4cc2_bucket_1/graph.bin
similarity index 100%
rename from src/Notes-master3/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_11/graph.bin
rename to src/Notes-master3/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_58ac417aab32fe8baaff547ba7247cc94da3cbfdfa14ec6f308b365c188a4cc2_bucket_1/graph.bin
diff --git a/src/Notes-master3/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_12/graph.bin b/src/Notes-master3/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_58ac417aab32fe8baaff547ba7247cc94da3cbfdfa14ec6f308b365c188a4cc2_bucket_2/graph.bin
similarity index 100%
rename from src/Notes-master3/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_12/graph.bin
rename to src/Notes-master3/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_58ac417aab32fe8baaff547ba7247cc94da3cbfdfa14ec6f308b365c188a4cc2_bucket_2/graph.bin
diff --git a/src/Notes-master3/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_13/graph.bin b/src/Notes-master3/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_58ac417aab32fe8baaff547ba7247cc94da3cbfdfa14ec6f308b365c188a4cc2_bucket_3/graph.bin
similarity index 100%
rename from src/Notes-master3/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_13/graph.bin
rename to src/Notes-master3/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_58ac417aab32fe8baaff547ba7247cc94da3cbfdfa14ec6f308b365c188a4cc2_bucket_3/graph.bin
diff --git a/src/Notes-master3/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_14/graph.bin b/src/Notes-master3/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_58ac417aab32fe8baaff547ba7247cc94da3cbfdfa14ec6f308b365c188a4cc2_bucket_4/graph.bin
similarity index 100%
rename from src/Notes-master3/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_14/graph.bin
rename to src/Notes-master3/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_58ac417aab32fe8baaff547ba7247cc94da3cbfdfa14ec6f308b365c188a4cc2_bucket_4/graph.bin
diff --git a/src/Notes-master3/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_15/graph.bin b/src/Notes-master3/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_58ac417aab32fe8baaff547ba7247cc94da3cbfdfa14ec6f308b365c188a4cc2_bucket_5/graph.bin
similarity index 100%
rename from src/Notes-master3/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_15/graph.bin
rename to src/Notes-master3/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_58ac417aab32fe8baaff547ba7247cc94da3cbfdfa14ec6f308b365c188a4cc2_bucket_5/graph.bin
diff --git a/src/Notes-master3/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_64c072e93a6acc14e0ed293116a01ff9f29051faa09fedcff42cc91b7bdc13c5_bucket_10/graph.bin b/src/Notes-master3/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_64c072e93a6acc14e0ed293116a01ff9f29051faa09fedcff42cc91b7bdc13c5_bucket_10/graph.bin
deleted file mode 100644
index 601f245..0000000
Binary files a/src/Notes-master3/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_64c072e93a6acc14e0ed293116a01ff9f29051faa09fedcff42cc91b7bdc13c5_bucket_10/graph.bin and /dev/null differ
diff --git a/src/Notes-master3/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_64c072e93a6acc14e0ed293116a01ff9f29051faa09fedcff42cc91b7bdc13c5_bucket_11/graph.bin b/src/Notes-master3/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_64c072e93a6acc14e0ed293116a01ff9f29051faa09fedcff42cc91b7bdc13c5_bucket_11/graph.bin
deleted file mode 100644
index 601f245..0000000
Binary files a/src/Notes-master3/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_64c072e93a6acc14e0ed293116a01ff9f29051faa09fedcff42cc91b7bdc13c5_bucket_11/graph.bin and /dev/null differ
diff --git a/src/Notes-master3/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_64c072e93a6acc14e0ed293116a01ff9f29051faa09fedcff42cc91b7bdc13c5_bucket_12/graph.bin b/src/Notes-master3/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_64c072e93a6acc14e0ed293116a01ff9f29051faa09fedcff42cc91b7bdc13c5_bucket_12/graph.bin
deleted file mode 100644
index 601f245..0000000
Binary files a/src/Notes-master3/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_64c072e93a6acc14e0ed293116a01ff9f29051faa09fedcff42cc91b7bdc13c5_bucket_12/graph.bin and /dev/null differ
diff --git a/src/Notes-master3/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_64c072e93a6acc14e0ed293116a01ff9f29051faa09fedcff42cc91b7bdc13c5_bucket_13/graph.bin b/src/Notes-master3/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_64c072e93a6acc14e0ed293116a01ff9f29051faa09fedcff42cc91b7bdc13c5_bucket_13/graph.bin
deleted file mode 100644
index 601f245..0000000
Binary files a/src/Notes-master3/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_64c072e93a6acc14e0ed293116a01ff9f29051faa09fedcff42cc91b7bdc13c5_bucket_13/graph.bin and /dev/null differ
diff --git a/src/Notes-master3/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_64c072e93a6acc14e0ed293116a01ff9f29051faa09fedcff42cc91b7bdc13c5_bucket_14/graph.bin b/src/Notes-master3/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_64c072e93a6acc14e0ed293116a01ff9f29051faa09fedcff42cc91b7bdc13c5_bucket_14/graph.bin
deleted file mode 100644
index 601f245..0000000
Binary files a/src/Notes-master3/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_64c072e93a6acc14e0ed293116a01ff9f29051faa09fedcff42cc91b7bdc13c5_bucket_14/graph.bin and /dev/null differ
diff --git a/src/Notes-master3/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_64c072e93a6acc14e0ed293116a01ff9f29051faa09fedcff42cc91b7bdc13c5_bucket_15/graph.bin b/src/Notes-master3/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_64c072e93a6acc14e0ed293116a01ff9f29051faa09fedcff42cc91b7bdc13c5_bucket_15/graph.bin
deleted file mode 100644
index 601f245..0000000
Binary files a/src/Notes-master3/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_64c072e93a6acc14e0ed293116a01ff9f29051faa09fedcff42cc91b7bdc13c5_bucket_15/graph.bin and /dev/null differ
diff --git a/src/Notes-master3/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_64c072e93a6acc14e0ed293116a01ff9f29051faa09fedcff42cc91b7bdc13c5_bucket_2/graph.bin b/src/Notes-master3/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_64c072e93a6acc14e0ed293116a01ff9f29051faa09fedcff42cc91b7bdc13c5_bucket_2/graph.bin
deleted file mode 100644
index 601f245..0000000
Binary files a/src/Notes-master3/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_64c072e93a6acc14e0ed293116a01ff9f29051faa09fedcff42cc91b7bdc13c5_bucket_2/graph.bin and /dev/null differ
diff --git a/src/Notes-master3/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_64c072e93a6acc14e0ed293116a01ff9f29051faa09fedcff42cc91b7bdc13c5_bucket_3/graph.bin b/src/Notes-master3/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_64c072e93a6acc14e0ed293116a01ff9f29051faa09fedcff42cc91b7bdc13c5_bucket_3/graph.bin
deleted file mode 100644
index 601f245..0000000
Binary files a/src/Notes-master3/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_64c072e93a6acc14e0ed293116a01ff9f29051faa09fedcff42cc91b7bdc13c5_bucket_3/graph.bin and /dev/null differ
diff --git a/src/Notes-master3/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_64c072e93a6acc14e0ed293116a01ff9f29051faa09fedcff42cc91b7bdc13c5_bucket_4/graph.bin b/src/Notes-master3/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_64c072e93a6acc14e0ed293116a01ff9f29051faa09fedcff42cc91b7bdc13c5_bucket_4/graph.bin
deleted file mode 100644
index 601f245..0000000
Binary files a/src/Notes-master3/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_64c072e93a6acc14e0ed293116a01ff9f29051faa09fedcff42cc91b7bdc13c5_bucket_4/graph.bin and /dev/null differ
diff --git a/src/Notes-master3/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_64c072e93a6acc14e0ed293116a01ff9f29051faa09fedcff42cc91b7bdc13c5_bucket_5/graph.bin b/src/Notes-master3/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_64c072e93a6acc14e0ed293116a01ff9f29051faa09fedcff42cc91b7bdc13c5_bucket_5/graph.bin
deleted file mode 100644
index 601f245..0000000
Binary files a/src/Notes-master3/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_64c072e93a6acc14e0ed293116a01ff9f29051faa09fedcff42cc91b7bdc13c5_bucket_5/graph.bin and /dev/null differ
diff --git a/src/Notes-master3/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_64c072e93a6acc14e0ed293116a01ff9f29051faa09fedcff42cc91b7bdc13c5_bucket_6/graph.bin b/src/Notes-master3/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_64c072e93a6acc14e0ed293116a01ff9f29051faa09fedcff42cc91b7bdc13c5_bucket_6/graph.bin
deleted file mode 100644
index 601f245..0000000
Binary files a/src/Notes-master3/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_64c072e93a6acc14e0ed293116a01ff9f29051faa09fedcff42cc91b7bdc13c5_bucket_6/graph.bin and /dev/null differ
diff --git a/src/Notes-master3/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_64c072e93a6acc14e0ed293116a01ff9f29051faa09fedcff42cc91b7bdc13c5_bucket_7/graph.bin b/src/Notes-master3/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_64c072e93a6acc14e0ed293116a01ff9f29051faa09fedcff42cc91b7bdc13c5_bucket_7/graph.bin
deleted file mode 100644
index 601f245..0000000
Binary files a/src/Notes-master3/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_64c072e93a6acc14e0ed293116a01ff9f29051faa09fedcff42cc91b7bdc13c5_bucket_7/graph.bin and /dev/null differ
diff --git a/src/Notes-master3/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_64c072e93a6acc14e0ed293116a01ff9f29051faa09fedcff42cc91b7bdc13c5_bucket_8/graph.bin b/src/Notes-master3/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_64c072e93a6acc14e0ed293116a01ff9f29051faa09fedcff42cc91b7bdc13c5_bucket_8/graph.bin
deleted file mode 100644
index 601f245..0000000
Binary files a/src/Notes-master3/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_64c072e93a6acc14e0ed293116a01ff9f29051faa09fedcff42cc91b7bdc13c5_bucket_8/graph.bin and /dev/null differ
diff --git a/src/Notes-master3/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_64c072e93a6acc14e0ed293116a01ff9f29051faa09fedcff42cc91b7bdc13c5_bucket_9/graph.bin b/src/Notes-master3/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_64c072e93a6acc14e0ed293116a01ff9f29051faa09fedcff42cc91b7bdc13c5_bucket_9/graph.bin
deleted file mode 100644
index 601f245..0000000
Binary files a/src/Notes-master3/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_64c072e93a6acc14e0ed293116a01ff9f29051faa09fedcff42cc91b7bdc13c5_bucket_9/graph.bin and /dev/null differ
diff --git a/src/Notes-master3/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_6/graph.bin b/src/Notes-master3/app/build/intermediates/desugar_graph/debugAndroidTest/out/currentProject/jar_b1347a41346191babb2a4d1fb2b19a9a2ac9d4aebfdb4bf4c5d846ae5f30f305_bucket_0/graph.bin
similarity index 100%
rename from src/Notes-master3/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_6/graph.bin
rename to src/Notes-master3/app/build/intermediates/desugar_graph/debugAndroidTest/out/currentProject/jar_b1347a41346191babb2a4d1fb2b19a9a2ac9d4aebfdb4bf4c5d846ae5f30f305_bucket_0/graph.bin
diff --git a/src/Notes-master3/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_7/graph.bin b/src/Notes-master3/app/build/intermediates/desugar_graph/debugAndroidTest/out/currentProject/jar_b1347a41346191babb2a4d1fb2b19a9a2ac9d4aebfdb4bf4c5d846ae5f30f305_bucket_1/graph.bin
similarity index 100%
rename from src/Notes-master3/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_7/graph.bin
rename to src/Notes-master3/app/build/intermediates/desugar_graph/debugAndroidTest/out/currentProject/jar_b1347a41346191babb2a4d1fb2b19a9a2ac9d4aebfdb4bf4c5d846ae5f30f305_bucket_1/graph.bin
diff --git a/src/Notes-master3/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_8/graph.bin b/src/Notes-master3/app/build/intermediates/desugar_graph/debugAndroidTest/out/currentProject/jar_b1347a41346191babb2a4d1fb2b19a9a2ac9d4aebfdb4bf4c5d846ae5f30f305_bucket_2/graph.bin
similarity index 100%
rename from src/Notes-master3/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_8/graph.bin
rename to src/Notes-master3/app/build/intermediates/desugar_graph/debugAndroidTest/out/currentProject/jar_b1347a41346191babb2a4d1fb2b19a9a2ac9d4aebfdb4bf4c5d846ae5f30f305_bucket_2/graph.bin
diff --git a/src/Notes-master3/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_9/graph.bin b/src/Notes-master3/app/build/intermediates/desugar_graph/debugAndroidTest/out/currentProject/jar_b1347a41346191babb2a4d1fb2b19a9a2ac9d4aebfdb4bf4c5d846ae5f30f305_bucket_3/graph.bin
similarity index 100%
rename from src/Notes-master3/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_9/graph.bin
rename to src/Notes-master3/app/build/intermediates/desugar_graph/debugAndroidTest/out/currentProject/jar_b1347a41346191babb2a4d1fb2b19a9a2ac9d4aebfdb4bf4c5d846ae5f30f305_bucket_3/graph.bin
diff --git a/src/Notes-master3/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_64c072e93a6acc14e0ed293116a01ff9f29051faa09fedcff42cc91b7bdc13c5_bucket_0/graph.bin b/src/Notes-master3/app/build/intermediates/desugar_graph/debugAndroidTest/out/currentProject/jar_b1347a41346191babb2a4d1fb2b19a9a2ac9d4aebfdb4bf4c5d846ae5f30f305_bucket_4/graph.bin
similarity index 100%
rename from src/Notes-master3/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_64c072e93a6acc14e0ed293116a01ff9f29051faa09fedcff42cc91b7bdc13c5_bucket_0/graph.bin
rename to src/Notes-master3/app/build/intermediates/desugar_graph/debugAndroidTest/out/currentProject/jar_b1347a41346191babb2a4d1fb2b19a9a2ac9d4aebfdb4bf4c5d846ae5f30f305_bucket_4/graph.bin
diff --git a/src/Notes-master3/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_64c072e93a6acc14e0ed293116a01ff9f29051faa09fedcff42cc91b7bdc13c5_bucket_1/graph.bin b/src/Notes-master3/app/build/intermediates/desugar_graph/debugAndroidTest/out/currentProject/jar_b1347a41346191babb2a4d1fb2b19a9a2ac9d4aebfdb4bf4c5d846ae5f30f305_bucket_5/graph.bin
similarity index 100%
rename from src/Notes-master3/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_64c072e93a6acc14e0ed293116a01ff9f29051faa09fedcff42cc91b7bdc13c5_bucket_1/graph.bin
rename to src/Notes-master3/app/build/intermediates/desugar_graph/debugAndroidTest/out/currentProject/jar_b1347a41346191babb2a4d1fb2b19a9a2ac9d4aebfdb4bf4c5d846ae5f30f305_bucket_5/graph.bin
diff --git a/src/Notes-master3/app/build/intermediates/desugar_graph/debugAndroidTest/out/currentProject/jar_fdc5d28186870baf89f7e34550effe334eb9ac5f8cae6121d889049766d6f814_bucket_0/graph.bin b/src/Notes-master3/app/build/intermediates/desugar_graph/debugAndroidTest/out/currentProject/jar_fdc5d28186870baf89f7e34550effe334eb9ac5f8cae6121d889049766d6f814_bucket_0/graph.bin
deleted file mode 100644
index 601f245..0000000
Binary files a/src/Notes-master3/app/build/intermediates/desugar_graph/debugAndroidTest/out/currentProject/jar_fdc5d28186870baf89f7e34550effe334eb9ac5f8cae6121d889049766d6f814_bucket_0/graph.bin and /dev/null differ
diff --git a/src/Notes-master3/app/build/intermediates/desugar_graph/debugAndroidTest/out/currentProject/jar_fdc5d28186870baf89f7e34550effe334eb9ac5f8cae6121d889049766d6f814_bucket_1/graph.bin b/src/Notes-master3/app/build/intermediates/desugar_graph/debugAndroidTest/out/currentProject/jar_fdc5d28186870baf89f7e34550effe334eb9ac5f8cae6121d889049766d6f814_bucket_1/graph.bin
deleted file mode 100644
index 601f245..0000000
Binary files a/src/Notes-master3/app/build/intermediates/desugar_graph/debugAndroidTest/out/currentProject/jar_fdc5d28186870baf89f7e34550effe334eb9ac5f8cae6121d889049766d6f814_bucket_1/graph.bin and /dev/null differ
diff --git a/src/Notes-master3/app/build/intermediates/desugar_graph/debugAndroidTest/out/currentProject/jar_fdc5d28186870baf89f7e34550effe334eb9ac5f8cae6121d889049766d6f814_bucket_10/graph.bin b/src/Notes-master3/app/build/intermediates/desugar_graph/debugAndroidTest/out/currentProject/jar_fdc5d28186870baf89f7e34550effe334eb9ac5f8cae6121d889049766d6f814_bucket_10/graph.bin
deleted file mode 100644
index 601f245..0000000
Binary files a/src/Notes-master3/app/build/intermediates/desugar_graph/debugAndroidTest/out/currentProject/jar_fdc5d28186870baf89f7e34550effe334eb9ac5f8cae6121d889049766d6f814_bucket_10/graph.bin and /dev/null differ
diff --git a/src/Notes-master3/app/build/intermediates/desugar_graph/debugAndroidTest/out/currentProject/jar_fdc5d28186870baf89f7e34550effe334eb9ac5f8cae6121d889049766d6f814_bucket_11/graph.bin b/src/Notes-master3/app/build/intermediates/desugar_graph/debugAndroidTest/out/currentProject/jar_fdc5d28186870baf89f7e34550effe334eb9ac5f8cae6121d889049766d6f814_bucket_11/graph.bin
deleted file mode 100644
index 601f245..0000000
Binary files a/src/Notes-master3/app/build/intermediates/desugar_graph/debugAndroidTest/out/currentProject/jar_fdc5d28186870baf89f7e34550effe334eb9ac5f8cae6121d889049766d6f814_bucket_11/graph.bin and /dev/null differ
diff --git a/src/Notes-master3/app/build/intermediates/desugar_graph/debugAndroidTest/out/currentProject/jar_fdc5d28186870baf89f7e34550effe334eb9ac5f8cae6121d889049766d6f814_bucket_12/graph.bin b/src/Notes-master3/app/build/intermediates/desugar_graph/debugAndroidTest/out/currentProject/jar_fdc5d28186870baf89f7e34550effe334eb9ac5f8cae6121d889049766d6f814_bucket_12/graph.bin
deleted file mode 100644
index 601f245..0000000
Binary files a/src/Notes-master3/app/build/intermediates/desugar_graph/debugAndroidTest/out/currentProject/jar_fdc5d28186870baf89f7e34550effe334eb9ac5f8cae6121d889049766d6f814_bucket_12/graph.bin and /dev/null differ
diff --git a/src/Notes-master3/app/build/intermediates/desugar_graph/debugAndroidTest/out/currentProject/jar_fdc5d28186870baf89f7e34550effe334eb9ac5f8cae6121d889049766d6f814_bucket_13/graph.bin b/src/Notes-master3/app/build/intermediates/desugar_graph/debugAndroidTest/out/currentProject/jar_fdc5d28186870baf89f7e34550effe334eb9ac5f8cae6121d889049766d6f814_bucket_13/graph.bin
deleted file mode 100644
index 601f245..0000000
Binary files a/src/Notes-master3/app/build/intermediates/desugar_graph/debugAndroidTest/out/currentProject/jar_fdc5d28186870baf89f7e34550effe334eb9ac5f8cae6121d889049766d6f814_bucket_13/graph.bin and /dev/null differ
diff --git a/src/Notes-master3/app/build/intermediates/desugar_graph/debugAndroidTest/out/currentProject/jar_fdc5d28186870baf89f7e34550effe334eb9ac5f8cae6121d889049766d6f814_bucket_14/graph.bin b/src/Notes-master3/app/build/intermediates/desugar_graph/debugAndroidTest/out/currentProject/jar_fdc5d28186870baf89f7e34550effe334eb9ac5f8cae6121d889049766d6f814_bucket_14/graph.bin
deleted file mode 100644
index 601f245..0000000
Binary files a/src/Notes-master3/app/build/intermediates/desugar_graph/debugAndroidTest/out/currentProject/jar_fdc5d28186870baf89f7e34550effe334eb9ac5f8cae6121d889049766d6f814_bucket_14/graph.bin and /dev/null differ
diff --git a/src/Notes-master3/app/build/intermediates/desugar_graph/debugAndroidTest/out/currentProject/jar_fdc5d28186870baf89f7e34550effe334eb9ac5f8cae6121d889049766d6f814_bucket_15/graph.bin b/src/Notes-master3/app/build/intermediates/desugar_graph/debugAndroidTest/out/currentProject/jar_fdc5d28186870baf89f7e34550effe334eb9ac5f8cae6121d889049766d6f814_bucket_15/graph.bin
deleted file mode 100644
index 601f245..0000000
Binary files a/src/Notes-master3/app/build/intermediates/desugar_graph/debugAndroidTest/out/currentProject/jar_fdc5d28186870baf89f7e34550effe334eb9ac5f8cae6121d889049766d6f814_bucket_15/graph.bin and /dev/null differ
diff --git a/src/Notes-master3/app/build/intermediates/desugar_graph/debugAndroidTest/out/currentProject/jar_fdc5d28186870baf89f7e34550effe334eb9ac5f8cae6121d889049766d6f814_bucket_2/graph.bin b/src/Notes-master3/app/build/intermediates/desugar_graph/debugAndroidTest/out/currentProject/jar_fdc5d28186870baf89f7e34550effe334eb9ac5f8cae6121d889049766d6f814_bucket_2/graph.bin
deleted file mode 100644
index 601f245..0000000
Binary files a/src/Notes-master3/app/build/intermediates/desugar_graph/debugAndroidTest/out/currentProject/jar_fdc5d28186870baf89f7e34550effe334eb9ac5f8cae6121d889049766d6f814_bucket_2/graph.bin and /dev/null differ
diff --git a/src/Notes-master3/app/build/intermediates/desugar_graph/debugAndroidTest/out/currentProject/jar_fdc5d28186870baf89f7e34550effe334eb9ac5f8cae6121d889049766d6f814_bucket_3/graph.bin b/src/Notes-master3/app/build/intermediates/desugar_graph/debugAndroidTest/out/currentProject/jar_fdc5d28186870baf89f7e34550effe334eb9ac5f8cae6121d889049766d6f814_bucket_3/graph.bin
deleted file mode 100644
index 601f245..0000000
Binary files a/src/Notes-master3/app/build/intermediates/desugar_graph/debugAndroidTest/out/currentProject/jar_fdc5d28186870baf89f7e34550effe334eb9ac5f8cae6121d889049766d6f814_bucket_3/graph.bin and /dev/null differ
diff --git a/src/Notes-master3/app/build/intermediates/desugar_graph/debugAndroidTest/out/currentProject/jar_fdc5d28186870baf89f7e34550effe334eb9ac5f8cae6121d889049766d6f814_bucket_4/graph.bin b/src/Notes-master3/app/build/intermediates/desugar_graph/debugAndroidTest/out/currentProject/jar_fdc5d28186870baf89f7e34550effe334eb9ac5f8cae6121d889049766d6f814_bucket_4/graph.bin
deleted file mode 100644
index 601f245..0000000
Binary files a/src/Notes-master3/app/build/intermediates/desugar_graph/debugAndroidTest/out/currentProject/jar_fdc5d28186870baf89f7e34550effe334eb9ac5f8cae6121d889049766d6f814_bucket_4/graph.bin and /dev/null differ
diff --git a/src/Notes-master3/app/build/intermediates/desugar_graph/debugAndroidTest/out/currentProject/jar_fdc5d28186870baf89f7e34550effe334eb9ac5f8cae6121d889049766d6f814_bucket_5/graph.bin b/src/Notes-master3/app/build/intermediates/desugar_graph/debugAndroidTest/out/currentProject/jar_fdc5d28186870baf89f7e34550effe334eb9ac5f8cae6121d889049766d6f814_bucket_5/graph.bin
deleted file mode 100644
index 601f245..0000000
Binary files a/src/Notes-master3/app/build/intermediates/desugar_graph/debugAndroidTest/out/currentProject/jar_fdc5d28186870baf89f7e34550effe334eb9ac5f8cae6121d889049766d6f814_bucket_5/graph.bin and /dev/null differ
diff --git a/src/Notes-master3/app/build/intermediates/desugar_graph/debugAndroidTest/out/currentProject/jar_fdc5d28186870baf89f7e34550effe334eb9ac5f8cae6121d889049766d6f814_bucket_6/graph.bin b/src/Notes-master3/app/build/intermediates/desugar_graph/debugAndroidTest/out/currentProject/jar_fdc5d28186870baf89f7e34550effe334eb9ac5f8cae6121d889049766d6f814_bucket_6/graph.bin
deleted file mode 100644
index 601f245..0000000
Binary files a/src/Notes-master3/app/build/intermediates/desugar_graph/debugAndroidTest/out/currentProject/jar_fdc5d28186870baf89f7e34550effe334eb9ac5f8cae6121d889049766d6f814_bucket_6/graph.bin and /dev/null differ
diff --git a/src/Notes-master3/app/build/intermediates/desugar_graph/debugAndroidTest/out/currentProject/jar_fdc5d28186870baf89f7e34550effe334eb9ac5f8cae6121d889049766d6f814_bucket_7/graph.bin b/src/Notes-master3/app/build/intermediates/desugar_graph/debugAndroidTest/out/currentProject/jar_fdc5d28186870baf89f7e34550effe334eb9ac5f8cae6121d889049766d6f814_bucket_7/graph.bin
deleted file mode 100644
index 601f245..0000000
Binary files a/src/Notes-master3/app/build/intermediates/desugar_graph/debugAndroidTest/out/currentProject/jar_fdc5d28186870baf89f7e34550effe334eb9ac5f8cae6121d889049766d6f814_bucket_7/graph.bin and /dev/null differ
diff --git a/src/Notes-master3/app/build/intermediates/desugar_graph/debugAndroidTest/out/currentProject/jar_fdc5d28186870baf89f7e34550effe334eb9ac5f8cae6121d889049766d6f814_bucket_8/graph.bin b/src/Notes-master3/app/build/intermediates/desugar_graph/debugAndroidTest/out/currentProject/jar_fdc5d28186870baf89f7e34550effe334eb9ac5f8cae6121d889049766d6f814_bucket_8/graph.bin
deleted file mode 100644
index 601f245..0000000
Binary files a/src/Notes-master3/app/build/intermediates/desugar_graph/debugAndroidTest/out/currentProject/jar_fdc5d28186870baf89f7e34550effe334eb9ac5f8cae6121d889049766d6f814_bucket_8/graph.bin and /dev/null differ
diff --git a/src/Notes-master3/app/build/intermediates/desugar_graph/debugAndroidTest/out/currentProject/jar_fdc5d28186870baf89f7e34550effe334eb9ac5f8cae6121d889049766d6f814_bucket_9/graph.bin b/src/Notes-master3/app/build/intermediates/desugar_graph/debugAndroidTest/out/currentProject/jar_fdc5d28186870baf89f7e34550effe334eb9ac5f8cae6121d889049766d6f814_bucket_9/graph.bin
deleted file mode 100644
index 601f245..0000000
Binary files a/src/Notes-master3/app/build/intermediates/desugar_graph/debugAndroidTest/out/currentProject/jar_fdc5d28186870baf89f7e34550effe334eb9ac5f8cae6121d889049766d6f814_bucket_9/graph.bin and /dev/null differ
diff --git a/src/Notes-master3/app/build/intermediates/dex/debug/mergeDexDebug/classes.dex b/src/Notes-master3/app/build/intermediates/dex/debug/mergeDexDebug/classes.dex
index 69a9fd9..c334d5f 100644
Binary files a/src/Notes-master3/app/build/intermediates/dex/debug/mergeDexDebug/classes.dex and b/src/Notes-master3/app/build/intermediates/dex/debug/mergeDexDebug/classes.dex 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 8bddf78..2fd055c 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/dex_archive_input_jar_hashes/debugAndroidTest/out b/src/Notes-master3/app/build/intermediates/dex_archive_input_jar_hashes/debugAndroidTest/out
index dfa1a72..34c45b5 100644
Binary files a/src/Notes-master3/app/build/intermediates/dex_archive_input_jar_hashes/debugAndroidTest/out and b/src/Notes-master3/app/build/intermediates/dex_archive_input_jar_hashes/debugAndroidTest/out differ
diff --git a/src/Notes-master3/app/build/intermediates/dex_number_of_buckets_file/debug/out b/src/Notes-master3/app/build/intermediates/dex_number_of_buckets_file/debug/out
index 19c7bdb..62f9457 100644
--- a/src/Notes-master3/app/build/intermediates/dex_number_of_buckets_file/debug/out
+++ b/src/Notes-master3/app/build/intermediates/dex_number_of_buckets_file/debug/out
@@ -1 +1 @@
-16
\ No newline at end of file
+6
\ No newline at end of file
diff --git a/src/Notes-master3/app/build/intermediates/dex_number_of_buckets_file/debugAndroidTest/out b/src/Notes-master3/app/build/intermediates/dex_number_of_buckets_file/debugAndroidTest/out
index 19c7bdb..62f9457 100644
--- a/src/Notes-master3/app/build/intermediates/dex_number_of_buckets_file/debugAndroidTest/out
+++ b/src/Notes-master3/app/build/intermediates/dex_number_of_buckets_file/debugAndroidTest/out
@@ -1 +1 @@
-16
\ No newline at end of file
+6
\ No newline at end of file
diff --git a/src/Notes-master3/app/build/intermediates/incremental/debug-mergeJavaRes/merge-state b/src/Notes-master3/app/build/intermediates/incremental/debug-mergeJavaRes/merge-state
index 512fa06..1c983fc 100644
Binary files a/src/Notes-master3/app/build/intermediates/incremental/debug-mergeJavaRes/merge-state and b/src/Notes-master3/app/build/intermediates/incremental/debug-mergeJavaRes/merge-state differ
diff --git a/src/Notes-master3/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/0PkI7zgYv7AnQpsKquwr5elXrcE= b/src/Notes-master3/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/0PkI7zgYv7AnQpsKquwr5elXrcE=
deleted file mode 100644
index f27829e..0000000
Binary files a/src/Notes-master3/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/0PkI7zgYv7AnQpsKquwr5elXrcE= and /dev/null differ
diff --git a/src/Notes-master3/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/0tiUTjw9kJjquKbXF3TYah7ql3Y= b/src/Notes-master3/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/0tiUTjw9kJjquKbXF3TYah7ql3Y=
deleted file mode 100644
index 3aad90c..0000000
Binary files a/src/Notes-master3/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/0tiUTjw9kJjquKbXF3TYah7ql3Y= and /dev/null differ
diff --git a/src/Notes-master3/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/3Vo_8a7bdRi7PjVYQtXXxN2+Ufo= b/src/Notes-master3/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/3Vo_8a7bdRi7PjVYQtXXxN2+Ufo=
deleted file mode 100644
index 172691b..0000000
Binary files a/src/Notes-master3/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/3Vo_8a7bdRi7PjVYQtXXxN2+Ufo= and /dev/null differ
diff --git a/src/Notes-master3/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/3cvpc8AGYX+NG0QIdBH4LxkmzII= b/src/Notes-master3/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/3cvpc8AGYX+NG0QIdBH4LxkmzII=
deleted file mode 100644
index 3e3acf4..0000000
Binary files a/src/Notes-master3/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/3cvpc8AGYX+NG0QIdBH4LxkmzII= and /dev/null differ
diff --git a/src/Notes-master3/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/7BLetWvTgDe6hckypKsRwrShe4s= b/src/Notes-master3/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/7BLetWvTgDe6hckypKsRwrShe4s=
deleted file mode 100644
index b5e5cbc..0000000
Binary files a/src/Notes-master3/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/7BLetWvTgDe6hckypKsRwrShe4s= and /dev/null differ
diff --git a/src/Notes-master3/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/8J0NcXej4sA_5KOVGlSVrPYC3eU= b/src/Notes-master3/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/8J0NcXej4sA_5KOVGlSVrPYC3eU=
deleted file mode 100644
index 0d4a161..0000000
Binary files a/src/Notes-master3/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/8J0NcXej4sA_5KOVGlSVrPYC3eU= and /dev/null differ
diff --git a/src/Notes-master3/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/A52LBK+SsZF7xkiGdWT9dAZ3TyE= b/src/Notes-master3/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/A52LBK+SsZF7xkiGdWT9dAZ3TyE=
deleted file mode 100644
index f3ed40b..0000000
Binary files a/src/Notes-master3/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/A52LBK+SsZF7xkiGdWT9dAZ3TyE= and /dev/null differ
diff --git a/src/Notes-master3/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/DOZTTdO++me0wOPAzjJckLd_XMA= b/src/Notes-master3/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/DOZTTdO++me0wOPAzjJckLd_XMA=
deleted file mode 100644
index 9f562b5..0000000
Binary files a/src/Notes-master3/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/DOZTTdO++me0wOPAzjJckLd_XMA= and /dev/null differ
diff --git a/src/Notes-master3/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/E0FYufmfs1GM2kHwT9EiYsusn48= b/src/Notes-master3/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/E0FYufmfs1GM2kHwT9EiYsusn48=
deleted file mode 100644
index 2e46a7c..0000000
Binary files a/src/Notes-master3/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/E0FYufmfs1GM2kHwT9EiYsusn48= and /dev/null differ
diff --git a/src/Notes-master3/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/GBKxYO57iWdXjhwkkbF0J3nQglQ= b/src/Notes-master3/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/GBKxYO57iWdXjhwkkbF0J3nQglQ=
deleted file mode 100644
index 8190f88..0000000
Binary files a/src/Notes-master3/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/GBKxYO57iWdXjhwkkbF0J3nQglQ= and /dev/null differ
diff --git a/src/Notes-master3/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/Jci2JsB_lqHkNDa+twO3ZLxdhxs= b/src/Notes-master3/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/Jci2JsB_lqHkNDa+twO3ZLxdhxs=
deleted file mode 100644
index 2400090..0000000
Binary files a/src/Notes-master3/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/Jci2JsB_lqHkNDa+twO3ZLxdhxs= and /dev/null differ
diff --git a/src/Notes-master3/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/JpM6V7S+o85UTL2yjhORZooxnt8= b/src/Notes-master3/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/JpM6V7S+o85UTL2yjhORZooxnt8=
deleted file mode 100644
index 3402ba5..0000000
Binary files a/src/Notes-master3/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/JpM6V7S+o85UTL2yjhORZooxnt8= and /dev/null differ
diff --git a/src/Notes-master3/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/Kt19ekTm3ILCe6f2mssp0gM5iG0= b/src/Notes-master3/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/Kt19ekTm3ILCe6f2mssp0gM5iG0=
deleted file mode 100644
index ac37f2b..0000000
Binary files a/src/Notes-master3/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/Kt19ekTm3ILCe6f2mssp0gM5iG0= and /dev/null differ
diff --git a/src/Notes-master3/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/MYswC2VnRz3JjbES6DGVw5xUgGk= b/src/Notes-master3/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/MYswC2VnRz3JjbES6DGVw5xUgGk=
deleted file mode 100644
index 810547b..0000000
Binary files a/src/Notes-master3/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/MYswC2VnRz3JjbES6DGVw5xUgGk= and /dev/null differ
diff --git a/src/Notes-master3/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/PboIDnPPttkNN4Tq8cYu9c4aVuk= b/src/Notes-master3/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/PboIDnPPttkNN4Tq8cYu9c4aVuk=
deleted file mode 100644
index ea6f509..0000000
Binary files a/src/Notes-master3/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/PboIDnPPttkNN4Tq8cYu9c4aVuk= and /dev/null differ
diff --git a/src/Notes-master3/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/ThCYCB44YG8H06D9VyyKVEUl0WM= b/src/Notes-master3/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/ThCYCB44YG8H06D9VyyKVEUl0WM=
deleted file mode 100644
index 5137d2e..0000000
Binary files a/src/Notes-master3/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/ThCYCB44YG8H06D9VyyKVEUl0WM= and /dev/null differ
diff --git a/src/Notes-master3/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/YyCH6y2tZOQfQWqtOJIYY6Dwe_E= b/src/Notes-master3/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/YyCH6y2tZOQfQWqtOJIYY6Dwe_E=
deleted file mode 100644
index 93b769e..0000000
Binary files a/src/Notes-master3/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/YyCH6y2tZOQfQWqtOJIYY6Dwe_E= and /dev/null differ
diff --git a/src/Notes-master3/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/b72MfptMCDd154rchn1v6pFYmQg= b/src/Notes-master3/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/b72MfptMCDd154rchn1v6pFYmQg=
deleted file mode 100644
index 6a09445..0000000
Binary files a/src/Notes-master3/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/b72MfptMCDd154rchn1v6pFYmQg= and /dev/null differ
diff --git a/src/Notes-master3/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/ee6G2AK_1Rro0QhEHxTXBUJ53ms= b/src/Notes-master3/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/ee6G2AK_1Rro0QhEHxTXBUJ53ms=
deleted file mode 100644
index 5afb9b4..0000000
Binary files a/src/Notes-master3/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/ee6G2AK_1Rro0QhEHxTXBUJ53ms= and /dev/null differ
diff --git a/src/Notes-master3/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/i2EqHasfVbCHQccTwMK+dDGLN90= b/src/Notes-master3/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/i2EqHasfVbCHQccTwMK+dDGLN90=
deleted file mode 100644
index 5405370..0000000
Binary files a/src/Notes-master3/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/i2EqHasfVbCHQccTwMK+dDGLN90= and /dev/null differ
diff --git a/src/Notes-master3/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/jABjcdpJZ40SXtWGmSJ_4YPI6+w= b/src/Notes-master3/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/jABjcdpJZ40SXtWGmSJ_4YPI6+w=
deleted file mode 100644
index e40b65d..0000000
Binary files a/src/Notes-master3/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/jABjcdpJZ40SXtWGmSJ_4YPI6+w= and /dev/null differ
diff --git a/src/Notes-master3/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/mA9Z1YJtSCxCUNAPs0MG3PXCcVo= b/src/Notes-master3/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/mA9Z1YJtSCxCUNAPs0MG3PXCcVo=
deleted file mode 100644
index 1f8cc12..0000000
Binary files a/src/Notes-master3/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/mA9Z1YJtSCxCUNAPs0MG3PXCcVo= and /dev/null differ
diff --git a/src/Notes-master3/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/mJADEmH5o3_SD782fESKFcXKwb4= b/src/Notes-master3/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/mJADEmH5o3_SD782fESKFcXKwb4=
deleted file mode 100644
index ee0fc38..0000000
Binary files a/src/Notes-master3/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/mJADEmH5o3_SD782fESKFcXKwb4= and /dev/null differ
diff --git a/src/Notes-master3/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/oeChAWjhYMUvSAIXC2Fbp0zML3k= b/src/Notes-master3/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/oeChAWjhYMUvSAIXC2Fbp0zML3k=
deleted file mode 100644
index b322a60..0000000
Binary files a/src/Notes-master3/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/oeChAWjhYMUvSAIXC2Fbp0zML3k= and /dev/null differ
diff --git a/src/Notes-master3/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/sNe5SwIHls0vUfLr4HrxUh2oS9k= b/src/Notes-master3/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/sNe5SwIHls0vUfLr4HrxUh2oS9k=
deleted file mode 100644
index 091b6b6..0000000
Binary files a/src/Notes-master3/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/sNe5SwIHls0vUfLr4HrxUh2oS9k= and /dev/null differ
diff --git a/src/Notes-master3/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/wSz860zNqrq2P_eAx7l+3j7ltC0= b/src/Notes-master3/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/wSz860zNqrq2P_eAx7l+3j7ltC0=
deleted file mode 100644
index 85e5545..0000000
Binary files a/src/Notes-master3/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/wSz860zNqrq2P_eAx7l+3j7ltC0= and /dev/null differ
diff --git a/src/Notes-master3/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/x7s2CdKTK4Csn299+JXjtyzDzdA= b/src/Notes-master3/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/x7s2CdKTK4Csn299+JXjtyzDzdA=
deleted file mode 100644
index 3b85954..0000000
Binary files a/src/Notes-master3/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/x7s2CdKTK4Csn299+JXjtyzDzdA= and /dev/null 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 3ec3683..0cc5a0a 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,102 +1,102 @@
-#Wed Jan 17 18:49:36 GMT+08:00 2024
-net.micode.notes.app-main-6\:/color/primary_text_dark.xml=E\:\\_Ufo\\0SE\\GitProject\\MicodeNotes\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\color_primary_text_dark.xml.flat
-net.micode.notes.app-main-6\:/color/secondary_text_dark.xml=E\:\\_Ufo\\0SE\\GitProject\\MicodeNotes\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\color_secondary_text_dark.xml.flat
-net.micode.notes.app-main-6\:/drawable-hdpi/acat.png=E\:\\_Ufo\\0SE\\GitProject\\MicodeNotes\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_acat.png.flat
-net.micode.notes.app-main-6\:/drawable-hdpi/achimpanzee.png=E\:\\_Ufo\\0SE\\GitProject\\MicodeNotes\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_achimpanzee.png.flat
-net.micode.notes.app-main-6\:/drawable-hdpi/agray.png=E\:\\_Ufo\\0SE\\GitProject\\MicodeNotes\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_agray.png.flat
-net.micode.notes.app-main-6\:/drawable-hdpi/beauty.jpg=E\:\\_Ufo\\0SE\\GitProject\\MicodeNotes\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_beauty.jpg.flat
-net.micode.notes.app-main-6\:/drawable-hdpi/bg_btn_set_color.png=E\:\\_Ufo\\0SE\\GitProject\\MicodeNotes\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_bg_btn_set_color.png.flat
-net.micode.notes.app-main-6\:/drawable-hdpi/bg_color_btn_mask.png=E\:\\_Ufo\\0SE\\GitProject\\MicodeNotes\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_bg_color_btn_mask.png.flat
-net.micode.notes.app-main-6\:/drawable-hdpi/call_record.png=E\:\\_Ufo\\0SE\\GitProject\\MicodeNotes\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_call_record.png.flat
-net.micode.notes.app-main-6\:/drawable-hdpi/clock.png=E\:\\_Ufo\\0SE\\GitProject\\MicodeNotes\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_clock.png.flat
-net.micode.notes.app-main-6\:/drawable-hdpi/delete.png=E\:\\_Ufo\\0SE\\GitProject\\MicodeNotes\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_delete.png.flat
-net.micode.notes.app-main-6\:/drawable-hdpi/dropdown_icon.9.png=E\:\\_Ufo\\0SE\\GitProject\\MicodeNotes\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_dropdown_icon.9.png.flat
-net.micode.notes.app-main-6\:/drawable-hdpi/edit_blue.9.png=E\:\\_Ufo\\0SE\\GitProject\\MicodeNotes\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_blue.9.png.flat
-net.micode.notes.app-main-6\:/drawable-hdpi/edit_green.9.png=E\:\\_Ufo\\0SE\\GitProject\\MicodeNotes\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_green.9.png.flat
-net.micode.notes.app-main-6\:/drawable-hdpi/edit_red.9.png=E\:\\_Ufo\\0SE\\GitProject\\MicodeNotes\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_red.9.png.flat
-net.micode.notes.app-main-6\:/drawable-hdpi/edit_title_blue.9.png=E\:\\_Ufo\\0SE\\GitProject\\MicodeNotes\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_blue.9.png.flat
-net.micode.notes.app-main-6\:/drawable-hdpi/edit_title_green.9.png=E\:\\_Ufo\\0SE\\GitProject\\MicodeNotes\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_green.9.png.flat
-net.micode.notes.app-main-6\:/drawable-hdpi/edit_title_red.9.png=E\:\\_Ufo\\0SE\\GitProject\\MicodeNotes\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_red.9.png.flat
-net.micode.notes.app-main-6\:/drawable-hdpi/edit_title_white.9.png=E\:\\_Ufo\\0SE\\GitProject\\MicodeNotes\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_white.9.png.flat
-net.micode.notes.app-main-6\:/drawable-hdpi/edit_title_yellow.9.png=E\:\\_Ufo\\0SE\\GitProject\\MicodeNotes\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_yellow.9.png.flat
-net.micode.notes.app-main-6\:/drawable-hdpi/edit_white.9.png=E\:\\_Ufo\\0SE\\GitProject\\MicodeNotes\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_white.9.png.flat
-net.micode.notes.app-main-6\:/drawable-hdpi/edit_yellow.9.png=E\:\\_Ufo\\0SE\\GitProject\\MicodeNotes\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_yellow.9.png.flat
-net.micode.notes.app-main-6\:/drawable-hdpi/font_large.png=E\:\\_Ufo\\0SE\\GitProject\\MicodeNotes\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_large.png.flat
-net.micode.notes.app-main-6\:/drawable-hdpi/font_normal.png=E\:\\_Ufo\\0SE\\GitProject\\MicodeNotes\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_normal.png.flat
-net.micode.notes.app-main-6\:/drawable-hdpi/font_size_selector_bg.9.png=E\:\\_Ufo\\0SE\\GitProject\\MicodeNotes\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_size_selector_bg.9.png.flat
-net.micode.notes.app-main-6\:/drawable-hdpi/font_small.png=E\:\\_Ufo\\0SE\\GitProject\\MicodeNotes\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_small.png.flat
-net.micode.notes.app-main-6\:/drawable-hdpi/font_super.png=E\:\\_Ufo\\0SE\\GitProject\\MicodeNotes\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_super.png.flat
-net.micode.notes.app-main-6\:/drawable-hdpi/icon_app.png=E\:\\_Ufo\\0SE\\GitProject\\MicodeNotes\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_icon_app.png.flat
-net.micode.notes.app-main-6\:/drawable-hdpi/list_background.png=E\:\\_Ufo\\0SE\\GitProject\\MicodeNotes\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_background.png.flat
-net.micode.notes.app-main-6\:/drawable-hdpi/list_blue_down.9.png=E\:\\_Ufo\\0SE\\GitProject\\MicodeNotes\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_blue_down.9.png.flat
-net.micode.notes.app-main-6\:/drawable-hdpi/list_blue_middle.9.png=E\:\\_Ufo\\0SE\\GitProject\\MicodeNotes\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_blue_middle.9.png.flat
-net.micode.notes.app-main-6\:/drawable-hdpi/list_blue_single.9.png=E\:\\_Ufo\\0SE\\GitProject\\MicodeNotes\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_blue_single.9.png.flat
-net.micode.notes.app-main-6\:/drawable-hdpi/list_blue_up.9.png=E\:\\_Ufo\\0SE\\GitProject\\MicodeNotes\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_blue_up.9.png.flat
-net.micode.notes.app-main-6\:/drawable-hdpi/list_folder.9.png=E\:\\_Ufo\\0SE\\GitProject\\MicodeNotes\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_folder.9.png.flat
-net.micode.notes.app-main-6\:/drawable-hdpi/list_footer_bg.9.png=E\:\\_Ufo\\0SE\\GitProject\\MicodeNotes\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_footer_bg.9.png.flat
-net.micode.notes.app-main-6\:/drawable-hdpi/list_green_down.9.png=E\:\\_Ufo\\0SE\\GitProject\\MicodeNotes\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_green_down.9.png.flat
-net.micode.notes.app-main-6\:/drawable-hdpi/list_green_middle.9.png=E\:\\_Ufo\\0SE\\GitProject\\MicodeNotes\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_green_middle.9.png.flat
-net.micode.notes.app-main-6\:/drawable-hdpi/list_green_single.9.png=E\:\\_Ufo\\0SE\\GitProject\\MicodeNotes\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_green_single.9.png.flat
-net.micode.notes.app-main-6\:/drawable-hdpi/list_green_up.9.png=E\:\\_Ufo\\0SE\\GitProject\\MicodeNotes\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_green_up.9.png.flat
-net.micode.notes.app-main-6\:/drawable-hdpi/list_red_down.9.png=E\:\\_Ufo\\0SE\\GitProject\\MicodeNotes\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_down.9.png.flat
-net.micode.notes.app-main-6\:/drawable-hdpi/list_red_middle.9.png=E\:\\_Ufo\\0SE\\GitProject\\MicodeNotes\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_middle.9.png.flat
-net.micode.notes.app-main-6\:/drawable-hdpi/list_red_single.9.png=E\:\\_Ufo\\0SE\\GitProject\\MicodeNotes\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_single.9.png.flat
-net.micode.notes.app-main-6\:/drawable-hdpi/list_red_up.9.png=E\:\\_Ufo\\0SE\\GitProject\\MicodeNotes\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_up.9.png.flat
-net.micode.notes.app-main-6\:/drawable-hdpi/list_white_down.9.png=E\:\\_Ufo\\0SE\\GitProject\\MicodeNotes\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_down.9.png.flat
-net.micode.notes.app-main-6\:/drawable-hdpi/list_white_middle.9.png=E\:\\_Ufo\\0SE\\GitProject\\MicodeNotes\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_middle.9.png.flat
-net.micode.notes.app-main-6\:/drawable-hdpi/list_white_single.9.png=E\:\\_Ufo\\0SE\\GitProject\\MicodeNotes\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_single.9.png.flat
-net.micode.notes.app-main-6\:/drawable-hdpi/list_white_up.9.png=E\:\\_Ufo\\0SE\\GitProject\\MicodeNotes\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_up.9.png.flat
-net.micode.notes.app-main-6\:/drawable-hdpi/list_yellow_down.9.png=E\:\\_Ufo\\0SE\\GitProject\\MicodeNotes\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_down.9.png.flat
-net.micode.notes.app-main-6\:/drawable-hdpi/list_yellow_middle.9.png=E\:\\_Ufo\\0SE\\GitProject\\MicodeNotes\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_middle.9.png.flat
-net.micode.notes.app-main-6\:/drawable-hdpi/list_yellow_single.9.png=E\:\\_Ufo\\0SE\\GitProject\\MicodeNotes\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_single.9.png.flat
-net.micode.notes.app-main-6\:/drawable-hdpi/list_yellow_up.9.png=E\:\\_Ufo\\0SE\\GitProject\\MicodeNotes\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_up.9.png.flat
-net.micode.notes.app-main-6\:/drawable-hdpi/menu_delete.png=E\:\\_Ufo\\0SE\\GitProject\\MicodeNotes\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_menu_delete.png.flat
-net.micode.notes.app-main-6\:/drawable-hdpi/menu_move.png=E\:\\_Ufo\\0SE\\GitProject\\MicodeNotes\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_menu_move.png.flat
-net.micode.notes.app-main-6\:/drawable-hdpi/new_note_normal.png=E\:\\_Ufo\\0SE\\GitProject\\MicodeNotes\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_new_note_normal.png.flat
-net.micode.notes.app-main-6\:/drawable-hdpi/new_note_pressed.png=E\:\\_Ufo\\0SE\\GitProject\\MicodeNotes\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_new_note_pressed.png.flat
-net.micode.notes.app-main-6\:/drawable-hdpi/note_edit_color_selector_panel.png=E\:\\_Ufo\\0SE\\GitProject\\MicodeNotes\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_note_edit_color_selector_panel.png.flat
-net.micode.notes.app-main-6\:/drawable-hdpi/notification.png=E\:\\_Ufo\\0SE\\GitProject\\MicodeNotes\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_notification.png.flat
-net.micode.notes.app-main-6\:/drawable-hdpi/search_result.png=E\:\\_Ufo\\0SE\\GitProject\\MicodeNotes\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_search_result.png.flat
-net.micode.notes.app-main-6\:/drawable-hdpi/selected.png=E\:\\_Ufo\\0SE\\GitProject\\MicodeNotes\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_selected.png.flat
-net.micode.notes.app-main-6\:/drawable-hdpi/title_alert.png=E\:\\_Ufo\\0SE\\GitProject\\MicodeNotes\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_title_alert.png.flat
-net.micode.notes.app-main-6\:/drawable-hdpi/title_bar_bg.9.png=E\:\\_Ufo\\0SE\\GitProject\\MicodeNotes\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_title_bar_bg.9.png.flat
-net.micode.notes.app-main-6\:/drawable-hdpi/widget_2x_blue.png=E\:\\_Ufo\\0SE\\GitProject\\MicodeNotes\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_blue.png.flat
-net.micode.notes.app-main-6\:/drawable-hdpi/widget_2x_green.png=E\:\\_Ufo\\0SE\\GitProject\\MicodeNotes\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_green.png.flat
-net.micode.notes.app-main-6\:/drawable-hdpi/widget_2x_red.png=E\:\\_Ufo\\0SE\\GitProject\\MicodeNotes\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_red.png.flat
-net.micode.notes.app-main-6\:/drawable-hdpi/widget_2x_white.png=E\:\\_Ufo\\0SE\\GitProject\\MicodeNotes\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_white.png.flat
-net.micode.notes.app-main-6\:/drawable-hdpi/widget_2x_yellow.png=E\:\\_Ufo\\0SE\\GitProject\\MicodeNotes\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_yellow.png.flat
-net.micode.notes.app-main-6\:/drawable-hdpi/widget_4x_blue.png=E\:\\_Ufo\\0SE\\GitProject\\MicodeNotes\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_blue.png.flat
-net.micode.notes.app-main-6\:/drawable-hdpi/widget_4x_green.png=E\:\\_Ufo\\0SE\\GitProject\\MicodeNotes\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_green.png.flat
-net.micode.notes.app-main-6\:/drawable-hdpi/widget_4x_red.png=E\:\\_Ufo\\0SE\\GitProject\\MicodeNotes\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_red.png.flat
-net.micode.notes.app-main-6\:/drawable-hdpi/widget_4x_white.png=E\:\\_Ufo\\0SE\\GitProject\\MicodeNotes\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_white.png.flat
-net.micode.notes.app-main-6\:/drawable-hdpi/widget_4x_yellow.png=E\:\\_Ufo\\0SE\\GitProject\\MicodeNotes\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_yellow.png.flat
-net.micode.notes.app-main-6\:/drawable/new_note.xml=E\:\\_Ufo\\0SE\\GitProject\\MicodeNotes\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable_new_note.xml.flat
-net.micode.notes.app-main-6\:/layout/account_dialog_title.xml=E\:\\_Ufo\\0SE\\GitProject\\MicodeNotes\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\layout_account_dialog_title.xml.flat
-net.micode.notes.app-main-6\:/layout/add_account_text.xml=E\:\\_Ufo\\0SE\\GitProject\\MicodeNotes\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\layout_add_account_text.xml.flat
-net.micode.notes.app-main-6\:/layout/datetime_picker.xml=E\:\\_Ufo\\0SE\\GitProject\\MicodeNotes\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\layout_datetime_picker.xml.flat
-net.micode.notes.app-main-6\:/layout/dialog_edit_text.xml=E\:\\_Ufo\\0SE\\GitProject\\MicodeNotes\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\layout_dialog_edit_text.xml.flat
-net.micode.notes.app-main-6\:/layout/folder_list_item.xml=E\:\\_Ufo\\0SE\\GitProject\\MicodeNotes\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\layout_folder_list_item.xml.flat
-net.micode.notes.app-main-6\:/layout/note_edit.xml=E\:\\_Ufo\\0SE\\GitProject\\MicodeNotes\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\layout_note_edit.xml.flat
-net.micode.notes.app-main-6\:/layout/note_edit_list_item.xml=E\:\\_Ufo\\0SE\\GitProject\\MicodeNotes\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\layout_note_edit_list_item.xml.flat
-net.micode.notes.app-main-6\:/layout/note_item.xml=E\:\\_Ufo\\0SE\\GitProject\\MicodeNotes\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\layout_note_item.xml.flat
-net.micode.notes.app-main-6\:/layout/note_list.xml=E\:\\_Ufo\\0SE\\GitProject\\MicodeNotes\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\layout_note_list.xml.flat
-net.micode.notes.app-main-6\:/layout/note_list_dropdown_menu.xml=E\:\\_Ufo\\0SE\\GitProject\\MicodeNotes\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\layout_note_list_dropdown_menu.xml.flat
-net.micode.notes.app-main-6\:/layout/note_list_footer.xml=E\:\\_Ufo\\0SE\\GitProject\\MicodeNotes\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\layout_note_list_footer.xml.flat
-net.micode.notes.app-main-6\:/layout/settings_header.xml=E\:\\_Ufo\\0SE\\GitProject\\MicodeNotes\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\layout_settings_header.xml.flat
-net.micode.notes.app-main-6\:/layout/test.xml=E\:\\_Ufo\\0SE\\GitProject\\MicodeNotes\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\layout_test.xml.flat
-net.micode.notes.app-main-6\:/layout/test1.xml=E\:\\_Ufo\\0SE\\GitProject\\MicodeNotes\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\layout_test1.xml.flat
-net.micode.notes.app-main-6\:/layout/widget_2x.xml=E\:\\_Ufo\\0SE\\GitProject\\MicodeNotes\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\layout_widget_2x.xml.flat
-net.micode.notes.app-main-6\:/layout/widget_4x.xml=E\:\\_Ufo\\0SE\\GitProject\\MicodeNotes\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\layout_widget_4x.xml.flat
-net.micode.notes.app-main-6\:/menu/call_note_edit.xml=E\:\\_Ufo\\0SE\\GitProject\\MicodeNotes\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\menu_call_note_edit.xml.flat
-net.micode.notes.app-main-6\:/menu/call_record_folder.xml=E\:\\_Ufo\\0SE\\GitProject\\MicodeNotes\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\menu_call_record_folder.xml.flat
-net.micode.notes.app-main-6\:/menu/note_edit.xml=E\:\\_Ufo\\0SE\\GitProject\\MicodeNotes\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\menu_note_edit.xml.flat
-net.micode.notes.app-main-6\:/menu/note_list.xml=E\:\\_Ufo\\0SE\\GitProject\\MicodeNotes\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\menu_note_list.xml.flat
-net.micode.notes.app-main-6\:/menu/note_list_dropdown.xml=E\:\\_Ufo\\0SE\\GitProject\\MicodeNotes\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\menu_note_list_dropdown.xml.flat
-net.micode.notes.app-main-6\:/menu/note_list_options.xml=E\:\\_Ufo\\0SE\\GitProject\\MicodeNotes\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\menu_note_list_options.xml.flat
-net.micode.notes.app-main-6\:/menu/sub_folder.xml=E\:\\_Ufo\\0SE\\GitProject\\MicodeNotes\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\menu_sub_folder.xml.flat
-net.micode.notes.app-main-6\:/raw-zh-rCN/introduction=E\:\\_Ufo\\0SE\\GitProject\\MicodeNotes\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\raw-zh-rCN_introduction.flat
-net.micode.notes.app-main-6\:/raw/introduction=E\:\\_Ufo\\0SE\\GitProject\\MicodeNotes\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\raw_introduction.flat
-net.micode.notes.app-main-6\:/xml/preferences.xml=E\:\\_Ufo\\0SE\\GitProject\\MicodeNotes\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\xml_preferences.xml.flat
-net.micode.notes.app-main-6\:/xml/searchable.xml=E\:\\_Ufo\\0SE\\GitProject\\MicodeNotes\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\xml_searchable.xml.flat
-net.micode.notes.app-main-6\:/xml/widget_2x_info.xml=E\:\\_Ufo\\0SE\\GitProject\\MicodeNotes\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\xml_widget_2x_info.xml.flat
-net.micode.notes.app-main-6\:/xml/widget_4x_info.xml=E\:\\_Ufo\\0SE\\GitProject\\MicodeNotes\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\xml_widget_4x_info.xml.flat
+#Thu Jan 18 19:33:33 CST 2024
+net.micode.notes.app-main-6\:/color/primary_text_dark.xml=D\:\\git\\MiNote2\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\color_primary_text_dark.xml.flat
+net.micode.notes.app-main-6\:/color/secondary_text_dark.xml=D\:\\git\\MiNote2\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\color_secondary_text_dark.xml.flat
+net.micode.notes.app-main-6\:/drawable-hdpi/acat.png=D\:\\git\\MiNote2\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_acat.png.flat
+net.micode.notes.app-main-6\:/drawable-hdpi/achimpanzee.png=D\:\\git\\MiNote2\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_achimpanzee.png.flat
+net.micode.notes.app-main-6\:/drawable-hdpi/agray.png=D\:\\git\\MiNote2\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_agray.png.flat
+net.micode.notes.app-main-6\:/drawable-hdpi/beauty.jpg=D\:\\git\\MiNote2\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_beauty.jpg.flat
+net.micode.notes.app-main-6\:/drawable-hdpi/bg_btn_set_color.png=D\:\\git\\MiNote2\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_bg_btn_set_color.png.flat
+net.micode.notes.app-main-6\:/drawable-hdpi/bg_color_btn_mask.png=D\:\\git\\MiNote2\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_bg_color_btn_mask.png.flat
+net.micode.notes.app-main-6\:/drawable-hdpi/call_record.png=D\:\\git\\MiNote2\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_call_record.png.flat
+net.micode.notes.app-main-6\:/drawable-hdpi/clock.png=D\:\\git\\MiNote2\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_clock.png.flat
+net.micode.notes.app-main-6\:/drawable-hdpi/delete.png=D\:\\git\\MiNote2\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_delete.png.flat
+net.micode.notes.app-main-6\:/drawable-hdpi/dropdown_icon.9.png=D\:\\git\\MiNote2\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_dropdown_icon.9.png.flat
+net.micode.notes.app-main-6\:/drawable-hdpi/edit_blue.9.png=D\:\\git\\MiNote2\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_blue.9.png.flat
+net.micode.notes.app-main-6\:/drawable-hdpi/edit_green.9.png=D\:\\git\\MiNote2\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_green.9.png.flat
+net.micode.notes.app-main-6\:/drawable-hdpi/edit_red.9.png=D\:\\git\\MiNote2\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_red.9.png.flat
+net.micode.notes.app-main-6\:/drawable-hdpi/edit_title_blue.9.png=D\:\\git\\MiNote2\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_blue.9.png.flat
+net.micode.notes.app-main-6\:/drawable-hdpi/edit_title_green.9.png=D\:\\git\\MiNote2\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_green.9.png.flat
+net.micode.notes.app-main-6\:/drawable-hdpi/edit_title_red.9.png=D\:\\git\\MiNote2\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_red.9.png.flat
+net.micode.notes.app-main-6\:/drawable-hdpi/edit_title_white.9.png=D\:\\git\\MiNote2\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_white.9.png.flat
+net.micode.notes.app-main-6\:/drawable-hdpi/edit_title_yellow.9.png=D\:\\git\\MiNote2\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_yellow.9.png.flat
+net.micode.notes.app-main-6\:/drawable-hdpi/edit_white.9.png=D\:\\git\\MiNote2\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_white.9.png.flat
+net.micode.notes.app-main-6\:/drawable-hdpi/edit_yellow.9.png=D\:\\git\\MiNote2\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_yellow.9.png.flat
+net.micode.notes.app-main-6\:/drawable-hdpi/font_large.png=D\:\\git\\MiNote2\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_large.png.flat
+net.micode.notes.app-main-6\:/drawable-hdpi/font_normal.png=D\:\\git\\MiNote2\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_normal.png.flat
+net.micode.notes.app-main-6\:/drawable-hdpi/font_size_selector_bg.9.png=D\:\\git\\MiNote2\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_size_selector_bg.9.png.flat
+net.micode.notes.app-main-6\:/drawable-hdpi/font_small.png=D\:\\git\\MiNote2\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_small.png.flat
+net.micode.notes.app-main-6\:/drawable-hdpi/font_super.png=D\:\\git\\MiNote2\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_super.png.flat
+net.micode.notes.app-main-6\:/drawable-hdpi/icon_app.png=D\:\\git\\MiNote2\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_icon_app.png.flat
+net.micode.notes.app-main-6\:/drawable-hdpi/list_background.png=D\:\\git\\MiNote2\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_background.png.flat
+net.micode.notes.app-main-6\:/drawable-hdpi/list_blue_down.9.png=D\:\\git\\MiNote2\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_blue_down.9.png.flat
+net.micode.notes.app-main-6\:/drawable-hdpi/list_blue_middle.9.png=D\:\\git\\MiNote2\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_blue_middle.9.png.flat
+net.micode.notes.app-main-6\:/drawable-hdpi/list_blue_single.9.png=D\:\\git\\MiNote2\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_blue_single.9.png.flat
+net.micode.notes.app-main-6\:/drawable-hdpi/list_blue_up.9.png=D\:\\git\\MiNote2\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_blue_up.9.png.flat
+net.micode.notes.app-main-6\:/drawable-hdpi/list_folder.9.png=D\:\\git\\MiNote2\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_folder.9.png.flat
+net.micode.notes.app-main-6\:/drawable-hdpi/list_footer_bg.9.png=D\:\\git\\MiNote2\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_footer_bg.9.png.flat
+net.micode.notes.app-main-6\:/drawable-hdpi/list_green_down.9.png=D\:\\git\\MiNote2\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_green_down.9.png.flat
+net.micode.notes.app-main-6\:/drawable-hdpi/list_green_middle.9.png=D\:\\git\\MiNote2\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_green_middle.9.png.flat
+net.micode.notes.app-main-6\:/drawable-hdpi/list_green_single.9.png=D\:\\git\\MiNote2\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_green_single.9.png.flat
+net.micode.notes.app-main-6\:/drawable-hdpi/list_green_up.9.png=D\:\\git\\MiNote2\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_green_up.9.png.flat
+net.micode.notes.app-main-6\:/drawable-hdpi/list_red_down.9.png=D\:\\git\\MiNote2\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_down.9.png.flat
+net.micode.notes.app-main-6\:/drawable-hdpi/list_red_middle.9.png=D\:\\git\\MiNote2\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_middle.9.png.flat
+net.micode.notes.app-main-6\:/drawable-hdpi/list_red_single.9.png=D\:\\git\\MiNote2\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_single.9.png.flat
+net.micode.notes.app-main-6\:/drawable-hdpi/list_red_up.9.png=D\:\\git\\MiNote2\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_up.9.png.flat
+net.micode.notes.app-main-6\:/drawable-hdpi/list_white_down.9.png=D\:\\git\\MiNote2\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_down.9.png.flat
+net.micode.notes.app-main-6\:/drawable-hdpi/list_white_middle.9.png=D\:\\git\\MiNote2\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_middle.9.png.flat
+net.micode.notes.app-main-6\:/drawable-hdpi/list_white_single.9.png=D\:\\git\\MiNote2\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_single.9.png.flat
+net.micode.notes.app-main-6\:/drawable-hdpi/list_white_up.9.png=D\:\\git\\MiNote2\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_up.9.png.flat
+net.micode.notes.app-main-6\:/drawable-hdpi/list_yellow_down.9.png=D\:\\git\\MiNote2\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_down.9.png.flat
+net.micode.notes.app-main-6\:/drawable-hdpi/list_yellow_middle.9.png=D\:\\git\\MiNote2\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_middle.9.png.flat
+net.micode.notes.app-main-6\:/drawable-hdpi/list_yellow_single.9.png=D\:\\git\\MiNote2\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_single.9.png.flat
+net.micode.notes.app-main-6\:/drawable-hdpi/list_yellow_up.9.png=D\:\\git\\MiNote2\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_up.9.png.flat
+net.micode.notes.app-main-6\:/drawable-hdpi/menu_delete.png=D\:\\git\\MiNote2\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_menu_delete.png.flat
+net.micode.notes.app-main-6\:/drawable-hdpi/menu_move.png=D\:\\git\\MiNote2\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_menu_move.png.flat
+net.micode.notes.app-main-6\:/drawable-hdpi/new_note_normal.png=D\:\\git\\MiNote2\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_new_note_normal.png.flat
+net.micode.notes.app-main-6\:/drawable-hdpi/new_note_pressed.png=D\:\\git\\MiNote2\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_new_note_pressed.png.flat
+net.micode.notes.app-main-6\:/drawable-hdpi/note_edit_color_selector_panel.png=D\:\\git\\MiNote2\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_note_edit_color_selector_panel.png.flat
+net.micode.notes.app-main-6\:/drawable-hdpi/notification.png=D\:\\git\\MiNote2\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_notification.png.flat
+net.micode.notes.app-main-6\:/drawable-hdpi/search_result.png=D\:\\git\\MiNote2\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_search_result.png.flat
+net.micode.notes.app-main-6\:/drawable-hdpi/selected.png=D\:\\git\\MiNote2\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_selected.png.flat
+net.micode.notes.app-main-6\:/drawable-hdpi/title_alert.png=D\:\\git\\MiNote2\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_title_alert.png.flat
+net.micode.notes.app-main-6\:/drawable-hdpi/title_bar_bg.9.png=D\:\\git\\MiNote2\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_title_bar_bg.9.png.flat
+net.micode.notes.app-main-6\:/drawable-hdpi/widget_2x_blue.png=D\:\\git\\MiNote2\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_blue.png.flat
+net.micode.notes.app-main-6\:/drawable-hdpi/widget_2x_green.png=D\:\\git\\MiNote2\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_green.png.flat
+net.micode.notes.app-main-6\:/drawable-hdpi/widget_2x_red.png=D\:\\git\\MiNote2\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_red.png.flat
+net.micode.notes.app-main-6\:/drawable-hdpi/widget_2x_white.png=D\:\\git\\MiNote2\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_white.png.flat
+net.micode.notes.app-main-6\:/drawable-hdpi/widget_2x_yellow.png=D\:\\git\\MiNote2\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_yellow.png.flat
+net.micode.notes.app-main-6\:/drawable-hdpi/widget_4x_blue.png=D\:\\git\\MiNote2\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_blue.png.flat
+net.micode.notes.app-main-6\:/drawable-hdpi/widget_4x_green.png=D\:\\git\\MiNote2\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_green.png.flat
+net.micode.notes.app-main-6\:/drawable-hdpi/widget_4x_red.png=D\:\\git\\MiNote2\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_red.png.flat
+net.micode.notes.app-main-6\:/drawable-hdpi/widget_4x_white.png=D\:\\git\\MiNote2\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_white.png.flat
+net.micode.notes.app-main-6\:/drawable-hdpi/widget_4x_yellow.png=D\:\\git\\MiNote2\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_yellow.png.flat
+net.micode.notes.app-main-6\:/drawable/new_note.xml=D\:\\git\\MiNote2\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable_new_note.xml.flat
+net.micode.notes.app-main-6\:/layout/account_dialog_title.xml=D\:\\git\\MiNote2\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\layout_account_dialog_title.xml.flat
+net.micode.notes.app-main-6\:/layout/add_account_text.xml=D\:\\git\\MiNote2\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\layout_add_account_text.xml.flat
+net.micode.notes.app-main-6\:/layout/datetime_picker.xml=D\:\\git\\MiNote2\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\layout_datetime_picker.xml.flat
+net.micode.notes.app-main-6\:/layout/dialog_edit_text.xml=D\:\\git\\MiNote2\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\layout_dialog_edit_text.xml.flat
+net.micode.notes.app-main-6\:/layout/folder_list_item.xml=D\:\\git\\MiNote2\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\layout_folder_list_item.xml.flat
+net.micode.notes.app-main-6\:/layout/note_edit.xml=D\:\\git\\MiNote2\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\layout_note_edit.xml.flat
+net.micode.notes.app-main-6\:/layout/note_edit_list_item.xml=D\:\\git\\MiNote2\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\layout_note_edit_list_item.xml.flat
+net.micode.notes.app-main-6\:/layout/note_item.xml=D\:\\git\\MiNote2\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\layout_note_item.xml.flat
+net.micode.notes.app-main-6\:/layout/note_list.xml=D\:\\git\\MiNote2\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\layout_note_list.xml.flat
+net.micode.notes.app-main-6\:/layout/note_list_dropdown_menu.xml=D\:\\git\\MiNote2\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\layout_note_list_dropdown_menu.xml.flat
+net.micode.notes.app-main-6\:/layout/note_list_footer.xml=D\:\\git\\MiNote2\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\layout_note_list_footer.xml.flat
+net.micode.notes.app-main-6\:/layout/settings_header.xml=D\:\\git\\MiNote2\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\layout_settings_header.xml.flat
+net.micode.notes.app-main-6\:/layout/test.xml=D\:\\git\\MiNote2\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\layout_test.xml.flat
+net.micode.notes.app-main-6\:/layout/test1.xml=D\:\\git\\MiNote2\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\layout_test1.xml.flat
+net.micode.notes.app-main-6\:/layout/widget_2x.xml=D\:\\git\\MiNote2\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\layout_widget_2x.xml.flat
+net.micode.notes.app-main-6\:/layout/widget_4x.xml=D\:\\git\\MiNote2\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\layout_widget_4x.xml.flat
+net.micode.notes.app-main-6\:/menu/call_note_edit.xml=D\:\\git\\MiNote2\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\menu_call_note_edit.xml.flat
+net.micode.notes.app-main-6\:/menu/call_record_folder.xml=D\:\\git\\MiNote2\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\menu_call_record_folder.xml.flat
+net.micode.notes.app-main-6\:/menu/note_edit.xml=D\:\\git\\MiNote2\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\menu_note_edit.xml.flat
+net.micode.notes.app-main-6\:/menu/note_list.xml=D\:\\git\\MiNote2\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\menu_note_list.xml.flat
+net.micode.notes.app-main-6\:/menu/note_list_dropdown.xml=D\:\\git\\MiNote2\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\menu_note_list_dropdown.xml.flat
+net.micode.notes.app-main-6\:/menu/note_list_options.xml=D\:\\git\\MiNote2\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\menu_note_list_options.xml.flat
+net.micode.notes.app-main-6\:/menu/sub_folder.xml=D\:\\git\\MiNote2\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\menu_sub_folder.xml.flat
+net.micode.notes.app-main-6\:/raw-zh-rCN/introduction=D\:\\git\\MiNote2\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\raw-zh-rCN_introduction.flat
+net.micode.notes.app-main-6\:/raw/introduction=D\:\\git\\MiNote2\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\raw_introduction.flat
+net.micode.notes.app-main-6\:/xml/preferences.xml=D\:\\git\\MiNote2\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\xml_preferences.xml.flat
+net.micode.notes.app-main-6\:/xml/searchable.xml=D\:\\git\\MiNote2\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\xml_searchable.xml.flat
+net.micode.notes.app-main-6\:/xml/widget_2x_info.xml=D\:\\git\\MiNote2\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\xml_widget_2x_info.xml.flat
+net.micode.notes.app-main-6\:/xml/widget_4x_info.xml=D\:\\git\\MiNote2\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\xml_widget_4x_info.xml.flat
diff --git a/src/Notes-master3/app/build/intermediates/incremental/debug/mergeDebugResources/merger.xml b/src/Notes-master3/app/build/intermediates/incremental/debug/mergeDebugResources/merger.xml
index cc906a7..0b327d5 100644
--- a/src/Notes-master3/app/build/intermediates/incremental/debug/mergeDebugResources/merger.xml
+++ b/src/Notes-master3/app/build/intermediates/incremental/debug/mergeDebugResources/merger.xml
@@ -1,5 +1,5 @@
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/src/Notes-master3/app/build/intermediates/incremental/debug/packageDebugResources/compile-file-map.properties b/src/Notes-master3/app/build/intermediates/incremental/debug/packageDebugResources/compile-file-map.properties
index 4b13c24..5a60c63 100644
--- a/src/Notes-master3/app/build/intermediates/incremental/debug/packageDebugResources/compile-file-map.properties
+++ b/src/Notes-master3/app/build/intermediates/incremental/debug/packageDebugResources/compile-file-map.properties
@@ -1,103 +1,102 @@
-#Wed Jan 17 18:49:36 GMT+08:00 2024
-net.micode.notes.app-main-5\:/color/primary_text_dark.xml=E\:\\_Ufo\\0SE\\GitProject\\MicodeNotes\\src\\Notes-master3\\app\\build\\intermediates\\packaged_res\\debug\\color\\primary_text_dark.xml
-net.micode.notes.app-main-5\:/color/secondary_text_dark.xml=E\:\\_Ufo\\0SE\\GitProject\\MicodeNotes\\src\\Notes-master3\\app\\build\\intermediates\\packaged_res\\debug\\color\\secondary_text_dark.xml
-net.micode.notes.app-main-5\:/drawable-hdpi/acat.png=E\:\\_Ufo\\0SE\\GitProject\\MicodeNotes\\src\\Notes-master3\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\acat.png
-net.micode.notes.app-main-5\:/drawable-hdpi/achimpanzee.png=E\:\\_Ufo\\0SE\\GitProject\\MicodeNotes\\src\\Notes-master3\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\achimpanzee.png
-net.micode.notes.app-main-5\:/drawable-hdpi/agray.png=E\:\\_Ufo\\0SE\\GitProject\\MicodeNotes\\src\\Notes-master3\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\agray.png
-net.micode.notes.app-main-5\:/drawable-hdpi/beauty.jpg=E\:\\_Ufo\\0SE\\GitProject\\MicodeNotes\\src\\Notes-master3\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\beauty.jpg
-net.micode.notes.app-main-5\:/drawable-hdpi/bg_btn_set_color.png=E\:\\_Ufo\\0SE\\GitProject\\MicodeNotes\\src\\Notes-master3\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\bg_btn_set_color.png
-net.micode.notes.app-main-5\:/drawable-hdpi/bg_color_btn_mask.png=E\:\\_Ufo\\0SE\\GitProject\\MicodeNotes\\src\\Notes-master3\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\bg_color_btn_mask.png
-net.micode.notes.app-main-5\:/drawable-hdpi/call_record.png=E\:\\_Ufo\\0SE\\GitProject\\MicodeNotes\\src\\Notes-master3\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\call_record.png
-net.micode.notes.app-main-5\:/drawable-hdpi/clock.png=E\:\\_Ufo\\0SE\\GitProject\\MicodeNotes\\src\\Notes-master3\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\clock.png
-net.micode.notes.app-main-5\:/drawable-hdpi/delete.png=E\:\\_Ufo\\0SE\\GitProject\\MicodeNotes\\src\\Notes-master3\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\delete.png
-net.micode.notes.app-main-5\:/drawable-hdpi/dropdown_icon.9.png=E\:\\_Ufo\\0SE\\GitProject\\MicodeNotes\\src\\Notes-master3\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\dropdown_icon.9.png
-net.micode.notes.app-main-5\:/drawable-hdpi/edit_blue.9.png=E\:\\_Ufo\\0SE\\GitProject\\MicodeNotes\\src\\Notes-master3\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\edit_blue.9.png
-net.micode.notes.app-main-5\:/drawable-hdpi/edit_green.9.png=E\:\\_Ufo\\0SE\\GitProject\\MicodeNotes\\src\\Notes-master3\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\edit_green.9.png
-net.micode.notes.app-main-5\:/drawable-hdpi/edit_red.9.png=E\:\\_Ufo\\0SE\\GitProject\\MicodeNotes\\src\\Notes-master3\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\edit_red.9.png
-net.micode.notes.app-main-5\:/drawable-hdpi/edit_title_blue.9.png=E\:\\_Ufo\\0SE\\GitProject\\MicodeNotes\\src\\Notes-master3\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\edit_title_blue.9.png
-net.micode.notes.app-main-5\:/drawable-hdpi/edit_title_green.9.png=E\:\\_Ufo\\0SE\\GitProject\\MicodeNotes\\src\\Notes-master3\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\edit_title_green.9.png
-net.micode.notes.app-main-5\:/drawable-hdpi/edit_title_red.9.png=E\:\\_Ufo\\0SE\\GitProject\\MicodeNotes\\src\\Notes-master3\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\edit_title_red.9.png
-net.micode.notes.app-main-5\:/drawable-hdpi/edit_title_white.9.png=E\:\\_Ufo\\0SE\\GitProject\\MicodeNotes\\src\\Notes-master3\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\edit_title_white.9.png
-net.micode.notes.app-main-5\:/drawable-hdpi/edit_title_yellow.9.png=E\:\\_Ufo\\0SE\\GitProject\\MicodeNotes\\src\\Notes-master3\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\edit_title_yellow.9.png
-net.micode.notes.app-main-5\:/drawable-hdpi/edit_white.9.png=E\:\\_Ufo\\0SE\\GitProject\\MicodeNotes\\src\\Notes-master3\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\edit_white.9.png
-net.micode.notes.app-main-5\:/drawable-hdpi/edit_yellow.9.png=E\:\\_Ufo\\0SE\\GitProject\\MicodeNotes\\src\\Notes-master3\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\edit_yellow.9.png
-net.micode.notes.app-main-5\:/drawable-hdpi/font_large.png=E\:\\_Ufo\\0SE\\GitProject\\MicodeNotes\\src\\Notes-master3\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\font_large.png
-net.micode.notes.app-main-5\:/drawable-hdpi/font_normal.png=E\:\\_Ufo\\0SE\\GitProject\\MicodeNotes\\src\\Notes-master3\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\font_normal.png
-net.micode.notes.app-main-5\:/drawable-hdpi/font_size_selector_bg.9.png=E\:\\_Ufo\\0SE\\GitProject\\MicodeNotes\\src\\Notes-master3\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\font_size_selector_bg.9.png
-net.micode.notes.app-main-5\:/drawable-hdpi/font_small.png=E\:\\_Ufo\\0SE\\GitProject\\MicodeNotes\\src\\Notes-master3\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\font_small.png
-net.micode.notes.app-main-5\:/drawable-hdpi/font_super.png=E\:\\_Ufo\\0SE\\GitProject\\MicodeNotes\\src\\Notes-master3\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\font_super.png
-net.micode.notes.app-main-5\:/drawable-hdpi/icon_app.png=E\:\\_Ufo\\0SE\\GitProject\\MicodeNotes\\src\\Notes-master3\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\icon_app.png
-net.micode.notes.app-main-5\:/drawable-hdpi/list_background.png=E\:\\_Ufo\\0SE\\GitProject\\MicodeNotes\\src\\Notes-master3\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_background.png
-net.micode.notes.app-main-5\:/drawable-hdpi/list_blue_down.9.png=E\:\\_Ufo\\0SE\\GitProject\\MicodeNotes\\src\\Notes-master3\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_blue_down.9.png
-net.micode.notes.app-main-5\:/drawable-hdpi/list_blue_middle.9.png=E\:\\_Ufo\\0SE\\GitProject\\MicodeNotes\\src\\Notes-master3\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_blue_middle.9.png
-net.micode.notes.app-main-5\:/drawable-hdpi/list_blue_single.9.png=E\:\\_Ufo\\0SE\\GitProject\\MicodeNotes\\src\\Notes-master3\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_blue_single.9.png
-net.micode.notes.app-main-5\:/drawable-hdpi/list_blue_up.9.png=E\:\\_Ufo\\0SE\\GitProject\\MicodeNotes\\src\\Notes-master3\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_blue_up.9.png
-net.micode.notes.app-main-5\:/drawable-hdpi/list_folder.9.png=E\:\\_Ufo\\0SE\\GitProject\\MicodeNotes\\src\\Notes-master3\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_folder.9.png
-net.micode.notes.app-main-5\:/drawable-hdpi/list_footer_bg.9.png=E\:\\_Ufo\\0SE\\GitProject\\MicodeNotes\\src\\Notes-master3\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_footer_bg.9.png
-net.micode.notes.app-main-5\:/drawable-hdpi/list_green_down.9.png=E\:\\_Ufo\\0SE\\GitProject\\MicodeNotes\\src\\Notes-master3\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_green_down.9.png
-net.micode.notes.app-main-5\:/drawable-hdpi/list_green_middle.9.png=E\:\\_Ufo\\0SE\\GitProject\\MicodeNotes\\src\\Notes-master3\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_green_middle.9.png
-net.micode.notes.app-main-5\:/drawable-hdpi/list_green_single.9.png=E\:\\_Ufo\\0SE\\GitProject\\MicodeNotes\\src\\Notes-master3\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_green_single.9.png
-net.micode.notes.app-main-5\:/drawable-hdpi/list_green_up.9.png=E\:\\_Ufo\\0SE\\GitProject\\MicodeNotes\\src\\Notes-master3\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_green_up.9.png
-net.micode.notes.app-main-5\:/drawable-hdpi/list_red_down.9.png=E\:\\_Ufo\\0SE\\GitProject\\MicodeNotes\\src\\Notes-master3\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_red_down.9.png
-net.micode.notes.app-main-5\:/drawable-hdpi/list_red_middle.9.png=E\:\\_Ufo\\0SE\\GitProject\\MicodeNotes\\src\\Notes-master3\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_red_middle.9.png
-net.micode.notes.app-main-5\:/drawable-hdpi/list_red_single.9.png=E\:\\_Ufo\\0SE\\GitProject\\MicodeNotes\\src\\Notes-master3\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_red_single.9.png
-net.micode.notes.app-main-5\:/drawable-hdpi/list_red_up.9.png=E\:\\_Ufo\\0SE\\GitProject\\MicodeNotes\\src\\Notes-master3\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_red_up.9.png
-net.micode.notes.app-main-5\:/drawable-hdpi/list_white_down.9.png=E\:\\_Ufo\\0SE\\GitProject\\MicodeNotes\\src\\Notes-master3\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_white_down.9.png
-net.micode.notes.app-main-5\:/drawable-hdpi/list_white_middle.9.png=E\:\\_Ufo\\0SE\\GitProject\\MicodeNotes\\src\\Notes-master3\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_white_middle.9.png
-net.micode.notes.app-main-5\:/drawable-hdpi/list_white_single.9.png=E\:\\_Ufo\\0SE\\GitProject\\MicodeNotes\\src\\Notes-master3\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_white_single.9.png
-net.micode.notes.app-main-5\:/drawable-hdpi/list_white_up.9.png=E\:\\_Ufo\\0SE\\GitProject\\MicodeNotes\\src\\Notes-master3\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_white_up.9.png
-net.micode.notes.app-main-5\:/drawable-hdpi/list_yellow_down.9.png=E\:\\_Ufo\\0SE\\GitProject\\MicodeNotes\\src\\Notes-master3\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_yellow_down.9.png
-net.micode.notes.app-main-5\:/drawable-hdpi/list_yellow_middle.9.png=E\:\\_Ufo\\0SE\\GitProject\\MicodeNotes\\src\\Notes-master3\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_yellow_middle.9.png
-net.micode.notes.app-main-5\:/drawable-hdpi/list_yellow_single.9.png=E\:\\_Ufo\\0SE\\GitProject\\MicodeNotes\\src\\Notes-master3\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_yellow_single.9.png
-net.micode.notes.app-main-5\:/drawable-hdpi/list_yellow_up.9.png=E\:\\_Ufo\\0SE\\GitProject\\MicodeNotes\\src\\Notes-master3\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_yellow_up.9.png
-net.micode.notes.app-main-5\:/drawable-hdpi/menu_delete.png=E\:\\_Ufo\\0SE\\GitProject\\MicodeNotes\\src\\Notes-master3\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\menu_delete.png
-net.micode.notes.app-main-5\:/drawable-hdpi/menu_move.png=E\:\\_Ufo\\0SE\\GitProject\\MicodeNotes\\src\\Notes-master3\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\menu_move.png
-net.micode.notes.app-main-5\:/drawable-hdpi/new_note_normal.png=E\:\\_Ufo\\0SE\\GitProject\\MicodeNotes\\src\\Notes-master3\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\new_note_normal.png
-net.micode.notes.app-main-5\:/drawable-hdpi/new_note_pressed.png=E\:\\_Ufo\\0SE\\GitProject\\MicodeNotes\\src\\Notes-master3\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\new_note_pressed.png
-net.micode.notes.app-main-5\:/drawable-hdpi/note_edit_color_selector_panel.png=E\:\\_Ufo\\0SE\\GitProject\\MicodeNotes\\src\\Notes-master3\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\note_edit_color_selector_panel.png
-net.micode.notes.app-main-5\:/drawable-hdpi/notification.png=E\:\\_Ufo\\0SE\\GitProject\\MicodeNotes\\src\\Notes-master3\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\notification.png
-net.micode.notes.app-main-5\:/drawable-hdpi/search_result.png=E\:\\_Ufo\\0SE\\GitProject\\MicodeNotes\\src\\Notes-master3\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\search_result.png
-net.micode.notes.app-main-5\:/drawable-hdpi/selected.png=E\:\\_Ufo\\0SE\\GitProject\\MicodeNotes\\src\\Notes-master3\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\selected.png
-net.micode.notes.app-main-5\:/drawable-hdpi/title_alert.png=E\:\\_Ufo\\0SE\\GitProject\\MicodeNotes\\src\\Notes-master3\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\title_alert.png
-net.micode.notes.app-main-5\:/drawable-hdpi/title_bar_bg.9.png=E\:\\_Ufo\\0SE\\GitProject\\MicodeNotes\\src\\Notes-master3\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\title_bar_bg.9.png
-net.micode.notes.app-main-5\:/drawable-hdpi/widget_2x_blue.png=E\:\\_Ufo\\0SE\\GitProject\\MicodeNotes\\src\\Notes-master3\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\widget_2x_blue.png
-net.micode.notes.app-main-5\:/drawable-hdpi/widget_2x_green.png=E\:\\_Ufo\\0SE\\GitProject\\MicodeNotes\\src\\Notes-master3\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\widget_2x_green.png
-net.micode.notes.app-main-5\:/drawable-hdpi/widget_2x_red.png=E\:\\_Ufo\\0SE\\GitProject\\MicodeNotes\\src\\Notes-master3\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\widget_2x_red.png
-net.micode.notes.app-main-5\:/drawable-hdpi/widget_2x_white.png=E\:\\_Ufo\\0SE\\GitProject\\MicodeNotes\\src\\Notes-master3\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\widget_2x_white.png
-net.micode.notes.app-main-5\:/drawable-hdpi/widget_2x_yellow.png=E\:\\_Ufo\\0SE\\GitProject\\MicodeNotes\\src\\Notes-master3\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\widget_2x_yellow.png
-net.micode.notes.app-main-5\:/drawable-hdpi/widget_4x_blue.png=E\:\\_Ufo\\0SE\\GitProject\\MicodeNotes\\src\\Notes-master3\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\widget_4x_blue.png
-net.micode.notes.app-main-5\:/drawable-hdpi/widget_4x_green.png=E\:\\_Ufo\\0SE\\GitProject\\MicodeNotes\\src\\Notes-master3\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\widget_4x_green.png
-net.micode.notes.app-main-5\:/drawable-hdpi/widget_4x_red.png=E\:\\_Ufo\\0SE\\GitProject\\MicodeNotes\\src\\Notes-master3\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\widget_4x_red.png
-net.micode.notes.app-main-5\:/drawable-hdpi/widget_4x_white.png=E\:\\_Ufo\\0SE\\GitProject\\MicodeNotes\\src\\Notes-master3\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\widget_4x_white.png
-net.micode.notes.app-main-5\:/drawable-hdpi/widget_4x_yellow.png=E\:\\_Ufo\\0SE\\GitProject\\MicodeNotes\\src\\Notes-master3\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\widget_4x_yellow.png
-net.micode.notes.app-main-5\:/drawable/new_note.xml=E\:\\_Ufo\\0SE\\GitProject\\MicodeNotes\\src\\Notes-master3\\app\\build\\intermediates\\packaged_res\\debug\\drawable\\new_note.xml
-net.micode.notes.app-main-5\:/layout/account_dialog_title.xml=E\:\\_Ufo\\0SE\\GitProject\\MicodeNotes\\src\\Notes-master3\\app\\build\\intermediates\\packaged_res\\debug\\layout\\account_dialog_title.xml
-net.micode.notes.app-main-5\:/layout/add_account_text.xml=E\:\\_Ufo\\0SE\\GitProject\\MicodeNotes\\src\\Notes-master3\\app\\build\\intermediates\\packaged_res\\debug\\layout\\add_account_text.xml
-net.micode.notes.app-main-5\:/layout/datetime_picker.xml=E\:\\_Ufo\\0SE\\GitProject\\MicodeNotes\\src\\Notes-master3\\app\\build\\intermediates\\packaged_res\\debug\\layout\\datetime_picker.xml
-net.micode.notes.app-main-5\:/layout/dialog_edit_text.xml=E\:\\_Ufo\\0SE\\GitProject\\MicodeNotes\\src\\Notes-master3\\app\\build\\intermediates\\packaged_res\\debug\\layout\\dialog_edit_text.xml
-net.micode.notes.app-main-5\:/layout/folder_list_item.xml=E\:\\_Ufo\\0SE\\GitProject\\MicodeNotes\\src\\Notes-master3\\app\\build\\intermediates\\packaged_res\\debug\\layout\\folder_list_item.xml
-net.micode.notes.app-main-5\:/layout/note_edit.xml=E\:\\_Ufo\\0SE\\GitProject\\MicodeNotes\\src\\Notes-master3\\app\\build\\intermediates\\packaged_res\\debug\\layout\\note_edit.xml
-net.micode.notes.app-main-5\:/layout/note_edit_list_item.xml=E\:\\_Ufo\\0SE\\GitProject\\MicodeNotes\\src\\Notes-master3\\app\\build\\intermediates\\packaged_res\\debug\\layout\\note_edit_list_item.xml
-net.micode.notes.app-main-5\:/layout/note_item.xml=E\:\\_Ufo\\0SE\\GitProject\\MicodeNotes\\src\\Notes-master3\\app\\build\\intermediates\\packaged_res\\debug\\layout\\note_item.xml
-net.micode.notes.app-main-5\:/layout/note_list.xml=E\:\\_Ufo\\0SE\\GitProject\\MicodeNotes\\src\\Notes-master3\\app\\build\\intermediates\\packaged_res\\debug\\layout\\note_list.xml
-net.micode.notes.app-main-5\:/layout/note_list_dropdown_menu.xml=E\:\\_Ufo\\0SE\\GitProject\\MicodeNotes\\src\\Notes-master3\\app\\build\\intermediates\\packaged_res\\debug\\layout\\note_list_dropdown_menu.xml
-net.micode.notes.app-main-5\:/layout/note_list_footer.xml=E\:\\_Ufo\\0SE\\GitProject\\MicodeNotes\\src\\Notes-master3\\app\\build\\intermediates\\packaged_res\\debug\\layout\\note_list_footer.xml
-net.micode.notes.app-main-5\:/layout/settings_header.xml=E\:\\_Ufo\\0SE\\GitProject\\MicodeNotes\\src\\Notes-master3\\app\\build\\intermediates\\packaged_res\\debug\\layout\\settings_header.xml
-net.micode.notes.app-main-5\:/layout/test.xml=E\:\\_Ufo\\0SE\\GitProject\\MicodeNotes\\src\\Notes-master3\\app\\build\\intermediates\\packaged_res\\debug\\layout\\test.xml
-net.micode.notes.app-main-5\:/layout/test1.xml=E\:\\_Ufo\\0SE\\GitProject\\MicodeNotes\\src\\Notes-master3\\app\\build\\intermediates\\packaged_res\\debug\\layout\\test1.xml
-net.micode.notes.app-main-5\:/layout/widget_2x.xml=E\:\\_Ufo\\0SE\\GitProject\\MicodeNotes\\src\\Notes-master3\\app\\build\\intermediates\\packaged_res\\debug\\layout\\widget_2x.xml
-net.micode.notes.app-main-5\:/layout/widget_4x.xml=E\:\\_Ufo\\0SE\\GitProject\\MicodeNotes\\src\\Notes-master3\\app\\build\\intermediates\\packaged_res\\debug\\layout\\widget_4x.xml
-net.micode.notes.app-main-5\:/menu/call_note_edit.xml=E\:\\_Ufo\\0SE\\GitProject\\MicodeNotes\\src\\Notes-master3\\app\\build\\intermediates\\packaged_res\\debug\\menu\\call_note_edit.xml
-net.micode.notes.app-main-5\:/menu/call_record_folder.xml=E\:\\_Ufo\\0SE\\GitProject\\MicodeNotes\\src\\Notes-master3\\app\\build\\intermediates\\packaged_res\\debug\\menu\\call_record_folder.xml
-net.micode.notes.app-main-5\:/menu/note_edit.xml=E\:\\_Ufo\\0SE\\GitProject\\MicodeNotes\\src\\Notes-master3\\app\\build\\intermediates\\packaged_res\\debug\\menu\\note_edit.xml
-net.micode.notes.app-main-5\:/menu/note_list.xml=E\:\\_Ufo\\0SE\\GitProject\\MicodeNotes\\src\\Notes-master3\\app\\build\\intermediates\\packaged_res\\debug\\menu\\note_list.xml
-net.micode.notes.app-main-5\:/menu/note_list_dropdown.xml=E\:\\_Ufo\\0SE\\GitProject\\MicodeNotes\\src\\Notes-master3\\app\\build\\intermediates\\packaged_res\\debug\\menu\\note_list_dropdown.xml
-net.micode.notes.app-main-5\:/menu/note_list_options.xml=E\:\\_Ufo\\0SE\\GitProject\\MicodeNotes\\src\\Notes-master3\\app\\build\\intermediates\\packaged_res\\debug\\menu\\note_list_options.xml
-net.micode.notes.app-main-5\:/menu/recover_list.xml=E\:\\_Ufo\\0SE\\GitProject\\MicodeNotes\\src\\Notes-master3\\app\\build\\intermediates\\packaged_res\\debug\\menu\\recover_list.xml
-net.micode.notes.app-main-5\:/menu/sub_folder.xml=E\:\\_Ufo\\0SE\\GitProject\\MicodeNotes\\src\\Notes-master3\\app\\build\\intermediates\\packaged_res\\debug\\menu\\sub_folder.xml
-net.micode.notes.app-main-5\:/raw-zh-rCN/introduction=E\:\\_Ufo\\0SE\\GitProject\\MicodeNotes\\src\\Notes-master3\\app\\build\\intermediates\\packaged_res\\debug\\raw-zh-rCN\\introduction
-net.micode.notes.app-main-5\:/raw/introduction=E\:\\_Ufo\\0SE\\GitProject\\MicodeNotes\\src\\Notes-master3\\app\\build\\intermediates\\packaged_res\\debug\\raw\\introduction
-net.micode.notes.app-main-5\:/xml/preferences.xml=E\:\\_Ufo\\0SE\\GitProject\\MicodeNotes\\src\\Notes-master3\\app\\build\\intermediates\\packaged_res\\debug\\xml\\preferences.xml
-net.micode.notes.app-main-5\:/xml/searchable.xml=E\:\\_Ufo\\0SE\\GitProject\\MicodeNotes\\src\\Notes-master3\\app\\build\\intermediates\\packaged_res\\debug\\xml\\searchable.xml
-net.micode.notes.app-main-5\:/xml/widget_2x_info.xml=E\:\\_Ufo\\0SE\\GitProject\\MicodeNotes\\src\\Notes-master3\\app\\build\\intermediates\\packaged_res\\debug\\xml\\widget_2x_info.xml
-net.micode.notes.app-main-5\:/xml/widget_4x_info.xml=E\:\\_Ufo\\0SE\\GitProject\\MicodeNotes\\src\\Notes-master3\\app\\build\\intermediates\\packaged_res\\debug\\xml\\widget_4x_info.xml
+#Thu Jan 18 19:33:34 CST 2024
+net.micode.notes.app-main-5\:/color/primary_text_dark.xml=D\:\\git\\MiNote2\\src\\Notes-master3\\app\\build\\intermediates\\packaged_res\\debug\\color\\primary_text_dark.xml
+net.micode.notes.app-main-5\:/color/secondary_text_dark.xml=D\:\\git\\MiNote2\\src\\Notes-master3\\app\\build\\intermediates\\packaged_res\\debug\\color\\secondary_text_dark.xml
+net.micode.notes.app-main-5\:/drawable-hdpi/acat.png=D\:\\git\\MiNote2\\src\\Notes-master3\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\acat.png
+net.micode.notes.app-main-5\:/drawable-hdpi/achimpanzee.png=D\:\\git\\MiNote2\\src\\Notes-master3\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\achimpanzee.png
+net.micode.notes.app-main-5\:/drawable-hdpi/agray.png=D\:\\git\\MiNote2\\src\\Notes-master3\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\agray.png
+net.micode.notes.app-main-5\:/drawable-hdpi/beauty.jpg=D\:\\git\\MiNote2\\src\\Notes-master3\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\beauty.jpg
+net.micode.notes.app-main-5\:/drawable-hdpi/bg_btn_set_color.png=D\:\\git\\MiNote2\\src\\Notes-master3\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\bg_btn_set_color.png
+net.micode.notes.app-main-5\:/drawable-hdpi/bg_color_btn_mask.png=D\:\\git\\MiNote2\\src\\Notes-master3\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\bg_color_btn_mask.png
+net.micode.notes.app-main-5\:/drawable-hdpi/call_record.png=D\:\\git\\MiNote2\\src\\Notes-master3\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\call_record.png
+net.micode.notes.app-main-5\:/drawable-hdpi/clock.png=D\:\\git\\MiNote2\\src\\Notes-master3\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\clock.png
+net.micode.notes.app-main-5\:/drawable-hdpi/delete.png=D\:\\git\\MiNote2\\src\\Notes-master3\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\delete.png
+net.micode.notes.app-main-5\:/drawable-hdpi/dropdown_icon.9.png=D\:\\git\\MiNote2\\src\\Notes-master3\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\dropdown_icon.9.png
+net.micode.notes.app-main-5\:/drawable-hdpi/edit_blue.9.png=D\:\\git\\MiNote2\\src\\Notes-master3\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\edit_blue.9.png
+net.micode.notes.app-main-5\:/drawable-hdpi/edit_green.9.png=D\:\\git\\MiNote2\\src\\Notes-master3\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\edit_green.9.png
+net.micode.notes.app-main-5\:/drawable-hdpi/edit_red.9.png=D\:\\git\\MiNote2\\src\\Notes-master3\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\edit_red.9.png
+net.micode.notes.app-main-5\:/drawable-hdpi/edit_title_blue.9.png=D\:\\git\\MiNote2\\src\\Notes-master3\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\edit_title_blue.9.png
+net.micode.notes.app-main-5\:/drawable-hdpi/edit_title_green.9.png=D\:\\git\\MiNote2\\src\\Notes-master3\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\edit_title_green.9.png
+net.micode.notes.app-main-5\:/drawable-hdpi/edit_title_red.9.png=D\:\\git\\MiNote2\\src\\Notes-master3\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\edit_title_red.9.png
+net.micode.notes.app-main-5\:/drawable-hdpi/edit_title_white.9.png=D\:\\git\\MiNote2\\src\\Notes-master3\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\edit_title_white.9.png
+net.micode.notes.app-main-5\:/drawable-hdpi/edit_title_yellow.9.png=D\:\\git\\MiNote2\\src\\Notes-master3\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\edit_title_yellow.9.png
+net.micode.notes.app-main-5\:/drawable-hdpi/edit_white.9.png=D\:\\git\\MiNote2\\src\\Notes-master3\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\edit_white.9.png
+net.micode.notes.app-main-5\:/drawable-hdpi/edit_yellow.9.png=D\:\\git\\MiNote2\\src\\Notes-master3\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\edit_yellow.9.png
+net.micode.notes.app-main-5\:/drawable-hdpi/font_large.png=D\:\\git\\MiNote2\\src\\Notes-master3\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\font_large.png
+net.micode.notes.app-main-5\:/drawable-hdpi/font_normal.png=D\:\\git\\MiNote2\\src\\Notes-master3\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\font_normal.png
+net.micode.notes.app-main-5\:/drawable-hdpi/font_size_selector_bg.9.png=D\:\\git\\MiNote2\\src\\Notes-master3\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\font_size_selector_bg.9.png
+net.micode.notes.app-main-5\:/drawable-hdpi/font_small.png=D\:\\git\\MiNote2\\src\\Notes-master3\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\font_small.png
+net.micode.notes.app-main-5\:/drawable-hdpi/font_super.png=D\:\\git\\MiNote2\\src\\Notes-master3\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\font_super.png
+net.micode.notes.app-main-5\:/drawable-hdpi/icon_app.png=D\:\\git\\MiNote2\\src\\Notes-master3\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\icon_app.png
+net.micode.notes.app-main-5\:/drawable-hdpi/list_background.png=D\:\\git\\MiNote2\\src\\Notes-master3\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_background.png
+net.micode.notes.app-main-5\:/drawable-hdpi/list_blue_down.9.png=D\:\\git\\MiNote2\\src\\Notes-master3\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_blue_down.9.png
+net.micode.notes.app-main-5\:/drawable-hdpi/list_blue_middle.9.png=D\:\\git\\MiNote2\\src\\Notes-master3\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_blue_middle.9.png
+net.micode.notes.app-main-5\:/drawable-hdpi/list_blue_single.9.png=D\:\\git\\MiNote2\\src\\Notes-master3\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_blue_single.9.png
+net.micode.notes.app-main-5\:/drawable-hdpi/list_blue_up.9.png=D\:\\git\\MiNote2\\src\\Notes-master3\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_blue_up.9.png
+net.micode.notes.app-main-5\:/drawable-hdpi/list_folder.9.png=D\:\\git\\MiNote2\\src\\Notes-master3\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_folder.9.png
+net.micode.notes.app-main-5\:/drawable-hdpi/list_footer_bg.9.png=D\:\\git\\MiNote2\\src\\Notes-master3\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_footer_bg.9.png
+net.micode.notes.app-main-5\:/drawable-hdpi/list_green_down.9.png=D\:\\git\\MiNote2\\src\\Notes-master3\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_green_down.9.png
+net.micode.notes.app-main-5\:/drawable-hdpi/list_green_middle.9.png=D\:\\git\\MiNote2\\src\\Notes-master3\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_green_middle.9.png
+net.micode.notes.app-main-5\:/drawable-hdpi/list_green_single.9.png=D\:\\git\\MiNote2\\src\\Notes-master3\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_green_single.9.png
+net.micode.notes.app-main-5\:/drawable-hdpi/list_green_up.9.png=D\:\\git\\MiNote2\\src\\Notes-master3\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_green_up.9.png
+net.micode.notes.app-main-5\:/drawable-hdpi/list_red_down.9.png=D\:\\git\\MiNote2\\src\\Notes-master3\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_red_down.9.png
+net.micode.notes.app-main-5\:/drawable-hdpi/list_red_middle.9.png=D\:\\git\\MiNote2\\src\\Notes-master3\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_red_middle.9.png
+net.micode.notes.app-main-5\:/drawable-hdpi/list_red_single.9.png=D\:\\git\\MiNote2\\src\\Notes-master3\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_red_single.9.png
+net.micode.notes.app-main-5\:/drawable-hdpi/list_red_up.9.png=D\:\\git\\MiNote2\\src\\Notes-master3\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_red_up.9.png
+net.micode.notes.app-main-5\:/drawable-hdpi/list_white_down.9.png=D\:\\git\\MiNote2\\src\\Notes-master3\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_white_down.9.png
+net.micode.notes.app-main-5\:/drawable-hdpi/list_white_middle.9.png=D\:\\git\\MiNote2\\src\\Notes-master3\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_white_middle.9.png
+net.micode.notes.app-main-5\:/drawable-hdpi/list_white_single.9.png=D\:\\git\\MiNote2\\src\\Notes-master3\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_white_single.9.png
+net.micode.notes.app-main-5\:/drawable-hdpi/list_white_up.9.png=D\:\\git\\MiNote2\\src\\Notes-master3\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_white_up.9.png
+net.micode.notes.app-main-5\:/drawable-hdpi/list_yellow_down.9.png=D\:\\git\\MiNote2\\src\\Notes-master3\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_yellow_down.9.png
+net.micode.notes.app-main-5\:/drawable-hdpi/list_yellow_middle.9.png=D\:\\git\\MiNote2\\src\\Notes-master3\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_yellow_middle.9.png
+net.micode.notes.app-main-5\:/drawable-hdpi/list_yellow_single.9.png=D\:\\git\\MiNote2\\src\\Notes-master3\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_yellow_single.9.png
+net.micode.notes.app-main-5\:/drawable-hdpi/list_yellow_up.9.png=D\:\\git\\MiNote2\\src\\Notes-master3\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_yellow_up.9.png
+net.micode.notes.app-main-5\:/drawable-hdpi/menu_delete.png=D\:\\git\\MiNote2\\src\\Notes-master3\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\menu_delete.png
+net.micode.notes.app-main-5\:/drawable-hdpi/menu_move.png=D\:\\git\\MiNote2\\src\\Notes-master3\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\menu_move.png
+net.micode.notes.app-main-5\:/drawable-hdpi/new_note_normal.png=D\:\\git\\MiNote2\\src\\Notes-master3\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\new_note_normal.png
+net.micode.notes.app-main-5\:/drawable-hdpi/new_note_pressed.png=D\:\\git\\MiNote2\\src\\Notes-master3\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\new_note_pressed.png
+net.micode.notes.app-main-5\:/drawable-hdpi/note_edit_color_selector_panel.png=D\:\\git\\MiNote2\\src\\Notes-master3\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\note_edit_color_selector_panel.png
+net.micode.notes.app-main-5\:/drawable-hdpi/notification.png=D\:\\git\\MiNote2\\src\\Notes-master3\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\notification.png
+net.micode.notes.app-main-5\:/drawable-hdpi/search_result.png=D\:\\git\\MiNote2\\src\\Notes-master3\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\search_result.png
+net.micode.notes.app-main-5\:/drawable-hdpi/selected.png=D\:\\git\\MiNote2\\src\\Notes-master3\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\selected.png
+net.micode.notes.app-main-5\:/drawable-hdpi/title_alert.png=D\:\\git\\MiNote2\\src\\Notes-master3\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\title_alert.png
+net.micode.notes.app-main-5\:/drawable-hdpi/title_bar_bg.9.png=D\:\\git\\MiNote2\\src\\Notes-master3\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\title_bar_bg.9.png
+net.micode.notes.app-main-5\:/drawable-hdpi/widget_2x_blue.png=D\:\\git\\MiNote2\\src\\Notes-master3\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\widget_2x_blue.png
+net.micode.notes.app-main-5\:/drawable-hdpi/widget_2x_green.png=D\:\\git\\MiNote2\\src\\Notes-master3\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\widget_2x_green.png
+net.micode.notes.app-main-5\:/drawable-hdpi/widget_2x_red.png=D\:\\git\\MiNote2\\src\\Notes-master3\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\widget_2x_red.png
+net.micode.notes.app-main-5\:/drawable-hdpi/widget_2x_white.png=D\:\\git\\MiNote2\\src\\Notes-master3\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\widget_2x_white.png
+net.micode.notes.app-main-5\:/drawable-hdpi/widget_2x_yellow.png=D\:\\git\\MiNote2\\src\\Notes-master3\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\widget_2x_yellow.png
+net.micode.notes.app-main-5\:/drawable-hdpi/widget_4x_blue.png=D\:\\git\\MiNote2\\src\\Notes-master3\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\widget_4x_blue.png
+net.micode.notes.app-main-5\:/drawable-hdpi/widget_4x_green.png=D\:\\git\\MiNote2\\src\\Notes-master3\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\widget_4x_green.png
+net.micode.notes.app-main-5\:/drawable-hdpi/widget_4x_red.png=D\:\\git\\MiNote2\\src\\Notes-master3\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\widget_4x_red.png
+net.micode.notes.app-main-5\:/drawable-hdpi/widget_4x_white.png=D\:\\git\\MiNote2\\src\\Notes-master3\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\widget_4x_white.png
+net.micode.notes.app-main-5\:/drawable-hdpi/widget_4x_yellow.png=D\:\\git\\MiNote2\\src\\Notes-master3\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\widget_4x_yellow.png
+net.micode.notes.app-main-5\:/drawable/new_note.xml=D\:\\git\\MiNote2\\src\\Notes-master3\\app\\build\\intermediates\\packaged_res\\debug\\drawable\\new_note.xml
+net.micode.notes.app-main-5\:/layout/account_dialog_title.xml=D\:\\git\\MiNote2\\src\\Notes-master3\\app\\build\\intermediates\\packaged_res\\debug\\layout\\account_dialog_title.xml
+net.micode.notes.app-main-5\:/layout/add_account_text.xml=D\:\\git\\MiNote2\\src\\Notes-master3\\app\\build\\intermediates\\packaged_res\\debug\\layout\\add_account_text.xml
+net.micode.notes.app-main-5\:/layout/datetime_picker.xml=D\:\\git\\MiNote2\\src\\Notes-master3\\app\\build\\intermediates\\packaged_res\\debug\\layout\\datetime_picker.xml
+net.micode.notes.app-main-5\:/layout/dialog_edit_text.xml=D\:\\git\\MiNote2\\src\\Notes-master3\\app\\build\\intermediates\\packaged_res\\debug\\layout\\dialog_edit_text.xml
+net.micode.notes.app-main-5\:/layout/folder_list_item.xml=D\:\\git\\MiNote2\\src\\Notes-master3\\app\\build\\intermediates\\packaged_res\\debug\\layout\\folder_list_item.xml
+net.micode.notes.app-main-5\:/layout/note_edit.xml=D\:\\git\\MiNote2\\src\\Notes-master3\\app\\build\\intermediates\\packaged_res\\debug\\layout\\note_edit.xml
+net.micode.notes.app-main-5\:/layout/note_edit_list_item.xml=D\:\\git\\MiNote2\\src\\Notes-master3\\app\\build\\intermediates\\packaged_res\\debug\\layout\\note_edit_list_item.xml
+net.micode.notes.app-main-5\:/layout/note_item.xml=D\:\\git\\MiNote2\\src\\Notes-master3\\app\\build\\intermediates\\packaged_res\\debug\\layout\\note_item.xml
+net.micode.notes.app-main-5\:/layout/note_list.xml=D\:\\git\\MiNote2\\src\\Notes-master3\\app\\build\\intermediates\\packaged_res\\debug\\layout\\note_list.xml
+net.micode.notes.app-main-5\:/layout/note_list_dropdown_menu.xml=D\:\\git\\MiNote2\\src\\Notes-master3\\app\\build\\intermediates\\packaged_res\\debug\\layout\\note_list_dropdown_menu.xml
+net.micode.notes.app-main-5\:/layout/note_list_footer.xml=D\:\\git\\MiNote2\\src\\Notes-master3\\app\\build\\intermediates\\packaged_res\\debug\\layout\\note_list_footer.xml
+net.micode.notes.app-main-5\:/layout/settings_header.xml=D\:\\git\\MiNote2\\src\\Notes-master3\\app\\build\\intermediates\\packaged_res\\debug\\layout\\settings_header.xml
+net.micode.notes.app-main-5\:/layout/test.xml=D\:\\git\\MiNote2\\src\\Notes-master3\\app\\build\\intermediates\\packaged_res\\debug\\layout\\test.xml
+net.micode.notes.app-main-5\:/layout/test1.xml=D\:\\git\\MiNote2\\src\\Notes-master3\\app\\build\\intermediates\\packaged_res\\debug\\layout\\test1.xml
+net.micode.notes.app-main-5\:/layout/widget_2x.xml=D\:\\git\\MiNote2\\src\\Notes-master3\\app\\build\\intermediates\\packaged_res\\debug\\layout\\widget_2x.xml
+net.micode.notes.app-main-5\:/layout/widget_4x.xml=D\:\\git\\MiNote2\\src\\Notes-master3\\app\\build\\intermediates\\packaged_res\\debug\\layout\\widget_4x.xml
+net.micode.notes.app-main-5\:/menu/call_note_edit.xml=D\:\\git\\MiNote2\\src\\Notes-master3\\app\\build\\intermediates\\packaged_res\\debug\\menu\\call_note_edit.xml
+net.micode.notes.app-main-5\:/menu/call_record_folder.xml=D\:\\git\\MiNote2\\src\\Notes-master3\\app\\build\\intermediates\\packaged_res\\debug\\menu\\call_record_folder.xml
+net.micode.notes.app-main-5\:/menu/note_edit.xml=D\:\\git\\MiNote2\\src\\Notes-master3\\app\\build\\intermediates\\packaged_res\\debug\\menu\\note_edit.xml
+net.micode.notes.app-main-5\:/menu/note_list.xml=D\:\\git\\MiNote2\\src\\Notes-master3\\app\\build\\intermediates\\packaged_res\\debug\\menu\\note_list.xml
+net.micode.notes.app-main-5\:/menu/note_list_dropdown.xml=D\:\\git\\MiNote2\\src\\Notes-master3\\app\\build\\intermediates\\packaged_res\\debug\\menu\\note_list_dropdown.xml
+net.micode.notes.app-main-5\:/menu/note_list_options.xml=D\:\\git\\MiNote2\\src\\Notes-master3\\app\\build\\intermediates\\packaged_res\\debug\\menu\\note_list_options.xml
+net.micode.notes.app-main-5\:/menu/sub_folder.xml=D\:\\git\\MiNote2\\src\\Notes-master3\\app\\build\\intermediates\\packaged_res\\debug\\menu\\sub_folder.xml
+net.micode.notes.app-main-5\:/raw-zh-rCN/introduction=D\:\\git\\MiNote2\\src\\Notes-master3\\app\\build\\intermediates\\packaged_res\\debug\\raw-zh-rCN\\introduction
+net.micode.notes.app-main-5\:/raw/introduction=D\:\\git\\MiNote2\\src\\Notes-master3\\app\\build\\intermediates\\packaged_res\\debug\\raw\\introduction
+net.micode.notes.app-main-5\:/xml/preferences.xml=D\:\\git\\MiNote2\\src\\Notes-master3\\app\\build\\intermediates\\packaged_res\\debug\\xml\\preferences.xml
+net.micode.notes.app-main-5\:/xml/searchable.xml=D\:\\git\\MiNote2\\src\\Notes-master3\\app\\build\\intermediates\\packaged_res\\debug\\xml\\searchable.xml
+net.micode.notes.app-main-5\:/xml/widget_2x_info.xml=D\:\\git\\MiNote2\\src\\Notes-master3\\app\\build\\intermediates\\packaged_res\\debug\\xml\\widget_2x_info.xml
+net.micode.notes.app-main-5\:/xml/widget_4x_info.xml=D\:\\git\\MiNote2\\src\\Notes-master3\\app\\build\\intermediates\\packaged_res\\debug\\xml\\widget_4x_info.xml
diff --git a/src/Notes-master3/app/build/intermediates/incremental/debug/packageDebugResources/merged.dir/values-ja/values-ja.xml b/src/Notes-master3/app/build/intermediates/incremental/debug/packageDebugResources/merged.dir/values-ja/values-ja.xml
new file mode 100644
index 0000000..8099e9c
--- /dev/null
+++ b/src/Notes-master3/app/build/intermediates/incremental/debug/packageDebugResources/merged.dir/values-ja/values-ja.xml
@@ -0,0 +1,115 @@
+
+
+
+ - ショートメッセージ
+ - メール
+
+
+ - %1$s 件の「%2$s」に一致する検索結果
+
+ フォルダとその含まれているノートを削除してもよろしいですか?
+ このノートを削除してもよろしいですか?
+ %d 個のノートを削除してもよろしいですか?
+ 削除
+ メモ
+ メモ 2x2
+ メモ 4x4
+ 削除
+ 通話メモ
+ キャンセル
+ 設定
+ リマインダーを削除しました
+ 空のノートにはアラームを設定できません
+ 空のノートはデスクトップに送ることができません
+ 表示しようとしているノートは存在しません
+ テキストをエクスポートする際にエラーが発生しました、SDカードを確認してください
+ SDカードが使用中で、操作できません
+ 同期がキャンセルされました
+ 同期に失敗しました。内部エラーが発生しました
+ 同期に失敗しました。ネットワークとアカウントの設定を確認してください
+ エクスポート失敗
+ フォルダ %1$s は既に存在します、違う名前を付けてください
+ yyyyMMdd
+ MM月dd日 kk:mm
+ %1$s テキストファイルを SDカード(%2$s) ディレクトリに出力しました
+ %1$d 個のノートを %2$s フォルダに移動しました
+ 名前を入力してください
+ デスクトップに追加されました
+ アラート
+ 美女背景
+ 橘猫背景
+ 猩猩背景
+ フォルダを作成する
+ 削除
+ 選択を解除
+ テキストをエクスポートする
+ フォルダ名を変更する
+ フォルダを削除する
+ フォルダを表示する
+ 大
+ 通常
+ 文字のサイズ
+ 小
+ 特大
+ 灰猫背景
+ リストモードに入る
+ フォルダに移動する
+ 親フォルダに移動
+ リストモードを終了する
+ 恢复便签
+ リマインダーを削除する
+ 回收站
+ 検索
+ すべて選択
+ 選択項目がありません、操作は無効です
+ %d 項目が選択されました
+ デスクトップに送る
+ 設定
+ 共有
+ 同期する
+ 同期をキャンセルする
+ フォルダを選択する
+ 期限切れ
+ メールを送信する
+ マップを開く
+ 電話をかける
+ ウェブページを閲覧する
+ 表示する
+ 了解しました
+ 新しいメモ
+ ...
+ Google タスクとのメモ同期
+ 同期アカウント
+ アカウントを追加
+ メモ作成時の背景色をランダムに選択する
+ 同期をキャンセル
+ 今すぐ同期
+ 現在のアカウント:%1$s
+ 同期アカウントを変更すると、過去のアカウントの同期情報が削除され、切り替え時に重複データが発生する可能性があります
+ Google アカウントを選択してください。メモはこのアカウントの Google タスク内容と同期されます。
+ メモの同期
+ 前回の同期:%1$s
+ キャンセル
+ アカウントを変更
+ アカウントを削除
+ 設定
+ 同期中のため、同期アカウントを変更できません
+ 同期アカウントが%1$sに設定されました
+ 恢复
+ メモ
+ メモを検索
+ メモを検索中
+ メモのテキスト
+ リマインダーを設定しました
+ エクスポート成功
+ %1$sとの同期が成功しました
+ サーバーのメモリストを取得しています...
+ %1$sにログイン中...
+ ローカルメモを同期しています...
+ 同期がキャンセルされました
+ 同期に失敗しました
+ 同期が成功しました
+ メモを同期しています...
+ 関連コンテンツがありません。新しいメモを作成してください。
+ 訪問者モードでは、メモの内容は表示されません
+
\ No newline at end of file
diff --git a/src/Notes-master3/app/build/intermediates/incremental/debug/packageDebugResources/merged.dir/values-zh-rCN/values-zh-rCN.xml b/src/Notes-master3/app/build/intermediates/incremental/debug/packageDebugResources/merged.dir/values-zh-rCN/values-zh-rCN.xml
new file mode 100644
index 0000000..d381da3
--- /dev/null
+++ b/src/Notes-master3/app/build/intermediates/incremental/debug/packageDebugResources/merged.dir/values-zh-rCN/values-zh-rCN.xml
@@ -0,0 +1,115 @@
+
+
+
+ - 短信
+ - 邮件
+
+
+ - %1$s 条符合“%2$s”的搜索结果
+
+ 确认删除文件夹及所包含的便签吗?
+ 确认要删除该条便签吗?
+ 确认要删除所选的 %d 条便签吗?
+ 删除
+ 便签
+ 便签2x2
+ 便签4x4
+ 删除
+ 通话便签
+ 取消
+ 设置
+ 成功删除提醒
+ 不能为空便签设置闹钟提醒
+ 不能将空便签发送到桌面
+ 要查看的便签不存在
+ 导出文本时发生错误,请检查SD卡
+ SD卡被占用,不能操作
+ 同步已取消
+ 同步失败,发生内部错误
+ 同步失败,请检查网络和帐号设置
+ 导出失败
+ 1
+ 文件夹 %1$s 已存在,请重新命名
+ yyyyMMdd
+ MM月dd日 kk:mm
+ 已将文本文件(%1$s)输出至SD卡(%2$s)目录
+ 已将所选 %1$d 条便签移到 %2$s 文件夹
+ 请输入名称
+ 已添加到桌面
+ 提醒我
+ 美女背景
+ 橘猫背景
+ 猩猩背景
+ 新建文件夹
+ 删除
+ 取消全选
+ 导出文本
+ 修改文件夹名称
+ 刪除文件夹
+ 查看文件夹
+ 大
+ 正常
+ 文字大小
+ 小
+ 超大
+ 灰猫背景
+ 进入清单模式
+ 移动到文件夹
+ 上一级文件夹
+ 退出清单模式
+ 恢复便签
+ 删除提醒
+ 回收站
+ 搜索
+ 全选
+ 没有选中项,操作无效
+ 选中了 %d 项
+ 发送到桌面
+ 设置
+ 分享
+ 同步
+ 取消同步
+ 选择文件夹
+ 已过期
+ 发送邮件
+ 打开地图
+ 呼叫电话
+ 浏览网页
+ 查看
+ 知道了
+ 新建便签
+ ...
+ 与google task同步便签记录
+ 同步账号
+ 添加账号
+ 新建便签背景颜色随机
+ 取消同步
+ 立即同步
+ 当前帐号 %1$s
+ 如更换同步帐号,过去的帐号同步信息将被清空,再次切换的同时可能会造成数据重复
+ 请选择google帐号,便签将与该帐号的google task内容同步。
+ 同步便签
+ 上次同步于 %1$s
+ 取消
+ 更换账号
+ 删除账号
+ 设置
+ 正在同步中,不能修改同步帐号
+ 同步帐号已设置为%1$s
+ 便签
+ 搜索便签
+ 正在搜索便签
+ 便签中的文字
+ 创建提醒
+ 导出成功
+ 与%1$s同步成功
+ 正在获取服务器便签列表...
+ 登录%1$s...
+ 正在同步本地便签...
+ 同步已取消
+ 同步失败
+ 同步成功
+ 同步便签...
+ 没有关联内容,点击新建便签。
+ 访客模式下,便签内容不可见
+
\ No newline at end of file
diff --git a/src/Notes-master3/app/build/intermediates/incremental/debug/packageDebugResources/merged.dir/values-zh-rTW/values-zh-rTW.xml b/src/Notes-master3/app/build/intermediates/incremental/debug/packageDebugResources/merged.dir/values-zh-rTW/values-zh-rTW.xml
new file mode 100644
index 0000000..d81d85e
--- /dev/null
+++ b/src/Notes-master3/app/build/intermediates/incremental/debug/packageDebugResources/merged.dir/values-zh-rTW/values-zh-rTW.xml
@@ -0,0 +1,115 @@
+
+
+
+ - 短信
+ - 郵件
+
+
+ - %1$s 條符合”%2$s“的搜尋結果
+
+ 確認刪除檔夾及所包含的便簽嗎?
+ 确认要删除該條便籤嗎?
+ 确认要刪除所選的 %d 條便籤嗎?
+ 刪除
+ 便簽
+ 便簽2x2
+ 便簽4x4
+ 刪除
+ 通話便籤
+ 取消
+ 設置
+ 成功刪除提醒
+ 不能爲空便籤設置鬧鐘提醒
+ 不能將空便籤發送到桌面
+ 要查看的便籤不存在
+ 導出TXT時發生錯誤,請檢查SD卡
+ SD卡被佔用,不能操作
+ 同步已取消
+ 同步失敗,發生內部錯誤
+ 同步失敗,請檢查網絡和帳號設置
+ 導出失敗
+ 文件夾 %1$s 已存在,請重新命名
+ yyyyMMdd
+ MM月dd日 kk:mm
+ 已將文本文件(%1$s)導出至SD(%2$s)目錄
+ 已將所選 %1$d 便籤移到 %2$s 文件夾
+ 請輸入名稱
+ 已添加到桌面
+ 提醒我
+ 美女背景
+ 橘猫背景
+ 猩猩背景
+ 新建文件夾
+ 刪除
+ 取消全選
+ 導出文本
+ 修改文件夾名稱
+ 刪除文件夾
+ 查看文件夾
+ 大
+ 正常
+ 文字大小
+ 小
+ 超大
+ 灰猫背景
+ 進入清單模式
+ 移動到文件夾
+ 上一級文件夾
+ 退出清單模式
+ 恢复便签
+ 刪除提醒
+ 回收站
+ 搜尋
+ 全選
+ 沒有選中項,操作無效
+ 選中了 %d 項
+ 發送到桌面
+ 設置
+ 分享
+ 同步
+ 取消同步
+ 選擇文件夾
+ 已過期
+ 發送郵件
+ 打開地圖
+ 呼叫電話
+ 浏覽網頁
+ 查看
+ 知道了
+ 新建便簽
+ ...
+ 与google task同步便簽記錄
+ 同步賬號
+ 添加賬號
+ 新建便籤背景顏色隨機
+ 取消同步
+ 立即同步
+ 當前帳號 %1$s
+ 如更換同步帳號,過去的帳號同步信息將被清空,再次切換的同時可能會造成數據重復
+ 請選擇google帳號,便簽將與該帳號的google task內容同步。
+ 同步便簽
+ 上次同步于 %1$s
+ 取消
+ 更換賬號
+ 刪除賬號
+ 設置
+ 正在同步中,不能修改同步帳號
+ 同步帳號已設置為%1$s
+ 恢复
+ 便籤
+ 搜索便籤
+ 正在搜索便籤
+ 便籤中的文字
+ 創建提醒
+ 導出成功
+ 與%1$s同步成功
+ 正在獲取服務器便籤列表...
+ 登陸%1$s...
+ 正在同步本地便籤...
+ 同步已取消
+ 同步失敗
+ 同步成功
+ 同步便簽...
+ 沒有關聯內容,點擊新建便簽。
+ 訪客模式下,便籤內容不可見
+
\ No newline at end of file
diff --git a/src/Notes-master3/app/build/intermediates/incremental/debug/packageDebugResources/merged.dir/values/values.xml b/src/Notes-master3/app/build/intermediates/incremental/debug/packageDebugResources/merged.dir/values/values.xml
new file mode 100644
index 0000000..9367dda
--- /dev/null
+++ b/src/Notes-master3/app/build/intermediates/incremental/debug/packageDebugResources/merged.dir/values/values.xml
@@ -0,0 +1,175 @@
+
+
+
+ - -%s
+ - --%s
+ - --%s
+ - --%s
+
+
+ - Messaging
+ - Email
+
+ #335b5b5b
+ 26sp
+ 20sp
+ 17sp
+ 14sp
+ 33sp
+
+ - %1$s result for \"%2$s\"
+
+ - %1$s results for \"%2$s\"
+
+ Confirm to delete folder and its notes?
+ Confirm to delete this note?
+ Confirm to delete the selected %d notes?
+ Delete selected notes
+ Notes
+ Notes 2x2
+ Notes 4x4
+ Delete
+ Call notes
+ cancel
+ set
+ Delete reminder successfully
+ Sorry, can not set clock on empty note
+ Sorry, can not send and empty note to home
+ The note is not exist
+ Export failed, please check SD card
+ SD card busy, not available now
+ Sync is canceled
+ Sync failed, internal error occurs
+ Sync failed, please check network and account settings
+ Export fail
+ notes_%s.txt
+ /MIUI/notes/
+ The folder %1$s exist, please rename
+ yyyyMMdd
+ MMMd kk:mm
+ Export text file (%1$s) to SD (%2$s) directory
+ (%d)
+ Have moved selected %1$d notes to %2$s folder
+ Input name
+ Note added to home
+ Remind me
+ background:beauty
+ background:cat
+ background:chimpanzee
+ New Folder
+ Delete
+ Deselect all
+ Export text
+ Change folder name
+ Delete folder
+ View folder
+ Large
+ Medium
+ Font size
+ Small
+ Super
+ background:gray
+ Enter check list
+ Move to folder
+ Parent folder
+ Leave check list
+ recover
+ Delete reminder
+ trash
+ Search
+ Select all
+ Nothing selected, the operation is invalid
+ %d selected
+ Send to home
+ Settings
+ Share
+ Sync
+ Cancel syncing
+ Select folder
+ Expired
+ Send email
+ Open map
+ Call
+ Browse web
+ Take a look
+ Got it
+ Add note
+ ...
+ Sync notes with google task
+ Sync account
+ Add account
+ New note background color random
+ Cancel syncing
+ Sync immediately
+ Current account %1$s
+ All sync related information will be deleted, which may result in duplicated items sometime
+ Please select a google account. Local notes will be synced with google task.
+ Sync notes
+ Last sync time %1$s
+ yyyy-MM-dd hh:mm:ss
+ Cancel
+ Change sync account
+ Remove sync account
+ Settings
+ Cannot change the account because sync is in progress
+ %1$s has been set as the sync account
+ Notes
+ Search notes
+ Searching Notes
+ Text in your notes
+ Set reminder
+ Export successful
+ Sync is successful with account %1$s
+ Getting remote note list...
+ Logging into %1$s...
+ Synchronize local notes with Google Task...
+ Sync is canceled
+ Sync is failed
+ Sync is successful
+ Syncing notes...
+ No associated note found, click to create associated note.
+ Privacy mode,can not see note content
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/Notes-master3/app/build/intermediates/incremental/debug/packageDebugResources/merger.xml b/src/Notes-master3/app/build/intermediates/incremental/debug/packageDebugResources/merger.xml
index e2bcbc2..0b327d5 100644
--- a/src/Notes-master3/app/build/intermediates/incremental/debug/packageDebugResources/merger.xml
+++ b/src/Notes-master3/app/build/intermediates/incremental/debug/packageDebugResources/merger.xml
@@ -1,5 +1,5 @@
-
+
- -%s
- --%s
- --%s
@@ -7,11 +7,11 @@
- Messaging
- Email
- #335b5b5b33sp26sp20sp17sp14spNotesNotes 2x2Notes 4x4No associated note found, click to create associated note.Privacy mode,can not see note content...Add noteDelete reminder successfullySet reminderExpiredyyyyMMddMMMd kk:mmGot itTake a lookCallSend emailBrowse webOpen map/MIUI/notes/notes_%s.txt(%d)New FolderExport textSyncCancel syncingSettingsSearchDeleteMove to folder%d selectedNothing selected, the operation is invalidSelect allDeselect allFont sizeSmallMediumLargeSuperEnter check listLeave check listView folderDelete folderChange folder nameThe folder %1$s exist, please renameShareSend to homeRemind meDelete reminderSelect folderParent folderNote added to homeConfirm to delete folder and its notes?Delete selected notesConfirm to delete the selected %d notes?Confirm to delete this note?Have moved selected %1$d notes to %2$s folderSD card busy, not available nowExport failed, please check SD cardThe note is not existSorry, can not set clock on empty noteSorry, can not send and empty note to homeExport successfulExport failExport text file (%1$s) to SD (%2$s) directorySyncing notes...Sync is successfulSync is failedSync is canceledSync is successful with account %1$sSync failed, please check network and account settingsSync failed, internal error occursSync is canceledLogging into %1$s...Getting remote note list...Synchronize local notes with Google Task...trashbackground:beautybackground:catbackground:chimpanzeebackground:graySettingsSync accountSync notes with google taskLast sync time %1$syyyy-MM-dd hh:mm:ssAdd accountChange sync accountRemove sync accountCancelSync immediatelyCancel syncingCurrent account %1$sAll sync related information will be deleted, which may result in duplicated items sometimeSync notesPlease select a google account. Local notes will be synced with google task.Cannot change the account because sync is in progress%1$s has been set as the sync accountNew note background color randomDeleteCall notesInput nameSearching NotesSearch notesText in your notesNotessetcancel
+ #335b5b5b33sp26sp20sp17sp14spNotesNotes 2x2Notes 4x4No associated note found, click to create associated note.Privacy mode,can not see note content...Add noteDelete reminder successfullySet reminderExpiredyyyyMMddMMMd kk:mmGot itTake a lookCallSend emailBrowse webOpen map/MIUI/notes/notes_%s.txt(%d)New FolderExport textSyncCancel syncingSettingsSearchDeleteMove to folder%d selectedNothing selected, the operation is invalidSelect allDeselect allFont sizeSmallMediumLargeSuperEnter check listLeave check listView folderDelete folderChange folder nameThe folder %1$s exist, please renameShareSend to homeRemind meDelete reminderSelect folderParent folderNote added to homeConfirm to delete folder and its notes?Delete selected notesConfirm to delete the selected %d notes?Confirm to delete this note?Have moved selected %1$d notes to %2$s folderSD card busy, not available nowExport failed, please check SD cardThe note is not existSorry, can not set clock on empty noteSorry, can not send and empty note to homeExport successfulExport failExport text file (%1$s) to SD (%2$s) directorySyncing notes...Sync is successfulSync is failedSync is canceledSync is successful with account %1$sSync failed, please check network and account settingsSync failed, internal error occursSync is canceledLogging into %1$s...Getting remote note list...Synchronize local notes with Google Task...trashbackground:beautybackground:catbackground:chimpanzeebackground:grayrecoverSettingsSync accountSync notes with google taskLast sync time %1$syyyy-MM-dd hh:mm:ssAdd accountChange sync accountRemove sync accountCancelSync immediatelyCancel syncingCurrent account %1$sAll sync related information will be deleted, which may result in duplicated items sometimeSync notesPlease select a google account. Local notes will be synced with google task.Cannot change the account because sync is in progress%1$s has been set as the sync accountNew note background color randomDeleteCall notesInput nameSearching NotesSearch notesText in your notesNotessetcancel
- %1$s result for \"%2$s\"
- %1$s results for \"%2$s\"
- recover
+
- ショートメッセージ
- メール
- メモメモ 2x2メモ 4x4関連コンテンツがありません。新しいメモを作成してください。訪問者モードでは、メモの内容は表示されません...新しいメモリマインダーを削除しましたリマインダーを設定しました期限切れyyyyMMddMM月dd日 kk:mm了解しました表示する電話をかけるメールを送信するウェブページを閲覧するマップを開くフォルダを作成するテキストをエクスポートする同期する同期をキャンセルする設定検索削除フォルダに移動する%d 項目が選択されました選択項目がありません、操作は無効ですすべて選択選択を解除文字のサイズ小通常大特大リストモードに入るリストモードを終了するフォルダを表示するフォルダを削除するフォルダ名を変更するフォルダ %1$s は既に存在します、違う名前を付けてください共有デスクトップに送るアラートリマインダーを削除するフォルダを選択する親フォルダに移動デスクトップに追加されました削除%d 個のノートを削除してもよろしいですか?このノートを削除してもよろしいですか?フォルダとその含まれているノートを削除してもよろしいですか?%1$d 個のノートを %2$s フォルダに移動しましたSDカードが使用中で、操作できませんテキストをエクスポートする際にエラーが発生しました、SDカードを確認してください表示しようとしているノートは存在しません空のノートにはアラームを設定できません空のノートはデスクトップに送ることができませんエクスポート成功エクスポート失敗%1$s テキストファイルを SDカード(%2$s) ディレクトリに出力しましたメモを同期しています...同期が成功しました同期に失敗しました同期がキャンセルされました%1$sとの同期が成功しました同期に失敗しました。ネットワークとアカウントの設定を確認してください同期に失敗しました。内部エラーが発生しました同期がキャンセルされました%1$sにログイン中...サーバーのメモリストを取得しています...ローカルメモを同期しています...回收站美女背景橘猫背景猩猩背景灰猫背景設定同期アカウントGoogle タスクとのメモ同期前回の同期:%1$sアカウントを追加アカウントを変更アカウントを削除キャンセル今すぐ同期同期をキャンセル現在のアカウント:%1$s同期アカウントを変更すると、過去のアカウントの同期情報が削除され、切り替え時に重複データが発生する可能性がありますメモの同期Google アカウントを選択してください。メモはこのアカウントの Google タスク内容と同期されます。同期中のため、同期アカウントを変更できません同期アカウントが%1$sに設定されましたメモ作成時の背景色をランダムに選択する削除通話メモ名前を入力してくださいメモを検索中メモを検索メモのテキストメモ設定キャンセル
+ メモメモ 2x2メモ 4x4関連コンテンツがありません。新しいメモを作成してください。訪問者モードでは、メモの内容は表示されません...新しいメモリマインダーを削除しましたリマインダーを設定しました期限切れyyyyMMddMM月dd日 kk:mm了解しました表示する電話をかけるメールを送信するウェブページを閲覧するマップを開くフォルダを作成するテキストをエクスポートする同期する同期をキャンセルする設定検索削除フォルダに移動する%d 項目が選択されました選択項目がありません、操作は無効ですすべて選択選択を解除文字のサイズ小通常大特大リストモードに入るリストモードを終了するフォルダを表示するフォルダを削除するフォルダ名を変更するフォルダ %1$s は既に存在します、違う名前を付けてください共有デスクトップに送るアラートリマインダーを削除するフォルダを選択する親フォルダに移動デスクトップに追加されました削除%d 個のノートを削除してもよろしいですか?このノートを削除してもよろしいですか?フォルダとその含まれているノートを削除してもよろしいですか?%1$d 個のノートを %2$s フォルダに移動しましたSDカードが使用中で、操作できませんテキストをエクスポートする際にエラーが発生しました、SDカードを確認してください表示しようとしているノートは存在しません空のノートにはアラームを設定できません空のノートはデスクトップに送ることができませんエクスポート成功エクスポート失敗%1$s テキストファイルを SDカード(%2$s) ディレクトリに出力しましたメモを同期しています...同期が成功しました同期に失敗しました同期がキャンセルされました%1$sとの同期が成功しました同期に失敗しました。ネットワークとアカウントの設定を確認してください同期に失敗しました。内部エラーが発生しました同期がキャンセルされました%1$sにログイン中...サーバーのメモリストを取得しています...ローカルメモを同期しています...回收站美女背景橘猫背景猩猩背景灰猫背景恢复便签恢复設定同期アカウントGoogle タスクとのメモ同期前回の同期:%1$sアカウントを追加アカウントを変更アカウントを削除キャンセル今すぐ同期同期をキャンセル現在のアカウント:%1$s同期アカウントを変更すると、過去のアカウントの同期情報が削除され、切り替え時に重複データが発生する可能性がありますメモの同期Google アカウントを選択してください。メモはこのアカウントの Google タスク内容と同期されます。同期中のため、同期アカウントを変更できません同期アカウントが%1$sに設定されましたメモ作成時の背景色をランダムに選択する削除通話メモ名前を入力してくださいメモを検索中メモを検索メモのテキストメモ設定キャンセル
- %1$s 件の「%2$s」に一致する検索結果
- 恢复恢复便签
+
- 短信
- 邮件
- 便签便签2x2便签4x4没有关联内容,点击新建便签。访客模式下,便签内容不可见...新建便签成功删除提醒创建提醒已过期yyyyMMddMM月dd日 kk:mm知道了查看呼叫电话发送邮件浏览网页打开地图1新建文件夹导出文本同步取消同步设置搜索删除移动到文件夹选中了 %d 项没有选中项,操作无效全选取消全选文字大小小正常大超大进入清单模式退出清单模式查看文件夹刪除文件夹修改文件夹名称文件夹 %1$s 已存在,请重新命名分享发送到桌面提醒我删除提醒选择文件夹上一级文件夹已添加到桌面删除确认要删除所选的 %d 条便签吗?确认要删除该条便签吗?确认删除文件夹及所包含的便签吗?已将所选 %1$d 条便签移到 %2$s 文件夹SD卡被占用,不能操作导出文本时发生错误,请检查SD卡要查看的便签不存在不能为空便签设置闹钟提醒不能将空便签发送到桌面导出成功导出失败已将文本文件(%1$s)输出至SD卡(%2$s)目录同步便签...同步成功同步失败同步已取消与%1$s同步成功同步失败,请检查网络和帐号设置同步失败,发生内部错误同步已取消登录%1$s...正在获取服务器便签列表...正在同步本地便签...回收站美女背景橘猫背景猩猩背景灰猫背景设置同步账号与google task同步便签记录上次同步于 %1$s添加账号更换账号删除账号取消立即同步取消同步当前帐号 %1$s如更换同步帐号,过去的帐号同步信息将被清空,再次切换的同时可能会造成数据重复同步便签请选择google帐号,便签将与该帐号的google task内容同步。正在同步中,不能修改同步帐号同步帐号已设置为%1$s新建便签背景颜色随机删除通话便签请输入名称正在搜索便签搜索便签便签中的文字便签设置取消
+ 便签便签2x2便签4x4没有关联内容,点击新建便签。访客模式下,便签内容不可见...新建便签成功删除提醒创建提醒已过期yyyyMMddMM月dd日 kk:mm知道了查看呼叫电话发送邮件浏览网页打开地图1新建文件夹导出文本同步取消同步设置搜索删除移动到文件夹选中了 %d 项没有选中项,操作无效全选取消全选文字大小小正常大超大进入清单模式退出清单模式查看文件夹刪除文件夹修改文件夹名称文件夹 %1$s 已存在,请重新命名分享发送到桌面提醒我删除提醒选择文件夹上一级文件夹已添加到桌面删除确认要删除所选的 %d 条便签吗?确认要删除该条便签吗?确认删除文件夹及所包含的便签吗?已将所选 %1$d 条便签移到 %2$s 文件夹SD卡被占用,不能操作导出文本时发生错误,请检查SD卡要查看的便签不存在不能为空便签设置闹钟提醒不能将空便签发送到桌面导出成功导出失败已将文本文件(%1$s)输出至SD卡(%2$s)目录同步便签...同步成功同步失败同步已取消与%1$s同步成功同步失败,请检查网络和帐号设置同步失败,发生内部错误同步已取消登录%1$s...正在获取服务器便签列表...正在同步本地便签...回收站美女背景橘猫背景猩猩背景灰猫背景设置同步账号与google task同步便签记录上次同步于 %1$s添加账号更换账号删除账号取消立即同步取消同步当前帐号 %1$s如更换同步帐号,过去的帐号同步信息将被清空,再次切换的同时可能会造成数据重复同步便签请选择google帐号,便签将与该帐号的google task内容同步。正在同步中,不能修改同步帐号同步帐号已设置为%1$s新建便签背景颜色随机删除通话便签请输入名称正在搜索便签搜索便签便签中的文字便签设置取消
- %1$s 条符合“%2$s”的搜索结果
- 恢复便签
+ 恢复便签
- 短信
- 郵件
- 便簽便簽2x2便簽4x4沒有關聯內容,點擊新建便簽。訪客模式下,便籤內容不可見...新建便簽成功刪除提醒創建提醒已過期yyyyMMddMM月dd日 kk:mm知道了查看呼叫電話發送郵件浏覽網頁打開地圖已將所選 %1$d 便籤移到 %2$s 文件夾新建文件夾導出文本同步取消同步設置搜尋刪除移動到文件夾選中了 %d 項沒有選中項,操作無效全選取消全選文字大小小正常大超大進入清單模式退出清單模式查看文件夾刪除文件夾修改文件夾名稱文件夾 %1$s 已存在,請重新命名分享發送到桌面提醒我刪除提醒選擇文件夾上一級文件夾已添加到桌面刪除确认要刪除所選的 %d 條便籤嗎?确认要删除該條便籤嗎?確認刪除檔夾及所包含的便簽嗎?SD卡被佔用,不能操作導出TXT時發生錯誤,請檢查SD卡要查看的便籤不存在不能爲空便籤設置鬧鐘提醒不能將空便籤發送到桌面導出成功導出失敗已將文本文件(%1$s)導出至SD(%2$s)目錄同步便簽...同步成功同步失敗同步已取消與%1$s同步成功同步失敗,請檢查網絡和帳號設置同步失敗,發生內部錯誤同步已取消登陸%1$s...正在獲取服務器便籤列表...正在同步本地便籤...回收站美女背景橘猫背景猩猩背景灰猫背景設置同步賬號与google task同步便簽記錄上次同步于 %1$s添加賬號更換賬號刪除賬號取消立即同步取消同步當前帳號 %1$s如更換同步帳號,過去的帳號同步信息將被清空,再次切換的同時可能會造成數據重復同步便簽請選擇google帳號,便簽將與該帳號的google task內容同步。正在同步中,不能修改同步帳號同步帳號已設置為%1$s新建便籤背景顏色隨機刪除通話便籤請輸入名稱正在搜索便籤搜索便籤便籤中的文字便籤設置取消
+ 便簽便簽2x2便簽4x4沒有關聯內容,點擊新建便簽。訪客模式下,便籤內容不可見...新建便簽成功刪除提醒創建提醒已過期yyyyMMddMM月dd日 kk:mm知道了查看呼叫電話發送郵件浏覽網頁打開地圖已將所選 %1$d 便籤移到 %2$s 文件夾新建文件夾導出文本同步取消同步設置搜尋刪除移動到文件夾選中了 %d 項沒有選中項,操作無效全選取消全選文字大小小正常大超大進入清單模式退出清單模式查看文件夾刪除文件夾修改文件夾名稱文件夾 %1$s 已存在,請重新命名分享發送到桌面提醒我刪除提醒選擇文件夾上一級文件夾已添加到桌面刪除确认要刪除所選的 %d 條便籤嗎?确认要删除該條便籤嗎?確認刪除檔夾及所包含的便簽嗎?SD卡被佔用,不能操作導出TXT時發生錯誤,請檢查SD卡要查看的便籤不存在不能爲空便籤設置鬧鐘提醒不能將空便籤發送到桌面導出成功導出失敗已將文本文件(%1$s)導出至SD(%2$s)目錄同步便簽...同步成功同步失敗同步已取消與%1$s同步成功同步失敗,請檢查網絡和帳號設置同步失敗,發生內部錯誤同步已取消登陸%1$s...正在獲取服務器便籤列表...正在同步本地便籤...回收站美女背景橘猫背景猩猩背景灰猫背景恢复便签恢复設置同步賬號与google task同步便簽記錄上次同步于 %1$s添加賬號更換賬號刪除賬號取消立即同步取消同步當前帳號 %1$s如更換同步帳號,過去的帳號同步信息將被清空,再次切換的同時可能會造成數據重復同步便簽請選擇google帳號,便簽將與該帳號的google task內容同步。正在同步中,不能修改同步帳號同步帳號已設置為%1$s新建便籤背景顏色隨機刪除通話便籤請輸入名稱正在搜索便籤搜索便籤便籤中的文字便籤設置取消
- %1$s 條符合”%2$s“的搜尋結果
- 恢复恢复便签
\ No newline at end of file
+
\ No newline at end of file
diff --git a/src/Notes-master3/app/build/intermediates/incremental/debugAndroidTest/mergeDebugAndroidTestResources/compile-file-map.properties b/src/Notes-master3/app/build/intermediates/incremental/debugAndroidTest/mergeDebugAndroidTestResources/compile-file-map.properties
index d84c60e..720257c 100644
--- a/src/Notes-master3/app/build/intermediates/incremental/debugAndroidTest/mergeDebugAndroidTestResources/compile-file-map.properties
+++ b/src/Notes-master3/app/build/intermediates/incremental/debugAndroidTest/mergeDebugAndroidTestResources/compile-file-map.properties
@@ -1 +1 @@
-#Wed Jan 03 17:04:39 GMT+08:00 2024
+#Thu Jan 18 19:33:36 CST 2024
diff --git a/src/Notes-master3/app/build/intermediates/incremental/debugAndroidTest/mergeDebugAndroidTestResources/merger.xml b/src/Notes-master3/app/build/intermediates/incremental/debugAndroidTest/mergeDebugAndroidTestResources/merger.xml
index d2ccc06..45824ed 100644
--- a/src/Notes-master3/app/build/intermediates/incremental/debugAndroidTest/mergeDebugAndroidTestResources/merger.xml
+++ b/src/Notes-master3/app/build/intermediates/incremental/debugAndroidTest/mergeDebugAndroidTestResources/merger.xml
@@ -1,2 +1,2 @@
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/src/Notes-master3/app/build/intermediates/incremental/mergeDebugAndroidTestAssets/merger.xml b/src/Notes-master3/app/build/intermediates/incremental/mergeDebugAndroidTestAssets/merger.xml
index fe9eb22..e89e47f 100644
--- a/src/Notes-master3/app/build/intermediates/incremental/mergeDebugAndroidTestAssets/merger.xml
+++ b/src/Notes-master3/app/build/intermediates/incremental/mergeDebugAndroidTestAssets/merger.xml
@@ -1,2 +1,2 @@
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/src/Notes-master3/app/build/intermediates/incremental/mergeDebugAndroidTestJniLibFolders/merger.xml b/src/Notes-master3/app/build/intermediates/incremental/mergeDebugAndroidTestJniLibFolders/merger.xml
index 349e4b1..17417e5 100644
--- a/src/Notes-master3/app/build/intermediates/incremental/mergeDebugAndroidTestJniLibFolders/merger.xml
+++ b/src/Notes-master3/app/build/intermediates/incremental/mergeDebugAndroidTestJniLibFolders/merger.xml
@@ -1,2 +1,2 @@
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/src/Notes-master3/app/build/intermediates/incremental/mergeDebugAndroidTestShaders/merger.xml b/src/Notes-master3/app/build/intermediates/incremental/mergeDebugAndroidTestShaders/merger.xml
index fe5f386..ac75ee0 100644
--- a/src/Notes-master3/app/build/intermediates/incremental/mergeDebugAndroidTestShaders/merger.xml
+++ b/src/Notes-master3/app/build/intermediates/incremental/mergeDebugAndroidTestShaders/merger.xml
@@ -1,2 +1,2 @@
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/src/Notes-master3/app/build/intermediates/incremental/mergeDebugAssets/merger.xml b/src/Notes-master3/app/build/intermediates/incremental/mergeDebugAssets/merger.xml
index 28e2230..79ffc1b 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 7d7ba65..080926c 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 e50a2c6..68944dd 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 aa8a39c..112184f 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 @@
-#Wed Jan 17 20:41:25 GMT+08:00 2024
-base.0=E\:\\_Ufo\\0SE\\GitProject\\MicodeNotes\\src\\Notes-master3\\app\\build\\intermediates\\dex\\debug\\mergeDexDebug\\classes.dex
+#Thu Jan 18 23:19:02 CST 2024
+base.0=D\:\\git\\MiNote2\\src\\Notes-master3\\app\\build\\intermediates\\dex\\debug\\mergeDexDebug\\classes.dex
path.0=classes.dex
renamed.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 d5920a8..3d139d2 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/incremental/packageDebugAndroidTest/tmp/debugAndroidTest/dex-renamer-state.txt b/src/Notes-master3/app/build/intermediates/incremental/packageDebugAndroidTest/tmp/debugAndroidTest/dex-renamer-state.txt
index 405dcc3..0adb938 100644
--- a/src/Notes-master3/app/build/intermediates/incremental/packageDebugAndroidTest/tmp/debugAndroidTest/dex-renamer-state.txt
+++ b/src/Notes-master3/app/build/intermediates/incremental/packageDebugAndroidTest/tmp/debugAndroidTest/dex-renamer-state.txt
@@ -1,4 +1,4 @@
-#Wed Jan 03 17:04:41 GMT+08:00 2024
-base.0=E\:\\_Ufo\\0SE\\GitProject\\MicodeNotes\\src\\Notes-master3\\app\\build\\intermediates\\dex\\debugAndroidTest\\mergeDexDebugAndroidTest\\classes.dex
+#Thu Jan 18 19:33:42 CST 2024
+base.0=D\:\\git\\MiNote2\\src\\Notes-master3\\app\\build\\intermediates\\dex\\debugAndroidTest\\mergeDexDebugAndroidTest\\classes.dex
path.0=classes.dex
renamed.0=classes.dex
diff --git a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/DataUtils.class b/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/DataUtils.class
index e3f0d3a..0120133 100644
Binary files a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/DataUtils.class and b/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/DataUtils.class differ
diff --git a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/AlarmAlertActivity.class b/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/AlarmAlertActivity.class
index 98353eb..9ee0832 100644
Binary files a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/AlarmAlertActivity.class and b/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/AlarmAlertActivity.class differ
diff --git a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/AlarmInitReceiver.class b/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/AlarmInitReceiver.class
index a1d202d..2d2cf71 100644
Binary files a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/AlarmInitReceiver.class and b/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/AlarmInitReceiver.class differ
diff --git a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/AlarmReceiver.class b/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/AlarmReceiver.class
index a41b775..bf50aea 100644
Binary files a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/AlarmReceiver.class and b/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/AlarmReceiver.class differ
diff --git a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$1.class b/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$1.class
index 029286f..e295827 100644
Binary files a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$1.class and b/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$1.class differ
diff --git a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$2.class b/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$2.class
index e65c35c..d69f12c 100644
Binary files a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$2.class and b/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$2.class differ
diff --git a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$3.class b/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$3.class
index de51bad..fba484b 100644
Binary files a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$3.class and b/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$3.class differ
diff --git a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$4.class b/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$4.class
index d04cbe7..bce451f 100644
Binary files a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$4.class and b/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$4.class differ
diff --git a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker.class b/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker.class
index 400d289..cfb706a 100644
Binary files a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker.class and b/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker.class differ
diff --git a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePickerDialog$1.class b/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePickerDialog$1.class
index 415e755..1af3230 100644
Binary files a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePickerDialog$1.class and b/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePickerDialog$1.class differ
diff --git a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePickerDialog.class b/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePickerDialog.class
index 71e5215..bb5ce6f 100644
Binary files a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePickerDialog.class and b/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePickerDialog.class differ
diff --git a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DropdownMenu$1.class b/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DropdownMenu$1.class
index ddd74fd..61fb92d 100644
Binary files a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DropdownMenu$1.class and b/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DropdownMenu$1.class differ
diff --git a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DropdownMenu.class b/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DropdownMenu.class
index 54e7df6..d721947 100644
Binary files a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DropdownMenu.class and b/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DropdownMenu.class differ
diff --git a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/FoldersListAdapter$FolderListItem.class b/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/FoldersListAdapter$FolderListItem.class
index fad3442..24069d8 100644
Binary files a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/FoldersListAdapter$FolderListItem.class and b/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/FoldersListAdapter$FolderListItem.class differ
diff --git a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/FoldersListAdapter.class b/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/FoldersListAdapter.class
index 023f716..851828d 100644
Binary files a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/FoldersListAdapter.class and b/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/FoldersListAdapter.class differ
diff --git a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$1.class b/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$1.class
index 980c364..71fcfdb 100644
Binary files a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$1.class and b/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$1.class differ
diff --git a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$2.class b/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$2.class
index ec7833f..5edcf28 100644
Binary files a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$2.class and b/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$2.class differ
diff --git a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$3.class b/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$3.class
index 89840c2..01e4484 100644
Binary files a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$3.class and b/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$3.class differ
diff --git a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$4.class b/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$4.class
index cf246b1..9799b77 100644
Binary files a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$4.class and b/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$4.class differ
diff --git a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$HeadViewHolder.class b/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$HeadViewHolder.class
index 8e5491b..1fb2540 100644
Binary files a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$HeadViewHolder.class and b/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$HeadViewHolder.class differ
diff --git a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity.class b/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity.class
index 963f088..2dd1ed9 100644
Binary files a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity.class and b/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity.class differ
diff --git a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditText$1.class b/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditText$1.class
index 2040186..b22a070 100644
Binary files a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditText$1.class and b/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditText$1.class differ
diff --git a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditText.class b/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditText.class
index 3a19d3b..cc80859 100644
Binary files a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditText.class and b/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditText.class differ
diff --git a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteItemData.class b/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteItemData.class
index 771aa91..7418e10 100644
Binary files a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteItemData.class and b/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteItemData.class differ
diff --git a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$1.class b/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$1.class
index e78492a..988d5df 100644
Binary files a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$1.class and b/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$1.class differ
diff --git a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$2.class b/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$2.class
index fb656f7..17d6bc5 100644
Binary files a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$2.class and b/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$2.class differ
diff --git a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$3.class b/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$3.class
index 38919bd..1a0bf1f 100644
Binary files a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$3.class and b/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$3.class differ
diff --git a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$4.class b/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$4.class
index 879f0e8..9d4596a 100644
Binary files a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$4.class and b/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$4.class differ
diff --git a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$5.class b/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$5.class
index ece28a0..1f48461 100644
Binary files a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$5.class and b/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$5.class differ
diff --git a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$6.class b/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$6.class
index 6d024d0..00c0c91 100644
Binary files a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$6.class and b/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$6.class differ
diff --git a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$7.class b/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$7.class
index 762794b..dfc8103 100644
Binary files a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$7.class and b/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$7.class differ
diff --git a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$8.class b/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$8.class
index 8201342..52fb4b4 100644
Binary files a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$8.class and b/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$8.class differ
diff --git a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$9.class b/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$9.class
index 1633958..7a5eac1 100644
Binary files a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$9.class and b/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$9.class differ
diff --git a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$BackgroundQueryHandler.class b/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$BackgroundQueryHandler.class
index 6877f68..ba2b487 100644
Binary files a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$BackgroundQueryHandler.class and b/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$BackgroundQueryHandler.class differ
diff --git a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback$1.class b/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback$1.class
index 016c842..2be4060 100644
Binary files a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback$1.class and b/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback$1.class differ
diff --git a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback$2.class b/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback$2.class
index b30291e..4e89a86 100644
Binary files a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback$2.class and b/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback$2.class differ
diff --git a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback.class b/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback.class
index b87dc79..1ab3ef6 100644
Binary files a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback.class and b/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback.class differ
diff --git a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$NewNoteOnTouchListener.class b/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$NewNoteOnTouchListener.class
index 2e5d866..906fa4f 100644
Binary files a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$NewNoteOnTouchListener.class and b/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$NewNoteOnTouchListener.class differ
diff --git a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.class b/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.class
index a1fa98b..2b7e9fc 100644
Binary files a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.class and b/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.class differ
diff --git a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity.class b/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity.class
index c7e53a6..94daf1c 100644
Binary files a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity.class and b/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity.class differ
diff --git a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListAdapter$AppWidgetAttribute.class b/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListAdapter$AppWidgetAttribute.class
index 2bdb58b..5c2072b 100644
Binary files a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListAdapter$AppWidgetAttribute.class and b/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListAdapter$AppWidgetAttribute.class differ
diff --git a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListAdapter.class b/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListAdapter.class
index 5e432e9..0dfa320 100644
Binary files a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListAdapter.class and b/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListAdapter.class differ
diff --git a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListItem.class b/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListItem.class
index 4596834..59fdba6 100644
Binary files a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListItem.class and b/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListItem.class differ
diff --git a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$1.class b/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$1.class
index 362fa05..4dedad5 100644
Binary files a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$1.class and b/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$1.class differ
diff --git a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$2.class b/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$2.class
index 8523228..46018a6 100644
Binary files a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$2.class and b/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$2.class differ
diff --git a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$3.class b/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$3.class
index d91bc85..29f794c 100644
Binary files a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$3.class and b/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$3.class differ
diff --git a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$4.class b/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$4.class
index 99c7a64..6bc8d75 100644
Binary files a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$4.class and b/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$4.class differ
diff --git a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$5.class b/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$5.class
index 17e4d3b..9f6ce3e 100644
Binary files a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$5.class and b/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$5.class differ
diff --git a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$6.class b/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$6.class
index 7b80036..de5bee6 100644
Binary files a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$6.class and b/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$6.class differ
diff --git a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$7.class b/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$7.class
index d9abeb9..39b203f 100644
Binary files a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$7.class and b/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$7.class differ
diff --git a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$8.class b/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$8.class
index 39e534a..debfb4c 100644
Binary files a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$8.class and b/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$8.class differ
diff --git a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$GTaskReceiver.class b/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$GTaskReceiver.class
index eb938cf..6540edf 100644
Binary files a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$GTaskReceiver.class and b/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$GTaskReceiver.class differ
diff --git a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity.class b/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity.class
index 0937be2..be17c36 100644
Binary files a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity.class and b/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity.class differ
diff --git a/src/Notes-master3/app/build/intermediates/local_only_symbol_list/debug/R-def.txt b/src/Notes-master3/app/build/intermediates/local_only_symbol_list/debug/R-def.txt
index f7dc3c2..d371f0f 100644
--- a/src/Notes-master3/app/build/intermediates/local_only_symbol_list/debug/R-def.txt
+++ b/src/Notes-master3/app/build/intermediates/local_only_symbol_list/debug/R-def.txt
@@ -141,6 +141,7 @@ id navigation_bar
id note_bg_color_selector
id note_edit_list
id note_edit_view
+id note_font
id note_item
id note_title
id notes_list
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 485c401..728315f 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,254 +20,254 @@
20 android:versionName="0.1" >
21
22 E:\_Ufo\0SE\GitProject\MicodeNotes\src\Notes-master3\app\src\main\AndroidManifest.xml:23:5-44
+22-->D:\git\MiNote2\src\Notes-master3\app\src\main\AndroidManifest.xml:23:5-44
23 android:minSdkVersion="14"
-23-->E:\_Ufo\0SE\GitProject\MicodeNotes\src\Notes-master3\app\src\main\AndroidManifest.xml:23:15-41
+23-->D:\git\MiNote2\src\Notes-master3\app\src\main\AndroidManifest.xml:23:15-41
24 android:targetSdkVersion="14" />
25
26
-26-->E:\_Ufo\0SE\GitProject\MicodeNotes\src\Notes-master3\app\src\main\AndroidManifest.xml:25:5-81
-26-->E:\_Ufo\0SE\GitProject\MicodeNotes\src\Notes-master3\app\src\main\AndroidManifest.xml:25:22-78
+26-->D:\git\MiNote2\src\Notes-master3\app\src\main\AndroidManifest.xml:25:5-81
+26-->D:\git\MiNote2\src\Notes-master3\app\src\main\AndroidManifest.xml:25:22-78
27
-27-->E:\_Ufo\0SE\GitProject\MicodeNotes\src\Notes-master3\app\src\main\AndroidManifest.xml:26:5-88
-27-->E:\_Ufo\0SE\GitProject\MicodeNotes\src\Notes-master3\app\src\main\AndroidManifest.xml:26:22-85
+27-->D:\git\MiNote2\src\Notes-master3\app\src\main\AndroidManifest.xml:26:5-88
+27-->D:\git\MiNote2\src\Notes-master3\app\src\main\AndroidManifest.xml:26:22-85
28
-28-->E:\_Ufo\0SE\GitProject\MicodeNotes\src\Notes-master3\app\src\main\AndroidManifest.xml:27:5-67
-28-->E:\_Ufo\0SE\GitProject\MicodeNotes\src\Notes-master3\app\src\main\AndroidManifest.xml:27:22-64
+28-->D:\git\MiNote2\src\Notes-master3\app\src\main\AndroidManifest.xml:27:5-67
+28-->D:\git\MiNote2\src\Notes-master3\app\src\main\AndroidManifest.xml:27:22-64
29
-29-->E:\_Ufo\0SE\GitProject\MicodeNotes\src\Notes-master3\app\src\main\AndroidManifest.xml:28:5-72
-29-->E:\_Ufo\0SE\GitProject\MicodeNotes\src\Notes-master3\app\src\main\AndroidManifest.xml:28:22-69
+29-->D:\git\MiNote2\src\Notes-master3\app\src\main\AndroidManifest.xml:28:5-72
+29-->D:\git\MiNote2\src\Notes-master3\app\src\main\AndroidManifest.xml:28:22-69
30
-30-->E:\_Ufo\0SE\GitProject\MicodeNotes\src\Notes-master3\app\src\main\AndroidManifest.xml:29:5-74
-30-->E:\_Ufo\0SE\GitProject\MicodeNotes\src\Notes-master3\app\src\main\AndroidManifest.xml:29:22-71
+30-->D:\git\MiNote2\src\Notes-master3\app\src\main\AndroidManifest.xml:29:5-74
+30-->D:\git\MiNote2\src\Notes-master3\app\src\main\AndroidManifest.xml:29:22-71
31
-31-->E:\_Ufo\0SE\GitProject\MicodeNotes\src\Notes-master3\app\src\main\AndroidManifest.xml:30:5-80
-31-->E:\_Ufo\0SE\GitProject\MicodeNotes\src\Notes-master3\app\src\main\AndroidManifest.xml:30:22-77
+31-->D:\git\MiNote2\src\Notes-master3\app\src\main\AndroidManifest.xml:30:5-80
+31-->D:\git\MiNote2\src\Notes-master3\app\src\main\AndroidManifest.xml:30:22-77
32
-32-->E:\_Ufo\0SE\GitProject\MicodeNotes\src\Notes-master3\app\src\main\AndroidManifest.xml:31:5-71
-32-->E:\_Ufo\0SE\GitProject\MicodeNotes\src\Notes-master3\app\src\main\AndroidManifest.xml:31:22-68
+32-->D:\git\MiNote2\src\Notes-master3\app\src\main\AndroidManifest.xml:31:5-71
+32-->D:\git\MiNote2\src\Notes-master3\app\src\main\AndroidManifest.xml:31:22-68
33
-33-->E:\_Ufo\0SE\GitProject\MicodeNotes\src\Notes-master3\app\src\main\AndroidManifest.xml:32:5-74
-33-->E:\_Ufo\0SE\GitProject\MicodeNotes\src\Notes-master3\app\src\main\AndroidManifest.xml:32:22-71
+33-->D:\git\MiNote2\src\Notes-master3\app\src\main\AndroidManifest.xml:32:5-74
+33-->D:\git\MiNote2\src\Notes-master3\app\src\main\AndroidManifest.xml:32:22-71
34
-34-->E:\_Ufo\0SE\GitProject\MicodeNotes\src\Notes-master3\app\src\main\AndroidManifest.xml:33:5-81
-34-->E:\_Ufo\0SE\GitProject\MicodeNotes\src\Notes-master3\app\src\main\AndroidManifest.xml:33:22-78
+34-->D:\git\MiNote2\src\Notes-master3\app\src\main\AndroidManifest.xml:33:5-81
+34-->D:\git\MiNote2\src\Notes-master3\app\src\main\AndroidManifest.xml:33:22-78
35
36 E:\_Ufo\0SE\GitProject\MicodeNotes\src\Notes-master3\app\src\main\AndroidManifest.xml:35:5-149:19
+36-->D:\git\MiNote2\src\Notes-master3\app\src\main\AndroidManifest.xml:35:5-149:19
37 android:debuggable="true"
38 android:extractNativeLibs="true"
39 android:icon="@drawable/icon_app"
-39-->E:\_Ufo\0SE\GitProject\MicodeNotes\src\Notes-master3\app\src\main\AndroidManifest.xml:36:9-42
+39-->D:\git\MiNote2\src\Notes-master3\app\src\main\AndroidManifest.xml:36:9-42
40 android:label="@string/app_name"
-40-->E:\_Ufo\0SE\GitProject\MicodeNotes\src\Notes-master3\app\src\main\AndroidManifest.xml:37:9-41
+40-->D:\git\MiNote2\src\Notes-master3\app\src\main\AndroidManifest.xml:37:9-41
41 android:testOnly="true" >
42 E:\_Ufo\0SE\GitProject\MicodeNotes\src\Notes-master3\app\src\main\AndroidManifest.xml:38:9-51:20
+42-->D:\git\MiNote2\src\Notes-master3\app\src\main\AndroidManifest.xml:38:9-51:20
43 android:name="net.micode.notes.ui.NotesListActivity"
-43-->E:\_Ufo\0SE\GitProject\MicodeNotes\src\Notes-master3\app\src\main\AndroidManifest.xml:39:13-49
+43-->D:\git\MiNote2\src\Notes-master3\app\src\main\AndroidManifest.xml:39:13-49
44 android:configChanges="keyboardHidden|orientation|screenSize"
-44-->E:\_Ufo\0SE\GitProject\MicodeNotes\src\Notes-master3\app\src\main\AndroidManifest.xml:40:13-74
+44-->D:\git\MiNote2\src\Notes-master3\app\src\main\AndroidManifest.xml:40:13-74
45 android:label="@string/app_name"
-45-->E:\_Ufo\0SE\GitProject\MicodeNotes\src\Notes-master3\app\src\main\AndroidManifest.xml:41:13-45
+45-->D:\git\MiNote2\src\Notes-master3\app\src\main\AndroidManifest.xml:41:13-45
46 android:launchMode="singleTop"
-46-->E:\_Ufo\0SE\GitProject\MicodeNotes\src\Notes-master3\app\src\main\AndroidManifest.xml:42:13-43
+46-->D:\git\MiNote2\src\Notes-master3\app\src\main\AndroidManifest.xml:42:13-43
47 android:theme="@style/NoteTheme"
-47-->E:\_Ufo\0SE\GitProject\MicodeNotes\src\Notes-master3\app\src\main\AndroidManifest.xml:43:13-45
+47-->D:\git\MiNote2\src\Notes-master3\app\src\main\AndroidManifest.xml:43:13-45
48 android:uiOptions="splitActionBarWhenNarrow"
-48-->E:\_Ufo\0SE\GitProject\MicodeNotes\src\Notes-master3\app\src\main\AndroidManifest.xml:44:13-57
+48-->D:\git\MiNote2\src\Notes-master3\app\src\main\AndroidManifest.xml:44:13-57
49 android:windowSoftInputMode="adjustPan" >
-49-->E:\_Ufo\0SE\GitProject\MicodeNotes\src\Notes-master3\app\src\main\AndroidManifest.xml:45:13-52
+49-->D:\git\MiNote2\src\Notes-master3\app\src\main\AndroidManifest.xml:45:13-52
50
-50-->E:\_Ufo\0SE\GitProject\MicodeNotes\src\Notes-master3\app\src\main\AndroidManifest.xml:47:13-50:29
+50-->D:\git\MiNote2\src\Notes-master3\app\src\main\AndroidManifest.xml:47:13-50:29
51
-51-->E:\_Ufo\0SE\GitProject\MicodeNotes\src\Notes-master3\app\src\main\AndroidManifest.xml:48:17-69
-51-->E:\_Ufo\0SE\GitProject\MicodeNotes\src\Notes-master3\app\src\main\AndroidManifest.xml:48:25-66
+51-->D:\git\MiNote2\src\Notes-master3\app\src\main\AndroidManifest.xml:48:17-69
+51-->D:\git\MiNote2\src\Notes-master3\app\src\main\AndroidManifest.xml:48:25-66
52
53
-53-->E:\_Ufo\0SE\GitProject\MicodeNotes\src\Notes-master3\app\src\main\AndroidManifest.xml:49:17-77
-53-->E:\_Ufo\0SE\GitProject\MicodeNotes\src\Notes-master3\app\src\main\AndroidManifest.xml:49:27-74
+53-->D:\git\MiNote2\src\Notes-master3\app\src\main\AndroidManifest.xml:49:17-77
+53-->D:\git\MiNote2\src\Notes-master3\app\src\main\AndroidManifest.xml:49:27-74
54
55
56 E:\_Ufo\0SE\GitProject\MicodeNotes\src\Notes-master3\app\src\main\AndroidManifest.xml:53:9-81:20
+56-->D:\git\MiNote2\src\Notes-master3\app\src\main\AndroidManifest.xml:53:9-81:20
57 android:name="net.micode.notes.ui.NoteEditActivity"
-57-->E:\_Ufo\0SE\GitProject\MicodeNotes\src\Notes-master3\app\src\main\AndroidManifest.xml:54:13-48
+57-->D:\git\MiNote2\src\Notes-master3\app\src\main\AndroidManifest.xml:54:13-48
58 android:configChanges="keyboardHidden|orientation|screenSize"
-58-->E:\_Ufo\0SE\GitProject\MicodeNotes\src\Notes-master3\app\src\main\AndroidManifest.xml:55:13-74
+58-->D:\git\MiNote2\src\Notes-master3\app\src\main\AndroidManifest.xml:55:13-74
59 android:launchMode="singleTop"
-59-->E:\_Ufo\0SE\GitProject\MicodeNotes\src\Notes-master3\app\src\main\AndroidManifest.xml:56:13-43
+59-->D:\git\MiNote2\src\Notes-master3\app\src\main\AndroidManifest.xml:56:13-43
60 android:theme="@style/NoteTheme" >
-60-->E:\_Ufo\0SE\GitProject\MicodeNotes\src\Notes-master3\app\src\main\AndroidManifest.xml:57:13-45
+60-->D:\git\MiNote2\src\Notes-master3\app\src\main\AndroidManifest.xml:57:13-45
61
-61-->E:\_Ufo\0SE\GitProject\MicodeNotes\src\Notes-master3\app\src\main\AndroidManifest.xml:59:13-64:29
+61-->D:\git\MiNote2\src\Notes-master3\app\src\main\AndroidManifest.xml:59:13-64:29
62
-62-->E:\_Ufo\0SE\GitProject\MicodeNotes\src\Notes-master3\app\src\main\AndroidManifest.xml:60:17-69
-62-->E:\_Ufo\0SE\GitProject\MicodeNotes\src\Notes-master3\app\src\main\AndroidManifest.xml:60:25-66
+62-->D:\git\MiNote2\src\Notes-master3\app\src\main\AndroidManifest.xml:60:17-69
+62-->D:\git\MiNote2\src\Notes-master3\app\src\main\AndroidManifest.xml:60:25-66
63
64
-64-->E:\_Ufo\0SE\GitProject\MicodeNotes\src\Notes-master3\app\src\main\AndroidManifest.xml:61:17-76
-64-->E:\_Ufo\0SE\GitProject\MicodeNotes\src\Notes-master3\app\src\main\AndroidManifest.xml:61:27-73
+64-->D:\git\MiNote2\src\Notes-master3\app\src\main\AndroidManifest.xml:61:17-76
+64-->D:\git\MiNote2\src\Notes-master3\app\src\main\AndroidManifest.xml:61:27-73
65
66
-66-->E:\_Ufo\0SE\GitProject\MicodeNotes\src\Notes-master3\app\src\main\AndroidManifest.xml:62:17-78
-66-->E:\_Ufo\0SE\GitProject\MicodeNotes\src\Notes-master3\app\src\main\AndroidManifest.xml:62:23-75
+66-->D:\git\MiNote2\src\Notes-master3\app\src\main\AndroidManifest.xml:62:17-78
+66-->D:\git\MiNote2\src\Notes-master3\app\src\main\AndroidManifest.xml:62:23-75
67
-67-->E:\_Ufo\0SE\GitProject\MicodeNotes\src\Notes-master3\app\src\main\AndroidManifest.xml:62:17-78
-67-->E:\_Ufo\0SE\GitProject\MicodeNotes\src\Notes-master3\app\src\main\AndroidManifest.xml:62:23-75
+67-->D:\git\MiNote2\src\Notes-master3\app\src\main\AndroidManifest.xml:62:17-78
+67-->D:\git\MiNote2\src\Notes-master3\app\src\main\AndroidManifest.xml:62:23-75
68
69
-69-->E:\_Ufo\0SE\GitProject\MicodeNotes\src\Notes-master3\app\src\main\AndroidManifest.xml:66:13-71:29
+69-->D:\git\MiNote2\src\Notes-master3\app\src\main\AndroidManifest.xml:66:13-71:29
70
-70-->E:\_Ufo\0SE\GitProject\MicodeNotes\src\Notes-master3\app\src\main\AndroidManifest.xml:67:17-79
-70-->E:\_Ufo\0SE\GitProject\MicodeNotes\src\Notes-master3\app\src\main\AndroidManifest.xml:67:25-76
+70-->D:\git\MiNote2\src\Notes-master3\app\src\main\AndroidManifest.xml:67:17-79
+70-->D:\git\MiNote2\src\Notes-master3\app\src\main\AndroidManifest.xml:67:25-76
71
72
-72-->E:\_Ufo\0SE\GitProject\MicodeNotes\src\Notes-master3\app\src\main\AndroidManifest.xml:61:17-76
-72-->E:\_Ufo\0SE\GitProject\MicodeNotes\src\Notes-master3\app\src\main\AndroidManifest.xml:61:27-73
+72-->D:\git\MiNote2\src\Notes-master3\app\src\main\AndroidManifest.xml:61:17-76
+72-->D:\git\MiNote2\src\Notes-master3\app\src\main\AndroidManifest.xml:61:27-73
73
74
-74-->E:\_Ufo\0SE\GitProject\MicodeNotes\src\Notes-master3\app\src\main\AndroidManifest.xml:62:17-78
-74-->E:\_Ufo\0SE\GitProject\MicodeNotes\src\Notes-master3\app\src\main\AndroidManifest.xml:62:23-75
+74-->D:\git\MiNote2\src\Notes-master3\app\src\main\AndroidManifest.xml:62:17-78
+74-->D:\git\MiNote2\src\Notes-master3\app\src\main\AndroidManifest.xml:62:23-75
75
-75-->E:\_Ufo\0SE\GitProject\MicodeNotes\src\Notes-master3\app\src\main\AndroidManifest.xml:62:17-78
-75-->E:\_Ufo\0SE\GitProject\MicodeNotes\src\Notes-master3\app\src\main\AndroidManifest.xml:62:23-75
+75-->D:\git\MiNote2\src\Notes-master3\app\src\main\AndroidManifest.xml:62:17-78
+75-->D:\git\MiNote2\src\Notes-master3\app\src\main\AndroidManifest.xml:62:23-75
76
77
-77-->E:\_Ufo\0SE\GitProject\MicodeNotes\src\Notes-master3\app\src\main\AndroidManifest.xml:73:13-76:29
+77-->D:\git\MiNote2\src\Notes-master3\app\src\main\AndroidManifest.xml:73:13-76:29
78
-78-->E:\_Ufo\0SE\GitProject\MicodeNotes\src\Notes-master3\app\src\main\AndroidManifest.xml:74:17-71
-78-->E:\_Ufo\0SE\GitProject\MicodeNotes\src\Notes-master3\app\src\main\AndroidManifest.xml:74:25-68
+78-->D:\git\MiNote2\src\Notes-master3\app\src\main\AndroidManifest.xml:74:17-71
+78-->D:\git\MiNote2\src\Notes-master3\app\src\main\AndroidManifest.xml:74:25-68
79
80
-80-->E:\_Ufo\0SE\GitProject\MicodeNotes\src\Notes-master3\app\src\main\AndroidManifest.xml:61:17-76
-80-->E:\_Ufo\0SE\GitProject\MicodeNotes\src\Notes-master3\app\src\main\AndroidManifest.xml:61:27-73
+80-->D:\git\MiNote2\src\Notes-master3\app\src\main\AndroidManifest.xml:61:17-76
+80-->D:\git\MiNote2\src\Notes-master3\app\src\main\AndroidManifest.xml:61:27-73
81
82
83 E:\_Ufo\0SE\GitProject\MicodeNotes\src\Notes-master3\app\src\main\AndroidManifest.xml:78:13-80:54
+83-->D:\git\MiNote2\src\Notes-master3\app\src\main\AndroidManifest.xml:78:13-80:54
84 android:name="android.app.searchable"
-84-->E:\_Ufo\0SE\GitProject\MicodeNotes\src\Notes-master3\app\src\main\AndroidManifest.xml:79:17-54
+84-->D:\git\MiNote2\src\Notes-master3\app\src\main\AndroidManifest.xml:79:17-54
85 android:resource="@xml/searchable" />
-85-->E:\_Ufo\0SE\GitProject\MicodeNotes\src\Notes-master3\app\src\main\AndroidManifest.xml:80:17-51
+85-->D:\git\MiNote2\src\Notes-master3\app\src\main\AndroidManifest.xml:80:17-51
86
87
88 E:\_Ufo\0SE\GitProject\MicodeNotes\src\Notes-master3\app\src\main\AndroidManifest.xml:83:9-86:43
+88-->D:\git\MiNote2\src\Notes-master3\app\src\main\AndroidManifest.xml:83:9-86:43
89 android:name="net.micode.notes.data.NotesProvider"
-89-->E:\_Ufo\0SE\GitProject\MicodeNotes\src\Notes-master3\app\src\main\AndroidManifest.xml:84:13-63
+89-->D:\git\MiNote2\src\Notes-master3\app\src\main\AndroidManifest.xml:84:13-63
90 android:authorities="micode_notes"
-90-->E:\_Ufo\0SE\GitProject\MicodeNotes\src\Notes-master3\app\src\main\AndroidManifest.xml:85:13-47
+90-->D:\git\MiNote2\src\Notes-master3\app\src\main\AndroidManifest.xml:85:13-47
91 android:multiprocess="true" />
-91-->E:\_Ufo\0SE\GitProject\MicodeNotes\src\Notes-master3\app\src\main\AndroidManifest.xml:86:13-40
+91-->D:\git\MiNote2\src\Notes-master3\app\src\main\AndroidManifest.xml:86:13-40
92
93 E:\_Ufo\0SE\GitProject\MicodeNotes\src\Notes-master3\app\src\main\AndroidManifest.xml:88:9-100:20
+93-->D:\git\MiNote2\src\Notes-master3\app\src\main\AndroidManifest.xml:88:9-100:20
94 android:name="net.micode.notes.widget.NoteWidgetProvider_2x"
-94-->E:\_Ufo\0SE\GitProject\MicodeNotes\src\Notes-master3\app\src\main\AndroidManifest.xml:89:13-57
+94-->D:\git\MiNote2\src\Notes-master3\app\src\main\AndroidManifest.xml:89:13-57
95 android:label="@string/app_widget2x2" >
-95-->E:\_Ufo\0SE\GitProject\MicodeNotes\src\Notes-master3\app\src\main\AndroidManifest.xml:90:13-50
+95-->D:\git\MiNote2\src\Notes-master3\app\src\main\AndroidManifest.xml:90:13-50
96
-96-->E:\_Ufo\0SE\GitProject\MicodeNotes\src\Notes-master3\app\src\main\AndroidManifest.xml:91:13-95:29
+96-->D:\git\MiNote2\src\Notes-master3\app\src\main\AndroidManifest.xml:91:13-95:29
97
-97-->E:\_Ufo\0SE\GitProject\MicodeNotes\src\Notes-master3\app\src\main\AndroidManifest.xml:92:17-84
-97-->E:\_Ufo\0SE\GitProject\MicodeNotes\src\Notes-master3\app\src\main\AndroidManifest.xml:92:25-81
+97-->D:\git\MiNote2\src\Notes-master3\app\src\main\AndroidManifest.xml:92:17-84
+97-->D:\git\MiNote2\src\Notes-master3\app\src\main\AndroidManifest.xml:92:25-81
98
-98-->E:\_Ufo\0SE\GitProject\MicodeNotes\src\Notes-master3\app\src\main\AndroidManifest.xml:93:17-85
-98-->E:\_Ufo\0SE\GitProject\MicodeNotes\src\Notes-master3\app\src\main\AndroidManifest.xml:93:25-82
+98-->D:\git\MiNote2\src\Notes-master3\app\src\main\AndroidManifest.xml:93:17-85
+98-->D:\git\MiNote2\src\Notes-master3\app\src\main\AndroidManifest.xml:93:25-82
99
-99-->E:\_Ufo\0SE\GitProject\MicodeNotes\src\Notes-master3\app\src\main\AndroidManifest.xml:94:17-85
-99-->E:\_Ufo\0SE\GitProject\MicodeNotes\src\Notes-master3\app\src\main\AndroidManifest.xml:94:25-82
+99-->D:\git\MiNote2\src\Notes-master3\app\src\main\AndroidManifest.xml:94:17-85
+99-->D:\git\MiNote2\src\Notes-master3\app\src\main\AndroidManifest.xml:94:25-82
100
101
102 E:\_Ufo\0SE\GitProject\MicodeNotes\src\Notes-master3\app\src\main\AndroidManifest.xml:97:13-99:58
+102-->D:\git\MiNote2\src\Notes-master3\app\src\main\AndroidManifest.xml:97:13-99:58
103 android:name="android.appwidget.provider"
-103-->E:\_Ufo\0SE\GitProject\MicodeNotes\src\Notes-master3\app\src\main\AndroidManifest.xml:98:17-58
+103-->D:\git\MiNote2\src\Notes-master3\app\src\main\AndroidManifest.xml:98:17-58
104 android:resource="@xml/widget_2x_info" />
-104-->E:\_Ufo\0SE\GitProject\MicodeNotes\src\Notes-master3\app\src\main\AndroidManifest.xml:99:17-55
+104-->D:\git\MiNote2\src\Notes-master3\app\src\main\AndroidManifest.xml:99:17-55
105
106 E:\_Ufo\0SE\GitProject\MicodeNotes\src\Notes-master3\app\src\main\AndroidManifest.xml:101:9-114:20
+106-->D:\git\MiNote2\src\Notes-master3\app\src\main\AndroidManifest.xml:101:9-114:20
107 android:name="net.micode.notes.widget.NoteWidgetProvider_4x"
-107-->E:\_Ufo\0SE\GitProject\MicodeNotes\src\Notes-master3\app\src\main\AndroidManifest.xml:102:13-57
+107-->D:\git\MiNote2\src\Notes-master3\app\src\main\AndroidManifest.xml:102:13-57
108 android:label="@string/app_widget4x4" >
-108-->E:\_Ufo\0SE\GitProject\MicodeNotes\src\Notes-master3\app\src\main\AndroidManifest.xml:103:13-50
+108-->D:\git\MiNote2\src\Notes-master3\app\src\main\AndroidManifest.xml:103:13-50
109
-109-->E:\_Ufo\0SE\GitProject\MicodeNotes\src\Notes-master3\app\src\main\AndroidManifest.xml:91:13-95:29
+109-->D:\git\MiNote2\src\Notes-master3\app\src\main\AndroidManifest.xml:91:13-95:29
110
-110-->E:\_Ufo\0SE\GitProject\MicodeNotes\src\Notes-master3\app\src\main\AndroidManifest.xml:92:17-84
-110-->E:\_Ufo\0SE\GitProject\MicodeNotes\src\Notes-master3\app\src\main\AndroidManifest.xml:92:25-81
+110-->D:\git\MiNote2\src\Notes-master3\app\src\main\AndroidManifest.xml:92:17-84
+110-->D:\git\MiNote2\src\Notes-master3\app\src\main\AndroidManifest.xml:92:25-81
111
-111-->E:\_Ufo\0SE\GitProject\MicodeNotes\src\Notes-master3\app\src\main\AndroidManifest.xml:93:17-85
-111-->E:\_Ufo\0SE\GitProject\MicodeNotes\src\Notes-master3\app\src\main\AndroidManifest.xml:93:25-82
+111-->D:\git\MiNote2\src\Notes-master3\app\src\main\AndroidManifest.xml:93:17-85
+111-->D:\git\MiNote2\src\Notes-master3\app\src\main\AndroidManifest.xml:93:25-82
112
-112-->E:\_Ufo\0SE\GitProject\MicodeNotes\src\Notes-master3\app\src\main\AndroidManifest.xml:94:17-85
-112-->E:\_Ufo\0SE\GitProject\MicodeNotes\src\Notes-master3\app\src\main\AndroidManifest.xml:94:25-82
+112-->D:\git\MiNote2\src\Notes-master3\app\src\main\AndroidManifest.xml:94:17-85
+112-->D:\git\MiNote2\src\Notes-master3\app\src\main\AndroidManifest.xml:94:25-82
113
114
115 E:\_Ufo\0SE\GitProject\MicodeNotes\src\Notes-master3\app\src\main\AndroidManifest.xml:97:13-99:58
+115-->D:\git\MiNote2\src\Notes-master3\app\src\main\AndroidManifest.xml:97:13-99:58
116 android:name="android.appwidget.provider"
-116-->E:\_Ufo\0SE\GitProject\MicodeNotes\src\Notes-master3\app\src\main\AndroidManifest.xml:98:17-58
+116-->D:\git\MiNote2\src\Notes-master3\app\src\main\AndroidManifest.xml:98:17-58
117 android:resource="@xml/widget_4x_info" />
-117-->E:\_Ufo\0SE\GitProject\MicodeNotes\src\Notes-master3\app\src\main\AndroidManifest.xml:99:17-55
+117-->D:\git\MiNote2\src\Notes-master3\app\src\main\AndroidManifest.xml:99:17-55
118
119
-119-->E:\_Ufo\0SE\GitProject\MicodeNotes\src\Notes-master3\app\src\main\AndroidManifest.xml:116:9-120:20
-119-->E:\_Ufo\0SE\GitProject\MicodeNotes\src\Notes-master3\app\src\main\AndroidManifest.xml:116:19-55
+119-->D:\git\MiNote2\src\Notes-master3\app\src\main\AndroidManifest.xml:116:9-120:20
+119-->D:\git\MiNote2\src\Notes-master3\app\src\main\AndroidManifest.xml:116:19-55
120
-120-->E:\_Ufo\0SE\GitProject\MicodeNotes\src\Notes-master3\app\src\main\AndroidManifest.xml:117:13-119:29
+120-->D:\git\MiNote2\src\Notes-master3\app\src\main\AndroidManifest.xml:117:13-119:29
121
-121-->E:\_Ufo\0SE\GitProject\MicodeNotes\src\Notes-master3\app\src\main\AndroidManifest.xml:118:17-79
-121-->E:\_Ufo\0SE\GitProject\MicodeNotes\src\Notes-master3\app\src\main\AndroidManifest.xml:118:25-76
+121-->D:\git\MiNote2\src\Notes-master3\app\src\main\AndroidManifest.xml:118:17-79
+121-->D:\git\MiNote2\src\Notes-master3\app\src\main\AndroidManifest.xml:118:25-76
122
123
124 E:\_Ufo\0SE\GitProject\MicodeNotes\src\Notes-master3\app\src\main\AndroidManifest.xml:122:9-125:20
+124-->D:\git\MiNote2\src\Notes-master3\app\src\main\AndroidManifest.xml:122:9-125:20
125 android:name="net.micode.notes.ui.AlarmReceiver"
-125-->E:\_Ufo\0SE\GitProject\MicodeNotes\src\Notes-master3\app\src\main\AndroidManifest.xml:123:13-61
+125-->D:\git\MiNote2\src\Notes-master3\app\src\main\AndroidManifest.xml:123:13-61
126 android:process=":remote" >
-126-->E:\_Ufo\0SE\GitProject\MicodeNotes\src\Notes-master3\app\src\main\AndroidManifest.xml:124:13-38
+126-->D:\git\MiNote2\src\Notes-master3\app\src\main\AndroidManifest.xml:124:13-38
127
128
129 E:\_Ufo\0SE\GitProject\MicodeNotes\src\Notes-master3\app\src\main\AndroidManifest.xml:127:9-132:20
+129-->D:\git\MiNote2\src\Notes-master3\app\src\main\AndroidManifest.xml:127:9-132:20
130 android:name="net.micode.notes.ui.AlarmAlertActivity"
-130-->E:\_Ufo\0SE\GitProject\MicodeNotes\src\Notes-master3\app\src\main\AndroidManifest.xml:128:13-50
+130-->D:\git\MiNote2\src\Notes-master3\app\src\main\AndroidManifest.xml:128:13-50
131 android:label="@string/app_name"
-131-->E:\_Ufo\0SE\GitProject\MicodeNotes\src\Notes-master3\app\src\main\AndroidManifest.xml:129:13-45
+131-->D:\git\MiNote2\src\Notes-master3\app\src\main\AndroidManifest.xml:129:13-45
132 android:launchMode="singleInstance"
-132-->E:\_Ufo\0SE\GitProject\MicodeNotes\src\Notes-master3\app\src\main\AndroidManifest.xml:130:13-48
+132-->D:\git\MiNote2\src\Notes-master3\app\src\main\AndroidManifest.xml:130:13-48
133 android:theme="@android:style/Theme.Holo.Wallpaper.NoTitleBar" >
-133-->E:\_Ufo\0SE\GitProject\MicodeNotes\src\Notes-master3\app\src\main\AndroidManifest.xml:131:13-75
+133-->D:\git\MiNote2\src\Notes-master3\app\src\main\AndroidManifest.xml:131:13-75
134
135 E:\_Ufo\0SE\GitProject\MicodeNotes\src\Notes-master3\app\src\main\AndroidManifest.xml:134:9-139:20
+135-->D:\git\MiNote2\src\Notes-master3\app\src\main\AndroidManifest.xml:134:9-139:20
136 android:name="net.micode.notes.ui.NotesPreferenceActivity"
-136-->E:\_Ufo\0SE\GitProject\MicodeNotes\src\Notes-master3\app\src\main\AndroidManifest.xml:135:13-71
+136-->D:\git\MiNote2\src\Notes-master3\app\src\main\AndroidManifest.xml:135:13-71
137 android:label="@string/preferences_title"
-137-->E:\_Ufo\0SE\GitProject\MicodeNotes\src\Notes-master3\app\src\main\AndroidManifest.xml:136:13-54
+137-->D:\git\MiNote2\src\Notes-master3\app\src\main\AndroidManifest.xml:136:13-54
138 android:launchMode="singleTop"
-138-->E:\_Ufo\0SE\GitProject\MicodeNotes\src\Notes-master3\app\src\main\AndroidManifest.xml:137:13-43
+138-->D:\git\MiNote2\src\Notes-master3\app\src\main\AndroidManifest.xml:137:13-43
139 android:theme="@android:style/Theme.Holo.Light" >
-139-->E:\_Ufo\0SE\GitProject\MicodeNotes\src\Notes-master3\app\src\main\AndroidManifest.xml:138:13-60
+139-->D:\git\MiNote2\src\Notes-master3\app\src\main\AndroidManifest.xml:138:13-60
140
141
142 E:\_Ufo\0SE\GitProject\MicodeNotes\src\Notes-master3\app\src\main\AndroidManifest.xml:141:9-144:19
+142-->D:\git\MiNote2\src\Notes-master3\app\src\main\AndroidManifest.xml:141:9-144:19
143 android:name="net.micode.notes.gtask.remote.GTaskSyncService"
-143-->E:\_Ufo\0SE\GitProject\MicodeNotes\src\Notes-master3\app\src\main\AndroidManifest.xml:142:13-74
+143-->D:\git\MiNote2\src\Notes-master3\app\src\main\AndroidManifest.xml:142:13-74
144 android:exported="false" >
-144-->E:\_Ufo\0SE\GitProject\MicodeNotes\src\Notes-master3\app\src\main\AndroidManifest.xml:143:13-37
+144-->D:\git\MiNote2\src\Notes-master3\app\src\main\AndroidManifest.xml:143:13-37
145
146
147 E:\_Ufo\0SE\GitProject\MicodeNotes\src\Notes-master3\app\src\main\AndroidManifest.xml:146:9-148:52
+147-->D:\git\MiNote2\src\Notes-master3\app\src\main\AndroidManifest.xml:146:9-148:52
148 android:name="android.app.default_searchable"
-148-->E:\_Ufo\0SE\GitProject\MicodeNotes\src\Notes-master3\app\src\main\AndroidManifest.xml:147:13-58
+148-->D:\git\MiNote2\src\Notes-master3\app\src\main\AndroidManifest.xml:147:13-58
149 android:value=".ui.NoteEditActivity" />
-149-->E:\_Ufo\0SE\GitProject\MicodeNotes\src\Notes-master3\app\src\main\AndroidManifest.xml:148:13-49
+149-->D:\git\MiNote2\src\Notes-master3\app\src\main\AndroidManifest.xml:148:13-49
150
151
152
diff --git a/src/Notes-master3/app/build/intermediates/manifest_merge_blame_file/debugAndroidTest/manifest-merger-blame-debug-androidTest-report.txt b/src/Notes-master3/app/build/intermediates/manifest_merge_blame_file/debugAndroidTest/manifest-merger-blame-debug-androidTest-report.txt
index e8c872f..7fa159d 100644
--- a/src/Notes-master3/app/build/intermediates/manifest_merge_blame_file/debugAndroidTest/manifest-merger-blame-debug-androidTest-report.txt
+++ b/src/Notes-master3/app/build/intermediates/manifest_merge_blame_file/debugAndroidTest/manifest-merger-blame-debug-androidTest-report.txt
@@ -3,32 +3,32 @@
3 package="net.micode.notes.test" >
4
5 E:\_Ufo\0SE\GitProject\MicodeNotes\src\Notes-master3\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest2594326139218601287.xml:5:5-74
+5-->D:\git\MiNote2\src\Notes-master3\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest15777676378986941245.xml:5:5-74
6 android:minSdkVersion="14"
-6-->E:\_Ufo\0SE\GitProject\MicodeNotes\src\Notes-master3\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest2594326139218601287.xml:5:15-41
+6-->D:\git\MiNote2\src\Notes-master3\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest15777676378986941245.xml:5:15-41
7 android:targetSdkVersion="14" />
-7-->E:\_Ufo\0SE\GitProject\MicodeNotes\src\Notes-master3\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest2594326139218601287.xml:5:42-71
+7-->D:\git\MiNote2\src\Notes-master3\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest15777676378986941245.xml:5:42-71
8
9 E:\_Ufo\0SE\GitProject\MicodeNotes\src\Notes-master3\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest2594326139218601287.xml:11:5-15:66
+9-->D:\git\MiNote2\src\Notes-master3\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest15777676378986941245.xml:11:5-15:66
10 android:name="android.test.InstrumentationTestRunner"
-10-->E:\_Ufo\0SE\GitProject\MicodeNotes\src\Notes-master3\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest2594326139218601287.xml:11:22-75
+10-->D:\git\MiNote2\src\Notes-master3\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest15777676378986941245.xml:11:22-75
11 android:functionalTest="false"
-11-->E:\_Ufo\0SE\GitProject\MicodeNotes\src\Notes-master3\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest2594326139218601287.xml:14:22-52
+11-->D:\git\MiNote2\src\Notes-master3\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest15777676378986941245.xml:14:22-52
12 android:handleProfiling="false"
-12-->E:\_Ufo\0SE\GitProject\MicodeNotes\src\Notes-master3\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest2594326139218601287.xml:13:22-53
+12-->D:\git\MiNote2\src\Notes-master3\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest15777676378986941245.xml:13:22-53
13 android:label="Tests for net.micode.notes"
-13-->E:\_Ufo\0SE\GitProject\MicodeNotes\src\Notes-master3\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest2594326139218601287.xml:15:22-64
+13-->D:\git\MiNote2\src\Notes-master3\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest15777676378986941245.xml:15:22-64
14 android:targetPackage="net.micode.notes" />
-14-->E:\_Ufo\0SE\GitProject\MicodeNotes\src\Notes-master3\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest2594326139218601287.xml:12:22-62
+14-->D:\git\MiNote2\src\Notes-master3\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest15777676378986941245.xml:12:22-62
15
16 E:\_Ufo\0SE\GitProject\MicodeNotes\src\Notes-master3\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest2594326139218601287.xml:7:5-9:19
+16-->D:\git\MiNote2\src\Notes-master3\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest15777676378986941245.xml:7:5-9:19
17 android:debuggable="true"
18 android:extractNativeLibs="true" >
19
-19-->E:\_Ufo\0SE\GitProject\MicodeNotes\src\Notes-master3\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest2594326139218601287.xml:8:9-60
-19-->E:\_Ufo\0SE\GitProject\MicodeNotes\src\Notes-master3\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest2594326139218601287.xml:8:23-57
+19-->D:\git\MiNote2\src\Notes-master3\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest15777676378986941245.xml:8:9-60
+19-->D:\git\MiNote2\src\Notes-master3\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest15777676378986941245.xml:8:23-57
20
21
22
diff --git a/src/Notes-master3/app/build/intermediates/merged_res/debug/menu_note_edit.xml.flat b/src/Notes-master3/app/build/intermediates/merged_res/debug/menu_note_edit.xml.flat
index 5052ebe..7e48bdd 100644
Binary files a/src/Notes-master3/app/build/intermediates/merged_res/debug/menu_note_edit.xml.flat and b/src/Notes-master3/app/build/intermediates/merged_res/debug/menu_note_edit.xml.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 21dbe6b..fbfb584 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
@@ -4,7 +4,7 @@
"outputFile": "net.micode.notes.app-merged_res-4:/values-zh-rCN_values-zh-rCN.arsc.flat",
"map": [
{
- "source": "E:\\_Ufo\\0SE\\GitProject\\MicodeNotes\\src\\Notes-master3\\app\\src\\main\\res\\values-zh-rCN\\strings.xml",
+ "source": "D:\\git\\MiNote2\\src\\Notes-master3\\app\\src\\main\\res\\values-zh-rCN\\strings.xml",
"from": {
"startLines": "127,72,71,70,69,19,20,21,118,119,126,125,26,78,79,77,76,75,91,90,89,81,38,61,29,30,82,73,120,68,64,97,98,99,39,45,50,40,60,59,58,54,53,51,52,55,100,56,46,67,57,130,65,96,44,49,48,47,63,43,62,41,42,66,28,34,36,33,35,32,31,25,24,103,102,105,117,110,109,111,112,114,113,104,108,106,107,101,115,116,124,122,121,123,27,80,88,93,92,94,87,86,85,84,22,23",
"startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
@@ -23,7 +23,7 @@
}
},
{
- "source": "E:\\_Ufo\\0SE\\GitProject\\MicodeNotes\\src\\Notes-master3\\app\\src\\main\\res\\values-zh-rCN\\arrays.xml",
+ "source": "D:\\git\\MiNote2\\src\\Notes-master3\\app\\src\\main\\res\\values-zh-rCN\\arrays.xml",
"from": {
"startLines": "18",
"startColumns": "4",
@@ -47,7 +47,43 @@
"outputFile": "net.micode.notes.app-merged_res-4:/values_values.arsc.flat",
"map": [
{
- "source": "E:\\_Ufo\\0SE\\GitProject\\MicodeNotes\\src\\Notes-master3\\app\\src\\main\\res\\values\\styles.xml",
+ "source": "D:\\git\\MiNote2\\src\\Notes-master3\\app\\src\\main\\res\\values\\dimens.xml",
+ "from": {
+ "startLines": "19,20,21,22,18",
+ "startColumns": "4,4,4,4,4",
+ "startOffsets": "783,836,890,944,730",
+ "endColumns": "51,52,52,51,51",
+ "endOffsets": "830,884,938,991,777"
+ },
+ "to": {
+ "startLines": "13,14,15,16,17",
+ "startColumns": "4,4,4,4,4",
+ "startOffsets": "477,529,582,635,687",
+ "endColumns": "51,52,52,51,51",
+ "endOffsets": "524,577,630,682,734"
+ }
+ },
+ {
+ "source": "D:\\git\\MiNote2\\src\\Notes-master3\\app\\src\\main\\res\\values\\strings.xml",
+ "from": {
+ "startLines": "137,72,75,74,73,19,20,21,127,128,136,135,26,81,82,80,79,78,94,93,92,84,39,38,64,29,30,85,41,76,129,71,67,101,102,103,42,48,53,43,63,62,61,57,56,54,55,58,104,59,49,70,60,106,68,99,47,52,51,50,66,46,65,44,45,69,28,34,36,33,35,32,31,25,24,110,109,113,125,118,117,119,120,122,121,111,112,116,114,115,108,123,124,134,132,131,133,27,83,91,96,95,97,90,89,88,87,22,23",
+ "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
+ "startOffsets": "8565,3991,4255,4158,4088,846,890,943,8053,8103,8506,8454,1308,4715,4810,4643,4558,4474,5689,5605,5502,4988,2064,2012,3482,1515,1590,5050,2159,4339,8167,3919,3670,6104,6163,6216,2219,2540,2846,2278,3410,3348,3290,3064,3011,2906,2960,3115,6283,3166,2588,3852,3227,6360,3720,6024,2492,2790,2701,2642,3607,2441,3561,2336,2380,3784,1459,1805,1915,1757,1861,1700,1651,1252,1198,6560,6492,6804,7954,7173,7091,7248,7338,7582,7502,6645,6721,7031,6869,6950,6436,7727,7850,8412,8283,8225,8337,1393,4919,5415,5826,5756,5907,5355,5299,5236,5175,996,1107",
+ "endLines": "141,72,75,74,73,19,20,21,127,128,136,135,26,81,82,80,79,78,94,93,92,84,39,38,64,29,30,85,41,76,129,71,67,101,102,103,42,48,53,43,63,62,61,57,56,54,55,58,104,59,49,70,60,106,68,99,47,52,51,50,66,46,65,44,45,69,28,34,36,33,35,32,31,25,24,110,109,113,125,118,117,119,120,122,121,111,112,116,114,115,108,123,124,134,132,131,133,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,73,59,104,58,101,54,70,48,57,51,65,57,46,58,56,70,60,56,49,51,52,49,49,53,59,52,65,61,48,62,46,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": "8973,4082,4333,4249,4152,884,937,990,8097,8161,8559,8500,1387,4804,4913,4709,4637,4552,5750,5683,5599,5044,2121,2058,3555,1584,1645,5150,2213,4436,8217,3985,3714,6157,6210,6277,2272,2582,2900,2330,3476,3404,3342,3109,3058,2954,3005,3160,6332,3221,2636,3913,3284,6404,3778,6066,2534,2840,2784,2695,3664,2486,3601,2374,2435,3846,1509,1855,1963,1799,1909,1751,1694,1302,1246,6639,6554,6863,8045,7242,7167,7332,7496,7721,7576,6715,6798,7085,6944,7025,6486,7844,7948,8448,8331,8277,8406,1453,4982,5496,5901,5820,5996,5409,5349,5293,5230,1101,1192"
+ },
+ "to": {
+ "startLines": "18,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125,126,127,128,129,130",
+ "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
+ "startOffsets": "739,1092,1188,1271,1367,1436,1479,1531,1583,1632,1695,1753,1804,1888,1982,2090,2161,2245,2328,2394,2477,2579,2640,2702,2753,2831,2905,2965,3070,3129,3231,3286,3357,3406,3464,3516,3582,3640,3687,3746,3803,3874,3935,3992,4042,4094,4147,4197,4247,4301,4361,4414,4480,4542,4591,4654,4701,4748,4803,4891,4949,5011,5061,5106,5149,5209,5276,5331,5386,5439,5486,5539,5595,5643,5698,5751,5835,5902,5966,6062,6136,6217,6306,6469,6613,6692,6767,6849,6908,6988,7068,7123,7245,7348,7389,7442,7499,7573,7638,7706,7792,7872,7941,8035,8094,8149,8211,8271,8381",
+ "endLines": "22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125,126,127,128,129,130",
+ "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,73,59,104,58,101,54,70,48,57,51,65,57,46,58,56,70,60,56,49,51,52,49,49,53,59,52,65,61,48,62,46,46,54,87,57,61,49,44,42,59,66,54,54,52,46,52,55,47,54,52,83,66,63,95,73,80,88,162,143,78,74,81,58,79,79,54,121,102,40,52,56,73,64,67,85,79,68,93,58,54,61,59,109,89",
+ "endOffsets": "1087,1183,1266,1362,1431,1474,1526,1578,1627,1690,1748,1799,1883,1977,2085,2156,2240,2323,2389,2472,2574,2635,2697,2748,2826,2900,2960,3065,3124,3226,3281,3352,3401,3459,3511,3577,3635,3682,3741,3798,3869,3930,3987,4037,4089,4142,4192,4242,4296,4356,4409,4475,4537,4586,4649,4696,4743,4798,4886,4944,5006,5056,5101,5144,5204,5271,5326,5381,5434,5481,5534,5590,5638,5693,5746,5830,5897,5961,6057,6131,6212,6301,6464,6608,6687,6762,6844,6903,6983,7063,7118,7240,7343,7384,7437,7494,7568,7633,7701,7787,7867,7936,8030,8089,8144,8206,8266,8376,8466"
+ }
+ },
+ {
+ "source": "D:\\git\\MiNote2\\src\\Notes-master3\\app\\src\\main\\res\\values\\styles.xml",
"from": {
"startLines": "66,71,80,76,38,42,46,51,56,34,61",
"startColumns": "4,4,4,4,4,4,4,4,4,4,4",
@@ -66,26 +102,7 @@
}
},
{
- "source": "E:\\_Ufo\\0SE\\GitProject\\MicodeNotes\\src\\Notes-master3\\app\\src\\main\\res\\values\\arrays.xml",
- "from": {
- "startLines": "19,26",
- "startColumns": "4,4",
- "startOffsets": "758,1073",
- "endLines": "24,29",
- "endColumns": "19,19",
- "endOffsets": "1065,1191"
- },
- "to": {
- "startLines": "2,8",
- "startColumns": "4,4",
- "startOffsets": "105,300",
- "endLines": "7,11",
- "endColumns": "19,19",
- "endOffsets": "295,415"
- }
- },
- {
- "source": "E:\\_Ufo\\0SE\\GitProject\\MicodeNotes\\src\\Notes-master3\\app\\src\\main\\res\\values\\colors.xml",
+ "source": "D:\\git\\MiNote2\\src\\Notes-master3\\app\\src\\main\\res\\values\\colors.xml",
"from": {
"startLines": "18",
"startColumns": "4",
@@ -102,39 +119,22 @@
}
},
{
- "source": "E:\\_Ufo\\0SE\\GitProject\\MicodeNotes\\src\\Notes-master3\\app\\src\\main\\res\\values\\strings.xml",
- "from": {
- "startLines": "137,72,75,74,73,19,20,21,127,128,136,135,26,81,82,80,79,78,94,93,92,84,39,38,64,29,30,85,41,76,129,71,67,101,102,103,42,48,53,43,63,62,61,57,56,54,55,58,104,59,49,70,60,106,68,99,47,52,51,50,66,46,65,44,45,69,28,34,36,33,35,32,31,25,24,110,109,113,125,118,117,119,120,122,121,111,112,116,114,115,108,123,124,134,132,131,133,27,83,91,96,95,97,90,89,88,87,22,23",
- "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
- "startOffsets": "8565,3991,4255,4158,4088,846,890,943,8053,8103,8506,8454,1308,4715,4810,4643,4558,4474,5689,5605,5502,4988,2064,2012,3482,1515,1590,5050,2159,4339,8167,3919,3670,6104,6163,6216,2219,2540,2846,2278,3410,3348,3290,3064,3011,2906,2960,3115,6283,3166,2588,3852,3227,6360,3720,6024,2492,2790,2701,2642,3607,2441,3561,2336,2380,3784,1459,1805,1915,1757,1861,1700,1651,1252,1198,6560,6492,6804,7954,7173,7091,7248,7338,7582,7502,6645,6721,7031,6869,6950,6436,7727,7850,8412,8283,8225,8337,1393,4919,5415,5826,5756,5907,5355,5299,5236,5175,996,1107",
- "endLines": "141,72,75,74,73,19,20,21,127,128,136,135,26,81,82,80,79,78,94,93,92,84,39,38,64,29,30,85,41,76,129,71,67,101,102,103,42,48,53,43,63,62,61,57,56,54,55,58,104,59,49,70,60,106,68,99,47,52,51,50,66,46,65,44,45,69,28,34,36,33,35,32,31,25,24,110,109,113,125,118,117,119,120,122,121,111,112,116,114,115,108,123,124,134,132,131,133,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,73,59,104,58,101,54,70,48,57,51,65,57,46,58,56,70,60,56,49,51,52,49,49,53,59,52,65,61,48,62,46,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": "8973,4082,4333,4249,4152,884,937,990,8097,8161,8559,8500,1387,4804,4913,4709,4637,4552,5750,5683,5599,5044,2121,2058,3555,1584,1645,5150,2213,4436,8217,3985,3714,6157,6210,6277,2272,2582,2900,2330,3476,3404,3342,3109,3058,2954,3005,3160,6332,3221,2636,3913,3284,6404,3778,6066,2534,2840,2784,2695,3664,2486,3601,2374,2435,3846,1509,1855,1963,1799,1909,1751,1694,1302,1246,6639,6554,6863,8045,7242,7167,7332,7496,7721,7576,6715,6798,7085,6944,7025,6486,7844,7948,8448,8331,8277,8406,1453,4982,5496,5901,5820,5996,5409,5349,5293,5230,1101,1192"
- },
- "to": {
- "startLines": "18,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125,126,127,128,129,130",
- "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
- "startOffsets": "739,1092,1188,1271,1367,1436,1479,1531,1583,1632,1695,1753,1804,1888,1982,2090,2161,2245,2328,2394,2477,2579,2640,2702,2753,2831,2905,2965,3070,3129,3231,3286,3357,3406,3464,3516,3582,3640,3687,3746,3803,3874,3935,3992,4042,4094,4147,4197,4247,4301,4361,4414,4480,4542,4591,4654,4701,4748,4803,4891,4949,5011,5061,5106,5149,5209,5276,5331,5386,5439,5486,5539,5595,5643,5698,5751,5835,5902,5966,6062,6136,6217,6306,6469,6613,6692,6767,6849,6908,6988,7068,7123,7245,7348,7389,7442,7499,7573,7638,7706,7792,7872,7941,8035,8094,8149,8211,8271,8381",
- "endLines": "22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125,126,127,128,129,130",
- "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,73,59,104,58,101,54,70,48,57,51,65,57,46,58,56,70,60,56,49,51,52,49,49,53,59,52,65,61,48,62,46,46,54,87,57,61,49,44,42,59,66,54,54,52,46,52,55,47,54,52,83,66,63,95,73,80,88,162,143,78,74,81,58,79,79,54,121,102,40,52,56,73,64,67,85,79,68,93,58,54,61,59,109,89",
- "endOffsets": "1087,1183,1266,1362,1431,1474,1526,1578,1627,1690,1748,1799,1883,1977,2085,2156,2240,2323,2389,2472,2574,2635,2697,2748,2826,2900,2960,3065,3124,3226,3281,3352,3401,3459,3511,3577,3635,3682,3741,3798,3869,3930,3987,4037,4089,4142,4192,4242,4296,4356,4409,4475,4537,4586,4649,4696,4743,4798,4886,4944,5006,5056,5101,5144,5204,5271,5326,5381,5434,5481,5534,5590,5638,5693,5746,5830,5897,5961,6057,6131,6212,6301,6464,6608,6687,6762,6844,6903,6983,7063,7118,7240,7343,7384,7437,7494,7568,7633,7701,7787,7867,7936,8030,8089,8144,8206,8266,8376,8466"
- }
- },
- {
- "source": "E:\\_Ufo\\0SE\\GitProject\\MicodeNotes\\src\\Notes-master3\\app\\src\\main\\res\\values\\dimens.xml",
+ "source": "D:\\git\\MiNote2\\src\\Notes-master3\\app\\src\\main\\res\\values\\arrays.xml",
"from": {
- "startLines": "19,20,21,22,18",
- "startColumns": "4,4,4,4,4",
- "startOffsets": "783,836,890,944,730",
- "endColumns": "51,52,52,51,51",
- "endOffsets": "830,884,938,991,777"
+ "startLines": "19,26",
+ "startColumns": "4,4",
+ "startOffsets": "758,1073",
+ "endLines": "24,29",
+ "endColumns": "19,19",
+ "endOffsets": "1065,1191"
},
"to": {
- "startLines": "13,14,15,16,17",
- "startColumns": "4,4,4,4,4",
- "startOffsets": "477,529,582,635,687",
- "endColumns": "51,52,52,51,51",
- "endOffsets": "524,577,630,682,734"
+ "startLines": "2,8",
+ "startColumns": "4,4",
+ "startOffsets": "105,300",
+ "endLines": "7,11",
+ "endColumns": "19,19",
+ "endOffsets": "295,415"
}
}
]
@@ -143,26 +143,7 @@
"outputFile": "net.micode.notes.app-merged_res-4:/values-zh-rTW_values-zh-rTW.arsc.flat",
"map": [
{
- "source": "E:\\_Ufo\\0SE\\GitProject\\MicodeNotes\\src\\Notes-master3\\app\\src\\main\\res\\values-zh-rTW\\arrays.xml",
- "from": {
- "startLines": "18",
- "startColumns": "4",
- "startOffsets": "730",
- "endLines": "21",
- "endColumns": "19",
- "endOffsets": "838"
- },
- "to": {
- "startLines": "2",
- "startColumns": "4",
- "startOffsets": "105",
- "endLines": "5",
- "endColumns": "19",
- "endOffsets": "210"
- }
- },
- {
- "source": "E:\\_Ufo\\0SE\\GitProject\\MicodeNotes\\src\\Notes-master3\\app\\src\\main\\res\\values-zh-rTW\\strings.xml",
+ "source": "D:\\git\\MiNote2\\src\\Notes-master3\\app\\src\\main\\res\\values-zh-rTW\\strings.xml",
"from": {
"startLines": "129,72,71,70,69,19,20,21,119,120,128,127,26,76,77,75,74,73,89,88,87,79,61,29,30,80,37,121,68,64,95,96,97,39,45,50,40,60,59,58,54,53,51,52,55,98,56,46,67,57,99,65,94,44,49,48,47,63,43,62,41,42,66,28,34,36,33,35,32,31,25,24,103,102,105,117,110,109,111,112,114,113,104,108,106,107,101,115,116,100,126,124,123,125,27,78,86,91,90,92,85,84,83,82,22,23",
"startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
@@ -179,21 +160,16 @@
"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,44,41,48,52,42,50,49,59,52,50,45,47,47,45,46,42,49,44,58,51,45,51,44,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,51,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65",
"endOffsets": "379,451,517,590,640,680,728,776,821,878,932,982,1044,1112,1189,1248,1314,1377,1432,1492,1555,1609,1669,1722,1784,1868,1948,1998,2057,2100,2145,2187,2236,2289,2332,2383,2433,2493,2546,2597,2643,2691,2739,2785,2832,2875,2925,2970,3029,3081,3127,3179,3224,3267,3314,3370,3425,3480,3524,3566,3607,3657,3716,3767,3816,3865,3912,3959,4006,4051,4102,4155,4230,4289,4346,4420,4484,4553,4631,4741,4845,4918,4984,5039,5104,5169,5218,5301,5379,5431,5469,5514,5562,5624,5681,5736,5795,5862,5920,5982,6030,6075,6123,6174,6240,6306"
}
- }
- ]
- },
- {
- "outputFile": "net.micode.notes.app-merged_res-4:/values-ja_values-ja.arsc.flat",
- "map": [
+ },
{
- "source": "E:\\_Ufo\\0SE\\GitProject\\MicodeNotes\\src\\Notes-master3\\app\\src\\main\\res\\values-ja\\arrays.xml",
+ "source": "D:\\git\\MiNote2\\src\\Notes-master3\\app\\src\\main\\res\\values-zh-rTW\\arrays.xml",
"from": {
"startLines": "18",
"startColumns": "4",
"startOffsets": "730",
"endLines": "21",
"endColumns": "19",
- "endOffsets": "846"
+ "endOffsets": "838"
},
"to": {
"startLines": "2",
@@ -201,11 +177,16 @@
"startOffsets": "105",
"endLines": "5",
"endColumns": "19",
- "endOffsets": "218"
+ "endOffsets": "210"
}
- },
+ }
+ ]
+ },
+ {
+ "outputFile": "net.micode.notes.app-merged_res-4:/values-ja_values-ja.arsc.flat",
+ "map": [
{
- "source": "E:\\_Ufo\\0SE\\GitProject\\MicodeNotes\\src\\Notes-master3\\app\\src\\main\\res\\values-ja\\strings.xml",
+ "source": "D:\\git\\MiNote2\\src\\Notes-master3\\app\\src\\main\\res\\values-ja\\strings.xml",
"from": {
"startLines": "128,71,70,69,68,19,20,21,119,120,127,126,26,77,78,76,75,74,90,89,88,80,60,29,30,81,72,121,67,63,96,97,98,38,44,49,39,59,58,57,53,52,50,51,54,99,55,45,66,56,100,64,95,43,48,47,46,62,42,61,40,41,65,28,34,36,33,35,32,31,25,24,104,103,106,118,111,110,112,113,115,114,105,109,107,108,102,116,117,101,125,123,122,124,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,4,4,4,4,4,4,4",
@@ -222,6 +203,25 @@
"endColumns": "14,86,73,77,49,39,48,48,44,56,56,49,68,74,88,69,88,69,62,70,81,57,72,52,61,98,84,55,66,43,44,41,48,56,42,51,58,62,56,54,45,47,49,45,46,42,52,47,60,56,45,58,44,42,49,63,59,58,43,41,42,55,62,51,52,50,48,53,48,47,51,52,72,61,60,82,67,69,81,128,121,73,65,57,68,68,48,90,85,51,37,45,47,62,65,58,64,73,61,67,55,49,52,56,80,74",
"endOffsets": "390,477,551,629,679,719,768,817,862,919,976,1026,1095,1170,1259,1329,1418,1488,1551,1622,1704,1762,1835,1888,1950,2049,2134,2190,2257,2301,2346,2388,2437,2494,2537,2589,2648,2711,2768,2823,2869,2917,2967,3013,3060,3103,3156,3204,3265,3322,3368,3427,3472,3515,3565,3629,3689,3748,3792,3834,3877,3933,3996,4048,4101,4152,4201,4255,4304,4352,4404,4457,4530,4592,4653,4736,4804,4874,4956,5085,5207,5281,5347,5405,5474,5543,5592,5683,5769,5821,5859,5905,5953,6016,6082,6141,6206,6280,6342,6410,6466,6516,6569,6626,6707,6782"
}
+ },
+ {
+ "source": "D:\\git\\MiNote2\\src\\Notes-master3\\app\\src\\main\\res\\values-ja\\arrays.xml",
+ "from": {
+ "startLines": "18",
+ "startColumns": "4",
+ "startOffsets": "730",
+ "endLines": "21",
+ "endColumns": "19",
+ "endOffsets": "846"
+ },
+ "to": {
+ "startLines": "2",
+ "startColumns": "4",
+ "startOffsets": "105",
+ "endLines": "5",
+ "endColumns": "19",
+ "endOffsets": "218"
+ }
}
]
}
diff --git a/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ja.json b/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ja.json
index 6fb83d8..84fe512 100644
--- a/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ja.json
+++ b/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ja.json
@@ -4,26 +4,7 @@
"outputFile": "net.micode.notes.app-mergeDebugResources-2:/values-ja/values-ja.xml",
"map": [
{
- "source": "E:\\_Ufo\\0SE\\GitProject\\MicodeNotes\\src\\Notes-master3\\app\\src\\main\\res\\values-ja\\arrays.xml",
- "from": {
- "startLines": "18",
- "startColumns": "4",
- "startOffsets": "730",
- "endLines": "21",
- "endColumns": "19",
- "endOffsets": "846"
- },
- "to": {
- "startLines": "2",
- "startColumns": "4",
- "startOffsets": "105",
- "endLines": "5",
- "endColumns": "19",
- "endOffsets": "218"
- }
- },
- {
- "source": "E:\\_Ufo\\0SE\\GitProject\\MicodeNotes\\src\\Notes-master3\\app\\src\\main\\res\\values-ja\\strings.xml",
+ "source": "D:\\git\\MiNote2\\src\\Notes-master3\\app\\src\\main\\res\\values-ja\\strings.xml",
"from": {
"startLines": "128,71,70,69,68,19,20,21,119,120,127,126,26,77,78,76,75,74,90,89,88,80,60,29,30,81,72,121,67,63,96,97,98,38,44,49,39,59,58,57,53,52,50,51,54,99,55,45,66,56,100,64,95,43,48,47,46,62,42,61,40,41,65,28,34,36,33,35,32,31,25,24,104,103,106,118,111,110,112,113,115,114,105,109,107,108,102,116,117,101,125,123,122,124,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,4,4,4,4,4,4,4",
@@ -40,6 +21,25 @@
"endColumns": "14,86,73,77,49,39,48,48,44,56,56,49,68,74,88,69,88,69,62,70,81,57,72,52,61,98,84,55,66,43,44,41,48,56,42,51,58,62,56,54,45,47,49,45,46,42,52,47,60,56,45,58,44,42,49,63,59,58,43,41,42,55,62,51,52,50,48,53,48,47,51,52,72,61,60,82,67,69,81,128,121,73,65,57,68,68,48,90,85,51,37,45,47,62,65,58,64,73,61,67,55,49,52,56,80,74",
"endOffsets": "390,477,551,629,679,719,768,817,862,919,976,1026,1095,1170,1259,1329,1418,1488,1551,1622,1704,1762,1835,1888,1950,2049,2134,2190,2257,2301,2346,2388,2437,2494,2537,2589,2648,2711,2768,2823,2869,2917,2967,3013,3060,3103,3156,3204,3265,3322,3368,3427,3472,3515,3565,3629,3689,3748,3792,3834,3877,3933,3996,4048,4101,4152,4201,4255,4304,4352,4404,4457,4530,4592,4653,4736,4804,4874,4956,5085,5207,5281,5347,5405,5474,5543,5592,5683,5769,5821,5859,5905,5953,6016,6082,6141,6206,6280,6342,6410,6466,6516,6569,6626,6707,6782"
}
+ },
+ {
+ "source": "D:\\git\\MiNote2\\src\\Notes-master3\\app\\src\\main\\res\\values-ja\\arrays.xml",
+ "from": {
+ "startLines": "18",
+ "startColumns": "4",
+ "startOffsets": "730",
+ "endLines": "21",
+ "endColumns": "19",
+ "endOffsets": "846"
+ },
+ "to": {
+ "startLines": "2",
+ "startColumns": "4",
+ "startOffsets": "105",
+ "endLines": "5",
+ "endColumns": "19",
+ "endOffsets": "218"
+ }
}
]
}
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 978d3b4..920a023 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
@@ -4,7 +4,7 @@
"outputFile": "net.micode.notes.app-mergeDebugResources-2:/values-zh-rCN/values-zh-rCN.xml",
"map": [
{
- "source": "E:\\_Ufo\\0SE\\GitProject\\MicodeNotes\\src\\Notes-master3\\app\\src\\main\\res\\values-zh-rCN\\strings.xml",
+ "source": "D:\\git\\MiNote2\\src\\Notes-master3\\app\\src\\main\\res\\values-zh-rCN\\strings.xml",
"from": {
"startLines": "127,72,71,70,69,19,20,21,118,119,126,125,26,78,79,77,76,75,91,90,89,81,38,61,29,30,82,73,120,68,64,97,98,99,39,45,50,40,60,59,58,54,53,51,52,55,100,56,46,67,57,130,65,96,44,49,48,47,63,43,62,41,42,66,28,34,36,33,35,32,31,25,24,103,102,105,117,110,109,111,112,114,113,104,108,106,107,101,115,116,124,122,121,123,27,80,88,93,92,94,87,86,85,84,22,23",
"startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
@@ -23,7 +23,7 @@
}
},
{
- "source": "E:\\_Ufo\\0SE\\GitProject\\MicodeNotes\\src\\Notes-master3\\app\\src\\main\\res\\values-zh-rCN\\arrays.xml",
+ "source": "D:\\git\\MiNote2\\src\\Notes-master3\\app\\src\\main\\res\\values-zh-rCN\\arrays.xml",
"from": {
"startLines": "18",
"startColumns": "4",
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 063701c..58d3a19 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
@@ -4,26 +4,7 @@
"outputFile": "net.micode.notes.app-mergeDebugResources-2:/values-zh-rTW/values-zh-rTW.xml",
"map": [
{
- "source": "E:\\_Ufo\\0SE\\GitProject\\MicodeNotes\\src\\Notes-master3\\app\\src\\main\\res\\values-zh-rTW\\arrays.xml",
- "from": {
- "startLines": "18",
- "startColumns": "4",
- "startOffsets": "730",
- "endLines": "21",
- "endColumns": "19",
- "endOffsets": "838"
- },
- "to": {
- "startLines": "2",
- "startColumns": "4",
- "startOffsets": "105",
- "endLines": "5",
- "endColumns": "19",
- "endOffsets": "210"
- }
- },
- {
- "source": "E:\\_Ufo\\0SE\\GitProject\\MicodeNotes\\src\\Notes-master3\\app\\src\\main\\res\\values-zh-rTW\\strings.xml",
+ "source": "D:\\git\\MiNote2\\src\\Notes-master3\\app\\src\\main\\res\\values-zh-rTW\\strings.xml",
"from": {
"startLines": "129,72,71,70,69,19,20,21,119,120,128,127,26,76,77,75,74,73,89,88,87,79,61,29,30,80,37,121,68,64,95,96,97,39,45,50,40,60,59,58,54,53,51,52,55,98,56,46,67,57,99,65,94,44,49,48,47,63,43,62,41,42,66,28,34,36,33,35,32,31,25,24,103,102,105,117,110,109,111,112,114,113,104,108,106,107,101,115,116,100,126,124,123,125,27,78,86,91,90,92,85,84,83,82,22,23",
"startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
@@ -40,6 +21,25 @@
"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,44,41,48,52,42,50,49,59,52,50,45,47,47,45,46,42,49,44,58,51,45,51,44,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,51,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65",
"endOffsets": "379,451,517,590,640,680,728,776,821,878,932,982,1044,1112,1189,1248,1314,1377,1432,1492,1555,1609,1669,1722,1784,1868,1948,1998,2057,2100,2145,2187,2236,2289,2332,2383,2433,2493,2546,2597,2643,2691,2739,2785,2832,2875,2925,2970,3029,3081,3127,3179,3224,3267,3314,3370,3425,3480,3524,3566,3607,3657,3716,3767,3816,3865,3912,3959,4006,4051,4102,4155,4230,4289,4346,4420,4484,4553,4631,4741,4845,4918,4984,5039,5104,5169,5218,5301,5379,5431,5469,5514,5562,5624,5681,5736,5795,5862,5920,5982,6030,6075,6123,6174,6240,6306"
}
+ },
+ {
+ "source": "D:\\git\\MiNote2\\src\\Notes-master3\\app\\src\\main\\res\\values-zh-rTW\\arrays.xml",
+ "from": {
+ "startLines": "18",
+ "startColumns": "4",
+ "startOffsets": "730",
+ "endLines": "21",
+ "endColumns": "19",
+ "endOffsets": "838"
+ },
+ "to": {
+ "startLines": "2",
+ "startColumns": "4",
+ "startOffsets": "105",
+ "endLines": "5",
+ "endColumns": "19",
+ "endOffsets": "210"
+ }
}
]
}
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 aadf854..82c5f8e 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
@@ -4,7 +4,43 @@
"outputFile": "net.micode.notes.app-mergeDebugResources-2:/values/values.xml",
"map": [
{
- "source": "E:\\_Ufo\\0SE\\GitProject\\MicodeNotes\\src\\Notes-master3\\app\\src\\main\\res\\values\\styles.xml",
+ "source": "D:\\git\\MiNote2\\src\\Notes-master3\\app\\src\\main\\res\\values\\dimens.xml",
+ "from": {
+ "startLines": "19,20,21,22,18",
+ "startColumns": "4,4,4,4,4",
+ "startOffsets": "783,836,890,944,730",
+ "endColumns": "51,52,52,51,51",
+ "endOffsets": "830,884,938,991,777"
+ },
+ "to": {
+ "startLines": "13,14,15,16,17",
+ "startColumns": "4,4,4,4,4",
+ "startOffsets": "477,529,582,635,687",
+ "endColumns": "51,52,52,51,51",
+ "endOffsets": "524,577,630,682,734"
+ }
+ },
+ {
+ "source": "D:\\git\\MiNote2\\src\\Notes-master3\\app\\src\\main\\res\\values\\strings.xml",
+ "from": {
+ "startLines": "137,72,75,74,73,19,20,21,127,128,136,135,26,81,82,80,79,78,94,93,92,84,39,38,64,29,30,85,41,76,129,71,67,101,102,103,42,48,53,43,63,62,61,57,56,54,55,58,104,59,49,70,60,106,68,99,47,52,51,50,66,46,65,44,45,69,28,34,36,33,35,32,31,25,24,110,109,113,125,118,117,119,120,122,121,111,112,116,114,115,108,123,124,134,132,131,133,27,83,91,96,95,97,90,89,88,87,22,23",
+ "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
+ "startOffsets": "8565,3991,4255,4158,4088,846,890,943,8053,8103,8506,8454,1308,4715,4810,4643,4558,4474,5689,5605,5502,4988,2064,2012,3482,1515,1590,5050,2159,4339,8167,3919,3670,6104,6163,6216,2219,2540,2846,2278,3410,3348,3290,3064,3011,2906,2960,3115,6283,3166,2588,3852,3227,6360,3720,6024,2492,2790,2701,2642,3607,2441,3561,2336,2380,3784,1459,1805,1915,1757,1861,1700,1651,1252,1198,6560,6492,6804,7954,7173,7091,7248,7338,7582,7502,6645,6721,7031,6869,6950,6436,7727,7850,8412,8283,8225,8337,1393,4919,5415,5826,5756,5907,5355,5299,5236,5175,996,1107",
+ "endLines": "141,72,75,74,73,19,20,21,127,128,136,135,26,81,82,80,79,78,94,93,92,84,39,38,64,29,30,85,41,76,129,71,67,101,102,103,42,48,53,43,63,62,61,57,56,54,55,58,104,59,49,70,60,106,68,99,47,52,51,50,66,46,65,44,45,69,28,34,36,33,35,32,31,25,24,110,109,113,125,118,117,119,120,122,121,111,112,116,114,115,108,123,124,134,132,131,133,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,73,59,104,58,101,54,70,48,57,51,65,57,46,58,56,70,60,56,49,51,52,49,49,53,59,52,65,61,48,62,46,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": "8973,4082,4333,4249,4152,884,937,990,8097,8161,8559,8500,1387,4804,4913,4709,4637,4552,5750,5683,5599,5044,2121,2058,3555,1584,1645,5150,2213,4436,8217,3985,3714,6157,6210,6277,2272,2582,2900,2330,3476,3404,3342,3109,3058,2954,3005,3160,6332,3221,2636,3913,3284,6404,3778,6066,2534,2840,2784,2695,3664,2486,3601,2374,2435,3846,1509,1855,1963,1799,1909,1751,1694,1302,1246,6639,6554,6863,8045,7242,7167,7332,7496,7721,7576,6715,6798,7085,6944,7025,6486,7844,7948,8448,8331,8277,8406,1453,4982,5496,5901,5820,5996,5409,5349,5293,5230,1101,1192"
+ },
+ "to": {
+ "startLines": "18,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125,126,127,128,129,130",
+ "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
+ "startOffsets": "739,1092,1188,1271,1367,1436,1479,1531,1583,1632,1695,1753,1804,1888,1982,2090,2161,2245,2328,2394,2477,2579,2640,2702,2753,2831,2905,2965,3070,3129,3231,3286,3357,3406,3464,3516,3582,3640,3687,3746,3803,3874,3935,3992,4042,4094,4147,4197,4247,4301,4361,4414,4480,4542,4591,4654,4701,4748,4803,4891,4949,5011,5061,5106,5149,5209,5276,5331,5386,5439,5486,5539,5595,5643,5698,5751,5835,5902,5966,6062,6136,6217,6306,6469,6613,6692,6767,6849,6908,6988,7068,7123,7245,7348,7389,7442,7499,7573,7638,7706,7792,7872,7941,8035,8094,8149,8211,8271,8381",
+ "endLines": "22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125,126,127,128,129,130",
+ "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,73,59,104,58,101,54,70,48,57,51,65,57,46,58,56,70,60,56,49,51,52,49,49,53,59,52,65,61,48,62,46,46,54,87,57,61,49,44,42,59,66,54,54,52,46,52,55,47,54,52,83,66,63,95,73,80,88,162,143,78,74,81,58,79,79,54,121,102,40,52,56,73,64,67,85,79,68,93,58,54,61,59,109,89",
+ "endOffsets": "1087,1183,1266,1362,1431,1474,1526,1578,1627,1690,1748,1799,1883,1977,2085,2156,2240,2323,2389,2472,2574,2635,2697,2748,2826,2900,2960,3065,3124,3226,3281,3352,3401,3459,3511,3577,3635,3682,3741,3798,3869,3930,3987,4037,4089,4142,4192,4242,4296,4356,4409,4475,4537,4586,4649,4696,4743,4798,4886,4944,5006,5056,5101,5144,5204,5271,5326,5381,5434,5481,5534,5590,5638,5693,5746,5830,5897,5961,6057,6131,6212,6301,6464,6608,6687,6762,6844,6903,6983,7063,7118,7240,7343,7384,7437,7494,7568,7633,7701,7787,7867,7936,8030,8089,8144,8206,8266,8376,8466"
+ }
+ },
+ {
+ "source": "D:\\git\\MiNote2\\src\\Notes-master3\\app\\src\\main\\res\\values\\styles.xml",
"from": {
"startLines": "66,71,80,76,38,42,46,51,56,34,61",
"startColumns": "4,4,4,4,4,4,4,4,4,4,4",
@@ -23,26 +59,7 @@
}
},
{
- "source": "E:\\_Ufo\\0SE\\GitProject\\MicodeNotes\\src\\Notes-master3\\app\\src\\main\\res\\values\\arrays.xml",
- "from": {
- "startLines": "19,26",
- "startColumns": "4,4",
- "startOffsets": "758,1073",
- "endLines": "24,29",
- "endColumns": "19,19",
- "endOffsets": "1065,1191"
- },
- "to": {
- "startLines": "2,8",
- "startColumns": "4,4",
- "startOffsets": "105,300",
- "endLines": "7,11",
- "endColumns": "19,19",
- "endOffsets": "295,415"
- }
- },
- {
- "source": "E:\\_Ufo\\0SE\\GitProject\\MicodeNotes\\src\\Notes-master3\\app\\src\\main\\res\\values\\colors.xml",
+ "source": "D:\\git\\MiNote2\\src\\Notes-master3\\app\\src\\main\\res\\values\\colors.xml",
"from": {
"startLines": "18",
"startColumns": "4",
@@ -59,39 +76,22 @@
}
},
{
- "source": "E:\\_Ufo\\0SE\\GitProject\\MicodeNotes\\src\\Notes-master3\\app\\src\\main\\res\\values\\strings.xml",
- "from": {
- "startLines": "137,72,75,74,73,19,20,21,127,128,136,135,26,81,82,80,79,78,94,93,92,84,39,38,64,29,30,85,41,76,129,71,67,101,102,103,42,48,53,43,63,62,61,57,56,54,55,58,104,59,49,70,60,106,68,99,47,52,51,50,66,46,65,44,45,69,28,34,36,33,35,32,31,25,24,110,109,113,125,118,117,119,120,122,121,111,112,116,114,115,108,123,124,134,132,131,133,27,83,91,96,95,97,90,89,88,87,22,23",
- "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
- "startOffsets": "8565,3991,4255,4158,4088,846,890,943,8053,8103,8506,8454,1308,4715,4810,4643,4558,4474,5689,5605,5502,4988,2064,2012,3482,1515,1590,5050,2159,4339,8167,3919,3670,6104,6163,6216,2219,2540,2846,2278,3410,3348,3290,3064,3011,2906,2960,3115,6283,3166,2588,3852,3227,6360,3720,6024,2492,2790,2701,2642,3607,2441,3561,2336,2380,3784,1459,1805,1915,1757,1861,1700,1651,1252,1198,6560,6492,6804,7954,7173,7091,7248,7338,7582,7502,6645,6721,7031,6869,6950,6436,7727,7850,8412,8283,8225,8337,1393,4919,5415,5826,5756,5907,5355,5299,5236,5175,996,1107",
- "endLines": "141,72,75,74,73,19,20,21,127,128,136,135,26,81,82,80,79,78,94,93,92,84,39,38,64,29,30,85,41,76,129,71,67,101,102,103,42,48,53,43,63,62,61,57,56,54,55,58,104,59,49,70,60,106,68,99,47,52,51,50,66,46,65,44,45,69,28,34,36,33,35,32,31,25,24,110,109,113,125,118,117,119,120,122,121,111,112,116,114,115,108,123,124,134,132,131,133,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,73,59,104,58,101,54,70,48,57,51,65,57,46,58,56,70,60,56,49,51,52,49,49,53,59,52,65,61,48,62,46,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": "8973,4082,4333,4249,4152,884,937,990,8097,8161,8559,8500,1387,4804,4913,4709,4637,4552,5750,5683,5599,5044,2121,2058,3555,1584,1645,5150,2213,4436,8217,3985,3714,6157,6210,6277,2272,2582,2900,2330,3476,3404,3342,3109,3058,2954,3005,3160,6332,3221,2636,3913,3284,6404,3778,6066,2534,2840,2784,2695,3664,2486,3601,2374,2435,3846,1509,1855,1963,1799,1909,1751,1694,1302,1246,6639,6554,6863,8045,7242,7167,7332,7496,7721,7576,6715,6798,7085,6944,7025,6486,7844,7948,8448,8331,8277,8406,1453,4982,5496,5901,5820,5996,5409,5349,5293,5230,1101,1192"
- },
- "to": {
- "startLines": "18,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125,126,127,128,129,130",
- "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
- "startOffsets": "739,1092,1188,1271,1367,1436,1479,1531,1583,1632,1695,1753,1804,1888,1982,2090,2161,2245,2328,2394,2477,2579,2640,2702,2753,2831,2905,2965,3070,3129,3231,3286,3357,3406,3464,3516,3582,3640,3687,3746,3803,3874,3935,3992,4042,4094,4147,4197,4247,4301,4361,4414,4480,4542,4591,4654,4701,4748,4803,4891,4949,5011,5061,5106,5149,5209,5276,5331,5386,5439,5486,5539,5595,5643,5698,5751,5835,5902,5966,6062,6136,6217,6306,6469,6613,6692,6767,6849,6908,6988,7068,7123,7245,7348,7389,7442,7499,7573,7638,7706,7792,7872,7941,8035,8094,8149,8211,8271,8381",
- "endLines": "22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125,126,127,128,129,130",
- "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,73,59,104,58,101,54,70,48,57,51,65,57,46,58,56,70,60,56,49,51,52,49,49,53,59,52,65,61,48,62,46,46,54,87,57,61,49,44,42,59,66,54,54,52,46,52,55,47,54,52,83,66,63,95,73,80,88,162,143,78,74,81,58,79,79,54,121,102,40,52,56,73,64,67,85,79,68,93,58,54,61,59,109,89",
- "endOffsets": "1087,1183,1266,1362,1431,1474,1526,1578,1627,1690,1748,1799,1883,1977,2085,2156,2240,2323,2389,2472,2574,2635,2697,2748,2826,2900,2960,3065,3124,3226,3281,3352,3401,3459,3511,3577,3635,3682,3741,3798,3869,3930,3987,4037,4089,4142,4192,4242,4296,4356,4409,4475,4537,4586,4649,4696,4743,4798,4886,4944,5006,5056,5101,5144,5204,5271,5326,5381,5434,5481,5534,5590,5638,5693,5746,5830,5897,5961,6057,6131,6212,6301,6464,6608,6687,6762,6844,6903,6983,7063,7118,7240,7343,7384,7437,7494,7568,7633,7701,7787,7867,7936,8030,8089,8144,8206,8266,8376,8466"
- }
- },
- {
- "source": "E:\\_Ufo\\0SE\\GitProject\\MicodeNotes\\src\\Notes-master3\\app\\src\\main\\res\\values\\dimens.xml",
+ "source": "D:\\git\\MiNote2\\src\\Notes-master3\\app\\src\\main\\res\\values\\arrays.xml",
"from": {
- "startLines": "19,20,21,22,18",
- "startColumns": "4,4,4,4,4",
- "startOffsets": "783,836,890,944,730",
- "endColumns": "51,52,52,51,51",
- "endOffsets": "830,884,938,991,777"
+ "startLines": "19,26",
+ "startColumns": "4,4",
+ "startOffsets": "758,1073",
+ "endLines": "24,29",
+ "endColumns": "19,19",
+ "endOffsets": "1065,1191"
},
"to": {
- "startLines": "13,14,15,16,17",
- "startColumns": "4,4,4,4,4",
- "startOffsets": "477,529,582,635,687",
- "endColumns": "51,52,52,51,51",
- "endOffsets": "524,577,630,682,734"
+ "startLines": "2,8",
+ "startColumns": "4,4",
+ "startOffsets": "105,300",
+ "endLines": "7,11",
+ "endColumns": "19,19",
+ "endOffsets": "295,415"
}
}
]
diff --git a/src/Notes-master3/app/build/intermediates/packaged_res/debug/menu/note_edit.xml b/src/Notes-master3/app/build/intermediates/packaged_res/debug/menu/note_edit.xml
index c7f49b6..2aec24e 100644
--- a/src/Notes-master3/app/build/intermediates/packaged_res/debug/menu/note_edit.xml
+++ b/src/Notes-master3/app/build/intermediates/packaged_res/debug/menu/note_edit.xml
@@ -54,4 +54,8 @@
android:id="@+id/menu_recover"
android:title="@string/menu_recover"/>
+
+
\ No newline at end of file
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 a2efcb2..85990f7 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/intermediates/project_dex_archive/debug/out/d03e41df219ff5fca2caf202c2fc23752f8581ec4d2e10b92cd306ca6e7795a3_5.jar b/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/d03e41df219ff5fca2caf202c2fc23752f8581ec4d2e10b92cd306ca6e7795a3_5.jar
new file mode 100644
index 0000000..828d39c
Binary files /dev/null and b/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/d03e41df219ff5fca2caf202c2fc23752f8581ec4d2e10b92cd306ca6e7795a3_5.jar differ
diff --git a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/eb6f20da3cc2ac965a06658247d18a42be297656b1b5e938e7017f80e1be0ad5_13.jar b/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/eb6f20da3cc2ac965a06658247d18a42be297656b1b5e938e7017f80e1be0ad5_13.jar
deleted file mode 100644
index e04a4bb..0000000
Binary files a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/eb6f20da3cc2ac965a06658247d18a42be297656b1b5e938e7017f80e1be0ad5_13.jar and /dev/null differ
diff --git a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/DataUtils.dex b/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/DataUtils.dex
index e7b1789..4b7431d 100644
Binary files a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/DataUtils.dex and b/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/DataUtils.dex differ
diff --git a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/AlarmAlertActivity.dex b/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/AlarmAlertActivity.dex
index fe16853..4ac6e41 100644
Binary files a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/AlarmAlertActivity.dex and b/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/AlarmAlertActivity.dex differ
diff --git a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/AlarmInitReceiver.dex b/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/AlarmInitReceiver.dex
index f641273..8a16167 100644
Binary files a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/AlarmInitReceiver.dex and b/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/AlarmInitReceiver.dex differ
diff --git a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/AlarmReceiver.dex b/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/AlarmReceiver.dex
index 9278ab0..93abd2d 100644
Binary files a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/AlarmReceiver.dex and b/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/AlarmReceiver.dex differ
diff --git a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$1.dex b/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$1.dex
index eed3350..23a610e 100644
Binary files a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$1.dex and b/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$1.dex differ
diff --git a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$2.dex b/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$2.dex
index 88dead1..89ebb49 100644
Binary files a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$2.dex and b/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$2.dex differ
diff --git a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$3.dex b/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$3.dex
index afad0e0..64a7dc9 100644
Binary files a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$3.dex and b/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$3.dex differ
diff --git a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$4.dex b/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$4.dex
index 01e1c18..8e3208f 100644
Binary files a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$4.dex and b/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$4.dex differ
diff --git a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker.dex b/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker.dex
index e1205dd..d759f11 100644
Binary files a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker.dex and b/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker.dex differ
diff --git a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePickerDialog$1.dex b/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePickerDialog$1.dex
index 2c10036..d028bfa 100644
Binary files a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePickerDialog$1.dex and b/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePickerDialog$1.dex differ
diff --git a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePickerDialog.dex b/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePickerDialog.dex
index 5bba515..aa8f632 100644
Binary files a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePickerDialog.dex and b/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePickerDialog.dex differ
diff --git a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DropdownMenu$1.dex b/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DropdownMenu$1.dex
index 49a8b16..638eb5b 100644
Binary files a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DropdownMenu$1.dex and b/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DropdownMenu$1.dex differ
diff --git a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DropdownMenu.dex b/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DropdownMenu.dex
index 92250f2..78420b4 100644
Binary files a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DropdownMenu.dex and b/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DropdownMenu.dex differ
diff --git a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/FoldersListAdapter$FolderListItem.dex b/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/FoldersListAdapter$FolderListItem.dex
index 1f9408f..757495f 100644
Binary files a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/FoldersListAdapter$FolderListItem.dex and b/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/FoldersListAdapter$FolderListItem.dex differ
diff --git a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/FoldersListAdapter.dex b/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/FoldersListAdapter.dex
index cce08c4..fa5de2c 100644
Binary files a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/FoldersListAdapter.dex and b/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/FoldersListAdapter.dex differ
diff --git a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$1.dex b/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$1.dex
index 19bd290..8a50206 100644
Binary files a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$1.dex and b/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$1.dex differ
diff --git a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$2.dex b/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$2.dex
index b353781..27a7296 100644
Binary files a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$2.dex and b/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$2.dex differ
diff --git a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$3.dex b/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$3.dex
index 1c2a119..53f301a 100644
Binary files a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$3.dex and b/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$3.dex differ
diff --git a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$4.dex b/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$4.dex
index 202e587..86fae48 100644
Binary files a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$4.dex and b/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$4.dex differ
diff --git a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$HeadViewHolder.dex b/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$HeadViewHolder.dex
index ac34ad8..ae8f7db 100644
Binary files a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$HeadViewHolder.dex and b/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$HeadViewHolder.dex differ
diff --git a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity.dex b/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity.dex
index c85df89..ddfcdaf 100644
Binary files a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity.dex and b/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity.dex differ
diff --git a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditText$1.dex b/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditText$1.dex
index 5915330..2ed323d 100644
Binary files a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditText$1.dex and b/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditText$1.dex differ
diff --git a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditText.dex b/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditText.dex
index 70d2682..06ca323 100644
Binary files a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditText.dex and b/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditText.dex differ
diff --git a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteItemData.dex b/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteItemData.dex
index bc0b0bf..1179ed5 100644
Binary files a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteItemData.dex and b/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteItemData.dex differ
diff --git a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$1.dex b/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$1.dex
index 618cbd8..3a77cc5 100644
Binary files a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$1.dex and b/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$1.dex differ
diff --git a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$2.dex b/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$2.dex
index bf0a64e..3ce1aac 100644
Binary files a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$2.dex and b/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$2.dex differ
diff --git a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$3.dex b/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$3.dex
index 3cd29cf..4a89b63 100644
Binary files a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$3.dex and b/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$3.dex differ
diff --git a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$4.dex b/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$4.dex
index e019b05..d0a764c 100644
Binary files a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$4.dex and b/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$4.dex differ
diff --git a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$5.dex b/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$5.dex
index 8cb0920..e3134cd 100644
Binary files a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$5.dex and b/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$5.dex differ
diff --git a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$6.dex b/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$6.dex
index 0f48ab3..8649db8 100644
Binary files a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$6.dex and b/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$6.dex differ
diff --git a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$7.dex b/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$7.dex
index b3cc9db..808a1c7 100644
Binary files a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$7.dex and b/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$7.dex differ
diff --git a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$8.dex b/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$8.dex
index de74007..22f7537 100644
Binary files a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$8.dex and b/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$8.dex differ
diff --git a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$9.dex b/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$9.dex
index 1f7ab46..654ee9d 100644
Binary files a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$9.dex and b/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$9.dex differ
diff --git a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$BackgroundQueryHandler.dex b/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$BackgroundQueryHandler.dex
index 5059453..eaeec04 100644
Binary files a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$BackgroundQueryHandler.dex and b/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$BackgroundQueryHandler.dex differ
diff --git a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback$1.dex b/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback$1.dex
index 5544306..1aafa79 100644
Binary files a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback$1.dex and b/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback$1.dex differ
diff --git a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback$2.dex b/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback$2.dex
index f3ea41e..be62d1d 100644
Binary files a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback$2.dex and b/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback$2.dex differ
diff --git a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback.dex b/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback.dex
index de3755f..8ad663b 100644
Binary files a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback.dex and b/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback.dex differ
diff --git a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$NewNoteOnTouchListener.dex b/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$NewNoteOnTouchListener.dex
index c58a0ba..dd9eaab 100644
Binary files a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$NewNoteOnTouchListener.dex and b/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$NewNoteOnTouchListener.dex differ
diff --git a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.dex b/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.dex
index 969dc3e..19f0636 100644
Binary files a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.dex and b/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.dex differ
diff --git a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity.dex b/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity.dex
index 880f283..d03736b 100644
Binary files a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity.dex and b/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity.dex differ
diff --git a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListAdapter$AppWidgetAttribute.dex b/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListAdapter$AppWidgetAttribute.dex
index a0cf8e6..593297b 100644
Binary files a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListAdapter$AppWidgetAttribute.dex and b/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListAdapter$AppWidgetAttribute.dex differ
diff --git a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListAdapter.dex b/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListAdapter.dex
index 68f5579..ba9cea1 100644
Binary files a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListAdapter.dex and b/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListAdapter.dex differ
diff --git a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListItem.dex b/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListItem.dex
index 46c593d..f69c797 100644
Binary files a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListItem.dex and b/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListItem.dex differ
diff --git a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$1.dex b/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$1.dex
index 14d6a26..d293872 100644
Binary files a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$1.dex and b/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$1.dex differ
diff --git a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$2.dex b/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$2.dex
index 99e75dd..dd4ee0b 100644
Binary files a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$2.dex and b/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$2.dex differ
diff --git a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$3.dex b/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$3.dex
index 80233e5..52a7151 100644
Binary files a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$3.dex and b/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$3.dex differ
diff --git a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$4.dex b/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$4.dex
index 5919360..bf96aaa 100644
Binary files a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$4.dex and b/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$4.dex differ
diff --git a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$5.dex b/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$5.dex
index a5a02af..58ce2f0 100644
Binary files a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$5.dex and b/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$5.dex differ
diff --git a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$6.dex b/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$6.dex
index 194cc49..a56d9d5 100644
Binary files a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$6.dex and b/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$6.dex differ
diff --git a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$7.dex b/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$7.dex
index 4861014..11735c4 100644
Binary files a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$7.dex and b/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$7.dex differ
diff --git a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$8.dex b/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$8.dex
index 5e41302..2983391 100644
Binary files a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$8.dex and b/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$8.dex differ
diff --git a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$GTaskReceiver.dex b/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$GTaskReceiver.dex
index 8f2b93d..061e7e3 100644
Binary files a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$GTaskReceiver.dex and b/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$GTaskReceiver.dex differ
diff --git a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity.dex b/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity.dex
index 685b35d..7c397ee 100644
Binary files a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity.dex and b/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity.dex differ
diff --git a/src/Notes-master3/app/build/intermediates/project_dex_archive/debugAndroidTest/out/9beb0e8a81eac172d79c8e543de1eecc1ee027841815a239df7ee9481370a50b_4.jar b/src/Notes-master3/app/build/intermediates/project_dex_archive/debugAndroidTest/out/9beb0e8a81eac172d79c8e543de1eecc1ee027841815a239df7ee9481370a50b_0.jar
similarity index 100%
rename from src/Notes-master3/app/build/intermediates/project_dex_archive/debugAndroidTest/out/9beb0e8a81eac172d79c8e543de1eecc1ee027841815a239df7ee9481370a50b_4.jar
rename to src/Notes-master3/app/build/intermediates/project_dex_archive/debugAndroidTest/out/9beb0e8a81eac172d79c8e543de1eecc1ee027841815a239df7ee9481370a50b_0.jar
diff --git a/src/Notes-master3/app/build/intermediates/runtime_symbol_list/debug/R.txt b/src/Notes-master3/app/build/intermediates/runtime_symbol_list/debug/R.txt
index 3c1b8b7..f4f0ef0 100644
--- a/src/Notes-master3/app/build/intermediates/runtime_symbol_list/debug/R.txt
+++ b/src/Notes-master3/app/build/intermediates/runtime_symbol_list/debug/R.txt
@@ -139,22 +139,23 @@ int id navigation_bar 0x7f050039
int id note_bg_color_selector 0x7f05003a
int id note_edit_list 0x7f05003b
int id note_edit_view 0x7f05003c
-int id note_item 0x7f05003d
-int id note_title 0x7f05003e
-int id notes_list 0x7f05003f
-int id prefenerece_sync_status_textview 0x7f050040
-int id preference_sync_button 0x7f050041
-int id selection_menu 0x7f050042
-int id sv_note_edit 0x7f050043
-int id tv_alert_date 0x7f050044
-int id tv_folder_name 0x7f050045
-int id tv_modified_date 0x7f050046
-int id tv_name 0x7f050047
-int id tv_time 0x7f050048
-int id tv_title 0x7f050049
-int id tv_title_bar 0x7f05004a
-int id widget_bg_image 0x7f05004b
-int id widget_text 0x7f05004c
+int id note_font 0x7f05003d
+int id note_item 0x7f05003e
+int id note_title 0x7f05003f
+int id notes_list 0x7f050040
+int id prefenerece_sync_status_textview 0x7f050041
+int id preference_sync_button 0x7f050042
+int id selection_menu 0x7f050043
+int id sv_note_edit 0x7f050044
+int id tv_alert_date 0x7f050045
+int id tv_folder_name 0x7f050046
+int id tv_modified_date 0x7f050047
+int id tv_name 0x7f050048
+int id tv_time 0x7f050049
+int id tv_title 0x7f05004a
+int id tv_title_bar 0x7f05004b
+int id widget_bg_image 0x7f05004c
+int id widget_text 0x7f05004d
int layout account_dialog_title 0x7f060000
int layout add_account_text 0x7f060001
int layout datetime_picker 0x7f060002
diff --git a/src/Notes-master3/app/build/intermediates/source_set_path_map/debug/file-map.txt b/src/Notes-master3/app/build/intermediates/source_set_path_map/debug/file-map.txt
index 2786771..ddc30ed 100644
--- a/src/Notes-master3/app/build/intermediates/source_set_path_map/debug/file-map.txt
+++ b/src/Notes-master3/app/build/intermediates/source_set_path_map/debug/file-map.txt
@@ -1,7 +1,7 @@
-net.micode.notes.app-pngs-0 E:\_Ufo\0SE\GitProject\MicodeNotes\src\Notes-master3\app\build\generated\res\pngs\debug
-net.micode.notes.app-resValues-1 E:\_Ufo\0SE\GitProject\MicodeNotes\src\Notes-master3\app\build\generated\res\resValues\debug
-net.micode.notes.app-packageDebugResources-2 E:\_Ufo\0SE\GitProject\MicodeNotes\src\Notes-master3\app\build\intermediates\incremental\debug\packageDebugResources\merged.dir
-net.micode.notes.app-packageDebugResources-3 E:\_Ufo\0SE\GitProject\MicodeNotes\src\Notes-master3\app\build\intermediates\incremental\debug\packageDebugResources\stripped.dir
-net.micode.notes.app-merged_res-4 E:\_Ufo\0SE\GitProject\MicodeNotes\src\Notes-master3\app\build\intermediates\merged_res\debug
-net.micode.notes.app-debug-5 E:\_Ufo\0SE\GitProject\MicodeNotes\src\Notes-master3\app\src\debug\res
-net.micode.notes.app-main-6 E:\_Ufo\0SE\GitProject\MicodeNotes\src\Notes-master3\app\src\main\res
+net.micode.notes.app-pngs-0 D:\git\MiNote2\src\Notes-master3\app\build\generated\res\pngs\debug
+net.micode.notes.app-resValues-1 D:\git\MiNote2\src\Notes-master3\app\build\generated\res\resValues\debug
+net.micode.notes.app-packageDebugResources-2 D:\git\MiNote2\src\Notes-master3\app\build\intermediates\incremental\debug\packageDebugResources\merged.dir
+net.micode.notes.app-packageDebugResources-3 D:\git\MiNote2\src\Notes-master3\app\build\intermediates\incremental\debug\packageDebugResources\stripped.dir
+net.micode.notes.app-merged_res-4 D:\git\MiNote2\src\Notes-master3\app\build\intermediates\merged_res\debug
+net.micode.notes.app-debug-5 D:\git\MiNote2\src\Notes-master3\app\src\debug\res
+net.micode.notes.app-main-6 D:\git\MiNote2\src\Notes-master3\app\src\main\res
diff --git a/src/Notes-master3/app/build/intermediates/source_set_path_map/debugAndroidTest/file-map.txt b/src/Notes-master3/app/build/intermediates/source_set_path_map/debugAndroidTest/file-map.txt
index 5816e43..9b3bd06 100644
--- a/src/Notes-master3/app/build/intermediates/source_set_path_map/debugAndroidTest/file-map.txt
+++ b/src/Notes-master3/app/build/intermediates/source_set_path_map/debugAndroidTest/file-map.txt
@@ -1,4 +1,4 @@
-net.micode.notes.test.app-androidTest-0 E:\_Ufo\0SE\GitProject\MicodeNotes\src\Notes-master3\app\build\generated\res\resValues\androidTest\debug
-net.micode.notes.test.app-mergeDebugAndroidTestResources-1 E:\_Ufo\0SE\GitProject\MicodeNotes\src\Notes-master3\app\build\intermediates\incremental\debugAndroidTest\mergeDebugAndroidTestResources\merged.dir
-net.micode.notes.test.app-mergeDebugAndroidTestResources-2 E:\_Ufo\0SE\GitProject\MicodeNotes\src\Notes-master3\app\build\intermediates\incremental\debugAndroidTest\mergeDebugAndroidTestResources\stripped.dir
-net.micode.notes.test.app-merged_res-3 E:\_Ufo\0SE\GitProject\MicodeNotes\src\Notes-master3\app\build\intermediates\merged_res\debugAndroidTest
+net.micode.notes.test.app-androidTest-0 D:\git\MiNote2\src\Notes-master3\app\build\generated\res\resValues\androidTest\debug
+net.micode.notes.test.app-mergeDebugAndroidTestResources-1 D:\git\MiNote2\src\Notes-master3\app\build\intermediates\incremental\debugAndroidTest\mergeDebugAndroidTestResources\merged.dir
+net.micode.notes.test.app-mergeDebugAndroidTestResources-2 D:\git\MiNote2\src\Notes-master3\app\build\intermediates\incremental\debugAndroidTest\mergeDebugAndroidTestResources\stripped.dir
+net.micode.notes.test.app-merged_res-3 D:\git\MiNote2\src\Notes-master3\app\build\intermediates\merged_res\debugAndroidTest
diff --git a/src/Notes-master3/app/build/intermediates/stable_resource_ids_file/debug/stableIds.txt b/src/Notes-master3/app/build/intermediates/stable_resource_ids_file/debug/stableIds.txt
index 0f4ec51..62651ee 100644
--- a/src/Notes-master3/app/build/intermediates/stable_resource_ids_file/debug/stableIds.txt
+++ b/src/Notes-master3/app/build/intermediates/stable_resource_ids_file/debug/stableIds.txt
@@ -61,9 +61,10 @@ net.micode.notes:string/menu_select_none = 0x7f0a0039
net.micode.notes:string/failed_sdcard_export = 0x7f0a0014
net.micode.notes:string/error_sync_network = 0x7f0a0013
net.micode.notes:string/error_sdcard_unmounted = 0x7f0a0010
+net.micode.notes:string/error_note_not_exist = 0x7f0a000e
net.micode.notes:string/notealert_ok = 0x7f0a0047
net.micode.notes:string/menu_move_parent_folder = 0x7f0a0032
-net.micode.notes:id/tv_title = 0x7f050049
+net.micode.notes:id/tv_title = 0x7f05004a
net.micode.notes:string/error_note_empty_for_clock = 0x7f0a000c
net.micode.notes:string/delete_remind_time_message = 0x7f0a000b
net.micode.notes:style/TextAppearanceNormal = 0x7f0b0006
@@ -103,6 +104,7 @@ net.micode.notes:drawable/list_red_single = 0x7f040027
net.micode.notes:layout/note_list_dropdown_menu = 0x7f060009
net.micode.notes:drawable/icon_app = 0x7f040019
net.micode.notes:layout/note_list = 0x7f060008
+net.micode.notes:id/note_font = 0x7f05003d
net.micode.notes:layout/note_edit = 0x7f060005
net.micode.notes:drawable/list_background = 0x7f04001a
net.micode.notes:string/alert_message_delete_notes = 0x7f0a0002
@@ -111,17 +113,17 @@ net.micode.notes:layout/folder_list_item = 0x7f060004
net.micode.notes:string/sync_progress_init_list = 0x7f0a0064
net.micode.notes:id/btn_new_note = 0x7f050004
net.micode.notes:layout/add_account_text = 0x7f060001
-net.micode.notes:id/widget_text = 0x7f05004c
-net.micode.notes:id/widget_bg_image = 0x7f05004b
+net.micode.notes:id/widget_text = 0x7f05004d
+net.micode.notes:id/widget_bg_image = 0x7f05004c
net.micode.notes:id/account_dialog_title = 0x7f050001
-net.micode.notes:id/tv_folder_name = 0x7f050045
-net.micode.notes:id/tv_alert_date = 0x7f050044
+net.micode.notes:id/tv_folder_name = 0x7f050046
+net.micode.notes:id/tv_alert_date = 0x7f050045
net.micode.notes:color/primary_text_dark = 0x7f020000
-net.micode.notes:id/tv_time = 0x7f050048
-net.micode.notes:id/selection_menu = 0x7f050042
-net.micode.notes:id/preference_sync_button = 0x7f050041
-net.micode.notes:id/notes_list = 0x7f05003f
-net.micode.notes:id/note_title = 0x7f05003e
+net.micode.notes:id/tv_time = 0x7f050049
+net.micode.notes:id/selection_menu = 0x7f050043
+net.micode.notes:id/preference_sync_button = 0x7f050042
+net.micode.notes:id/notes_list = 0x7f050040
+net.micode.notes:id/note_title = 0x7f05003f
net.micode.notes:layout/test = 0x7f06000c
net.micode.notes:id/note_bg_color_selector = 0x7f05003a
net.micode.notes:id/navigation_bar = 0x7f050039
@@ -142,7 +144,7 @@ net.micode.notes:id/menu_font_size = 0x7f05002b
net.micode.notes:id/menu_chimpanzee = 0x7f050027
net.micode.notes:string/menu_move = 0x7f0a0031
net.micode.notes:id/date = 0x7f05000b
-net.micode.notes:id/note_item = 0x7f05003d
+net.micode.notes:id/note_item = 0x7f05003e
net.micode.notes:id/menu_setting = 0x7f050034
net.micode.notes:drawable/list_blue_down = 0x7f04001b
net.micode.notes:id/menu_cat = 0x7f050026
@@ -151,7 +153,6 @@ net.micode.notes:id/menu_alert = 0x7f050024
net.micode.notes:dimen/text_font_size_large = 0x7f030000
net.micode.notes:id/ll_font_super = 0x7f050023
net.micode.notes:id/ll_font_small = 0x7f050022
-net.micode.notes:string/error_note_not_exist = 0x7f0a000e
net.micode.notes:string/error_note_empty_for_send_to_desktop = 0x7f0a000d
net.micode.notes:id/minute = 0x7f050037
net.micode.notes:id/ll_font_normal = 0x7f050021
@@ -179,7 +180,7 @@ net.micode.notes:color/user_query_highlight = 0x7f020002
net.micode.notes:id/font_size_selector = 0x7f05000f
net.micode.notes:string/preferences_toast_cannot_change_account = 0x7f0a005a
net.micode.notes:id/et_edit_text = 0x7f05000d
-net.micode.notes:id/tv_modified_date = 0x7f050046
+net.micode.notes:id/tv_modified_date = 0x7f050047
net.micode.notes:id/iv_bg_white_select = 0x7f050019
net.micode.notes:drawable/edit_title_yellow = 0x7f040011
net.micode.notes:layout/dialog_edit_text = 0x7f060003
@@ -230,7 +231,7 @@ net.micode.notes:drawable/list_green_up = 0x7f040024
net.micode.notes:drawable/font_small = 0x7f040017
net.micode.notes:array/menu_share_ways = 0x7f010001
net.micode.notes:id/btn_set_bg_color = 0x7f050005
-net.micode.notes:id/prefenerece_sync_status_textview = 0x7f050040
+net.micode.notes:id/prefenerece_sync_status_textview = 0x7f050041
net.micode.notes:string/folder_exist = 0x7f0a0017
net.micode.notes:id/note_edit_list = 0x7f05003b
net.micode.notes:drawable/new_note = 0x7f040033
@@ -246,7 +247,7 @@ net.micode.notes:drawable/dropdown_icon = 0x7f040009
net.micode.notes:string/notelist_string_info = 0x7f0a0049
net.micode.notes:drawable/list_blue_single = 0x7f04001d
net.micode.notes:drawable/list_white_middle = 0x7f04002a
-net.micode.notes:id/tv_title_bar = 0x7f05004a
+net.micode.notes:id/tv_title_bar = 0x7f05004b
net.micode.notes:drawable/edit_title_red = 0x7f04000f
net.micode.notes:color/secondary_text_dark = 0x7f020001
net.micode.notes:drawable/list_folder = 0x7f04001f
@@ -283,7 +284,7 @@ net.micode.notes:string/ticker_success = 0x7f0a0069
net.micode.notes:id/iv_medium_select = 0x7f05001d
net.micode.notes:id/button4 = 0x7f050009
net.micode.notes:id/menu_new_folder = 0x7f05002e
-net.micode.notes:id/sv_note_edit = 0x7f050043
+net.micode.notes:id/sv_note_edit = 0x7f050044
net.micode.notes:drawable/call_record = 0x7f040006
net.micode.notes:menu/note_list_dropdown = 0x7f070004
net.micode.notes:drawable/list_red_up = 0x7f040028
@@ -292,7 +293,7 @@ net.micode.notes:drawable/list_white_single = 0x7f04002b
net.micode.notes:layout/note_list_footer = 0x7f06000a
net.micode.notes:id/menu_beauty = 0x7f050025
net.micode.notes:string/menu_folder_delete = 0x7f0a0028
-net.micode.notes:id/tv_name = 0x7f050047
+net.micode.notes:id/tv_name = 0x7f050048
net.micode.notes:string/note_link_other = 0x7f0a0043
net.micode.notes:drawable/acat = 0x7f040000
net.micode.notes:string/menu_font_super = 0x7f0a002e
diff --git a/src/Notes-master3/app/build/outputs/apk/androidTest/debug/app-debug-androidTest.apk b/src/Notes-master3/app/build/outputs/apk/androidTest/debug/app-debug-androidTest.apk
index c5be36d..1e07b8f 100644
Binary files a/src/Notes-master3/app/build/outputs/apk/androidTest/debug/app-debug-androidTest.apk and b/src/Notes-master3/app/build/outputs/apk/androidTest/debug/app-debug-androidTest.apk differ
diff --git a/src/Notes-master3/app/build/outputs/apk/debug/app-debug.apk b/src/Notes-master3/app/build/outputs/apk/debug/app-debug.apk
new file mode 100644
index 0000000..5f9839a
Binary files /dev/null and b/src/Notes-master3/app/build/outputs/apk/debug/app-debug.apk differ
diff --git a/src/Notes-master3/app/build/outputs/apk/debug/output-metadata.json b/src/Notes-master3/app/build/outputs/apk/debug/output-metadata.json
new file mode 100644
index 0000000..b2231b9
--- /dev/null
+++ b/src/Notes-master3/app/build/outputs/apk/debug/output-metadata.json
@@ -0,0 +1,20 @@
+{
+ "version": 3,
+ "artifactType": {
+ "type": "APK",
+ "kind": "Directory"
+ },
+ "applicationId": "net.micode.notes",
+ "variantName": "debug",
+ "elements": [
+ {
+ "type": "SINGLE",
+ "filters": [],
+ "attributes": [],
+ "versionCode": 1,
+ "versionName": "0.1",
+ "outputFile": "app-debug.apk"
+ }
+ ],
+ "elementType": "File"
+}
\ No newline at end of file
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 7d5c079..5363a06 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,227 +1,227 @@
-- Merging decision tree log ---
manifest
-ADDED from E:\_Ufo\0SE\GitProject\MicodeNotes\src\Notes-master3\app\src\main\AndroidManifest.xml:18:1-150:12
-INJECTED from E:\_Ufo\0SE\GitProject\MicodeNotes\src\Notes-master3\app\src\main\AndroidManifest.xml:18:1-150:12
-INJECTED from E:\_Ufo\0SE\GitProject\MicodeNotes\src\Notes-master3\app\src\main\AndroidManifest.xml:18:1-150:12
-INJECTED from E:\_Ufo\0SE\GitProject\MicodeNotes\src\Notes-master3\app\src\main\AndroidManifest.xml:18:1-150:12
+ADDED from D:\git\MiNote2\src\Notes-master3\app\src\main\AndroidManifest.xml:18:1-150:12
+INJECTED from D:\git\MiNote2\src\Notes-master3\app\src\main\AndroidManifest.xml:18:1-150:12
+INJECTED from D:\git\MiNote2\src\Notes-master3\app\src\main\AndroidManifest.xml:18:1-150:12
+INJECTED from D:\git\MiNote2\src\Notes-master3\app\src\main\AndroidManifest.xml:18:1-150:12
package
- ADDED from E:\_Ufo\0SE\GitProject\MicodeNotes\src\Notes-master3\app\src\main\AndroidManifest.xml:19:5-31
- INJECTED from E:\_Ufo\0SE\GitProject\MicodeNotes\src\Notes-master3\app\src\main\AndroidManifest.xml
+ ADDED from D:\git\MiNote2\src\Notes-master3\app\src\main\AndroidManifest.xml:19:5-31
+ INJECTED from D:\git\MiNote2\src\Notes-master3\app\src\main\AndroidManifest.xml
android:versionName
- ADDED from E:\_Ufo\0SE\GitProject\MicodeNotes\src\Notes-master3\app\src\main\AndroidManifest.xml:21:5-30
- INJECTED from E:\_Ufo\0SE\GitProject\MicodeNotes\src\Notes-master3\app\src\main\AndroidManifest.xml
+ ADDED from D:\git\MiNote2\src\Notes-master3\app\src\main\AndroidManifest.xml:21:5-30
+ INJECTED from D:\git\MiNote2\src\Notes-master3\app\src\main\AndroidManifest.xml
xmlns:android
- ADDED from E:\_Ufo\0SE\GitProject\MicodeNotes\src\Notes-master3\app\src\main\AndroidManifest.xml:18:11-69
+ ADDED from D:\git\MiNote2\src\Notes-master3\app\src\main\AndroidManifest.xml:18:11-69
android:versionCode
- ADDED from E:\_Ufo\0SE\GitProject\MicodeNotes\src\Notes-master3\app\src\main\AndroidManifest.xml:20:5-28
- INJECTED from E:\_Ufo\0SE\GitProject\MicodeNotes\src\Notes-master3\app\src\main\AndroidManifest.xml
+ ADDED from D:\git\MiNote2\src\Notes-master3\app\src\main\AndroidManifest.xml:20:5-28
+ INJECTED from D:\git\MiNote2\src\Notes-master3\app\src\main\AndroidManifest.xml
uses-sdk
-ADDED from E:\_Ufo\0SE\GitProject\MicodeNotes\src\Notes-master3\app\src\main\AndroidManifest.xml:23:5-44
-INJECTED from E:\_Ufo\0SE\GitProject\MicodeNotes\src\Notes-master3\app\src\main\AndroidManifest.xml:23:5-44
-INJECTED from E:\_Ufo\0SE\GitProject\MicodeNotes\src\Notes-master3\app\src\main\AndroidManifest.xml:23:5-44
+ADDED from D:\git\MiNote2\src\Notes-master3\app\src\main\AndroidManifest.xml:23:5-44
+INJECTED from D:\git\MiNote2\src\Notes-master3\app\src\main\AndroidManifest.xml:23:5-44
+INJECTED from D:\git\MiNote2\src\Notes-master3\app\src\main\AndroidManifest.xml:23:5-44
android:targetSdkVersion
- INJECTED from E:\_Ufo\0SE\GitProject\MicodeNotes\src\Notes-master3\app\src\main\AndroidManifest.xml
+ INJECTED from D:\git\MiNote2\src\Notes-master3\app\src\main\AndroidManifest.xml
android:minSdkVersion
- ADDED from E:\_Ufo\0SE\GitProject\MicodeNotes\src\Notes-master3\app\src\main\AndroidManifest.xml:23:15-41
- INJECTED from E:\_Ufo\0SE\GitProject\MicodeNotes\src\Notes-master3\app\src\main\AndroidManifest.xml
+ ADDED from D:\git\MiNote2\src\Notes-master3\app\src\main\AndroidManifest.xml:23:15-41
+ INJECTED from D:\git\MiNote2\src\Notes-master3\app\src\main\AndroidManifest.xml
uses-permission#android.permission.WRITE_EXTERNAL_STORAGE
-ADDED from E:\_Ufo\0SE\GitProject\MicodeNotes\src\Notes-master3\app\src\main\AndroidManifest.xml:25:5-81
+ADDED from D:\git\MiNote2\src\Notes-master3\app\src\main\AndroidManifest.xml:25:5-81
android:name
- ADDED from E:\_Ufo\0SE\GitProject\MicodeNotes\src\Notes-master3\app\src\main\AndroidManifest.xml:25:22-78
+ ADDED from D:\git\MiNote2\src\Notes-master3\app\src\main\AndroidManifest.xml:25:22-78
uses-permission#com.android.launcher.permission.INSTALL_SHORTCUT
-ADDED from E:\_Ufo\0SE\GitProject\MicodeNotes\src\Notes-master3\app\src\main\AndroidManifest.xml:26:5-88
+ADDED from D:\git\MiNote2\src\Notes-master3\app\src\main\AndroidManifest.xml:26:5-88
android:name
- ADDED from E:\_Ufo\0SE\GitProject\MicodeNotes\src\Notes-master3\app\src\main\AndroidManifest.xml:26:22-85
+ ADDED from D:\git\MiNote2\src\Notes-master3\app\src\main\AndroidManifest.xml:26:22-85
uses-permission#android.permission.INTERNET
-ADDED from E:\_Ufo\0SE\GitProject\MicodeNotes\src\Notes-master3\app\src\main\AndroidManifest.xml:27:5-67
+ADDED from D:\git\MiNote2\src\Notes-master3\app\src\main\AndroidManifest.xml:27:5-67
android:name
- ADDED from E:\_Ufo\0SE\GitProject\MicodeNotes\src\Notes-master3\app\src\main\AndroidManifest.xml:27:22-64
+ ADDED from D:\git\MiNote2\src\Notes-master3\app\src\main\AndroidManifest.xml:27:22-64
uses-permission#android.permission.READ_CONTACTS
-ADDED from E:\_Ufo\0SE\GitProject\MicodeNotes\src\Notes-master3\app\src\main\AndroidManifest.xml:28:5-72
+ADDED from D:\git\MiNote2\src\Notes-master3\app\src\main\AndroidManifest.xml:28:5-72
android:name
- ADDED from E:\_Ufo\0SE\GitProject\MicodeNotes\src\Notes-master3\app\src\main\AndroidManifest.xml:28:22-69
+ ADDED from D:\git\MiNote2\src\Notes-master3\app\src\main\AndroidManifest.xml:28:22-69
uses-permission#android.permission.MANAGE_ACCOUNTS
-ADDED from E:\_Ufo\0SE\GitProject\MicodeNotes\src\Notes-master3\app\src\main\AndroidManifest.xml:29:5-74
+ADDED from D:\git\MiNote2\src\Notes-master3\app\src\main\AndroidManifest.xml:29:5-74
android:name
- ADDED from E:\_Ufo\0SE\GitProject\MicodeNotes\src\Notes-master3\app\src\main\AndroidManifest.xml:29:22-71
+ ADDED from D:\git\MiNote2\src\Notes-master3\app\src\main\AndroidManifest.xml:29:22-71
uses-permission#android.permission.AUTHENTICATE_ACCOUNTS
-ADDED from E:\_Ufo\0SE\GitProject\MicodeNotes\src\Notes-master3\app\src\main\AndroidManifest.xml:30:5-80
+ADDED from D:\git\MiNote2\src\Notes-master3\app\src\main\AndroidManifest.xml:30:5-80
android:name
- ADDED from E:\_Ufo\0SE\GitProject\MicodeNotes\src\Notes-master3\app\src\main\AndroidManifest.xml:30:22-77
+ ADDED from D:\git\MiNote2\src\Notes-master3\app\src\main\AndroidManifest.xml:30:22-77
uses-permission#android.permission.GET_ACCOUNTS
-ADDED from E:\_Ufo\0SE\GitProject\MicodeNotes\src\Notes-master3\app\src\main\AndroidManifest.xml:31:5-71
+ADDED from D:\git\MiNote2\src\Notes-master3\app\src\main\AndroidManifest.xml:31:5-71
android:name
- ADDED from E:\_Ufo\0SE\GitProject\MicodeNotes\src\Notes-master3\app\src\main\AndroidManifest.xml:31:22-68
+ ADDED from D:\git\MiNote2\src\Notes-master3\app\src\main\AndroidManifest.xml:31:22-68
uses-permission#android.permission.USE_CREDENTIALS
-ADDED from E:\_Ufo\0SE\GitProject\MicodeNotes\src\Notes-master3\app\src\main\AndroidManifest.xml:32:5-74
+ADDED from D:\git\MiNote2\src\Notes-master3\app\src\main\AndroidManifest.xml:32:5-74
android:name
- ADDED from E:\_Ufo\0SE\GitProject\MicodeNotes\src\Notes-master3\app\src\main\AndroidManifest.xml:32:22-71
+ ADDED from D:\git\MiNote2\src\Notes-master3\app\src\main\AndroidManifest.xml:32:22-71
uses-permission#android.permission.RECEIVE_BOOT_COMPLETED
-ADDED from E:\_Ufo\0SE\GitProject\MicodeNotes\src\Notes-master3\app\src\main\AndroidManifest.xml:33:5-81
+ADDED from D:\git\MiNote2\src\Notes-master3\app\src\main\AndroidManifest.xml:33:5-81
android:name
- ADDED from E:\_Ufo\0SE\GitProject\MicodeNotes\src\Notes-master3\app\src\main\AndroidManifest.xml:33:22-78
+ ADDED from D:\git\MiNote2\src\Notes-master3\app\src\main\AndroidManifest.xml:33:22-78
application
-ADDED from E:\_Ufo\0SE\GitProject\MicodeNotes\src\Notes-master3\app\src\main\AndroidManifest.xml:35:5-149:19
-INJECTED from E:\_Ufo\0SE\GitProject\MicodeNotes\src\Notes-master3\app\src\main\AndroidManifest.xml:35:5-149:19
+ADDED from D:\git\MiNote2\src\Notes-master3\app\src\main\AndroidManifest.xml:35:5-149:19
+INJECTED from D:\git\MiNote2\src\Notes-master3\app\src\main\AndroidManifest.xml:35:5-149:19
android:extractNativeLibs
- INJECTED from E:\_Ufo\0SE\GitProject\MicodeNotes\src\Notes-master3\app\src\main\AndroidManifest.xml
+ INJECTED from D:\git\MiNote2\src\Notes-master3\app\src\main\AndroidManifest.xml
android:label
- ADDED from E:\_Ufo\0SE\GitProject\MicodeNotes\src\Notes-master3\app\src\main\AndroidManifest.xml:37:9-41
+ ADDED from D:\git\MiNote2\src\Notes-master3\app\src\main\AndroidManifest.xml:37:9-41
android:icon
- ADDED from E:\_Ufo\0SE\GitProject\MicodeNotes\src\Notes-master3\app\src\main\AndroidManifest.xml:36:9-42
+ ADDED from D:\git\MiNote2\src\Notes-master3\app\src\main\AndroidManifest.xml:36:9-42
activity#net.micode.notes.ui.NotesListActivity
-ADDED from E:\_Ufo\0SE\GitProject\MicodeNotes\src\Notes-master3\app\src\main\AndroidManifest.xml:38:9-51:20
+ADDED from D:\git\MiNote2\src\Notes-master3\app\src\main\AndroidManifest.xml:38:9-51:20
android:label
- ADDED from E:\_Ufo\0SE\GitProject\MicodeNotes\src\Notes-master3\app\src\main\AndroidManifest.xml:41:13-45
+ ADDED from D:\git\MiNote2\src\Notes-master3\app\src\main\AndroidManifest.xml:41:13-45
android:launchMode
- ADDED from E:\_Ufo\0SE\GitProject\MicodeNotes\src\Notes-master3\app\src\main\AndroidManifest.xml:42:13-43
+ ADDED from D:\git\MiNote2\src\Notes-master3\app\src\main\AndroidManifest.xml:42:13-43
android:windowSoftInputMode
- ADDED from E:\_Ufo\0SE\GitProject\MicodeNotes\src\Notes-master3\app\src\main\AndroidManifest.xml:45:13-52
+ ADDED from D:\git\MiNote2\src\Notes-master3\app\src\main\AndroidManifest.xml:45:13-52
android:uiOptions
- ADDED from E:\_Ufo\0SE\GitProject\MicodeNotes\src\Notes-master3\app\src\main\AndroidManifest.xml:44:13-57
+ ADDED from D:\git\MiNote2\src\Notes-master3\app\src\main\AndroidManifest.xml:44:13-57
android:configChanges
- ADDED from E:\_Ufo\0SE\GitProject\MicodeNotes\src\Notes-master3\app\src\main\AndroidManifest.xml:40:13-74
+ ADDED from D:\git\MiNote2\src\Notes-master3\app\src\main\AndroidManifest.xml:40:13-74
android:theme
- ADDED from E:\_Ufo\0SE\GitProject\MicodeNotes\src\Notes-master3\app\src\main\AndroidManifest.xml:43:13-45
+ ADDED from D:\git\MiNote2\src\Notes-master3\app\src\main\AndroidManifest.xml:43:13-45
android:name
- ADDED from E:\_Ufo\0SE\GitProject\MicodeNotes\src\Notes-master3\app\src\main\AndroidManifest.xml:39:13-49
+ ADDED from D:\git\MiNote2\src\Notes-master3\app\src\main\AndroidManifest.xml:39:13-49
intent-filter#action:name:android.intent.action.MAIN+category:name:android.intent.category.LAUNCHER
-ADDED from E:\_Ufo\0SE\GitProject\MicodeNotes\src\Notes-master3\app\src\main\AndroidManifest.xml:47:13-50:29
+ADDED from D:\git\MiNote2\src\Notes-master3\app\src\main\AndroidManifest.xml:47:13-50:29
action#android.intent.action.MAIN
-ADDED from E:\_Ufo\0SE\GitProject\MicodeNotes\src\Notes-master3\app\src\main\AndroidManifest.xml:48:17-69
+ADDED from D:\git\MiNote2\src\Notes-master3\app\src\main\AndroidManifest.xml:48:17-69
android:name
- ADDED from E:\_Ufo\0SE\GitProject\MicodeNotes\src\Notes-master3\app\src\main\AndroidManifest.xml:48:25-66
+ ADDED from D:\git\MiNote2\src\Notes-master3\app\src\main\AndroidManifest.xml:48:25-66
category#android.intent.category.LAUNCHER
-ADDED from E:\_Ufo\0SE\GitProject\MicodeNotes\src\Notes-master3\app\src\main\AndroidManifest.xml:49:17-77
+ADDED from D:\git\MiNote2\src\Notes-master3\app\src\main\AndroidManifest.xml:49:17-77
android:name
- ADDED from E:\_Ufo\0SE\GitProject\MicodeNotes\src\Notes-master3\app\src\main\AndroidManifest.xml:49:27-74
+ ADDED from D:\git\MiNote2\src\Notes-master3\app\src\main\AndroidManifest.xml:49:27-74
activity#net.micode.notes.ui.NoteEditActivity
-ADDED from E:\_Ufo\0SE\GitProject\MicodeNotes\src\Notes-master3\app\src\main\AndroidManifest.xml:53:9-81:20
+ADDED from D:\git\MiNote2\src\Notes-master3\app\src\main\AndroidManifest.xml:53:9-81:20
android:launchMode
- ADDED from E:\_Ufo\0SE\GitProject\MicodeNotes\src\Notes-master3\app\src\main\AndroidManifest.xml:56:13-43
+ ADDED from D:\git\MiNote2\src\Notes-master3\app\src\main\AndroidManifest.xml:56:13-43
android:configChanges
- ADDED from E:\_Ufo\0SE\GitProject\MicodeNotes\src\Notes-master3\app\src\main\AndroidManifest.xml:55:13-74
+ ADDED from D:\git\MiNote2\src\Notes-master3\app\src\main\AndroidManifest.xml:55:13-74
android:theme
- ADDED from E:\_Ufo\0SE\GitProject\MicodeNotes\src\Notes-master3\app\src\main\AndroidManifest.xml:57:13-45
+ ADDED from D:\git\MiNote2\src\Notes-master3\app\src\main\AndroidManifest.xml:57:13-45
android:name
- ADDED from E:\_Ufo\0SE\GitProject\MicodeNotes\src\Notes-master3\app\src\main\AndroidManifest.xml:54:13-48
+ ADDED from D:\git\MiNote2\src\Notes-master3\app\src\main\AndroidManifest.xml:54: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:\_Ufo\0SE\GitProject\MicodeNotes\src\Notes-master3\app\src\main\AndroidManifest.xml:59:13-64:29
+ADDED from D:\git\MiNote2\src\Notes-master3\app\src\main\AndroidManifest.xml:59:13-64:29
action#android.intent.action.VIEW
-ADDED from E:\_Ufo\0SE\GitProject\MicodeNotes\src\Notes-master3\app\src\main\AndroidManifest.xml:60:17-69
+ADDED from D:\git\MiNote2\src\Notes-master3\app\src\main\AndroidManifest.xml:60:17-69
android:name
- ADDED from E:\_Ufo\0SE\GitProject\MicodeNotes\src\Notes-master3\app\src\main\AndroidManifest.xml:60:25-66
+ ADDED from D:\git\MiNote2\src\Notes-master3\app\src\main\AndroidManifest.xml:60:25-66
category#android.intent.category.DEFAULT
-ADDED from E:\_Ufo\0SE\GitProject\MicodeNotes\src\Notes-master3\app\src\main\AndroidManifest.xml:61:17-76
+ADDED from D:\git\MiNote2\src\Notes-master3\app\src\main\AndroidManifest.xml:61:17-76
android:name
- ADDED from E:\_Ufo\0SE\GitProject\MicodeNotes\src\Notes-master3\app\src\main\AndroidManifest.xml:61:27-73
+ ADDED from D:\git\MiNote2\src\Notes-master3\app\src\main\AndroidManifest.xml:61:27-73
data
-ADDED from E:\_Ufo\0SE\GitProject\MicodeNotes\src\Notes-master3\app\src\main\AndroidManifest.xml:62:17-78
+ADDED from D:\git\MiNote2\src\Notes-master3\app\src\main\AndroidManifest.xml:62:17-78
android:mimeType
- ADDED from E:\_Ufo\0SE\GitProject\MicodeNotes\src\Notes-master3\app\src\main\AndroidManifest.xml:62:23-75
+ ADDED from D:\git\MiNote2\src\Notes-master3\app\src\main\AndroidManifest.xml:62: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:\_Ufo\0SE\GitProject\MicodeNotes\src\Notes-master3\app\src\main\AndroidManifest.xml:66:13-71:29
+ADDED from D:\git\MiNote2\src\Notes-master3\app\src\main\AndroidManifest.xml:66:13-71:29
action#android.intent.action.INSERT_OR_EDIT
-ADDED from E:\_Ufo\0SE\GitProject\MicodeNotes\src\Notes-master3\app\src\main\AndroidManifest.xml:67:17-79
+ADDED from D:\git\MiNote2\src\Notes-master3\app\src\main\AndroidManifest.xml:67:17-79
android:name
- ADDED from E:\_Ufo\0SE\GitProject\MicodeNotes\src\Notes-master3\app\src\main\AndroidManifest.xml:67:25-76
+ ADDED from D:\git\MiNote2\src\Notes-master3\app\src\main\AndroidManifest.xml:67:25-76
intent-filter#action:name:android.intent.action.SEARCH+category:name:android.intent.category.DEFAULT
-ADDED from E:\_Ufo\0SE\GitProject\MicodeNotes\src\Notes-master3\app\src\main\AndroidManifest.xml:73:13-76:29
+ADDED from D:\git\MiNote2\src\Notes-master3\app\src\main\AndroidManifest.xml:73:13-76:29
action#android.intent.action.SEARCH
-ADDED from E:\_Ufo\0SE\GitProject\MicodeNotes\src\Notes-master3\app\src\main\AndroidManifest.xml:74:17-71
+ADDED from D:\git\MiNote2\src\Notes-master3\app\src\main\AndroidManifest.xml:74:17-71
android:name
- ADDED from E:\_Ufo\0SE\GitProject\MicodeNotes\src\Notes-master3\app\src\main\AndroidManifest.xml:74:25-68
+ ADDED from D:\git\MiNote2\src\Notes-master3\app\src\main\AndroidManifest.xml:74:25-68
meta-data#android.app.searchable
-ADDED from E:\_Ufo\0SE\GitProject\MicodeNotes\src\Notes-master3\app\src\main\AndroidManifest.xml:78:13-80:54
+ADDED from D:\git\MiNote2\src\Notes-master3\app\src\main\AndroidManifest.xml:78:13-80:54
android:resource
- ADDED from E:\_Ufo\0SE\GitProject\MicodeNotes\src\Notes-master3\app\src\main\AndroidManifest.xml:80:17-51
+ ADDED from D:\git\MiNote2\src\Notes-master3\app\src\main\AndroidManifest.xml:80:17-51
android:name
- ADDED from E:\_Ufo\0SE\GitProject\MicodeNotes\src\Notes-master3\app\src\main\AndroidManifest.xml:79:17-54
+ ADDED from D:\git\MiNote2\src\Notes-master3\app\src\main\AndroidManifest.xml:79:17-54
provider#net.micode.notes.data.NotesProvider
-ADDED from E:\_Ufo\0SE\GitProject\MicodeNotes\src\Notes-master3\app\src\main\AndroidManifest.xml:83:9-86:43
+ADDED from D:\git\MiNote2\src\Notes-master3\app\src\main\AndroidManifest.xml:83:9-86:43
android:authorities
- ADDED from E:\_Ufo\0SE\GitProject\MicodeNotes\src\Notes-master3\app\src\main\AndroidManifest.xml:85:13-47
+ ADDED from D:\git\MiNote2\src\Notes-master3\app\src\main\AndroidManifest.xml:85:13-47
android:multiprocess
- ADDED from E:\_Ufo\0SE\GitProject\MicodeNotes\src\Notes-master3\app\src\main\AndroidManifest.xml:86:13-40
+ ADDED from D:\git\MiNote2\src\Notes-master3\app\src\main\AndroidManifest.xml:86:13-40
android:name
- ADDED from E:\_Ufo\0SE\GitProject\MicodeNotes\src\Notes-master3\app\src\main\AndroidManifest.xml:84:13-63
+ ADDED from D:\git\MiNote2\src\Notes-master3\app\src\main\AndroidManifest.xml:84:13-63
receiver#net.micode.notes.widget.NoteWidgetProvider_2x
-ADDED from E:\_Ufo\0SE\GitProject\MicodeNotes\src\Notes-master3\app\src\main\AndroidManifest.xml:88:9-100:20
+ADDED from D:\git\MiNote2\src\Notes-master3\app\src\main\AndroidManifest.xml:88:9-100:20
android:label
- ADDED from E:\_Ufo\0SE\GitProject\MicodeNotes\src\Notes-master3\app\src\main\AndroidManifest.xml:90:13-50
+ ADDED from D:\git\MiNote2\src\Notes-master3\app\src\main\AndroidManifest.xml:90:13-50
android:name
- ADDED from E:\_Ufo\0SE\GitProject\MicodeNotes\src\Notes-master3\app\src\main\AndroidManifest.xml:89:13-57
+ ADDED from D:\git\MiNote2\src\Notes-master3\app\src\main\AndroidManifest.xml:89: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:\_Ufo\0SE\GitProject\MicodeNotes\src\Notes-master3\app\src\main\AndroidManifest.xml:91:13-95:29
+ADDED from D:\git\MiNote2\src\Notes-master3\app\src\main\AndroidManifest.xml:91:13-95:29
action#android.appwidget.action.APPWIDGET_UPDATE
-ADDED from E:\_Ufo\0SE\GitProject\MicodeNotes\src\Notes-master3\app\src\main\AndroidManifest.xml:92:17-84
+ADDED from D:\git\MiNote2\src\Notes-master3\app\src\main\AndroidManifest.xml:92:17-84
android:name
- ADDED from E:\_Ufo\0SE\GitProject\MicodeNotes\src\Notes-master3\app\src\main\AndroidManifest.xml:92:25-81
+ ADDED from D:\git\MiNote2\src\Notes-master3\app\src\main\AndroidManifest.xml:92:25-81
action#android.appwidget.action.APPWIDGET_DELETED
-ADDED from E:\_Ufo\0SE\GitProject\MicodeNotes\src\Notes-master3\app\src\main\AndroidManifest.xml:93:17-85
+ADDED from D:\git\MiNote2\src\Notes-master3\app\src\main\AndroidManifest.xml:93:17-85
android:name
- ADDED from E:\_Ufo\0SE\GitProject\MicodeNotes\src\Notes-master3\app\src\main\AndroidManifest.xml:93:25-82
+ ADDED from D:\git\MiNote2\src\Notes-master3\app\src\main\AndroidManifest.xml:93:25-82
action#android.intent.action.PRIVACY_MODE_CHANGED
-ADDED from E:\_Ufo\0SE\GitProject\MicodeNotes\src\Notes-master3\app\src\main\AndroidManifest.xml:94:17-85
+ADDED from D:\git\MiNote2\src\Notes-master3\app\src\main\AndroidManifest.xml:94:17-85
android:name
- ADDED from E:\_Ufo\0SE\GitProject\MicodeNotes\src\Notes-master3\app\src\main\AndroidManifest.xml:94:25-82
+ ADDED from D:\git\MiNote2\src\Notes-master3\app\src\main\AndroidManifest.xml:94:25-82
meta-data#android.appwidget.provider
-ADDED from E:\_Ufo\0SE\GitProject\MicodeNotes\src\Notes-master3\app\src\main\AndroidManifest.xml:97:13-99:58
+ADDED from D:\git\MiNote2\src\Notes-master3\app\src\main\AndroidManifest.xml:97:13-99:58
android:resource
- ADDED from E:\_Ufo\0SE\GitProject\MicodeNotes\src\Notes-master3\app\src\main\AndroidManifest.xml:99:17-55
+ ADDED from D:\git\MiNote2\src\Notes-master3\app\src\main\AndroidManifest.xml:99:17-55
android:name
- ADDED from E:\_Ufo\0SE\GitProject\MicodeNotes\src\Notes-master3\app\src\main\AndroidManifest.xml:98:17-58
+ ADDED from D:\git\MiNote2\src\Notes-master3\app\src\main\AndroidManifest.xml:98:17-58
receiver#net.micode.notes.widget.NoteWidgetProvider_4x
-ADDED from E:\_Ufo\0SE\GitProject\MicodeNotes\src\Notes-master3\app\src\main\AndroidManifest.xml:101:9-114:20
+ADDED from D:\git\MiNote2\src\Notes-master3\app\src\main\AndroidManifest.xml:101:9-114:20
android:label
- ADDED from E:\_Ufo\0SE\GitProject\MicodeNotes\src\Notes-master3\app\src\main\AndroidManifest.xml:103:13-50
+ ADDED from D:\git\MiNote2\src\Notes-master3\app\src\main\AndroidManifest.xml:103:13-50
android:name
- ADDED from E:\_Ufo\0SE\GitProject\MicodeNotes\src\Notes-master3\app\src\main\AndroidManifest.xml:102:13-57
+ ADDED from D:\git\MiNote2\src\Notes-master3\app\src\main\AndroidManifest.xml:102:13-57
receiver#net.micode.notes.ui.AlarmInitReceiver
-ADDED from E:\_Ufo\0SE\GitProject\MicodeNotes\src\Notes-master3\app\src\main\AndroidManifest.xml:116:9-120:20
+ADDED from D:\git\MiNote2\src\Notes-master3\app\src\main\AndroidManifest.xml:116:9-120:20
android:name
- ADDED from E:\_Ufo\0SE\GitProject\MicodeNotes\src\Notes-master3\app\src\main\AndroidManifest.xml:116:19-55
+ ADDED from D:\git\MiNote2\src\Notes-master3\app\src\main\AndroidManifest.xml:116:19-55
intent-filter#action:name:android.intent.action.BOOT_COMPLETED
-ADDED from E:\_Ufo\0SE\GitProject\MicodeNotes\src\Notes-master3\app\src\main\AndroidManifest.xml:117:13-119:29
+ADDED from D:\git\MiNote2\src\Notes-master3\app\src\main\AndroidManifest.xml:117:13-119:29
action#android.intent.action.BOOT_COMPLETED
-ADDED from E:\_Ufo\0SE\GitProject\MicodeNotes\src\Notes-master3\app\src\main\AndroidManifest.xml:118:17-79
+ADDED from D:\git\MiNote2\src\Notes-master3\app\src\main\AndroidManifest.xml:118:17-79
android:name
- ADDED from E:\_Ufo\0SE\GitProject\MicodeNotes\src\Notes-master3\app\src\main\AndroidManifest.xml:118:25-76
+ ADDED from D:\git\MiNote2\src\Notes-master3\app\src\main\AndroidManifest.xml:118:25-76
receiver#net.micode.notes.ui.AlarmReceiver
-ADDED from E:\_Ufo\0SE\GitProject\MicodeNotes\src\Notes-master3\app\src\main\AndroidManifest.xml:122:9-125:20
+ADDED from D:\git\MiNote2\src\Notes-master3\app\src\main\AndroidManifest.xml:122:9-125:20
android:process
- ADDED from E:\_Ufo\0SE\GitProject\MicodeNotes\src\Notes-master3\app\src\main\AndroidManifest.xml:124:13-38
+ ADDED from D:\git\MiNote2\src\Notes-master3\app\src\main\AndroidManifest.xml:124:13-38
android:name
- ADDED from E:\_Ufo\0SE\GitProject\MicodeNotes\src\Notes-master3\app\src\main\AndroidManifest.xml:123:13-61
+ ADDED from D:\git\MiNote2\src\Notes-master3\app\src\main\AndroidManifest.xml:123:13-61
activity#net.micode.notes.ui.AlarmAlertActivity
-ADDED from E:\_Ufo\0SE\GitProject\MicodeNotes\src\Notes-master3\app\src\main\AndroidManifest.xml:127:9-132:20
+ADDED from D:\git\MiNote2\src\Notes-master3\app\src\main\AndroidManifest.xml:127:9-132:20
android:label
- ADDED from E:\_Ufo\0SE\GitProject\MicodeNotes\src\Notes-master3\app\src\main\AndroidManifest.xml:129:13-45
+ ADDED from D:\git\MiNote2\src\Notes-master3\app\src\main\AndroidManifest.xml:129:13-45
android:launchMode
- ADDED from E:\_Ufo\0SE\GitProject\MicodeNotes\src\Notes-master3\app\src\main\AndroidManifest.xml:130:13-48
+ ADDED from D:\git\MiNote2\src\Notes-master3\app\src\main\AndroidManifest.xml:130:13-48
android:theme
- ADDED from E:\_Ufo\0SE\GitProject\MicodeNotes\src\Notes-master3\app\src\main\AndroidManifest.xml:131:13-75
+ ADDED from D:\git\MiNote2\src\Notes-master3\app\src\main\AndroidManifest.xml:131:13-75
android:name
- ADDED from E:\_Ufo\0SE\GitProject\MicodeNotes\src\Notes-master3\app\src\main\AndroidManifest.xml:128:13-50
+ ADDED from D:\git\MiNote2\src\Notes-master3\app\src\main\AndroidManifest.xml:128:13-50
activity#net.micode.notes.ui.NotesPreferenceActivity
-ADDED from E:\_Ufo\0SE\GitProject\MicodeNotes\src\Notes-master3\app\src\main\AndroidManifest.xml:134:9-139:20
+ADDED from D:\git\MiNote2\src\Notes-master3\app\src\main\AndroidManifest.xml:134:9-139:20
android:label
- ADDED from E:\_Ufo\0SE\GitProject\MicodeNotes\src\Notes-master3\app\src\main\AndroidManifest.xml:136:13-54
+ ADDED from D:\git\MiNote2\src\Notes-master3\app\src\main\AndroidManifest.xml:136:13-54
android:launchMode
- ADDED from E:\_Ufo\0SE\GitProject\MicodeNotes\src\Notes-master3\app\src\main\AndroidManifest.xml:137:13-43
+ ADDED from D:\git\MiNote2\src\Notes-master3\app\src\main\AndroidManifest.xml:137:13-43
android:theme
- ADDED from E:\_Ufo\0SE\GitProject\MicodeNotes\src\Notes-master3\app\src\main\AndroidManifest.xml:138:13-60
+ ADDED from D:\git\MiNote2\src\Notes-master3\app\src\main\AndroidManifest.xml:138:13-60
android:name
- ADDED from E:\_Ufo\0SE\GitProject\MicodeNotes\src\Notes-master3\app\src\main\AndroidManifest.xml:135:13-71
+ ADDED from D:\git\MiNote2\src\Notes-master3\app\src\main\AndroidManifest.xml:135:13-71
service#net.micode.notes.gtask.remote.GTaskSyncService
-ADDED from E:\_Ufo\0SE\GitProject\MicodeNotes\src\Notes-master3\app\src\main\AndroidManifest.xml:141:9-144:19
+ADDED from D:\git\MiNote2\src\Notes-master3\app\src\main\AndroidManifest.xml:141:9-144:19
android:exported
- ADDED from E:\_Ufo\0SE\GitProject\MicodeNotes\src\Notes-master3\app\src\main\AndroidManifest.xml:143:13-37
+ ADDED from D:\git\MiNote2\src\Notes-master3\app\src\main\AndroidManifest.xml:143:13-37
android:name
- ADDED from E:\_Ufo\0SE\GitProject\MicodeNotes\src\Notes-master3\app\src\main\AndroidManifest.xml:142:13-74
+ ADDED from D:\git\MiNote2\src\Notes-master3\app\src\main\AndroidManifest.xml:142:13-74
meta-data#android.app.default_searchable
-ADDED from E:\_Ufo\0SE\GitProject\MicodeNotes\src\Notes-master3\app\src\main\AndroidManifest.xml:146:9-148:52
+ADDED from D:\git\MiNote2\src\Notes-master3\app\src\main\AndroidManifest.xml:146:9-148:52
android:value
- ADDED from E:\_Ufo\0SE\GitProject\MicodeNotes\src\Notes-master3\app\src\main\AndroidManifest.xml:148:13-49
+ ADDED from D:\git\MiNote2\src\Notes-master3\app\src\main\AndroidManifest.xml:148:13-49
android:name
- ADDED from E:\_Ufo\0SE\GitProject\MicodeNotes\src\Notes-master3\app\src\main\AndroidManifest.xml:147:13-58
+ ADDED from D:\git\MiNote2\src\Notes-master3\app\src\main\AndroidManifest.xml:147:13-58
diff --git a/src/Notes-master3/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/AlarmAlertActivity.class.uniqueId7 b/src/Notes-master3/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/AlarmAlertActivity.class.uniqueId7
deleted file mode 100644
index 98353eb..0000000
Binary files a/src/Notes-master3/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/AlarmAlertActivity.class.uniqueId7 and /dev/null differ
diff --git a/src/Notes-master3/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/GTaskASyncTask$1.class.uniqueId32 b/src/Notes-master3/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/GTaskASyncTask$1.class.uniqueId24
similarity index 100%
rename from src/Notes-master3/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/GTaskASyncTask$1.class.uniqueId32
rename to src/Notes-master3/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/GTaskASyncTask$1.class.uniqueId24
diff --git a/src/Notes-master3/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/GTaskASyncTask.class.uniqueId19 b/src/Notes-master3/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/GTaskASyncTask.class.uniqueId34
similarity index 100%
rename from src/Notes-master3/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/GTaskASyncTask.class.uniqueId19
rename to src/Notes-master3/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/GTaskASyncTask.class.uniqueId34
diff --git a/src/Notes-master3/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NoteEditActivity$1.class.uniqueId2 b/src/Notes-master3/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NoteEditActivity$1.class.uniqueId2
new file mode 100644
index 0000000..71fcfdb
Binary files /dev/null and b/src/Notes-master3/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NoteEditActivity$1.class.uniqueId2 differ
diff --git a/src/Notes-master3/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NoteEditActivity$1.class.uniqueId30 b/src/Notes-master3/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NoteEditActivity$2.class.uniqueId28
similarity index 61%
rename from src/Notes-master3/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NoteEditActivity$1.class.uniqueId30
rename to src/Notes-master3/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NoteEditActivity$2.class.uniqueId28
index 06b3b77..5edcf28 100644
Binary files a/src/Notes-master3/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NoteEditActivity$1.class.uniqueId30 and b/src/Notes-master3/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NoteEditActivity$2.class.uniqueId28 differ
diff --git a/src/Notes-master3/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NoteEditActivity$2.class.uniqueId5 b/src/Notes-master3/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NoteEditActivity$3.class.uniqueId5
similarity index 70%
rename from src/Notes-master3/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NoteEditActivity$2.class.uniqueId5
rename to src/Notes-master3/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NoteEditActivity$3.class.uniqueId5
index 17db1b6..01e4484 100644
Binary files a/src/Notes-master3/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NoteEditActivity$2.class.uniqueId5 and b/src/Notes-master3/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NoteEditActivity$3.class.uniqueId5 differ
diff --git a/src/Notes-master3/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NoteEditActivity$3.class.uniqueId28 b/src/Notes-master3/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NoteEditActivity$4.class.uniqueId14
similarity index 72%
rename from src/Notes-master3/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NoteEditActivity$3.class.uniqueId28
rename to src/Notes-master3/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NoteEditActivity$4.class.uniqueId14
index 5074c84..9799b77 100644
Binary files a/src/Notes-master3/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NoteEditActivity$3.class.uniqueId28 and b/src/Notes-master3/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NoteEditActivity$4.class.uniqueId14 differ
diff --git a/src/Notes-master3/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NoteEditActivity$HeadViewHolder.class.uniqueId35 b/src/Notes-master3/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NoteEditActivity$HeadViewHolder.class.uniqueId6
similarity index 84%
rename from src/Notes-master3/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NoteEditActivity$HeadViewHolder.class.uniqueId35
rename to src/Notes-master3/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NoteEditActivity$HeadViewHolder.class.uniqueId6
index 3c39825..1fb2540 100644
Binary files a/src/Notes-master3/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NoteEditActivity$HeadViewHolder.class.uniqueId35 and b/src/Notes-master3/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NoteEditActivity$HeadViewHolder.class.uniqueId6 differ
diff --git a/src/Notes-master3/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NoteEditActivity.class.uniqueId16 b/src/Notes-master3/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NoteEditActivity.class.uniqueId16
deleted file mode 100644
index d93b1bc..0000000
Binary files a/src/Notes-master3/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NoteEditActivity.class.uniqueId16 and /dev/null differ
diff --git a/src/Notes-master3/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NoteEditActivity.class.uniqueId23 b/src/Notes-master3/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NoteEditActivity.class.uniqueId23
new file mode 100644
index 0000000..2dd1ed9
Binary files /dev/null and b/src/Notes-master3/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NoteEditActivity.class.uniqueId23 differ
diff --git a/src/Notes-master3/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NoteItemData.class.uniqueId29 b/src/Notes-master3/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NoteItemData.class.uniqueId29
deleted file mode 100644
index 771aa91..0000000
Binary files a/src/Notes-master3/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NoteItemData.class.uniqueId29 and /dev/null differ
diff --git a/src/Notes-master3/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NoteWidgetProvider.class.uniqueId9 b/src/Notes-master3/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NoteWidgetProvider.class.uniqueId25
similarity index 100%
rename from src/Notes-master3/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NoteWidgetProvider.class.uniqueId9
rename to src/Notes-master3/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NoteWidgetProvider.class.uniqueId25
diff --git a/src/Notes-master3/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$1.class.uniqueId18 b/src/Notes-master3/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$1.class.uniqueId16
similarity index 100%
rename from src/Notes-master3/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$1.class.uniqueId18
rename to src/Notes-master3/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$1.class.uniqueId16
diff --git a/src/Notes-master3/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$2.class.uniqueId22 b/src/Notes-master3/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$2.class.uniqueId17
similarity index 80%
rename from src/Notes-master3/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$2.class.uniqueId22
rename to src/Notes-master3/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$2.class.uniqueId17
index 19bfa08..298e83a 100644
Binary files a/src/Notes-master3/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$2.class.uniqueId22 and b/src/Notes-master3/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$2.class.uniqueId17 differ
diff --git a/src/Notes-master3/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$3.class.uniqueId6 b/src/Notes-master3/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$3.class.uniqueId7
similarity index 85%
rename from src/Notes-master3/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$3.class.uniqueId6
rename to src/Notes-master3/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$3.class.uniqueId7
index fb71355..1c382c9 100644
Binary files a/src/Notes-master3/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$3.class.uniqueId6 and b/src/Notes-master3/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$3.class.uniqueId7 differ
diff --git a/src/Notes-master3/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$4.class.uniqueId11 b/src/Notes-master3/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$4.class.uniqueId11
index 9023969..d14b1ee 100644
Binary files a/src/Notes-master3/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$4.class.uniqueId11 and b/src/Notes-master3/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$4.class.uniqueId11 differ
diff --git a/src/Notes-master3/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$5.class.uniqueId36 b/src/Notes-master3/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$5.class.uniqueId30
similarity index 83%
rename from src/Notes-master3/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$5.class.uniqueId36
rename to src/Notes-master3/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$5.class.uniqueId30
index ab5bd97..f5d4fb6 100644
Binary files a/src/Notes-master3/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$5.class.uniqueId36 and b/src/Notes-master3/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$5.class.uniqueId30 differ
diff --git a/src/Notes-master3/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$6.class.uniqueId1 b/src/Notes-master3/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$6.class.uniqueId13
similarity index 90%
rename from src/Notes-master3/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$6.class.uniqueId1
rename to src/Notes-master3/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$6.class.uniqueId13
index 2f0134b..a2d8c08 100644
Binary files a/src/Notes-master3/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$6.class.uniqueId1 and b/src/Notes-master3/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$6.class.uniqueId13 differ
diff --git a/src/Notes-master3/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$7.class.uniqueId20 b/src/Notes-master3/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$7.class.uniqueId22
similarity index 88%
rename from src/Notes-master3/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$7.class.uniqueId20
rename to src/Notes-master3/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$7.class.uniqueId22
index ee32b71..033e969 100644
Binary files a/src/Notes-master3/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$7.class.uniqueId20 and b/src/Notes-master3/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$7.class.uniqueId22 differ
diff --git a/src/Notes-master3/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$8.class.uniqueId2 b/src/Notes-master3/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$8.class.uniqueId9
similarity index 82%
rename from src/Notes-master3/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$8.class.uniqueId2
rename to src/Notes-master3/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$8.class.uniqueId9
index e624d39..7177493 100644
Binary files a/src/Notes-master3/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$8.class.uniqueId2 and b/src/Notes-master3/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$8.class.uniqueId9 differ
diff --git a/src/Notes-master3/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$9.class.uniqueId12 b/src/Notes-master3/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$9.class.uniqueId20
similarity index 88%
rename from src/Notes-master3/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$9.class.uniqueId12
rename to src/Notes-master3/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$9.class.uniqueId20
index 1346736..48364be 100644
Binary files a/src/Notes-master3/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$9.class.uniqueId12 and b/src/Notes-master3/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$9.class.uniqueId20 differ
diff --git a/src/Notes-master3/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$BackgroundQueryHandler.class.uniqueId21 b/src/Notes-master3/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$BackgroundQueryHandler.class.uniqueId12
similarity index 100%
rename from src/Notes-master3/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$BackgroundQueryHandler.class.uniqueId21
rename to src/Notes-master3/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$BackgroundQueryHandler.class.uniqueId12
diff --git a/src/Notes-master3/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$ListEditState.class.uniqueId10 b/src/Notes-master3/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$ListEditState.class.uniqueId33
similarity index 100%
rename from src/Notes-master3/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$ListEditState.class.uniqueId10
rename to src/Notes-master3/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$ListEditState.class.uniqueId33
diff --git a/src/Notes-master3/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$ModeCallback$1.class.uniqueId3 b/src/Notes-master3/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$ModeCallback$1.class.uniqueId10
similarity index 100%
rename from src/Notes-master3/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$ModeCallback$1.class.uniqueId3
rename to src/Notes-master3/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$ModeCallback$1.class.uniqueId10
diff --git a/src/Notes-master3/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$ModeCallback$2.class.uniqueId26 b/src/Notes-master3/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$ModeCallback$2.class.uniqueId18
similarity index 100%
rename from src/Notes-master3/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$ModeCallback$2.class.uniqueId26
rename to src/Notes-master3/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$ModeCallback$2.class.uniqueId18
diff --git a/src/Notes-master3/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$ModeCallback.class.uniqueId37 b/src/Notes-master3/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$ModeCallback.class.uniqueId31
similarity index 100%
rename from src/Notes-master3/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$ModeCallback.class.uniqueId37
rename to src/Notes-master3/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$ModeCallback.class.uniqueId31
diff --git a/src/Notes-master3/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$NewNoteOnTouchListener.class.uniqueId24 b/src/Notes-master3/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$NewNoteOnTouchListener.class.uniqueId36
similarity index 100%
rename from src/Notes-master3/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$NewNoteOnTouchListener.class.uniqueId24
rename to src/Notes-master3/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$NewNoteOnTouchListener.class.uniqueId36
diff --git a/src/Notes-master3/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$OnListItemClickListener.class.uniqueId15 b/src/Notes-master3/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$OnListItemClickListener.class.uniqueId29
similarity index 92%
rename from src/Notes-master3/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$OnListItemClickListener.class.uniqueId15
rename to src/Notes-master3/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$OnListItemClickListener.class.uniqueId29
index 1363b85..5b33e55 100644
Binary files a/src/Notes-master3/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$OnListItemClickListener.class.uniqueId15 and b/src/Notes-master3/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$OnListItemClickListener.class.uniqueId29 differ
diff --git a/src/Notes-master3/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity.class.uniqueId13 b/src/Notes-master3/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity.class.uniqueId19
similarity index 90%
rename from src/Notes-master3/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity.class.uniqueId13
rename to src/Notes-master3/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity.class.uniqueId19
index bc7117a..c47f958 100644
Binary files a/src/Notes-master3/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity.class.uniqueId13 and b/src/Notes-master3/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity.class.uniqueId19 differ
diff --git a/src/Notes-master3/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesPreferenceActivity$1.class.uniqueId23 b/src/Notes-master3/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesPreferenceActivity$1.class.uniqueId26
similarity index 85%
rename from src/Notes-master3/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesPreferenceActivity$1.class.uniqueId23
rename to src/Notes-master3/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesPreferenceActivity$1.class.uniqueId26
index 362fa05..4dedad5 100644
Binary files a/src/Notes-master3/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesPreferenceActivity$1.class.uniqueId23 and b/src/Notes-master3/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesPreferenceActivity$1.class.uniqueId26 differ
diff --git a/src/Notes-master3/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesPreferenceActivity$2.class.uniqueId17 b/src/Notes-master3/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesPreferenceActivity$2.class.uniqueId0
similarity index 87%
rename from src/Notes-master3/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesPreferenceActivity$2.class.uniqueId17
rename to src/Notes-master3/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesPreferenceActivity$2.class.uniqueId0
index 8523228..46018a6 100644
Binary files a/src/Notes-master3/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesPreferenceActivity$2.class.uniqueId17 and b/src/Notes-master3/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesPreferenceActivity$2.class.uniqueId0 differ
diff --git a/src/Notes-master3/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesPreferenceActivity$3.class.uniqueId31 b/src/Notes-master3/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesPreferenceActivity$3.class.uniqueId35
similarity index 87%
rename from src/Notes-master3/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesPreferenceActivity$3.class.uniqueId31
rename to src/Notes-master3/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesPreferenceActivity$3.class.uniqueId35
index d91bc85..29f794c 100644
Binary files a/src/Notes-master3/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesPreferenceActivity$3.class.uniqueId31 and b/src/Notes-master3/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesPreferenceActivity$3.class.uniqueId35 differ
diff --git a/src/Notes-master3/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesPreferenceActivity$4.class.uniqueId8 b/src/Notes-master3/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesPreferenceActivity$4.class.uniqueId8
index 99c7a64..6bc8d75 100644
Binary files a/src/Notes-master3/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesPreferenceActivity$4.class.uniqueId8 and b/src/Notes-master3/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesPreferenceActivity$4.class.uniqueId8 differ
diff --git a/src/Notes-master3/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesPreferenceActivity$5.class.uniqueId14 b/src/Notes-master3/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesPreferenceActivity$5.class.uniqueId27
similarity index 90%
rename from src/Notes-master3/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesPreferenceActivity$5.class.uniqueId14
rename to src/Notes-master3/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesPreferenceActivity$5.class.uniqueId27
index 17e4d3b..9f6ce3e 100644
Binary files a/src/Notes-master3/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesPreferenceActivity$5.class.uniqueId14 and b/src/Notes-master3/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesPreferenceActivity$5.class.uniqueId27 differ
diff --git a/src/Notes-master3/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesPreferenceActivity$6.class.uniqueId34 b/src/Notes-master3/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesPreferenceActivity$6.class.uniqueId32
similarity index 84%
rename from src/Notes-master3/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesPreferenceActivity$6.class.uniqueId34
rename to src/Notes-master3/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesPreferenceActivity$6.class.uniqueId32
index 7b80036..de5bee6 100644
Binary files a/src/Notes-master3/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesPreferenceActivity$6.class.uniqueId34 and b/src/Notes-master3/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesPreferenceActivity$6.class.uniqueId32 differ
diff --git a/src/Notes-master3/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesPreferenceActivity$7.class.uniqueId0 b/src/Notes-master3/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesPreferenceActivity$7.class.uniqueId15
similarity index 89%
rename from src/Notes-master3/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesPreferenceActivity$7.class.uniqueId0
rename to src/Notes-master3/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesPreferenceActivity$7.class.uniqueId15
index d9abeb9..39b203f 100644
Binary files a/src/Notes-master3/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesPreferenceActivity$7.class.uniqueId0 and b/src/Notes-master3/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesPreferenceActivity$7.class.uniqueId15 differ
diff --git a/src/Notes-master3/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesPreferenceActivity$8.class.uniqueId25 b/src/Notes-master3/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesPreferenceActivity$8.class.uniqueId21
similarity index 89%
rename from src/Notes-master3/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesPreferenceActivity$8.class.uniqueId25
rename to src/Notes-master3/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesPreferenceActivity$8.class.uniqueId21
index 39e534a..debfb4c 100644
Binary files a/src/Notes-master3/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesPreferenceActivity$8.class.uniqueId25 and b/src/Notes-master3/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesPreferenceActivity$8.class.uniqueId21 differ
diff --git a/src/Notes-master3/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesPreferenceActivity$GTaskReceiver.class.uniqueId33 b/src/Notes-master3/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesPreferenceActivity$GTaskReceiver.class.uniqueId1
similarity index 88%
rename from src/Notes-master3/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesPreferenceActivity$GTaskReceiver.class.uniqueId33
rename to src/Notes-master3/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesPreferenceActivity$GTaskReceiver.class.uniqueId1
index eb938cf..6540edf 100644
Binary files a/src/Notes-master3/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesPreferenceActivity$GTaskReceiver.class.uniqueId33 and b/src/Notes-master3/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesPreferenceActivity$GTaskReceiver.class.uniqueId1 differ
diff --git a/src/Notes-master3/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesPreferenceActivity.class.uniqueId27 b/src/Notes-master3/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesPreferenceActivity.class.uniqueId3
similarity index 85%
rename from src/Notes-master3/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesPreferenceActivity.class.uniqueId27
rename to src/Notes-master3/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesPreferenceActivity.class.uniqueId3
index 0937be2..be17c36 100644
Binary files a/src/Notes-master3/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesPreferenceActivity.class.uniqueId27 and b/src/Notes-master3/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesPreferenceActivity.class.uniqueId3 differ
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 a09c107..3c066cd 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
diff --git a/src/Notes-master3/app/src/main/assets/font/STCAIYUN.TTF b/src/Notes-master3/app/src/main/assets/font/STCAIYUN.TTF
new file mode 100644
index 0000000..f2c31b3
Binary files /dev/null and b/src/Notes-master3/app/src/main/assets/font/STCAIYUN.TTF differ
diff --git a/src/Notes-master3/app/src/main/assets/font/STFANGSO.TTF b/src/Notes-master3/app/src/main/assets/font/STFANGSO.TTF
new file mode 100644
index 0000000..441f288
Binary files /dev/null and b/src/Notes-master3/app/src/main/assets/font/STFANGSO.TTF differ
diff --git a/src/Notes-master3/app/src/main/assets/font/STHUPO.TTF b/src/Notes-master3/app/src/main/assets/font/STHUPO.TTF
new file mode 100644
index 0000000..d1104b9
Binary files /dev/null and b/src/Notes-master3/app/src/main/assets/font/STHUPO.TTF differ
diff --git a/src/Notes-master3/app/src/main/assets/font/STKAITI.TTF b/src/Notes-master3/app/src/main/assets/font/STKAITI.TTF
new file mode 100644
index 0000000..5044116
Binary files /dev/null and b/src/Notes-master3/app/src/main/assets/font/STKAITI.TTF differ
diff --git a/src/Notes-master3/app/src/main/assets/font/STLITI.TTF b/src/Notes-master3/app/src/main/assets/font/STLITI.TTF
new file mode 100644
index 0000000..8ede20e
Binary files /dev/null and b/src/Notes-master3/app/src/main/assets/font/STLITI.TTF differ
diff --git a/src/Notes-master3/app/src/main/assets/font/simhei.ttf b/src/Notes-master3/app/src/main/assets/font/simhei.ttf
new file mode 100644
index 0000000..5bd4687
Binary files /dev/null and b/src/Notes-master3/app/src/main/assets/font/simhei.ttf differ
diff --git a/src/Notes-master3/app/src/main/java/net/micode/notes/ui/AlarmAlertActivity.java b/src/Notes-master3/app/src/main/java/net/micode/notes/ui/AlarmAlertActivity.java
index 85723be..3447ff6 100644
--- a/src/Notes-master3/app/src/main/java/net/micode/notes/ui/AlarmAlertActivity.java
+++ b/src/Notes-master3/app/src/main/java/net/micode/notes/ui/AlarmAlertActivity.java
@@ -20,14 +20,14 @@ import android.app.Activity;
import android.app.AlertDialog;
import android.content.Context;
import android.content.DialogInterface;
-import android.content.DialogInterface.OnClickListener;
-import android.content.DialogInterface.OnDismissListener;
+import android.content.DialogInterface.OnClickListener;//监听事件功能,点击就会实现相应功能
+import android.content.DialogInterface.OnDismissListener;//该方法将在关闭对话框时调用
import android.content.Intent;
import android.media.AudioManager;
import android.media.MediaPlayer;
import android.media.RingtoneManager;
import android.net.Uri;
-import android.os.Bundle;
+import android.os.Bundle;//用于传递数据
import android.os.PowerManager;
import android.provider.Settings;
import android.view.Window;
@@ -39,7 +39,9 @@ import net.micode.notes.tool.DataUtils;
import java.io.IOException;
-
+/**
+ * 功能:实现闹铃提醒界面
+ */
public class AlarmAlertActivity extends Activity implements OnClickListener, OnDismissListener {
private long mNoteId;
private String mSnippet;
@@ -54,6 +56,9 @@ public class AlarmAlertActivity extends Activity implements OnClickListener, OnD
final Window win = getWindow();
win.addFlags(WindowManager.LayoutParams.FLAG_SHOW_WHEN_LOCKED);
+ /*
+ 判断闹钟启动时屏幕是否点亮,若未点亮,激活闹钟时开启手机屏幕
+ */
if (!isScreenOn()) {
win.addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON
| WindowManager.LayoutParams.FLAG_TURN_SCREEN_ON
@@ -76,21 +81,23 @@ public class AlarmAlertActivity extends Activity implements OnClickListener, OnD
mPlayer = new MediaPlayer();
if (DataUtils.visibleInNoteDatabase(getContentResolver(), mNoteId, Notes.TYPE_NOTE)) {
- showActionDialog();
- playAlarmSound();
+ showActionDialog();//弹出对话框
+ playAlarmSound();//闹钟提示音触发
} else {
- finish();
+ finish();//完成闹钟动作
}
}
+ /*判断屏幕是否处于锁定状态 */
private boolean isScreenOn() {
PowerManager pm = (PowerManager) getSystemService(Context.POWER_SERVICE);
return pm.isScreenOn();
}
+ /*播放闹钟提示音 */
private void playAlarmSound() {
Uri url = RingtoneManager.getActualDefaultRingtoneUri(this, RingtoneManager.TYPE_ALARM);
-
+ //调用系统铃声管理获得闹钟提示音
int silentModeStreams = Settings.System.getInt(getContentResolver(),
Settings.System.MODE_RINGER_STREAMS_AFFECTED, 0);
@@ -100,10 +107,10 @@ public class AlarmAlertActivity extends Activity implements OnClickListener, OnD
mPlayer.setAudioStreamType(AudioManager.STREAM_ALARM);
}
try {
- mPlayer.setDataSource(this, url);
+ mPlayer.setDataSource(this, url);//设置铃声数据来源
mPlayer.prepare();
- mPlayer.setLooping(true);
- mPlayer.start();
+ mPlayer.setLooping(true);//循环播放
+ mPlayer.start();//开始播放
} catch (IllegalArgumentException e) {
// TODO Auto-generated catch block
e.printStackTrace();
@@ -116,20 +123,23 @@ public class AlarmAlertActivity extends Activity implements OnClickListener, OnD
} catch (IOException e) {
// TODO Auto-generated catch block
e.printStackTrace();
- }
+ }//异常处理
}
+ /*设置对话框 */
private void showActionDialog() {
AlertDialog.Builder dialog = new AlertDialog.Builder(this);
- dialog.setTitle(R.string.app_name);
- dialog.setMessage(mSnippet);
- dialog.setPositiveButton(R.string.notealert_ok, this);
+ dialog.setTitle(R.string.app_name);//对话框标题
+ dialog.setMessage(mSnippet);//对话框内容
+ dialog.setPositiveButton(R.string.notealert_ok, this);//“是”按钮
+ //“否”按钮
if (isScreenOn()) {
dialog.setNegativeButton(R.string.notealert_enter, this);
}
dialog.show().setOnDismissListener(this);
}
+ /*判断点击操作 */
public void onClick(DialogInterface dialog, int which) {
switch (which) {
case DialogInterface.BUTTON_NEGATIVE:
@@ -143,11 +153,13 @@ public class AlarmAlertActivity extends Activity implements OnClickListener, OnD
}
}
+ /*忽略闹钟*/
public void onDismiss(DialogInterface dialog) {
- stopAlarmSound();
+ stopAlarmSound();/*停止播放 */
finish();
}
+ /*停止播放 */
private void stopAlarmSound() {
if (mPlayer != null) {
mPlayer.stop();
diff --git a/src/Notes-master3/app/src/main/java/net/micode/notes/ui/AlarmInitReceiver.java b/src/Notes-master3/app/src/main/java/net/micode/notes/ui/AlarmInitReceiver.java
index f221202..e5e1243 100644
--- a/src/Notes-master3/app/src/main/java/net/micode/notes/ui/AlarmInitReceiver.java
+++ b/src/Notes-master3/app/src/main/java/net/micode/notes/ui/AlarmInitReceiver.java
@@ -27,39 +27,58 @@ import android.database.Cursor;
import net.micode.notes.data.Notes;
import net.micode.notes.data.Notes.NoteColumns;
-
+/**
+ * 自定义接收器类,用于在设备启动时或接收到特定系统广播时,初始化和设置笔记应用中的闹钟提醒功能。
+ */
public class AlarmInitReceiver extends BroadcastReceiver {
- private static final String [] PROJECTION = new String [] {
- NoteColumns.ID,
- NoteColumns.ALERTED_DATE
+ /*操作数据库调用ID与闹钟时间 */
+ private static final String[] PROJECTION = new String[]{
+ NoteColumns.ID,
+ NoteColumns.ALERTED_DATE
};
- private static final int COLUMN_ID = 0;
- private static final int COLUMN_ALERTED_DATE = 1;
+ private static final int COLUMN_ID = 0;
+ private static final int COLUMN_ALERTED_DATE = 1;
@Override
+ /*获取当前时间 */
public void onReceive(Context context, Intent intent) {
+ // 获取当前系统时间的毫秒值
long currentDate = System.currentTimeMillis();
+
+ // 查询数据库,查找所有的闹钟提醒时间大于当前时间的笔记
Cursor c = context.getContentResolver().query(Notes.CONTENT_NOTE_URI,
PROJECTION,
NoteColumns.ALERTED_DATE + ">? AND " + NoteColumns.TYPE + "=" + Notes.TYPE_NOTE,
- new String[] { String.valueOf(currentDate) },
+ new String[]{String.valueOf(currentDate)},
null);
+ // 确保查询返回了有效的数据集合
if (c != null) {
+ // 遍历查询结果
if (c.moveToFirst()) {
do {
+ // 获取笔记设定的提醒时间
long alertDate = c.getLong(COLUMN_ALERTED_DATE);
+
+ // 创建一个指向 AlarmReceiver 的 Intent,并设置数据为笔记的内容的 URI
Intent sender = new Intent(context, AlarmReceiver.class);
sender.setData(ContentUris.withAppendedId(Notes.CONTENT_NOTE_URI, c.getLong(COLUMN_ID)));
+
+ // 创建一个能执行广播的 PendingIntent
PendingIntent pendingIntent = PendingIntent.getBroadcast(context, 0, sender, 0);
+
+ // 获取 AlarmManager 服务
AlarmManager alermManager = (AlarmManager) context
.getSystemService(Context.ALARM_SERVICE);
+
+ // 设置单次闹钟
alermManager.set(AlarmManager.RTC_WAKEUP, alertDate, pendingIntent);
- } while (c.moveToNext());
+ } while (c.moveToNext()); // 是否还有更多数据
}
+ // 关闭游标以释放资源
c.close();
- }
+ }// 根据数据库中的闹钟时间创建一个闹钟机制
}
}
diff --git a/src/Notes-master3/app/src/main/java/net/micode/notes/ui/AlarmReceiver.java b/src/Notes-master3/app/src/main/java/net/micode/notes/ui/AlarmReceiver.java
index 54e503b..bf3afaf 100644
--- a/src/Notes-master3/app/src/main/java/net/micode/notes/ui/AlarmReceiver.java
+++ b/src/Notes-master3/app/src/main/java/net/micode/notes/ui/AlarmReceiver.java
@@ -20,11 +20,14 @@ import android.content.BroadcastReceiver;
import android.content.Context;
import android.content.Intent;
+/**
+ * 闹钟提醒接收器
+ */
public class AlarmReceiver extends BroadcastReceiver {
@Override
public void onReceive(Context context, Intent intent) {
- intent.setClass(context, AlarmAlertActivity.class);
+ intent.setClass(context, AlarmAlertActivity.class);//启动AlarmAlertActivity
intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
- context.startActivity(intent);
+ context.startActivity(intent);//创建一个栈并将新的activity装入其中
}
}
diff --git a/src/Notes-master3/app/src/main/java/net/micode/notes/ui/DateTimePicker.java b/src/Notes-master3/app/src/main/java/net/micode/notes/ui/DateTimePicker.java
index 496b0cd..b2c9787 100644
--- a/src/Notes-master3/app/src/main/java/net/micode/notes/ui/DateTimePicker.java
+++ b/src/Notes-master3/app/src/main/java/net/micode/notes/ui/DateTimePicker.java
@@ -28,6 +28,9 @@ import android.view.View;
import android.widget.FrameLayout;
import android.widget.NumberPicker;
+/**
+ *设置提醒时间的部件
+ */
public class DateTimePicker extends FrameLayout {
private static final boolean DEFAULT_ENABLE_STATE = true;
@@ -46,11 +49,13 @@ public class DateTimePicker extends FrameLayout {
private static final int AMPM_SPINNER_MIN_VAL = 0;
private static final int AMPM_SPINNER_MAX_VAL = 1;
+ //四个设置闹钟时间所需的变量
private final NumberPicker mDateSpinner;
private final NumberPicker mHourSpinner;
private final NumberPicker mMinuteSpinner;
private final NumberPicker mAmPmSpinner;
- private Calendar mDate;
+
+ private Calendar mDate;//用于操作时间
private String[] mDateDisplayValues = new String[DAYS_IN_ALL_WEEK];
@@ -64,6 +69,7 @@ public class DateTimePicker extends FrameLayout {
private OnDateTimeChangedListener mOnDateTimeChangedListener;
+ /*对日期的监听 */
private NumberPicker.OnValueChangeListener mOnDateChangedListener = new NumberPicker.OnValueChangeListener() {
@Override
public void onValueChange(NumberPicker picker, int oldVal, int newVal) {
@@ -73,6 +79,7 @@ public class DateTimePicker extends FrameLayout {
}
};
+ /*对小时的监听 */
private NumberPicker.OnValueChangeListener mOnHourChangedListener = new NumberPicker.OnValueChangeListener() {
@Override
public void onValueChange(NumberPicker picker, int oldVal, int newVal) {
@@ -83,26 +90,27 @@ public class DateTimePicker extends FrameLayout {
cal.setTimeInMillis(mDate.getTimeInMillis());
cal.add(Calendar.DAY_OF_YEAR, 1);
isDateChanged = true;
+ //对于12小时制时,晚上11点和12点交替时对日期的更改
} else if (mIsAm && oldVal == HOURS_IN_HALF_DAY && newVal == HOURS_IN_HALF_DAY - 1) {
cal.setTimeInMillis(mDate.getTimeInMillis());
cal.add(Calendar.DAY_OF_YEAR, -1);
isDateChanged = true;
- }
+ }//对于12小时制时,凌晨11点和12点交替时对日期的更改
if (oldVal == HOURS_IN_HALF_DAY - 1 && newVal == HOURS_IN_HALF_DAY ||
oldVal == HOURS_IN_HALF_DAY && newVal == HOURS_IN_HALF_DAY - 1) {
mIsAm = !mIsAm;
updateAmPmControl();
- }
+ }//对于12小时制时,中午11点和12点交替时对AM和PM的更改
} else {
if (oldVal == HOURS_IN_ALL_DAY - 1 && newVal == 0) {
cal.setTimeInMillis(mDate.getTimeInMillis());
cal.add(Calendar.DAY_OF_YEAR, 1);
- isDateChanged = true;
+ isDateChanged = true;//对于24小时制时,晚上11点和12点交替时对日期的更改
} else if (oldVal == 0 && newVal == HOURS_IN_ALL_DAY - 1) {
cal.setTimeInMillis(mDate.getTimeInMillis());
cal.add(Calendar.DAY_OF_YEAR, -1);
isDateChanged = true;
- }
+ }//对于12小时制时,凌晨11点和12点交替时对日期的更改
}
int newHour = mHourSpinner.getValue() % HOURS_IN_HALF_DAY + (mIsAm ? 0 : HOURS_IN_HALF_DAY);
mDate.set(Calendar.HOUR_OF_DAY, newHour);
@@ -117,15 +125,18 @@ public class DateTimePicker extends FrameLayout {
private NumberPicker.OnValueChangeListener mOnMinuteChangedListener = new NumberPicker.OnValueChangeListener() {
@Override
+ /*对分钟的监听 */
public void onValueChange(NumberPicker picker, int oldVal, int newVal) {
int minValue = mMinuteSpinner.getMinValue();
int maxValue = mMinuteSpinner.getMaxValue();
- int offset = 0;
+ int offset = 0;//判断小时是否改变的记录器
if (oldVal == maxValue && newVal == minValue) {
offset += 1;
} else if (oldVal == minValue && newVal == maxValue) {
offset -= 1;
}
+ //如果原值为59,新值为0,则offset加1
+ //如果原值为0,新值为59,则offset减1
if (offset != 0) {
mDate.add(Calendar.HOUR_OF_DAY, offset);
mHourSpinner.setValue(getCurrentHour());
@@ -144,6 +155,7 @@ public class DateTimePicker extends FrameLayout {
}
};
+ /*对AM和PM的监听 */
private NumberPicker.OnValueChangeListener mOnAmPmChangedListener = new NumberPicker.OnValueChangeListener() {
@Override
public void onValueChange(NumberPicker picker, int oldVal, int newVal) {
@@ -160,13 +172,15 @@ public class DateTimePicker extends FrameLayout {
public interface OnDateTimeChangedListener {
void onDateTimeChanged(DateTimePicker view, int year, int month,
- int dayOfMonth, int hourOfDay, int minute);
+ int dayOfMonth, int hourOfDay, int minute);
}
+ /*访问数据库获取当前时间*/
public DateTimePicker(Context context) {
this(context, System.currentTimeMillis());
}
+ /*转化上一个函数获取的时间格式 */
public DateTimePicker(Context context, long date) {
this(context, date, DateFormat.is24HourFormat(context));
}
@@ -262,8 +276,9 @@ public class DateTimePicker extends FrameLayout {
* @param hourOfDay The current hourOfDay
* @param minute The current minute
*/
+ /*设置当前日期 */
public void setCurrentDate(int year, int month,
- int dayOfMonth, int hourOfDay, int minute) {
+ int dayOfMonth, int hourOfDay, int minute) {
setCurrentYear(year);
setCurrentMonth(month);
setCurrentDay(dayOfMonth);
@@ -434,6 +449,7 @@ public class DateTimePicker extends FrameLayout {
updateAmPmControl();
}
+ /*关于判定星期几的算法 */
private void updateDateControl() {
Calendar cal = Calendar.getInstance();
cal.setTimeInMillis(mDate.getTimeInMillis());
@@ -448,6 +464,7 @@ public class DateTimePicker extends FrameLayout {
mDateSpinner.invalidate();
}
+ /*对于判定AM与PM的算法 */
private void updateAmPmControl() {
if (mIs24HourView) {
mAmPmSpinner.setVisibility(View.GONE);
@@ -458,6 +475,7 @@ public class DateTimePicker extends FrameLayout {
}
}
+ /*对于小时的算法 */
private void updateHourControl() {
if (mIs24HourView) {
mHourSpinner.setMinValue(HOUR_SPINNER_MIN_VAL_24_HOUR_VIEW);
diff --git a/src/Notes-master3/app/src/main/java/net/micode/notes/ui/DateTimePickerDialog.java b/src/Notes-master3/app/src/main/java/net/micode/notes/ui/DateTimePickerDialog.java
index 2c47ba4..426c522 100644
--- a/src/Notes-master3/app/src/main/java/net/micode/notes/ui/DateTimePickerDialog.java
+++ b/src/Notes-master3/app/src/main/java/net/micode/notes/ui/DateTimePickerDialog.java
@@ -1,19 +1,3 @@
-/*
- * Copyright (c) 2010-2011, The MiCode Open Source Community (www.micode.net)
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
package net.micode.notes.ui;
import java.util.Calendar;
@@ -29,11 +13,17 @@ import android.content.DialogInterface.OnClickListener;
import android.text.format.DateFormat;
import android.text.format.DateUtils;
+/**
+ * 实现设置提醒时间的对话框
+ */
public class DateTimePickerDialog extends AlertDialog implements OnClickListener {
-
+ //创建一个Calendar类型的变量 mDate,方便时间的操作
private Calendar mDate = Calendar.getInstance();
private boolean mIs24HourView;
+ //声明一个时间日期滚动选择控件 mOnDateTimeSetListener
private OnDateTimeSetListener mOnDateTimeSetListener;
+ //DateTimePicker控件,控件一般用于让用户可以从日期列表中选择单个值。
+ //运行时,单击控件边上的下拉箭头,会显示为两个部分:一个下拉列表,一个用于选择日期的
private DateTimePicker mDateTimePicker;
public interface OnDateTimeSetListener {
@@ -41,26 +31,30 @@ public class DateTimePickerDialog extends AlertDialog implements OnClickListener
}
public DateTimePickerDialog(Context context, long date) {
+ //对该界面对话框的实例化
super(context);
+ //对数据库的操作
mDateTimePicker = new DateTimePicker(context);
setView(mDateTimePicker);
+ //添加一个子视图
mDateTimePicker.setOnDateTimeChangedListener(new OnDateTimeChangedListener() {
public void onDateTimeChanged(DateTimePicker view, int year, int month,
- int dayOfMonth, int hourOfDay, int minute) {
+ int dayOfMonth, int hourOfDay, int minute) {
mDate.set(Calendar.YEAR, year);
mDate.set(Calendar.MONTH, month);
mDate.set(Calendar.DAY_OF_MONTH, dayOfMonth);
mDate.set(Calendar.HOUR_OF_DAY, hourOfDay);
mDate.set(Calendar.MINUTE, minute);
+ //将视图中的各选项设置为系统当前时间
updateTitle(mDate.getTimeInMillis());
}
});
- mDate.setTimeInMillis(date);
- mDate.set(Calendar.SECOND, 0);
+ mDate.setTimeInMillis(date);//得到系统时间
+ mDate.set(Calendar.SECOND, 0);//将秒数设置为0
mDateTimePicker.setCurrentDate(mDate.getTimeInMillis());
setButton(context.getString(R.string.datetime_dialog_ok), this);
- setButton2(context.getString(R.string.datetime_dialog_cancel), (OnClickListener)null);
- set24HourView(DateFormat.is24HourFormat(this.getContext()));
+ setButton2(context.getString(R.string.datetime_dialog_cancel), (OnClickListener)null);//设置按钮
+ set24HourView(DateFormat.is24HourFormat(this.getContext()));//时间标准化打印
updateTitle(mDate.getTimeInMillis());
}
@@ -68,19 +62,23 @@ public class DateTimePickerDialog extends AlertDialog implements OnClickListener
mIs24HourView = is24HourView;
}
+ /*将时间日期滚动选择控件实例化*/
public void setOnDateTimeSetListener(OnDateTimeSetListener callBack) {
mOnDateTimeSetListener = callBack;
}
+ /*android开发中常见日期管理工具类(API)——DateUtils:按照上下午显示时间*/
private void updateTitle(long date) {
int flag =
- DateUtils.FORMAT_SHOW_YEAR |
- DateUtils.FORMAT_SHOW_DATE |
- DateUtils.FORMAT_SHOW_TIME;
+ DateUtils.FORMAT_SHOW_YEAR |
+ DateUtils.FORMAT_SHOW_DATE |
+ DateUtils.FORMAT_SHOW_TIME;
flag |= mIs24HourView ? DateUtils.FORMAT_24HOUR : DateUtils.FORMAT_24HOUR;
setTitle(DateUtils.formatDateTime(this.getContext(), date, flag));
}
+ /*第一个参数arg0是接收到点击事件的对话框
+ 第二个参数arg1是该对话框上的按钮*/
public void onClick(DialogInterface arg0, int arg1) {
if (mOnDateTimeSetListener != null) {
mOnDateTimeSetListener.OnDateTimeSet(this, mDate.getTimeInMillis());
diff --git a/src/Notes-master3/app/src/main/java/net/micode/notes/ui/DropdownMenu.java b/src/Notes-master3/app/src/main/java/net/micode/notes/ui/DropdownMenu.java
index 613dc74..3c8675d 100644
--- a/src/Notes-master3/app/src/main/java/net/micode/notes/ui/DropdownMenu.java
+++ b/src/Notes-master3/app/src/main/java/net/micode/notes/ui/DropdownMenu.java
@@ -1,19 +1,3 @@
-/*
- * Copyright (c) 2010-2011, The MiCode Open Source Community (www.micode.net)
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
package net.micode.notes.ui;
import android.content.Context;
@@ -29,14 +13,16 @@ import net.micode.notes.R;
public class DropdownMenu {
private Button mButton;
- private PopupMenu mPopupMenu;
+ private PopupMenu mPopupMenu;//声明一个下拉菜单
private Menu mMenu;
public DropdownMenu(Context context, Button button, int menuId) {
mButton = button;
- mButton.setBackgroundResource(R.drawable.dropdown_icon);
+ mButton.setBackgroundResource(R.drawable.dropdown_icon);//设置这个view的背景
mPopupMenu = new PopupMenu(context, mButton);
mMenu = mPopupMenu.getMenu();
+ //MenuInflater是用来实例化Menu目录下的Menu布局文件
+ //根据ID来确认menu的内容选项
mPopupMenu.getMenuInflater().inflate(menuId, mMenu);
mButton.setOnClickListener(new OnClickListener() {
public void onClick(View v) {
@@ -45,17 +31,20 @@ public class DropdownMenu {
});
}
+ /*设置菜单的监听 */
public void setOnDropdownMenuItemClickListener(OnMenuItemClickListener listener) {
if (mPopupMenu != null) {
mPopupMenu.setOnMenuItemClickListener(listener);
}
}
+ /*对于菜单选项的初始化,根据索引搜索菜单需要的选项 */
public MenuItem findItem(int id) {
return mMenu.findItem(id);
}
+ /*布局文件,设置标题 */
public void setTitle(CharSequence title) {
mButton.setText(title);
}
-}
+}
\ No newline at end of file
diff --git a/src/Notes-master3/app/src/main/java/net/micode/notes/ui/FoldersListAdapter.java b/src/Notes-master3/app/src/main/java/net/micode/notes/ui/FoldersListAdapter.java
index 96b77da..aa20ebf 100644
--- a/src/Notes-master3/app/src/main/java/net/micode/notes/ui/FoldersListAdapter.java
+++ b/src/Notes-master3/app/src/main/java/net/micode/notes/ui/FoldersListAdapter.java
@@ -1,19 +1,3 @@
-/*
- * Copyright (c) 2010-2011, The MiCode Open Source Community (www.micode.net)
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
package net.micode.notes.ui;
import android.content.Context;
@@ -28,27 +12,37 @@ import net.micode.notes.R;
import net.micode.notes.data.Notes;
import net.micode.notes.data.Notes.NoteColumns;
+/**
+ *
+ 主要作用是便签数据库和用户的交互
+ 这里就是用folder(文件夹)的形式展现给用户
+ */
+/*调用数据库中便签的ID和片段 */
public class FoldersListAdapter extends CursorAdapter {
public static final String [] PROJECTION = {
- NoteColumns.ID,
- NoteColumns.SNIPPET
+ NoteColumns.ID,
+ NoteColumns.SNIPPET
};
public static final int ID_COLUMN = 0;
public static final int NAME_COLUMN = 1;
+ /*数据库操作 */
public FoldersListAdapter(Context context, Cursor c) {
super(context, c);
// TODO Auto-generated constructor stub
}
@Override
+ /*创建一个文件夹,对于各文件夹中子标签的初始化 */
public View newView(Context context, Cursor cursor, ViewGroup parent) {
+ //ViewGroup是容器
return new FolderListItem(context);
}
@Override
+ /*将各个布局文件绑定起来 */
public void bindView(View view, Context context, Cursor cursor) {
if (view instanceof FolderListItem) {
String folderName = (cursor.getLong(ID_COLUMN) == Notes.ID_ROOT_FOLDER) ? context
@@ -57,6 +51,7 @@ public class FoldersListAdapter extends CursorAdapter {
}
}
+ /*根据数据库中标签的ID得到标签的各项内容 */
public String getFolderName(Context context, int position) {
Cursor cursor = (Cursor) getItem(position);
return (cursor.getLong(ID_COLUMN) == Notes.ID_ROOT_FOLDER) ? context
@@ -67,8 +62,8 @@ public class FoldersListAdapter extends CursorAdapter {
private TextView mName;
public FolderListItem(Context context) {
- super(context);
- inflate(context, R.layout.folder_list_item, this);
+ super(context);//操作数据库
+ inflate(context, R.layout.folder_list_item, this);//根据布局文件的名字等信息将其找出来
mName = (TextView) findViewById(R.id.tv_folder_name);
}
@@ -77,4 +72,4 @@ public class FoldersListAdapter extends CursorAdapter {
}
}
-}
+}
\ No newline at end of file
diff --git a/src/Notes-master3/app/src/main/java/net/micode/notes/ui/NoteEditActivity.java b/src/Notes-master3/app/src/main/java/net/micode/notes/ui/NoteEditActivity.java
index 0d23f27..fbdfc6b 100644
--- a/src/Notes-master3/app/src/main/java/net/micode/notes/ui/NoteEditActivity.java
+++ b/src/Notes-master3/app/src/main/java/net/micode/notes/ui/NoteEditActivity.java
@@ -29,6 +29,7 @@ import android.content.DialogInterface;
import android.content.Intent;
import android.content.SharedPreferences;
import android.graphics.Paint;
+import android.graphics.Typeface;
import android.os.AsyncTask;
import android.os.Bundle;
import android.preference.PreferenceManager;
@@ -91,6 +92,67 @@ public class NoteEditActivity extends Activity implements OnClickListener,
public ImageView ibSetBgColor;
}
+ // 定义显示单选对话框的方法
+ public void showSingleAlertDialog()
+ {
+ // 创建一个包含字体选项的字符串数组
+ final String[] items = {"黑体","华文彩云","华文仿宋","华文琥珀","楷体","隶书"};
+
+ // 使用该活动的上下文实例化AlertDialog的构建器
+ AlertDialog.Builder alertBuilder = new AlertDialog.Builder(this);
+
+ // 为对话框设置标题
+ alertBuilder.setTitle("选择字体");
+
+ // 设置对话框的单选项,其中'0'表示默认选中的项(黑体),并为选项设置一个监听器
+ alertBuilder.setSingleChoiceItems(items, 0, (dialogInterface, i) -> {
+ // 使用switch语句处理用户的选择事件
+ switch(i){
+ // 如果选择了"黑体"
+ // 加载黑体字体并设置到文本编辑器
+ case 0:
+ Typeface typeface0 = Typeface.createFromAsset(getAssets(),"font/simhei.ttf");
+ mNoteEditor.setTypeface(typeface0);
+ break;
+ // 如果选择了"华文彩云"
+ // 加载华文彩云字体并设置到文本编辑器
+ case 1:
+ Typeface typeface1 = Typeface.createFromAsset(getAssets(),"font/STCAIYUN.TTF");
+ mNoteEditor.setTypeface(typeface1);
+ break;
+ // 如果选择了"华文仿宋"
+ // 加载华文仿宋字体并设置到文本编辑器
+ case 2:
+ Typeface typeface2 = Typeface.createFromAsset(getAssets(),"font/STFANGSO.TTF");
+ mNoteEditor.setTypeface(typeface2);
+ break;
+ // 如果选择了"华文琥珀"
+ // 加载华文琥珀字体并设置到文本编辑器
+ case 3:
+ Typeface typeface3 = Typeface.createFromAsset(getAssets(),"font/STHUPO.TTF");
+ mNoteEditor.setTypeface(typeface3);
+ break;
+ // 如果选择了"楷体"
+ // 加载楷体字体并设置到文本编辑器
+ case 4:
+ Typeface typeface4 = Typeface.createFromAsset(getAssets(),"font/STKAITI.TTF");
+ mNoteEditor.setTypeface(typeface4);
+ break;
+ // 如果选择了"隶书"
+ // 加载隶书字体并设置到文本编辑器
+ case 5:
+ Typeface typeface5 = Typeface.createFromAsset(getAssets(),"font/STLITI.TTF");
+ mNoteEditor.setTypeface(typeface5);
+ break;
+ }
+
+ // 显示一个短暂的提示信息,表明用户选择的字体
+ Toast.makeText(NoteEditActivity.this, items[i], Toast.LENGTH_SHORT).show();
+ });
+
+ // 显示构建好的单选对话框
+ alertBuilder.show();
+ }
private static final Map sBgSelectorBtnsMap = new HashMap();
static {
sBgSelectorBtnsMap.put(R.id.iv_bg_yellow, ResourceParser.YELLOW);
@@ -195,24 +257,26 @@ public class NoteEditActivity extends Activity implements OnClickListener,
}
}
+ /**
+ * 初始化活动状态。根据Intent的不同行动创建或加载笔记。
+ *
+ * @param intent 从其他地方传递到这个活动的意图(Intent)
+ * @return boolean 返回true如果笔记被成功加载或创建;如果出错则返回false
+ */
private boolean initActivityState(Intent intent) {
- /**
- * If the user specified the {@link Intent#ACTION_VIEW} but not provided with id,
- * then jump to the NotesListActivity
- */
+ // 如果用户指定了查看动作但未提供id,则跳转到NotesListActivity
mWorkingNote = null;
if (TextUtils.equals(Intent.ACTION_VIEW, intent.getAction())) {
long noteId = intent.getLongExtra(Intent.EXTRA_UID, 0);
mUserQuery = "";
- /**
- * Starting from the searched result
- */
+ // 从搜索结果开始
if (intent.hasExtra(SearchManager.EXTRA_DATA_KEY)) {
noteId = Long.parseLong(intent.getStringExtra(SearchManager.EXTRA_DATA_KEY));
mUserQuery = intent.getStringExtra(SearchManager.USER_QUERY);
}
+ // 验证noteId是否存在于数据库,如果不存在,则跳转到笔记列表活动,并显示错误信息
if (!DataUtils.visibleInNoteDatabase(getContentResolver(), noteId, Notes.TYPE_NOTE)) {
Intent jump = new Intent(this, NotesListActivity.class);
startActivity(jump);
@@ -220,18 +284,21 @@ public class NoteEditActivity extends Activity implements OnClickListener,
finish();
return false;
} else {
+ // 加载noteId对应的笔记
mWorkingNote = WorkingNote.load(this, noteId);
+ // 如果加载失败,记录错误日志,结束活动
if (mWorkingNote == null) {
Log.e(TAG, "load note failed with note id" + noteId);
finish();
return false;
}
}
+ // 设置输入模式为隐藏键盘、调整大小
getWindow().setSoftInputMode(
WindowManager.LayoutParams.SOFT_INPUT_STATE_HIDDEN
| WindowManager.LayoutParams.SOFT_INPUT_ADJUST_RESIZE);
} else if(TextUtils.equals(Intent.ACTION_INSERT_OR_EDIT, intent.getAction())) {
- // New note
+ // 插入或编辑新笔记
long folderId = intent.getLongExtra(Notes.INTENT_EXTRA_FOLDER_ID, 0);
int widgetId = intent.getIntExtra(Notes.INTENT_EXTRA_WIDGET_ID,
AppWidgetManager.INVALID_APPWIDGET_ID);
@@ -240,7 +307,7 @@ public class NoteEditActivity extends Activity implements OnClickListener,
int bgResId = intent.getIntExtra(Notes.INTENT_EXTRA_BACKGROUND_ID,
ResourceParser.getDefaultBgId(this));
- // Parse call-record note
+ // 解析来电记录笔记
String phoneNumber = intent.getStringExtra(Intent.EXTRA_PHONE_NUMBER);
long callDate = intent.getLongExtra(Notes.INTENT_EXTRA_CALL_DATE, 0);
if (callDate != 0 && phoneNumber != null) {
@@ -248,32 +315,39 @@ public class NoteEditActivity extends Activity implements OnClickListener,
Log.w(TAG, "The call record number is null");
}
long noteId = 0;
+ // 如果存在匹配的电话号码和通话日期,则加载笔记
if ((noteId = DataUtils.getNoteIdByPhoneNumberAndCallDate(getContentResolver(),
phoneNumber, callDate)) > 0) {
mWorkingNote = WorkingNote.load(this, noteId);
+ // 如果加载失败,记录错误日志,结束活动
if (mWorkingNote == null) {
Log.e(TAG, "load call note failed with note id" + noteId);
finish();
return false;
}
} else {
+ // 如果不存在匹配的电话号码和通话日期,创建一个空白笔记
mWorkingNote = WorkingNote.createEmptyNote(this, folderId, widgetId,
widgetType, bgResId);
mWorkingNote.convertToCallNote(phoneNumber, callDate);
}
} else {
+ // 创建一个空白笔记
mWorkingNote = WorkingNote.createEmptyNote(this, folderId, widgetId, widgetType,
bgResId);
}
+ // 设置输入模式为可见键盘、调整大小
getWindow().setSoftInputMode(
WindowManager.LayoutParams.SOFT_INPUT_ADJUST_RESIZE
| WindowManager.LayoutParams.SOFT_INPUT_STATE_VISIBLE);
} else {
+ // 如果意图(Intent)没有指定动作,认为不支持,记录错误日志,结束活动
Log.e(TAG, "Intent not specified action, should not support");
finish();
return false;
}
+ // 设置笔记设置状态改变监听器
mWorkingNote.setOnSettingStatusChangedListener(this);
return true;
}
@@ -284,48 +358,68 @@ public class NoteEditActivity extends Activity implements OnClickListener,
initNoteScreen();
}
+ /**
+ * 初始化笔记界面的方法。
+ */
private void initNoteScreen() {
+ // 根据用户选择的字体大小设置笔记编辑器的文字外观
mNoteEditor.setTextAppearance(this, TextAppearanceResources
.getTexAppearanceResource(mFontSizeId));
+
+ // 检查笔记是否处于清单模式,并据此切换到列表模式或设置文本内容
if (mWorkingNote.getCheckListMode() == TextNote.MODE_CHECK_LIST) {
+ // 如果笔记是列表模式,则切换到列表视图模式
switchToListMode(mWorkingNote.getContent());
} else {
+ // 如果笔记不是列表模式,则在编辑器中设置笔记内容,并高亮显示搜索结果
mNoteEditor.setText(getHighlightQueryResult(mWorkingNote.getContent(), mUserQuery));
+ // 将光标定位到文本的末尾
mNoteEditor.setSelection(mNoteEditor.getText().length());
}
+
+ // 遍历并隐藏背景选择器中的视图元素
for (Integer id : sBgSelectorSelectionMap.keySet()) {
findViewById(sBgSelectorSelectionMap.get(id)).setVisibility(View.GONE);
}
+
+ // 根据笔记设置,调整标题栏和笔记编辑器面板的背景
mHeadViewPanel.setBackgroundResource(mWorkingNote.getTitleBgResId());
mNoteEditorPanel.setBackgroundResource(mWorkingNote.getBgColorResId());
+ // 更新并展示笔记最后修改的日期和时间
mNoteHeaderHolder.tvModified.setText(DateUtils.formatDateTime(this,
mWorkingNote.getModifiedDate(), DateUtils.FORMAT_SHOW_DATE
| DateUtils.FORMAT_NUMERIC_DATE | DateUtils.FORMAT_SHOW_TIME
| DateUtils.FORMAT_SHOW_YEAR));
- /**
- * TODO: Add the menu for setting alert. Currently disable it because the DateTimePicker
- * is not ready
- */
+ // TODO: 添加设置提醒菜单的代码。目前因为DateTimePicker未就绪,所以此功能被禁用
showAlertHeader();
}
+ /**
+ * 显示或隐藏笔记提醒头部信息的方法。
+ */
private void showAlertHeader() {
+ // 检查当前笔记是否有设置提醒闹钟
if (mWorkingNote.hasClockAlert()) {
- long time = System.currentTimeMillis();
- if (time > mWorkingNote.getAlertDate()) {
+ long currentTime = System.currentTimeMillis(); // 获取当前时间
+ // 判断当前时间是否已经超过笔记设置的提醒时间
+ if (currentTime > mWorkingNote.getAlertDate()) {
+ // 如果提醒时间已经过期,则显示过期信息
mNoteHeaderHolder.tvAlertDate.setText(R.string.note_alert_expired);
} else {
+ // 如果提醒时间还没过期,显示距离提醒时间还有多久
mNoteHeaderHolder.tvAlertDate.setText(DateUtils.getRelativeTimeSpanString(
- mWorkingNote.getAlertDate(), time, DateUtils.MINUTE_IN_MILLIS));
+ mWorkingNote.getAlertDate(), currentTime, DateUtils.MINUTE_IN_MILLIS));
}
+ // 显示提醒日期和图标
mNoteHeaderHolder.tvAlertDate.setVisibility(View.VISIBLE);
mNoteHeaderHolder.ivAlertIcon.setVisibility(View.VISIBLE);
} else {
+ // 如果没有设置提醒闹钟,隐藏相关的视图组件
mNoteHeaderHolder.tvAlertDate.setVisibility(View.GONE);
mNoteHeaderHolder.ivAlertIcon.setVisibility(View.GONE);
- };
+ }
}
private ContentResolver mContentResolver;
@@ -347,268 +441,449 @@ public class NoteEditActivity extends Activity implements OnClickListener,
}
@Override
+ /**
+ * 当Activity重新启动时会调用这个回调函数,处理新的Intent。
+ *
+ * @param intent 新的Intent对象。
+ */
protected void onNewIntent(Intent intent) {
+ // 调用父类的onNewIntent方法
super.onNewIntent(intent);
+ // 初始化Activity状态
initActivityState(intent);
}
+ /**
+ * 当Activity的状态需要被保存时调用此方法,比如在屏幕方向改变或者Activity被系统销毁时。
+ *
+ * @param outState 一个Bundle对象,用于保存Activity的状态。
+ */
@Override
protected void onSaveInstanceState(Bundle outState) {
+ // 调用父类的onSaveInstanceState方法
super.onSaveInstanceState(outState);
/**
- * For new note without note id, we should firstly save it to
- * generate a id. If the editing note is not worth saving, there
- * is no id which is equivalent to create new note
+ * 对于新建的笔记,如果笔记id不存在,则首先保存笔记以生成id。
+ * 如果正在编辑的笔记不值得被保存,则没有id,相当于创建了一个新笔记。
*/
if (!mWorkingNote.existInDatabase()) {
+ // 如果笔记还没有保存到数据库中,先保存笔记
saveNote();
}
+ // 将当前笔记的id保存到Bundle中
outState.putLong(Intent.EXTRA_UID, mWorkingNote.getNoteId());
+ // 在Log中记录当前保存的笔记id
Log.d(TAG, "Save working note id: " + mWorkingNote.getNoteId() + " onSaveInstanceState");
}
+ /**
+ * 分发触摸事件时的回调函数。
+ *
+ * @param ev 传递的MotionEvent对象,包含触摸事件的各种信息。
+ * @return 如果事件被消费了,则返回true;否则返回false。
+ */
@Override
public boolean dispatchTouchEvent(MotionEvent ev) {
+ // 检查颜色选择器视图是否可见,且触摸事件不在该视图范围内
if (mNoteBgColorSelector.getVisibility() == View.VISIBLE
&& !inRangeOfView(mNoteBgColorSelector, ev)) {
+ // 如果是,则隐藏颜色选择器视图
mNoteBgColorSelector.setVisibility(View.GONE);
+ // 消费掉这个事件
return true;
}
+ // 检查字体大小选择器视图是否可见,且触摸事件不在该视图范围内
if (mFontSizeSelector.getVisibility() == View.VISIBLE
&& !inRangeOfView(mFontSizeSelector, ev)) {
+ // 如果是,则隐藏字体大小选择器视图
mFontSizeSelector.setVisibility(View.GONE);
+ // 消费掉这个事件
return true;
}
+ // 如果以上情况都不符合,调用父类的dispatchTouchEvent继续处理事件
return super.dispatchTouchEvent(ev);
}
+ /**
+ * 判断触摸事件的坐标是否在指定视图的范围内。
+ *
+ * @param view 需要判断的视图。
+ * @param ev 当前的触摸事件。
+ * @return 如果触摸事件的坐标在视图的范围内,返回true,否则返回false。
+ */
private boolean inRangeOfView(View view, MotionEvent ev) {
+ // 创建一个数组来存放视图在屏幕上的坐标位置
int []location = new int[2];
+ // 获取视图在屏幕上的坐标位置,并将其存入location数组
view.getLocationOnScreen(location);
+ // 获取视图在屏幕上的X坐标位置
int x = location[0];
+ // 获取视图在屏幕上的Y坐标位置
int y = location[1];
+ // 判断触摸事件的坐标是否超出了视图的范围
if (ev.getX() < x
|| ev.getX() > (x + view.getWidth())
|| ev.getY() < y
|| ev.getY() > (y + view.getHeight())) {
- return false;
- }
+ // 如果超出了,返回false
+ return false;
+ }
+ // 如果没有超出,返回true
return true;
}
+ /**
+ * 初始化Activity所需的资源。
+ */
private void initResources() {
+ // 根据Id获取笔记头部视图
mHeadViewPanel = findViewById(R.id.note_title);
+ // 创建HeadViewHolder实例来持有头部视图的子视图的引用
mNoteHeaderHolder = new HeadViewHolder();
+ // 通过ID查询并持有显示最后修改日期的TextView
mNoteHeaderHolder.tvModified = (TextView) findViewById(R.id.tv_modified_date);
+ // 通过ID查询并持有提醒图标的ImageView
mNoteHeaderHolder.ivAlertIcon = (ImageView) findViewById(R.id.iv_alert_icon);
+ // 通过ID查询并持有提醒日期的TextView
mNoteHeaderHolder.tvAlertDate = (TextView) findViewById(R.id.tv_alert_date);
+ // 通过ID查询并持有设置背景颜色的ImageView,同时设置点击监听
mNoteHeaderHolder.ibSetBgColor = (ImageView) findViewById(R.id.btn_set_bg_color);
mNoteHeaderHolder.ibSetBgColor.setOnClickListener(this);
+ // 通过ID查询并持有编辑笔记内容的EditText
mNoteEditor = (EditText) findViewById(R.id.note_edit_view);
+ // 通过ID查询并持有编辑板(可能是一个ScrollView)
mNoteEditorPanel = findViewById(R.id.sv_note_edit);
+ // 通过ID查询并持有背景颜色选择器
mNoteBgColorSelector = findViewById(R.id.note_bg_color_selector);
+ // 对背景选择器中的按钮进行遍历设置监听
for (int id : sBgSelectorBtnsMap.keySet()) {
ImageView iv = (ImageView) findViewById(id);
iv.setOnClickListener(this);
}
+ // 通过ID查询并持有字体大小选择器,同时设置点击监听
mFontSizeSelector = findViewById(R.id.font_size_selector);
for (int id : sFontSizeBtnsMap.keySet()) {
View view = findViewById(id);
view.setOnClickListener(this);
- };
+ }
+ // 获取SharedPreferences实例用来读取或存储程序的配置信息
mSharedPrefs = PreferenceManager.getDefaultSharedPreferences(this);
+ // 获取存储在SharedPreferences中的字体大小的ID
mFontSizeId = mSharedPrefs.getInt(PREFERENCE_FONT_SIZE, ResourceParser.BG_DEFAULT_FONT_SIZE);
/**
- * HACKME: Fix bug of store the resource id in shared preference.
- * The id may larger than the length of resources, in this case,
- * return the {@link ResourceParser#BG_DEFAULT_FONT_SIZE}
+ * HACKME: 修复在SharedPreferences中存储资源ID导致的bug。
+ * 如果字体大小的ID超出了资源的长度,则使用默认字体大小。
*/
if(mFontSizeId >= TextAppearanceResources.getResourcesSize()) {
+ // 如果ID过大,设置为默认的字体大小ID
mFontSizeId = ResourceParser.BG_DEFAULT_FONT_SIZE;
}
+ // 通过ID查询并持有编辑列表的LinearLayout
mEditTextList = (LinearLayout) findViewById(R.id.note_edit_list);
}
@Override
+ /**
+ * 当Activity暂停时调用的方法。
+ */
protected void onPause() {
- super.onPause();
- if(saveNote()) {
+ super.onPause(); // 调用父类的onPause()方法来完成一些系统级别的处理
+ if(saveNote()) { // 尝试保存笔记,如果笔记成功保存
+ // 使用Log.d()输出调试信息,记录笔记已保存,并输出笔记内容的长度
Log.d(TAG, "Note data was saved with length:" + mWorkingNote.getContent().length());
}
+ // 清除当前的设置状态
clearSettingState();
}
+ /**
+ * 更新小部件的方法。
+ */
private void updateWidget() {
+ // 创建一个广播意图,用于通知应用小部件需要更新
Intent intent = new Intent(AppWidgetManager.ACTION_APPWIDGET_UPDATE);
+ // 根据工作中的笔记小部件的类型来设置要通知更新的小部件类
if (mWorkingNote.getWidgetType() == Notes.TYPE_WIDGET_2X) {
- intent.setClass(this, NoteWidgetProvider_2x.class);
+ intent.setClass(this, NoteWidgetProvider_2x.class); // 设置为2x小部件提供器
} else if (mWorkingNote.getWidgetType() == Notes.TYPE_WIDGET_4X) {
- intent.setClass(this, NoteWidgetProvider_4x.class);
+ intent.setClass(this, NoteWidgetProvider_4x.class); // 设置为4x小部件提供器
} else {
+ // 如果小部件类型不受支持,输出错误信息并退出方法
Log.e(TAG, "Unspported widget type");
return;
}
-
+ // 向意图中添加小部件ID,这将告知小部件提供器哪个小部件需要更新
intent.putExtra(AppWidgetManager.EXTRA_APPWIDGET_IDS, new int[] {
- mWorkingNote.getWidgetId()
+ mWorkingNote.getWidgetId()
});
-
+ // 发送广播,通知系统小部件需要更新
sendBroadcast(intent);
+ // 设置返回结果为RESULT_OK,表示更新已成功
setResult(RESULT_OK, intent);
}
+ /**
+ * 当点击事件发生时调用的方法。
+ *
+ * @param v 触发点击事件的视图(View)。
+ */
public void onClick(View v) {
- int id = v.getId();
+ int id = v.getId(); // 获取触发点击事件的视图的ID
if (id == R.id.btn_set_bg_color) {
- mNoteBgColorSelector.setVisibility(View.VISIBLE);
+ // 如果点击的是设置背景颜色按钮
+ mNoteBgColorSelector.setVisibility(View.VISIBLE); // 显示背景颜色选择器
+ // 显示当前选择的背景颜色的视图
findViewById(sBgSelectorSelectionMap.get(mWorkingNote.getBgColorId())).setVisibility(
View.VISIBLE);
} else if (sBgSelectorBtnsMap.containsKey(id)) {
+ // 如果点击的是某个背景颜色的按钮
+ // 隐藏当前选择的背景颜色的视图
findViewById(sBgSelectorSelectionMap.get(mWorkingNote.getBgColorId())).setVisibility(
View.GONE);
- mWorkingNote.setBgColorId(sBgSelectorBtnsMap.get(id));
- mNoteBgColorSelector.setVisibility(View.GONE);
+ mWorkingNote.setBgColorId(sBgSelectorBtnsMap.get(id)); // 更新笔记的背景颜色ID
+ mNoteBgColorSelector.setVisibility(View.GONE); // 隐藏背景颜色选择器
} else if (sFontSizeBtnsMap.containsKey(id)) {
+ // 如果点击的是某个字体大小的按钮
+ // 隐藏当前选择的字体大小的视图
findViewById(sFontSelectorSelectionMap.get(mFontSizeId)).setVisibility(View.GONE);
- mFontSizeId = sFontSizeBtnsMap.get(id);
+ mFontSizeId = sFontSizeBtnsMap.get(id); // 更新字体大小ID
+ // 保存字体大小ID到SharedPreferences
mSharedPrefs.edit().putInt(PREFERENCE_FONT_SIZE, mFontSizeId).commit();
+ // 显示新选择的字体大小的视图
findViewById(sFontSelectorSelectionMap.get(mFontSizeId)).setVisibility(View.VISIBLE);
+ // 如果当前笔记处于清单模式
if (mWorkingNote.getCheckListMode() == TextNote.MODE_CHECK_LIST) {
+ // 获取工作中的笔记文本
getWorkingText();
+ // 更新列表模式,传入笔记内容
switchToListMode(mWorkingNote.getContent());
} else {
+ // 设置笔记编辑器的字体外观,这将改变笔记的字体大小
mNoteEditor.setTextAppearance(this,
TextAppearanceResources.getTexAppearanceResource(mFontSizeId));
}
+ // 隐藏字体大小选择器
mFontSizeSelector.setVisibility(View.GONE);
}
}
-
@Override
+ /**
+ * 处理Android设备上的后退按钮被点击时的行为。
+ */
public void onBackPressed() {
+ // 尝试清除设置状态
if(clearSettingState()) {
+ // 如果清除了设置状态,提前结束方法,不再执行后面的代码
return;
}
+ // 在退出前,尝试保存笔记
saveNote();
+ // 调用父类的onBackPressed(),执行系统默认的后退操作
super.onBackPressed();
}
+ /**
+ * 尝试清除设置状态,如果设置选择器是可见的,就让它们不可见,并返回true。
+ *
+ * @return 返回一个布尔值,表示是否有设置状态被清除。
+ */
private boolean clearSettingState() {
+ // 检查背景颜色选择器是否可见
if (mNoteBgColorSelector.getVisibility() == View.VISIBLE) {
+ // 如果可见,则设为不可见
mNoteBgColorSelector.setVisibility(View.GONE);
+ // 返回true,表示清除了设置状态
return true;
+ // 检查字体大小选择器是否可见
} else if (mFontSizeSelector.getVisibility() == View.VISIBLE) {
+ // 如果可见,则设为不可见
mFontSizeSelector.setVisibility(View.GONE);
+ // 返回true,同样表示清除了设置状态
return true;
}
+ // 如果没有设置状态需要清除,返回false
return false;
}
+ /**
+ * 当背景颜色改变时调用的方法,以更新界面。
+ */
public void onBackgroundColorChanged() {
+ // 获取当前背景颜色的ID,然后设置对应的选择器为可见
findViewById(sBgSelectorSelectionMap.get(mWorkingNote.getBgColorId())).setVisibility(
View.VISIBLE);
+ // 更新笔记编辑面板的背景为当前选择的颜色资源
mNoteEditorPanel.setBackgroundResource(mWorkingNote.getBgColorResId());
+ // 更新标题栏的背景为当前选择的颜色资源
mHeadViewPanel.setBackgroundResource(mWorkingNote.getTitleBgResId());
}
@Override
+ /**
+ * 准备选项菜单(Action Bar菜单)的方法,在每次显示菜单之前都会调用。
+ *
+ * @param menu 选项菜单
+ * @return 如果菜单应该显示,则返回true;否则返回false。
+ */
public boolean onPrepareOptionsMenu(Menu menu) {
+ // 如果当前Activity正在结束,则不进行操作,直接返回true
if (isFinishing()) {
return true;
}
+ // 清除设置状态,如果存在打开的设置选项,会被隐藏
clearSettingState();
+ // 清除菜单当前的所有项,准备填充新的菜单项
menu.clear();
+ // 确定是要加载哪种菜单资源,这取决于当前笔记的文件夹ID是否为通话记录文件夹
if (mWorkingNote.getFolderId() == Notes.ID_CALL_RECORD_FOLDER) {
+ // 如果笔记是电话记录文件夹中的笔记,加载特定于电话笔记的菜单资源
getMenuInflater().inflate(R.menu.call_note_edit, menu);
} else {
+ // 否则是普通笔记,加载普通编辑笔记的菜单资源
getMenuInflater().inflate(R.menu.note_edit, menu);
}
+ // 根据笔记的清单模式状态,更新清单模式菜单项的标题
if (mWorkingNote.getCheckListMode() == TextNote.MODE_CHECK_LIST) {
+ // 如果是清单模式,则将菜单项文本设置为“普通模式”
menu.findItem(R.id.menu_list_mode).setTitle(R.string.menu_normal_mode);
} else {
+ // 否则设置为“清单模式”
menu.findItem(R.id.menu_list_mode).setTitle(R.string.menu_list_mode);
}
+ // 根据笔记是否有闹钟提醒,显示或隐藏相关菜单项
if (mWorkingNote.hasClockAlert()) {
+ // 如果有闹钟提醒,隐藏设置提醒的菜单项
menu.findItem(R.id.menu_alert).setVisible(false);
} else {
+ // 如果没有闹钟提醒,隐藏删除提醒的菜单项
menu.findItem(R.id.menu_delete_remind).setVisible(false);
}
+ // 返回true表示菜单应显示
return true;
}
@Override
+ /**
+ * 处理选项菜单项的点击事件。
+ *
+ * @param item 被点击的菜单项
+ * @return 如果点击事件被处理,则返回true。
+ */
public boolean onOptionsItemSelected(MenuItem item) {
+ // 获取被点击菜单项的ID
int itemId = item.getItemId();
+ // 根据菜单项ID进行判断,执行相应的操作
if (itemId == R.id.menu_new_note) {
+ // 创建新笔记
createNewNote();
} else if (itemId == R.id.menu_delete) {
+ // 创建一个对话框来确认删除操作
AlertDialog.Builder builder = new AlertDialog.Builder(this);
builder.setTitle(getString(R.string.alert_title_delete));
builder.setIcon(android.R.drawable.ic_dialog_alert);
builder.setMessage(getString(R.string.alert_message_delete_note));
+ // 设置“确定”按钮及其点击事件
builder.setPositiveButton(android.R.string.ok,
new DialogInterface.OnClickListener() {
public void onClick(DialogInterface dialog, int which) {
+ // 删除当前笔记并退出当前界面
deleteCurrentNote();
finish();
}
});
+ // 设置“取消”按钮,点击时不进行任何操作
builder.setNegativeButton(android.R.string.cancel, null);
+ // 显示对话框
builder.show();
} else if (itemId == R.id.menu_font_size) {
+ // 显示字体大小选择器
mFontSizeSelector.setVisibility(View.VISIBLE);
+ // 设置当前选中的字体大小为可见
findViewById(sFontSelectorSelectionMap.get(mFontSizeId)).setVisibility(View.VISIBLE);
} else if (itemId == R.id.menu_list_mode) {
+ // 切换笔记的清单模式
mWorkingNote.setCheckListMode(mWorkingNote.getCheckListMode() == 0 ?
TextNote.MODE_CHECK_LIST : 0);
} else if (itemId == R.id.menu_share) {
+ // 获取当前笔记文本并共享
getWorkingText();
sendTo(this, mWorkingNote.getContent());
} else if (itemId == R.id.menu_send_to_desktop) {
+ // 发送当前笔记到桌面
sendToDesktop();
} else if (itemId == R.id.menu_alert) {
+ // 设置提醒
setReminder();
} else if (itemId == R.id.menu_delete_remind) {
+ // 删除设置的提醒
mWorkingNote.setAlertDate(0, false);
} else if (itemId == R.id.menu_recover) {
+ // 恢复笔记
recoverNotes();
+ } else if (itemId == R.id.note_font) {
+ // 显示字体选择对话框
+ showSingleAlertDialog();
}
+ // 返回true表示事件已经处理完毕
return true;
}
+ /**
+ * 设置提醒时间的方法。它创建了一个日期时间选择对话框供用户选择提醒时间。
+ */
private void setReminder() {
+ // 创建一个日期时间选择对话框实例,初始化为当前系统时间
DateTimePickerDialog d = new DateTimePickerDialog(this, System.currentTimeMillis());
+ // 设置日期时间选择后的回调监听器
d.setOnDateTimeSetListener(new OnDateTimeSetListener() {
public void OnDateTimeSet(AlertDialog dialog, long date) {
- mWorkingNote.setAlertDate(date , true);
+ // 当用户设置了一个日期和时间后,调用该方法更新笔记的提醒时间
+ mWorkingNote.setAlertDate(date, true);
}
});
+ // 显示日期时间选择对话框
d.show();
}
/**
* Share note to apps that support {@link Intent#ACTION_SEND} action
* and {@text/plain} type
+ *
+ * 将笔记内容通过支持发送动作(Intent.ACTION_SEND)并且类型为纯文本(text/plain)的应用分享出去。
+ *
+ * @param context 上下文,用于启动分享的Intent。
+ * @param info 要分享的笔记的内容。
*/
private void sendTo(Context context, String info) {
+ // 创建分享数据的Intent
Intent intent = new Intent(Intent.ACTION_SEND);
+ // 附加要分享的文本信息
intent.putExtra(Intent.EXTRA_TEXT, info);
+ // 设置分享数据的类型为文本
intent.setType("text/plain");
+ // 启动分享操作
context.startActivity(intent);
}
+ /**
+ * 创建新笔记的方法。
+ */
private void createNewNote() {
- // Firstly, save current editing notes
+ // 先保存当前正在编辑的笔记
saveNote();
- // For safety, start a new NoteEditActivity
+ // 出于安全原因,启动一个新的NoteEditActivity
finish();
+ // 创建一个到NoteEditActivity的意图
Intent intent = new Intent(this, NoteEditActivity.class);
+ // 设置动作为插入或者编辑
intent.setAction(Intent.ACTION_INSERT_OR_EDIT);
+ // 附加当前笔记的文件夹ID信息
intent.putExtra(Notes.INTENT_EXTRA_FOLDER_ID, mWorkingNote.getFolderId());
+ // 启动新的活动
startActivity(intent);
}
diff --git a/src/Notes-master3/app/src/main/java/net/micode/notes/ui/NoteEditText.java b/src/Notes-master3/app/src/main/java/net/micode/notes/ui/NoteEditText.java
index 2afe2a8..7e18f7a 100644
--- a/src/Notes-master3/app/src/main/java/net/micode/notes/ui/NoteEditText.java
+++ b/src/Notes-master3/app/src/main/java/net/micode/notes/ui/NoteEditText.java
@@ -37,6 +37,9 @@ import net.micode.notes.R;
import java.util.HashMap;
import java.util.Map;
+/**
+ * 实现便签编辑活动
+ */
public class NoteEditText extends EditText {
private static final String TAG = "NoteEditText";
private int mIndex;
diff --git a/src/Notes-master3/app/src/main/java/net/micode/notes/ui/NoteItemData.java b/src/Notes-master3/app/src/main/java/net/micode/notes/ui/NoteItemData.java
index 0f5a878..391e6ba 100644
--- a/src/Notes-master3/app/src/main/java/net/micode/notes/ui/NoteItemData.java
+++ b/src/Notes-master3/app/src/main/java/net/micode/notes/ui/NoteItemData.java
@@ -1,19 +1,3 @@
-/*
- * Copyright (c) 2010-2011, The MiCode Open Source Community (www.micode.net)
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
package net.micode.notes.ui;
import android.content.Context;
@@ -25,21 +9,23 @@ import net.micode.notes.data.Notes;
import net.micode.notes.data.Notes.NoteColumns;
import net.micode.notes.tool.DataUtils;
-
+/**
+ * 便签项数据
+ */
public class NoteItemData {
static final String [] PROJECTION = new String [] {
- NoteColumns.ID,
- NoteColumns.ALERTED_DATE,
- NoteColumns.BG_COLOR_ID,
- NoteColumns.CREATED_DATE,
- NoteColumns.HAS_ATTACHMENT,
- NoteColumns.MODIFIED_DATE,
- NoteColumns.NOTES_COUNT,
- NoteColumns.PARENT_ID,
- NoteColumns.SNIPPET,
- NoteColumns.TYPE,
- NoteColumns.WIDGET_ID,
- NoteColumns.WIDGET_TYPE,
+ NoteColumns.ID,
+ NoteColumns.ALERTED_DATE,
+ NoteColumns.BG_COLOR_ID,
+ NoteColumns.CREATED_DATE,
+ NoteColumns.HAS_ATTACHMENT,
+ NoteColumns.MODIFIED_DATE,
+ NoteColumns.NOTES_COUNT,
+ NoteColumns.PARENT_ID,
+ NoteColumns.SNIPPET,
+ NoteColumns.TYPE,
+ NoteColumns.WIDGET_ID,
+ NoteColumns.WIDGET_TYPE,
};
private static final int ID_COLUMN = 0;
@@ -75,8 +61,9 @@ public class NoteItemData {
private boolean mIsOnlyOneItem;
private boolean mIsOneNoteFollowingFolder;
private boolean mIsMultiNotesFollowingFolder;
-
- public NoteItemData(Context context, Cursor cursor) {
+ //初始化NoteItemData,主要利用光标cursor获取的东西
+ public NoteItemData(Context context, Cursor cursor) {
+ //getxxx为转换格式
mId = cursor.getLong(ID_COLUMN);
mAlertDate = cursor.getLong(ALERTED_DATE_COLUMN);
mBgColorId = cursor.getInt(BG_COLOR_ID_COLUMN);
@@ -92,10 +79,11 @@ public class NoteItemData {
mWidgetId = cursor.getInt(WIDGET_ID_COLUMN);
mWidgetType = cursor.getInt(WIDGET_TYPE_COLUMN);
+ //初始化电话号码的信息
mPhoneNumber = "";
if (mParentId == Notes.ID_CALL_RECORD_FOLDER) {
mPhoneNumber = DataUtils.getCallNumberByNoteId(context.getContentResolver(), mId);
- if (!TextUtils.isEmpty(mPhoneNumber)) {
+ if (!TextUtils.isEmpty(mPhoneNumber)) {//mphonenumber里有符合字符串,则用contart功能连接
mName = Contact.getContact(context, mPhoneNumber);
if (mName == null) {
mName = mPhoneNumber;
@@ -108,32 +96,35 @@ public class NoteItemData {
}
checkPostion(cursor);
}
-
+ ///根据鼠标的位置设置标记,和位置
private void checkPostion(Cursor cursor) {
+ //初始化几个标记,cursor具体功能笔记中已提到,不一一叙述
mIsLastItem = cursor.isLast() ? true : false;
mIsFirstItem = cursor.isFirst() ? true : false;
mIsOnlyOneItem = (cursor.getCount() == 1);
+ //初始化“多重子文件”“单一子文件”2个标记
mIsMultiNotesFollowingFolder = false;
mIsOneNoteFollowingFolder = false;
- if (mType == Notes.TYPE_NOTE && !mIsFirstItem) {
+ //主要是设置上诉2标记
+ if (mType == Notes.TYPE_NOTE && !mIsFirstItem) {//若是note格式并且不是第一个元素
int position = cursor.getPosition();
- if (cursor.moveToPrevious()) {
+ if (cursor.moveToPrevious()) {//获取光标位置后看上一行
if (cursor.getInt(TYPE_COLUMN) == Notes.TYPE_FOLDER
- || cursor.getInt(TYPE_COLUMN) == Notes.TYPE_SYSTEM) {
+ || cursor.getInt(TYPE_COLUMN) == Notes.TYPE_SYSTEM) {//若光标满足系统或note格式
if (cursor.getCount() > (position + 1)) {
- mIsMultiNotesFollowingFolder = true;
+ mIsMultiNotesFollowingFolder = true;//若是数据行数大于但前位置+1则设置成正确
} else {
- mIsOneNoteFollowingFolder = true;
+ mIsOneNoteFollowingFolder = true;//否则单一文件夹标记为true
}
}
- if (!cursor.moveToNext()) {
+ if (!cursor.moveToNext()) {//若不能再往下走则报错
throw new IllegalStateException("cursor move to previous but can't move back");
}
}
}
}
-
+ ///以下都是获取标记
public boolean isOneFollowingFolder() {
return mIsOneNoteFollowingFolder;
}
@@ -214,6 +205,7 @@ public class NoteItemData {
return (mAlertDate > 0);
}
+ //若数据父id为保存至文件夹模式的id且满足电话号码单元不为空,则isCallRecord为true
public boolean isCallRecord() {
return (mParentId == Notes.ID_CALL_RECORD_FOLDER && !TextUtils.isEmpty(mPhoneNumber));
}
@@ -221,4 +213,4 @@ public class NoteItemData {
public static int getNoteType(Cursor cursor) {
return cursor.getInt(TYPE_COLUMN);
}
-}
+}
\ No newline at end of file
diff --git a/src/Notes-master3/app/src/main/java/net/micode/notes/ui/NotesListActivity.java b/src/Notes-master3/app/src/main/java/net/micode/notes/ui/NotesListActivity.java
index 1d4561a..ebc3ba6 100644
--- a/src/Notes-master3/app/src/main/java/net/micode/notes/ui/NotesListActivity.java
+++ b/src/Notes-master3/app/src/main/java/net/micode/notes/ui/NotesListActivity.java
@@ -143,66 +143,86 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
- setContentView(R.layout.note_list);
- getWindow().setBackgroundDrawableResource(R.drawable.beauty);
- initResources();
+ setContentView(R.layout.note_list); // 设置当前活动的布局文件
+ getWindow().setBackgroundDrawableResource(R.drawable.beauty); // 设置当前活动窗口的背景资源
+ initResources(); // 调用了一个自定义的方法来初始化资源
/**
- * Insert an introduction when user firstly use this application
+ * Insert an introduction when user firstly uses this application
*/
- setAppInfoFromRawRes();
+ setAppInfoFromRawRes(); // 从Raw资源目录导入应用信息,例如当用户首次使用应用时显示一个介绍
}
@Override
protected void onActivityResult(int requestCode, int resultCode, Intent data) {
if (resultCode == RESULT_OK
&& (requestCode == REQUEST_CODE_OPEN_NODE || requestCode == REQUEST_CODE_NEW_NODE)) {
- mNotesListAdapter.changeCursor(null);
+ mNotesListAdapter.changeCursor(null); // 当返回结果为OK且请求码为打开或新建笔记时,更新列表适配器
} else {
- super.onActivityResult(requestCode, resultCode, data);
+ super.onActivityResult(requestCode, resultCode, data); // 否则,调用超类的onActivityResult方法
}
}
private void setAppInfoFromRawRes() {
+ // 获取默认的SharedPreferences实例,这通常用于存储应用的偏好设置。
SharedPreferences sp = PreferenceManager.getDefaultSharedPreferences(this);
+
+ // 检查是否已添加过引导介绍,如果没有,则继续执行。
if (!sp.getBoolean(PREFERENCE_ADD_INTRODUCTION, false)) {
+ // 使用StringBuilder来存储文件的内容。
StringBuilder sb = new StringBuilder();
+ // 初始化InputStream为null,用于后续读取Raw资源文件。
InputStream in = null;
try {
- in = getResources().openRawResource(R.raw.introduction);
+ // 打开Raw资源文件,准备读取介绍内容。
+ in = getResources().openRawResource(R.raw.introduction);
+ // 确保资源文件存在。
if (in != null) {
+ // 创建InputStreamReader,用于读取InputStream。
InputStreamReader isr = new InputStreamReader(in);
+ // 创建BufferedReader,提供读取文本文件的效率。
BufferedReader br = new BufferedReader(isr);
- char [] buf = new char[1024];
+ // 创建一个字符数组作为缓冲区。
+ char[] buf = new char[1024];
int len = 0;
+ // 读取文件内容,直到文件结束。
while ((len = br.read(buf)) > 0) {
+ // 将读取的内容追加到StringBuilder。
sb.append(buf, 0, len);
}
} else {
+ // 文件没有正确打开,记录错误并返回。
Log.e(TAG, "Read introduction file error");
return;
}
} catch (IOException e) {
+ // 发生IOException,打印堆栈跟踪并返回。
e.printStackTrace();
return;
} finally {
- if(in != null) {
+ // 最终块确保InputStream关闭,以避免内存泄漏。
+ if (in != null) {
try {
in.close();
} catch (IOException e) {
- // TODO Auto-generated catch block
+ // 如果关闭InputStream时发生错误,也打印堆栈跟踪。
e.printStackTrace();
}
}
}
+ // 创建一个空的工作笔记,准备插入到应用中。
WorkingNote note = WorkingNote.createEmptyNote(this, Notes.ID_ROOT_FOLDER,
AppWidgetManager.INVALID_APPWIDGET_ID, Notes.TYPE_WIDGET_INVALIDE,
ResourceParser.RED);
+ // 设置该笔记的文本内容为StringBuilder中的字符串。
note.setWorkingText(sb.toString());
+ // 尝试保存笔记并根据返回值判断是否成功。
if (note.saveNote()) {
+ // 如果笔记成功保存,则在SharedPreferences中标记已添加引导介绍。
sp.edit().putBoolean(PREFERENCE_ADD_INTRODUCTION, true).commit();
} else {
+ // 如果保存笔记失败,记录错误并返回。
Log.e(TAG, "Save introduction note error");
return;
}
@@ -211,41 +231,76 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt
@Override
protected void onStart() {
- super.onStart();
- startAsyncNotesListQuery();
+ super.onStart(); // 调用 Activity 超类的 onStart 方法以正确设置生命周期。
+ startAsyncNotesListQuery(); // 启动异步查询来填充笔记列表的数据。
}
private void initResources() {
+ // 获取 Activity 的 ContentResolver 实例,它用于与内容提供者交互。
mContentResolver = this.getContentResolver();
+
+ // 创建一个 BackgroundQueryHandler,这个自定义的类可能是用来在后台线程执行数据库查询,不阻塞UI线程。
mBackgroundQueryHandler = new BackgroundQueryHandler(this.getContentResolver());
+
+ // 设置当前文件夹的ID为根文件夹ID。
mCurrentFolderId = Notes.ID_ROOT_FOLDER;
+
+ // 查找 ListView 的实例,并将其赋给 mNotesListView。
mNotesListView = (ListView) findViewById(R.id.notes_list);
+
+ // 为 ListView 添加 footer,这通常用于显示加载更多或者其他未指定内容。
mNotesListView.addFooterView(LayoutInflater.from(this).inflate(R.layout.note_list_footer, null),
null, false);
+
+ // 设置 Item 的点击事件监听器,OnListItemClickListener 是一个自定义的监听器,处理列表项点击事件。
mNotesListView.setOnItemClickListener(new OnListItemClickListener());
+
+ // 设置 Item 长按的事件监听器,当前类(可能是一个 Activity)被设置为处理长按事件的监听器。
mNotesListView.setOnItemLongClickListener(this);
+
+ // 初始化并设置 ListView 的适配器,NotesListAdapter 是一个自定义的适配器,用来管理和显示笔记条目。
mNotesListAdapter = new NotesListAdapter(this);
mNotesListView.setAdapter(mNotesListAdapter);
+
+ // 查找添加新笔记的 Button 并设置点击事件监听器,点击时触发添加新笔记的逻辑。
mAddNewNote = (Button) findViewById(R.id.btn_new_note);
mAddNewNote.setOnClickListener(this);
+
+ // 为添加新笔记按钮设置触摸事件监听器,可能是为了处理特定的用户交互。
mAddNewNote.setOnTouchListener(new NewNoteOnTouchListener());
+
+ // 初始化几个用于处理触摸事件的变量。
mDispatch = false;
mDispatchY = 0;
mOriginY = 0;
+
+ // 查找并设置标题栏的 TextView 控件。
mTitleBar = (TextView) findViewById(R.id.tv_title_bar);
+
+ // 设置一个状态变量来表示当前编辑模式,此处设置为 NOTE_LIST 表示用户正在查看笔记列表。
mState = ListEditState.NOTE_LIST;
+
+ // 创建一个 ModeCallback 实例,这个类可能是用来处理上下文操作模式(如行动模式或文本编辑模式)的回调。
mModeCallBack = new ModeCallback();
}
+ /**
+ * 一个内部类,用于实现多选模式下的事件监听和菜单管理。
+ */
private class ModeCallback implements ListView.MultiChoiceModeListener, OnMenuItemClickListener {
- private DropdownMenu mDropDownMenu;
- private ActionMode mActionMode;
- private MenuItem mMoveMenu;
+ private DropdownMenu mDropDownMenu; // 下拉菜单实例。
+ private ActionMode mActionMode; // 行动模式(ActionMode)实例,用于在多选模式下展现操作菜单。
+ private MenuItem mMoveMenu; // 移动菜单项的实例。
+ /**
+ * 创建ActionMode时的回调,用于初始化菜单。
+ */
public boolean onCreateActionMode(ActionMode mode, Menu menu) {
- getMenuInflater().inflate(R.menu.note_list_options, menu);
- menu.findItem(R.id.delete).setOnMenuItemClickListener(this);
- mMoveMenu = menu.findItem(R.id.move);
+ getMenuInflater().inflate(R.menu.note_list_options, menu); // 从资源文件加载菜单布局。
+ menu.findItem(R.id.delete).setOnMenuItemClickListener(this); // 设置“删除”菜单项的点击监听器。
+ mMoveMenu = menu.findItem(R.id.move); // 获取“移动”菜单项。
+
+ // 根据当前焦点笔记的文件夹ID和用户文件夹数量决定是否显示“移动”菜单项。
if (mFocusNoteDataItem.getParentId() == Notes.ID_CALL_RECORD_FOLDER
|| DataUtils.getUserFolderCount(mContentResolver) == 0) {
mMoveMenu.setVisible(false);
@@ -253,28 +308,33 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt
mMoveMenu.setVisible(true);
mMoveMenu.setOnMenuItemClickListener(this);
}
- mActionMode = mode;
- mNotesListAdapter.setChoiceMode(true);
- mNotesListView.setLongClickable(false);
- mAddNewNote.setVisibility(View.GONE);
+ mActionMode = mode; // 设置ActionMode实例。
+ mNotesListAdapter.setChoiceMode(true); // 设置适配器的选择模式。
+ mNotesListView.setLongClickable(false); // 设置ListView不再响应长按事件。
+ mAddNewNote.setVisibility(View.GONE); // 隐藏添加新笔记按钮。
+
+ // 自定义下拉菜单布局设置给行动模式的自定义视图。
View customView = LayoutInflater.from(NotesListActivity.this).inflate(
R.layout.note_list_dropdown_menu, null);
mode.setCustomView(customView);
mDropDownMenu = new DropdownMenu(NotesListActivity.this,
(Button) customView.findViewById(R.id.selection_menu),
- R.menu.note_list_dropdown);
+ R.menu.note_list_dropdown); // 创建下拉菜单。
mDropDownMenu.setOnDropdownMenuItemClickListener(new PopupMenu.OnMenuItemClickListener(){
public boolean onMenuItemClick(MenuItem item) {
+ // 选择或取消选择所有项。
mNotesListAdapter.selectAll(!mNotesListAdapter.isAllSelected());
- updateMenu();
+ updateMenu(); // 更新菜单。
return true;
}
-
});
return true;
}
+ /**
+ * 更新选择菜单的标题和项目,将其与列表适配器的选择状态同步。
+ */
private void updateMenu() {
int selectedCount = mNotesListAdapter.getSelectedCount();
// Update dropdown menu
@@ -292,33 +352,48 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt
}
}
+ // 在ActionMode的准备阶段可能需要做一些菜单更新操作。
public boolean onPrepareActionMode(ActionMode mode, Menu menu) {
// TODO Auto-generated method stub
return false;
}
+ // 当多选菜单中一项被点击时的事件处理。
public boolean onActionItemClicked(ActionMode mode, MenuItem item) {
// TODO Auto-generated method stub
return false;
}
+ /**
+ * 当ActionMode被销毁时的回调,用于重置状态。
+ */
public void onDestroyActionMode(ActionMode mode) {
- mNotesListAdapter.setChoiceMode(false);
- mNotesListView.setLongClickable(true);
- mAddNewNote.setVisibility(View.VISIBLE);
+ mNotesListAdapter.setChoiceMode(false); // 重置适配器的选择模式。
+ mNotesListView.setLongClickable(true); // 恢复ListView的长按响应。
+ mAddNewNote.setVisibility(View.VISIBLE); // 显示添加新笔记按钮。
}
+ /**
+ * 结束当前的ActionMode。
+ */
public void finishActionMode() {
mActionMode.finish();
}
+ /**
+ * 当列表项的选中状态改变时的回调,更新菜单和适配器状态。
+ */
public void onItemCheckedStateChanged(ActionMode mode, int position, long id,
- boolean checked) {
- mNotesListAdapter.setCheckedItem(position, checked);
- updateMenu();
+ boolean checked) {
+ mNotesListAdapter.setCheckedItem(position, checked); // 更新适配器中项目的选中状态。
+ updateMenu(); // 更新菜单显示。
}
+ /**
+ * 当多选菜单项被点击时的事件处理。
+ */
public boolean onMenuItemClick(MenuItem item) {
+ // 如果未选择任何项,则显示一个提示信息,并结束事件处理。
if (mNotesListAdapter.getSelectedCount() == 0) {
Toast.makeText(NotesListActivity.this, getString(R.string.menu_select_none),
Toast.LENGTH_SHORT).show();
@@ -327,6 +402,7 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt
int itemId = item.getItemId();
if (itemId == R.id.delete) {
+ // 如果点击的是“删除”,则弹出确认删除的提示对话框。
AlertDialog.Builder builder = new AlertDialog.Builder(NotesListActivity.this);
builder.setTitle(getString(R.string.alert_title_delete));
builder.setIcon(android.R.drawable.ic_dialog_alert);
@@ -336,14 +412,16 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt
new DialogInterface.OnClickListener() {
public void onClick(DialogInterface dialog,
int which) {
- batchDelete();
+ batchDelete(); // 触发批量删除逻辑。
}
});
builder.setNegativeButton(android.R.string.cancel, null);
builder.show();
} else if (itemId == R.id.move) {
+ // 如果点击的是“移动”,则启动目标文件夹的查询。
startQueryDestinationFolders();
} else {
+ // 对于其他情况,不作处理并返回false。
return false;
}
return true;
@@ -479,18 +557,35 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt
);
}
+ /**
+ * BackgroundQueryHandler 是一个自定义的异步查询处理者,衍生自 AsyncQueryHandler,用于进行数据库查询操作而不影响主 UI 线程。
+ */
private final class BackgroundQueryHandler extends AsyncQueryHandler {
+ /**
+ * BackgroundQueryHandler 的构造函数。
+ * @param contentResolver 传递给基类的 ContentResolver 对象,用于执行查询操作。
+ */
public BackgroundQueryHandler(ContentResolver contentResolver) {
super(contentResolver);
}
+ /**
+ * 当后台查询完成时,该方法会被回调。
+ *
+ * @param token 一个用于标识查询的整型标记,便于区分是哪个查询完成。
+ * @param cookie 传递给查询的附加对象,可以用来传递额外的信息。
+ * @param cursor 查询返回的 Cursor 对象,包含了查询结果的数据。
+ */
@Override
protected void onQueryComplete(int token, Object cookie, Cursor cursor) {
switch (token) {
case FOLDER_NOTE_LIST_QUERY_TOKEN:
+ // 若是笔记列表查询完成,更新笔记列表适配器的光标。
mNotesListAdapter.changeCursor(cursor);
break;
case FOLDER_LIST_QUERY_TOKEN:
+ // 若是文件夹列表查询完成,根据查询结果显示文件夹列表弹窗,
+ // 或者在查询失败时输出错误日志。
if (cursor != null && cursor.getCount() > 0) {
showFolderListMenu(cursor);
} else {
@@ -498,17 +593,26 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt
}
break;
default:
+ // 对于其他的查询标记,不做处理。
return;
}
}
}
+ /**
+ * 显示用于选择目标文件夹的弹窗菜单。
+ *
+ * @param cursor 包含文件夹数据的光标。
+ */
private void showFolderListMenu(Cursor cursor) {
AlertDialog.Builder builder = new AlertDialog.Builder(NotesListActivity.this);
- builder.setTitle(R.string.menu_title_select_folder);
+ builder.setTitle(R.string.menu_title_select_folder); // 设置弹窗标题。
+
+ // 使用适配器来显示文件夹列表。
final FoldersListAdapter adapter = new FoldersListAdapter(this, cursor);
+ // 当列表中的项被点击时,将选择的笔记批量移动到对应的文件夹,
+ // 并向用户显示一个短暂的提示消息,然后结束 ActionMode。
builder.setAdapter(adapter, new DialogInterface.OnClickListener() {
-
public void onClick(DialogInterface dialog, int which) {
DataUtils.batchMoveToFolder(mContentResolver,
mNotesListAdapter.getSelectedItemIds(), adapter.getItemId(which));
@@ -518,10 +622,10 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt
mNotesListAdapter.getSelectedCount(),
adapter.getFolderName(NotesListActivity.this, which)),
Toast.LENGTH_SHORT).show();
- mModeCallBack.finishActionMode();
+ mModeCallBack.finishActionMode(); // 结束行动模式。
}
});
- builder.show();
+ builder.show(); // 显示弹窗菜单。
}
// 创建新便签的方法
diff --git a/src/Notes-master3/app/src/main/java/net/micode/notes/ui/NotesListAdapter.java b/src/Notes-master3/app/src/main/java/net/micode/notes/ui/NotesListAdapter.java
index 51c9cb9..b165769 100644
--- a/src/Notes-master3/app/src/main/java/net/micode/notes/ui/NotesListAdapter.java
+++ b/src/Notes-master3/app/src/main/java/net/micode/notes/ui/NotesListAdapter.java
@@ -1,19 +1,3 @@
-/*
- * Copyright (c) 2010-2011, The MiCode Open Source Community (www.micode.net)
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
package net.micode.notes.ui;
import android.content.Context;
@@ -23,6 +7,7 @@ import android.view.View;
import android.view.ViewGroup;
import android.widget.CursorAdapter;
+
import net.micode.notes.data.Notes;
import java.util.Collection;
@@ -31,55 +16,94 @@ import java.util.HashSet;
import java.util.Iterator;
+/*
+ * 功能:直译为便签表连接器,继承了CursorAdapter,它为cursor和ListView提供了连接的桥梁。
+ * 所以NotesListAdapter实现的是鼠标和编辑便签链接的桥梁
+ */
public class NotesListAdapter extends CursorAdapter {
private static final String TAG = "NotesListAdapter";
private Context mContext;
private HashMap mSelectedIndex;
- private int mNotesCount;
- private boolean mChoiceMode;
+ private int mNotesCount; //便签数
+ private boolean mChoiceMode; //选择模式标记
+ /*
+ * 桌面widget的属性,包括编号和类型
+ */
public static class AppWidgetAttribute {
public int widgetId;
public int widgetType;
};
+ /*
+ * 函数功能:初始化便签链接器
+ * 函数实现:根据传进来的内容设置相关变量
+ */
public NotesListAdapter(Context context) {
- super(context, null);
- mSelectedIndex = new HashMap();
+ super(context, null); //父类对象置空
+ mSelectedIndex = new HashMap(); //新建选项下标的hash表
mContext = context;
mNotesCount = 0;
}
@Override
+ /*
+ * 函数功能:新建一个视图来存储光标所指向的数据
+ * 函数实现:使用兄弟类NotesListItem新建一个项目选项
+ */
public View newView(Context context, Cursor cursor, ViewGroup parent) {
return new NotesListItem(context);
}
+ /*
+ * 函数功能:将已经存在的视图和鼠标指向的数据进行捆绑
+ * 函数实现:如下注释
+ */
@Override
public void bindView(View view, Context context, Cursor cursor) {
if (view instanceof NotesListItem) {
+ //若view是NotesListItem的一个实例
NoteItemData itemData = new NoteItemData(context, cursor);
((NotesListItem) view).bind(context, itemData, mChoiceMode,
isSelectedItem(cursor.getPosition()));
+ //则新建一个项目选项并且用bind跟将view和鼠标,内容,便签数据捆绑在一起
}
}
+ /*
+ * 函数功能:设置勾选框
+ * 函数实现:如下注释
+ */
public void setCheckedItem(final int position, final boolean checked) {
mSelectedIndex.put(position, checked);
+ //根据定位和是否勾选设置下标
notifyDataSetChanged();
+ //在修改后刷新activity
}
+ /*
+ * 函数功能:判断单选按钮是否勾选
+ */
public boolean isInChoiceMode() {
return mChoiceMode;
}
+ /*
+ * 函数功能:设置单项选项框
+ * 函数实现:重置下标并且根据参数mode设置选项
+ */
public void setChoiceMode(boolean mode) {
mSelectedIndex.clear();
mChoiceMode = mode;
}
+ /*
+ * 函数功能:选择全部选项
+ * 函数实现:如下注释
+ */
public void selectAll(boolean checked) {
Cursor cursor = getCursor();
+ //获取光标位置
for (int i = 0; i < getCount(); i++) {
if (cursor.moveToPosition(i)) {
if (NoteItemData.getNoteType(cursor) == Notes.TYPE_NOTE) {
@@ -87,30 +111,47 @@ public class NotesListAdapter extends CursorAdapter {
}
}
}
+ //遍历所有光标可用的位置在判断为便签类型之后勾选单项框
}
+ /*
+ * 函数功能:建立选择项的下标列表
+ * 函数实现:如下注释
+ */
public HashSet getSelectedItemIds() {
HashSet itemSet = new HashSet();
+ //建立hash表
for (Integer position : mSelectedIndex.keySet()) {
+ //遍历所有的关键
if (mSelectedIndex.get(position) == true) {
+ //若光标位置可用
Long id = getItemId(position);
if (id == Notes.ID_ROOT_FOLDER) {
+ //原文件不需要添加
Log.d(TAG, "Wrong item id, should not happen");
} else {
itemSet.add(id);
}
+ //则将id该下标假如选项集合中
+
}
}
return itemSet;
}
+ /*
+ * 函数功能:建立桌面Widget的选项表
+ * 函数实现:如下注释
+ */
public HashSet getSelectedWidget() {
HashSet itemSet = new HashSet();
for (Integer position : mSelectedIndex.keySet()) {
if (mSelectedIndex.get(position) == true) {
Cursor c = (Cursor) getItem(position);
+ //以上4句和getSelectedItemIds一样,不再重复
if (c != null) {
+ //光标位置可用的话就建立新的Widget属性并编辑下标和类型,最后添加到选项集中
AppWidgetAttribute widget = new AppWidgetAttribute();
NoteItemData item = new NoteItemData(mContext, c);
widget.widgetId = item.getWidgetId();
@@ -128,26 +169,42 @@ public class NotesListAdapter extends CursorAdapter {
return itemSet;
}
+ /*
+ * 函数功能:获取选项个数
+ * 函数实现:如下注释
+ */
public int getSelectedCount() {
Collection values = mSelectedIndex.values();
+ //首先获取选项下标的值
if (null == values) {
return 0;
}
Iterator iter = values.iterator();
+ //初始化叠加器
int count = 0;
while (iter.hasNext()) {
if (true == iter.next()) {
+ //若value值为真计数+1
count++;
}
}
return count;
}
+ /*
+ * 函数功能:判断是否全部选中
+ * 函数实现:如下注释
+ */
public boolean isAllSelected() {
int checkedCount = getSelectedCount();
return (checkedCount != 0 && checkedCount == mNotesCount);
+ //获取选项数看是否等于便签的个数
}
+ /*
+ * 函数功能:判断是否为选项表
+ * 函数实现:通过传递的下标来确定
+ */
public boolean isSelectedItem(final int position) {
if (null == mSelectedIndex.get(position)) {
return false;
@@ -156,29 +213,45 @@ public class NotesListAdapter extends CursorAdapter {
}
@Override
+ /*
+ * 函数功能:在activity内容发生局部变动的时候回调该函数计算便签的数量
+ * 函数实现:如下注释
+ */
protected void onContentChanged() {
super.onContentChanged();
+ //执行基类函数
calcNotesCount();
}
@Override
+ /*
+ * 函数功能:在activity光标发生局部变动的时候回调该函数计算便签的数量
+ */
public void changeCursor(Cursor cursor) {
super.changeCursor(cursor);
+ //执行基类函数
calcNotesCount();
}
+ /*
+ * 函数功能:计算便签数量
+ *
+ */
private void calcNotesCount() {
mNotesCount = 0;
for (int i = 0; i < getCount(); i++) {
+ //获取总数同时遍历
Cursor c = (Cursor) getItem(i);
if (c != null) {
if (NoteItemData.getNoteType(c) == Notes.TYPE_NOTE) {
mNotesCount++;
+ //若该位置不为空并且文本类型为便签就+1
}
} else {
Log.e(TAG, "Invalid cursor");
return;
}
+ //否则报错
}
}
-}
+}
\ No newline at end of file
diff --git a/src/Notes-master3/app/src/main/java/net/micode/notes/ui/NotesListItem.java b/src/Notes-master3/app/src/main/java/net/micode/notes/ui/NotesListItem.java
index 1221e80..b7706c5 100644
--- a/src/Notes-master3/app/src/main/java/net/micode/notes/ui/NotesListItem.java
+++ b/src/Notes-master3/app/src/main/java/net/micode/notes/ui/NotesListItem.java
@@ -1,19 +1,3 @@
-/*
- * Copyright (c) 2010-2011, The MiCode Open Source Community (www.micode.net)
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
package net.micode.notes.ui;
import android.content.Context;
@@ -30,37 +14,47 @@ import net.micode.notes.tool.DataUtils;
import net.micode.notes.tool.ResourceParser.NoteItemBgResources;
+/**
+ * 创建便签列表项目选项
+ */
public class NotesListItem extends LinearLayout {
- private ImageView mAlert;
- private TextView mTitle;
- private TextView mTime;
- private TextView mCallName;
- private NoteItemData mItemData;
- private CheckBox mCheckBox;
+ private ImageView mAlert;//闹钟图片
+ private TextView mTitle; //标题
+ private TextView mTime; //时间
+ private TextView mCallName; //
+ private NoteItemData mItemData; //标签数据
+ private CheckBox mCheckBox; //打钩框
+ /**
+ *初始化基本信息
+ */
public NotesListItem(Context context) {
- super(context);
- inflate(context, R.layout.note_item, this);
+ super(context); //super()它的主要作用是调整调用父类构造函数的顺序
+ inflate(context, R.layout.note_item, this);//Inflate可用于将一个xml中定义的布局控件找出来,这里的xml是r。layout
+ //findViewById用于从contentView中查找指定ID的View,转换出来的形式根据需要而定;
mAlert = (ImageView) findViewById(R.id.iv_alert_icon);
mTitle = (TextView) findViewById(R.id.tv_title);
mTime = (TextView) findViewById(R.id.tv_time);
mCallName = (TextView) findViewById(R.id.tv_name);
mCheckBox = (CheckBox) findViewById(android.R.id.checkbox);
}
-
+ ///根据data的属性对各个控件的属性的控制,主要是可见性Visibility,内容setText,格式setTextAppearance
public void bind(Context context, NoteItemData data, boolean choiceMode, boolean checked) {
if (choiceMode && data.getType() == Notes.TYPE_NOTE) {
- mCheckBox.setVisibility(View.VISIBLE);
- mCheckBox.setChecked(checked);
+ mCheckBox.setVisibility(View.VISIBLE); ///设置可见行为可见
+ mCheckBox.setChecked(checked); ///格子打钩
} else {
mCheckBox.setVisibility(View.GONE);
}
mItemData = data;
+ ///设置控件属性,一共三种情况,由data的id和父id是否与保存到文件夹的id一致来决定
if (data.getId() == Notes.ID_CALL_RECORD_FOLDER) {
mCallName.setVisibility(View.GONE);
mAlert.setVisibility(View.VISIBLE);
+ //设置该textview的style
mTitle.setTextAppearance(context, R.style.TextAppearancePrimaryItem);
+ //settext为设置内容
mTitle.setText(context.getString(R.string.call_record_folder_name)
+ context.getString(R.string.format_folder_files_count, data.getNotesCount()));
mAlert.setImageResource(R.drawable.call_record);
@@ -69,8 +63,9 @@ public class NotesListItem extends LinearLayout {
mCallName.setText(data.getCallName());
mTitle.setTextAppearance(context,R.style.TextAppearanceSecondaryItem);
mTitle.setText(DataUtils.getFormattedSnippet(data.getSnippet()));
+ ///关于闹钟的设置
if (data.hasAlert()) {
- mAlert.setImageResource(R.drawable.clock);
+ mAlert.setImageResource(R.drawable.clock);//图片来源的设置
mAlert.setVisibility(View.VISIBLE);
} else {
mAlert.setVisibility(View.GONE);
@@ -78,45 +73,48 @@ public class NotesListItem extends LinearLayout {
} else {
mCallName.setVisibility(View.GONE);
mTitle.setTextAppearance(context, R.style.TextAppearancePrimaryItem);
-
+ ///设置title格式
if (data.getType() == Notes.TYPE_FOLDER) {
mTitle.setText(data.getSnippet()
+ context.getString(R.string.format_folder_files_count,
- data.getNotesCount()));
+ data.getNotesCount()));
mAlert.setVisibility(View.GONE);
} else {
mTitle.setText(DataUtils.getFormattedSnippet(data.getSnippet()));
if (data.hasAlert()) {
- mAlert.setImageResource(R.drawable.clock);
+ mAlert.setImageResource(R.drawable.clock);///设置图片来源
mAlert.setVisibility(View.VISIBLE);
} else {
mAlert.setVisibility(View.GONE);
}
}
}
- mTime.setText(DateUtils.getRelativeTimeSpanString(data.getModifiedDate()));
+ ///设置内容,获取相关时间,从data里编辑的日期中获取
+ mTime. setText(DateUtils.getRelativeTimeSpanString(data.getModifiedDate()));
setBackground(data);
}
-
+ //根据data的文件属性来设置背景
private void setBackground(NoteItemData data) {
int id = data.getBgColorId();
+ //,若是note型文件,则4种情况,对于4种不同情况的背景来源
if (data.getType() == Notes.TYPE_NOTE) {
+ //单个数据并且只有一个子文件夹
if (data.isSingle() || data.isOneFollowingFolder()) {
setBackgroundResource(NoteItemBgResources.getNoteBgSingleRes(id));
- } else if (data.isLast()) {
+ } else if (data.isLast()) {//是最后一个数据
setBackgroundResource(NoteItemBgResources.getNoteBgLastRes(id));
- } else if (data.isFirst() || data.isMultiFollowingFolder()) {
+ } else if (data.isFirst() || data.isMultiFollowingFolder()) {//是一个数据并有多个子文件夹
setBackgroundResource(NoteItemBgResources.getNoteBgFirstRes(id));
} else {
setBackgroundResource(NoteItemBgResources.getNoteBgNormalRes(id));
}
} else {
+ //若不是note直接调用文件夹的背景来源
setBackgroundResource(NoteItemBgResources.getFolderBgRes());
}
}
-
public NoteItemData getItemData() {
return mItemData;
}
-}
+}
\ No newline at end of file
diff --git a/src/Notes-master3/app/src/main/java/net/micode/notes/ui/NotesPreferenceActivity.java b/src/Notes-master3/app/src/main/java/net/micode/notes/ui/NotesPreferenceActivity.java
index 07c5f7e..a0acfff 100644
--- a/src/Notes-master3/app/src/main/java/net/micode/notes/ui/NotesPreferenceActivity.java
+++ b/src/Notes-master3/app/src/main/java/net/micode/notes/ui/NotesPreferenceActivity.java
@@ -1,19 +1,3 @@
-/*
- * Copyright (c) 2010-2011, The MiCode Open Source Community (www.micode.net)
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
package net.micode.notes.ui;
import android.accounts.Account;
@@ -47,66 +31,78 @@ import net.micode.notes.data.Notes;
import net.micode.notes.data.Notes.NoteColumns;
import net.micode.notes.gtask.remote.GTaskSyncService;
-
+/*
+ *该类功能:NotesPreferenceActivity,在小米便签中主要实现的是对背景颜色和字体大小的数据储存。
+ * 继承了PreferenceActivity主要功能为对系统信息和配置进行自动保存的Activity
+ */
public class NotesPreferenceActivity extends PreferenceActivity {
- public static final String PREFERENCE_NAME = "notes_preferences";
-
- public static final String PREFERENCE_SYNC_ACCOUNT_NAME = "pref_key_account_name";
-
- public static final String PREFERENCE_LAST_SYNC_TIME = "pref_last_sync_time";
-
+ public static final String PREFERENCE_NAME = "notes_preferences";//优先名
+ public static final String PREFERENCE_SYNC_ACCOUNT_NAME = "pref_key_account_name";//同步账号
+ public static final String PREFERENCE_LAST_SYNC_TIME = "pref_last_sync_time";//同步时间
public static final String PREFERENCE_SET_BG_COLOR_KEY = "pref_key_bg_random_appear";
-
- private static final String PREFERENCE_SYNC_ACCOUNT_KEY = "pref_sync_account_key";
-
- private static final String AUTHORITIES_FILTER_KEY = "authorities";
-
- private PreferenceCategory mAccountCategory;
-
- private GTaskReceiver mReceiver;
-
- private Account[] mOriAccounts;
-
- private boolean mHasAddedAccount;
+ private static final String PREFERENCE_SYNC_ACCOUNT_KEY = "pref_sync_account_key";//同步密码
+ private static final String AUTHORITIES_FILTER_KEY = "authorities";//本地密码
+ private PreferenceCategory mAccountCategory;//账户分组
+ private GTaskReceiver mReceiver;//同步任务接收器
+ private Account[] mOriAccounts;//账户
+ private boolean mHasAddedAccount;//账户的hash标记
@Override
+ /*创建一个activity*/
protected void onCreate(Bundle icicle) {
+ //先执行父类的创建函数
super.onCreate(icicle);
/* using the app icon for navigation */
getActionBar().setDisplayHomeAsUpEnabled(true);
+ //给左上角图标的左边加上一个返回的图标
addPreferencesFromResource(R.xml.preferences);
+ //添加xml来源并显示 xml
mAccountCategory = (PreferenceCategory) findPreference(PREFERENCE_SYNC_ACCOUNT_KEY);
+ //根据同步账户关键码来初始化分组
mReceiver = new GTaskReceiver();
IntentFilter filter = new IntentFilter();
filter.addAction(GTaskSyncService.GTASK_SERVICE_BROADCAST_NAME);
registerReceiver(mReceiver, filter);
+ //初始化同步组件
mOriAccounts = null;
View header = LayoutInflater.from(this).inflate(R.layout.settings_header, null);
+ //获取listvivew,ListView的作用:用于列出所有选择
getListView().addHeaderView(header, null, true);
+ //在listview组件上方添加其他组件
}
@Override
+ /*
+ * 函数功能:activity交互功能的实现,用于接受用户的输入
+ * 函数实现:如下注释
+ */
protected void onResume() {
+ //先执行父类 的交互实现
super.onResume();
// need to set sync account automatically if user has added a new
// account
if (mHasAddedAccount) {
+ //若用户新加了账户则自动设置同步账户
Account[] accounts = getGoogleAccounts();
+ //获取google同步账户
if (mOriAccounts != null && accounts.length > mOriAccounts.length) {
+ //若原账户不为空且当前账户有增加
for (Account accountNew : accounts) {
boolean found = false;
for (Account accountOld : mOriAccounts) {
if (TextUtils.equals(accountOld.name, accountNew.name)) {
+ //更新账户
found = true;
break;
}
}
if (!found) {
setSyncAccount(accountNew.name);
+ //若是没有找到旧的账户,那么同步账号中就只添加新账户
break;
}
}
@@ -114,58 +110,83 @@ public class NotesPreferenceActivity extends PreferenceActivity {
}
refreshUI();
+ //刷新标签界面
}
@Override
+ /*
+ * 函数功能:销毁一个activity
+ * 函数实现:如下注释
+ */
protected void onDestroy() {
if (mReceiver != null) {
unregisterReceiver(mReceiver);
+ //注销接收器
}
super.onDestroy();
+ //执行父类的销毁动作
}
+ /*
+ * 函数功能:重新设置账户信息
+ * 函数实现:如下注释
+ */
private void loadAccountPreference() {
mAccountCategory.removeAll();
-
+ //销毁所有的分组
Preference accountPref = new Preference(this);
+ //建立首选项
final String defaultAccount = getSyncAccountName(this);
accountPref.setTitle(getString(R.string.preferences_account_title));
accountPref.setSummary(getString(R.string.preferences_account_summary));
+ //设置首选项的大标题和小标题
accountPref.setOnPreferenceClickListener(new OnPreferenceClickListener() {
public boolean onPreferenceClick(Preference preference) {
+ //建立监听器
if (!GTaskSyncService.isSyncing()) {
if (TextUtils.isEmpty(defaultAccount)) {
// the first time to set account
+ //若是第一次建立账户显示选择账户提示对话框
showSelectAccountAlertDialog();
} else {
// if the account has already been set, we need to promp
// user about the risk
+ //若是已经建立则显示修改对话框并进行修改操作
showChangeAccountConfirmAlertDialog();
}
} else {
+ //若在没有同步的情况下,则在toast中显示不能修改
Toast.makeText(NotesPreferenceActivity.this,
- R.string.preferences_toast_cannot_change_account, Toast.LENGTH_SHORT)
+ R.string.preferences_toast_cannot_change_account, Toast.LENGTH_SHORT)
.show();
}
return true;
}
});
+ //根据新建首选项编辑新的账户分组
mAccountCategory.addPreference(accountPref);
}
+ /*
+ *函数功能:设置按键的状态和最后同步的时间
+ *函数实现:如下注释
+ */
private void loadSyncButton() {
Button syncButton = (Button) findViewById(R.id.preference_sync_button);
TextView lastSyncTimeView = (TextView) findViewById(R.id.prefenerece_sync_status_textview);
-
+ //获取同步按钮控件和最终同步时间的的窗口
// set button state
+ //设置按钮的状态
if (GTaskSyncService.isSyncing()) {
+ //若是在同步状态下
syncButton.setText(getString(R.string.preferences_button_sync_cancel));
syncButton.setOnClickListener(new View.OnClickListener() {
public void onClick(View v) {
GTaskSyncService.cancelSync(NotesPreferenceActivity.this);
}
});
+ //设置按钮显示的文本为“取消同步”以及监听器
} else {
syncButton.setText(getString(R.string.preferences_button_sync_immediately));
syncButton.setOnClickListener(new View.OnClickListener() {
@@ -173,50 +194,61 @@ public class NotesPreferenceActivity extends PreferenceActivity {
GTaskSyncService.startSync(NotesPreferenceActivity.this);
}
});
+ //若是不同步则设置按钮显示的文本为“立即同步”以及对应监听器
}
syncButton.setEnabled(!TextUtils.isEmpty(getSyncAccountName(this)));
+ //设置按键可用还是不可用
// set last sync time
+ // 设置最终同步时间
if (GTaskSyncService.isSyncing()) {
+ //若是在同步的情况下
lastSyncTimeView.setText(GTaskSyncService.getProgressString());
lastSyncTimeView.setVisibility(View.VISIBLE);
+ // 根据当前同步服务器设置时间显示框的文本以及可见性
} else {
+ //若是非同步情况
long lastSyncTime = getLastSyncTime(this);
if (lastSyncTime != 0) {
lastSyncTimeView.setText(getString(R.string.preferences_last_sync_time,
DateFormat.format(getString(R.string.preferences_last_sync_time_format),
lastSyncTime)));
lastSyncTimeView.setVisibility(View.VISIBLE);
+ //则根据最后同步时间的信息来编辑时间显示框的文本内容和可见性
} else {
+ //若时间为空直接设置为不可见状态
lastSyncTimeView.setVisibility(View.GONE);
}
}
}
-
+ /*函数功能:刷新标签界面*/
private void refreshUI() {
loadAccountPreference();
loadSyncButton();
}
+ /*函数功能:显示账户选择的对话框并进行账户的设置*/
private void showSelectAccountAlertDialog() {
AlertDialog.Builder dialogBuilder = new AlertDialog.Builder(this);
+ //创建一个新的对话框
View titleView = LayoutInflater.from(this).inflate(R.layout.account_dialog_title, null);
TextView titleTextView = (TextView) titleView.findViewById(R.id.account_dialog_title);
titleTextView.setText(getString(R.string.preferences_dialog_select_account_title));
TextView subtitleTextView = (TextView) titleView.findViewById(R.id.account_dialog_subtitle);
subtitleTextView.setText(getString(R.string.preferences_dialog_select_account_tips));
-
+ //设置标题以及子标题的内容
dialogBuilder.setCustomTitle(titleView);
dialogBuilder.setPositiveButton(null, null);
-
+ //设置对话框的自定义标题,建立一个YES的按钮
Account[] accounts = getGoogleAccounts();
String defAccount = getSyncAccountName(this);
-
+ //获取同步账户信息
mOriAccounts = accounts;
mHasAddedAccount = false;
if (accounts.length > 0) {
+ //若账户不为空
CharSequence[] items = new CharSequence[accounts.length];
final CharSequence[] itemMapping = items;
int checkedItem = -1;
@@ -224,83 +256,110 @@ public class NotesPreferenceActivity extends PreferenceActivity {
for (Account account : accounts) {
if (TextUtils.equals(account.name, defAccount)) {
checkedItem = index;
+ //在账户列表中查询到所需账户
}
items[index++] = account.name;
}
dialogBuilder.setSingleChoiceItems(items, checkedItem,
+ //在对话框建立一个单选的复选框
new DialogInterface.OnClickListener() {
public void onClick(DialogInterface dialog, int which) {
setSyncAccount(itemMapping[which].toString());
dialog.dismiss();
+ //取消对话框
refreshUI();
}
+ //设置点击后执行的事件,包括检录新同步账户和刷新标签界面
});
+ //建立对话框网络版的监听器
}
View addAccountView = LayoutInflater.from(this).inflate(R.layout.add_account_text, null);
dialogBuilder.setView(addAccountView);
+ //给新加账户对话框设置自定义样式
final AlertDialog dialog = dialogBuilder.show();
+ //显示对话框
addAccountView.setOnClickListener(new View.OnClickListener() {
public void onClick(View v) {
mHasAddedAccount = true;
+ //将新加账户的hash置true
Intent intent = new Intent("android.settings.ADD_ACCOUNT_SETTINGS");
+ //建立网络建立组件
intent.putExtra(AUTHORITIES_FILTER_KEY, new String[] {
- "gmail-ls"
+ "gmail-ls"
});
startActivityForResult(intent, -1);
+ //跳回上一个选项
dialog.dismiss();
}
});
+ //建立新加账户对话框的监听器
}
+ /*函数功能:显示账户选择对话框和相关账户操作*/
private void showChangeAccountConfirmAlertDialog() {
AlertDialog.Builder dialogBuilder = new AlertDialog.Builder(this);
-
+ //创建一个新的对话框
View titleView = LayoutInflater.from(this).inflate(R.layout.account_dialog_title, null);
TextView titleTextView = (TextView) titleView.findViewById(R.id.account_dialog_title);
titleTextView.setText(getString(R.string.preferences_dialog_change_account_title,
getSyncAccountName(this)));
TextView subtitleTextView = (TextView) titleView.findViewById(R.id.account_dialog_subtitle);
subtitleTextView.setText(getString(R.string.preferences_dialog_change_account_warn_msg));
+ //根据同步修改的账户信息设置标题以及子标题的内容
dialogBuilder.setCustomTitle(titleView);
-
+ //设置对话框的自定义标题
CharSequence[] menuItemArray = new CharSequence[] {
getString(R.string.preferences_menu_change_account),
getString(R.string.preferences_menu_remove_account),
getString(R.string.preferences_menu_cancel)
};
+ //定义一些标记字符串
dialogBuilder.setItems(menuItemArray, new DialogInterface.OnClickListener() {
+ //设置对话框要显示的一个list,用于显示几个命令时,即change,remove,cancel
public void onClick(DialogInterface dialog, int which) {
+ //按键功能,由which来决定
if (which == 0) {
+ //进入账户选择对话框
showSelectAccountAlertDialog();
} else if (which == 1) {
+ //删除账户并且跟新便签界面
removeSyncAccount();
refreshUI();
}
}
});
dialogBuilder.show();
+ //显示对话框
}
+ /*函数功能:获取谷歌账户*/
private Account[] getGoogleAccounts() {
AccountManager accountManager = AccountManager.get(this);
return accountManager.getAccountsByType("com.google");
}
+ /*函数功能:设置同步账户*/
private void setSyncAccount(String account) {
if (!getSyncAccountName(this).equals(account)) {
+ //假如该账号不在同步账号列表中
SharedPreferences settings = getSharedPreferences(PREFERENCE_NAME, Context.MODE_PRIVATE);
SharedPreferences.Editor editor = settings.edit();
+ //编辑共享的首选项
if (account != null) {
editor.putString(PREFERENCE_SYNC_ACCOUNT_NAME, account);
} else {
editor.putString(PREFERENCE_SYNC_ACCOUNT_NAME, "");
}
+ //将该账号加入到首选项中
+
editor.commit();
+ //提交修改的数据
+
- // clean up last sync time
setLastSyncTime(this, 0);
+ //将最后同步时间清零
// clean up local gtask related info
new Thread(new Runnable() {
@@ -311,23 +370,30 @@ public class NotesPreferenceActivity extends PreferenceActivity {
getContentResolver().update(Notes.CONTENT_NOTE_URI, values, null, null);
}
}).start();
+ //重置当地同步任务的信息
Toast.makeText(NotesPreferenceActivity.this,
getString(R.string.preferences_toast_success_set_accout, account),
Toast.LENGTH_SHORT).show();
+ //将toast的文本信息置为“设置账户成功”并显示出来
}
}
-
+ /*函数功能:删除同步账户*/
private void removeSyncAccount() {
SharedPreferences settings = getSharedPreferences(PREFERENCE_NAME, Context.MODE_PRIVATE);
SharedPreferences.Editor editor = settings.edit();
+ //设置共享首选项
+
if (settings.contains(PREFERENCE_SYNC_ACCOUNT_NAME)) {
editor.remove(PREFERENCE_SYNC_ACCOUNT_NAME);
+ //假如当前首选项中有账户就删除
}
if (settings.contains(PREFERENCE_LAST_SYNC_TIME)) {
editor.remove(PREFERENCE_LAST_SYNC_TIME);
+ //删除当前首选项中有账户时间
}
editor.commit();
+ //提交更新后的数据
// clean up local gtask related info
new Thread(new Runnable() {
@@ -338,51 +404,70 @@ public class NotesPreferenceActivity extends PreferenceActivity {
getContentResolver().update(Notes.CONTENT_NOTE_URI, values, null, null);
}
}).start();
+ //重置当地同步任务的信息
}
+ /*函数功能:获取同步账户名称*/
public static String getSyncAccountName(Context context) {
SharedPreferences settings = context.getSharedPreferences(PREFERENCE_NAME,
Context.MODE_PRIVATE);
return settings.getString(PREFERENCE_SYNC_ACCOUNT_NAME, "");
}
+ /*函数功能:设置最终同步的时间*/
public static void setLastSyncTime(Context context, long time) {
SharedPreferences settings = context.getSharedPreferences(PREFERENCE_NAME,
Context.MODE_PRIVATE);
SharedPreferences.Editor editor = settings.edit();
+ // 从共享首选项中找到相关账户并获取其编辑器
editor.putLong(PREFERENCE_LAST_SYNC_TIME, time);
editor.commit();
+ //编辑最终同步时间并提交更新
}
-
+ /* 函数功能:获取最终同步时间*/
public static long getLastSyncTime(Context context) {
SharedPreferences settings = context.getSharedPreferences(PREFERENCE_NAME,
Context.MODE_PRIVATE);
return settings.getLong(PREFERENCE_LAST_SYNC_TIME, 0);
}
+ /*
+ * 函数功能:接受同步信息
+ * 函数实现:继承BroadcastReceiver
+ */
private class GTaskReceiver extends BroadcastReceiver {
@Override
public void onReceive(Context context, Intent intent) {
refreshUI();
if (intent.getBooleanExtra(GTaskSyncService.GTASK_SERVICE_BROADCAST_IS_SYNCING, false)) {
+ //获取随广播而来的Intent中的同步服务的数据
TextView syncStatus = (TextView) findViewById(R.id.prefenerece_sync_status_textview);
syncStatus.setText(intent
.getStringExtra(GTaskSyncService.GTASK_SERVICE_BROADCAST_PROGRESS_MSG));
+ //通过获取的数据在设置系统的状态
}
}
}
+ /*
+ * 函数功能:处理菜单的选项
+ * 函数实现:如下注释
+ * 参数:MenuItem菜单选项
+ */
public boolean onOptionsItemSelected(MenuItem item) {
switch (item.getItemId()) {
+ //根据选项的id选择,这里只有一个主页
case android.R.id.home:
Intent intent = new Intent(this, NotesListActivity.class);
intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
startActivity(intent);
return true;
+ //在主页情况下在创建连接组件intent,发出清空的信号并开始一个相应的activity
default:
return false;
}
}
}
+
\ No newline at end of file
diff --git a/src/Notes-master3/app/src/main/res/menu/note_edit.xml b/src/Notes-master3/app/src/main/res/menu/note_edit.xml
index c7f49b6..2aec24e 100644
--- a/src/Notes-master3/app/src/main/res/menu/note_edit.xml
+++ b/src/Notes-master3/app/src/main/res/menu/note_edit.xml
@@ -54,4 +54,8 @@
android:id="@+id/menu_recover"
android:title="@string/menu_recover"/>
+
+
\ No newline at end of file
diff --git a/src/Notes-master3/local.properties b/src/Notes-master3/local.properties
index 334d06f..94a0543 100644
--- a/src/Notes-master3/local.properties
+++ b/src/Notes-master3/local.properties
@@ -4,4 +4,4 @@
# Location of the SDK. This is only used by Gradle.
#
#Mon Nov 06 23:06:52 GMT+08:00 2023
-sdk.dir=C\:\\Users\\24486\\AppData\\Local\\Android\\Sdk
+sdk.dir=C\:\\Users\\18976\\AppData\\Local\\Android\\Sdk