Merge branch 'a_branch' of https://bdgit.educoder.net/puf7qhzog/note into a_branch

2747 changed files with 8984 additions and 0 deletions
--- a/src/Notes-master/.gitignore
+++ b/src/Notes-master/.gitignore
--- a/src/Notes-master/.gradle/4.1/fileChanges/last-build.bin
+++ b/src/Notes-master/.gradle/4.1/fileChanges/last-build.bin
--- a/src/Notes-master/.gradle/4.1/fileContent/fileContent.lock
+++ b/src/Notes-master/.gradle/4.1/fileContent/fileContent.lock
--- a/src/Notes-master/.gradle/4.1/fileHashes/fileHashes.bin
+++ b/src/Notes-master/.gradle/4.1/fileHashes/fileHashes.bin
--- a/src/Notes-master/.gradle/4.1/fileHashes/fileHashes.lock
+++ b/src/Notes-master/.gradle/4.1/fileHashes/fileHashes.lock
--- a/src/Notes-master/.gradle/4.1/fileHashes/resourceHashesCache.bin
+++ b/src/Notes-master/.gradle/4.1/fileHashes/resourceHashesCache.bin
--- a/src/Notes-master/.gradle/4.1/javaCompile/classAnalysis.bin
+++ b/src/Notes-master/.gradle/4.1/javaCompile/classAnalysis.bin
--- a/src/Notes-master/.gradle/4.1/javaCompile/jarAnalysis.bin
+++ b/src/Notes-master/.gradle/4.1/javaCompile/jarAnalysis.bin
--- a/src/Notes-master/.gradle/4.1/javaCompile/javaCompile.lock
+++ b/src/Notes-master/.gradle/4.1/javaCompile/javaCompile.lock
--- a/src/Notes-master/.gradle/4.1/javaCompile/taskHistory.bin
+++ b/src/Notes-master/.gradle/4.1/javaCompile/taskHistory.bin
--- a/src/Notes-master/.gradle/4.1/javaCompile/taskJars.bin
+++ b/src/Notes-master/.gradle/4.1/javaCompile/taskJars.bin
--- a/src/Notes-master/.gradle/4.1/taskHistory/fileSnapshots.bin
+++ b/src/Notes-master/.gradle/4.1/taskHistory/fileSnapshots.bin
--- a/src/Notes-master/.gradle/4.1/taskHistory/taskHistory.bin
+++ b/src/Notes-master/.gradle/4.1/taskHistory/taskHistory.bin
--- a/src/Notes-master/.gradle/4.1/taskHistory/taskHistory.lock
+++ b/src/Notes-master/.gradle/4.1/taskHistory/taskHistory.lock
--- a/src/Notes-master/.gradle/5.1.1/fileChanges/last-build.bin
+++ b/src/Notes-master/.gradle/5.1.1/fileChanges/last-build.bin
--- a/src/Notes-master/.gradle/5.1.1/fileHashes/fileHashes.lock
+++ b/src/Notes-master/.gradle/5.1.1/fileHashes/fileHashes.lock
--- a/src/Notes-master/.gradle/5.1.1/gc.properties
+++ b/src/Notes-master/.gradle/5.1.1/gc.properties
--- a/src/Notes-master/.gradle/5.2.1/fileChanges/last-build.bin
+++ b/src/Notes-master/.gradle/5.2.1/fileChanges/last-build.bin
--- a/src/Notes-master/.gradle/5.2.1/fileHashes/fileHashes.lock
+++ b/src/Notes-master/.gradle/5.2.1/fileHashes/fileHashes.lock
--- a/src/Notes-master/.gradle/5.2.1/gc.properties
+++ b/src/Notes-master/.gradle/5.2.1/gc.properties
--- a/src/Notes-master/.gradle/5.3/fileChanges/last-build.bin
+++ b/src/Notes-master/.gradle/5.3/fileChanges/last-build.bin
--- a/src/Notes-master/.gradle/5.3/fileHashes/fileHashes.lock
+++ b/src/Notes-master/.gradle/5.3/fileHashes/fileHashes.lock
--- a/src/Notes-master/.gradle/5.3/gc.properties
+++ b/src/Notes-master/.gradle/5.3/gc.properties
--- a/src/Notes-master/.gradle/5.4.1/fileChanges/last-build.bin
+++ b/src/Notes-master/.gradle/5.4.1/fileChanges/last-build.bin
--- a/src/Notes-master/.gradle/5.4.1/fileHashes/fileHashes.lock
+++ b/src/Notes-master/.gradle/5.4.1/fileHashes/fileHashes.lock
--- a/src/Notes-master/.gradle/5.4.1/gc.properties
+++ b/src/Notes-master/.gradle/5.4.1/gc.properties
--- a/src/Notes-master/.gradle/5.5.1/fileChanges/last-build.bin
+++ b/src/Notes-master/.gradle/5.5.1/fileChanges/last-build.bin
--- a/src/Notes-master/.gradle/5.5.1/fileHashes/fileHashes.lock
+++ b/src/Notes-master/.gradle/5.5.1/fileHashes/fileHashes.lock
--- a/src/Notes-master/.gradle/5.5.1/gc.properties
+++ b/src/Notes-master/.gradle/5.5.1/gc.properties
--- a/src/Notes-master/.gradle/5.5/fileChanges/last-build.bin
+++ b/src/Notes-master/.gradle/5.5/fileChanges/last-build.bin
--- a/src/Notes-master/.gradle/5.5/fileHashes/fileHashes.lock
+++ b/src/Notes-master/.gradle/5.5/fileHashes/fileHashes.lock
--- a/src/Notes-master/.gradle/5.5/gc.properties
+++ b/src/Notes-master/.gradle/5.5/gc.properties
--- a/src/Notes-master/.gradle/6.5/fileChanges/last-build.bin
+++ b/src/Notes-master/.gradle/6.5/fileChanges/last-build.bin
--- a/src/Notes-master/.gradle/6.5/fileHashes/fileHashes.lock
+++ b/src/Notes-master/.gradle/6.5/fileHashes/fileHashes.lock
--- a/src/Notes-master/.gradle/6.5/gc.properties
+++ b/src/Notes-master/.gradle/6.5/gc.properties
--- a/src/Notes-master/.gradle/6.8/fileChanges/last-build.bin
+++ b/src/Notes-master/.gradle/6.8/fileChanges/last-build.bin
--- a/src/Notes-master/.gradle/6.8/fileHashes/fileHashes.lock
+++ b/src/Notes-master/.gradle/6.8/fileHashes/fileHashes.lock
--- a/src/Notes-master/.gradle/6.8/gc.properties
+++ b/src/Notes-master/.gradle/6.8/gc.properties
--- a/src/Notes-master/.gradle/7.3/checksums/checksums.lock
+++ b/src/Notes-master/.gradle/7.3/checksums/checksums.lock
--- a/src/Notes-master/.gradle/7.3/dependencies-accessors/dependencies-accessors.lock
+++ b/src/Notes-master/.gradle/7.3/dependencies-accessors/dependencies-accessors.lock
--- a/src/Notes-master/.gradle/7.3/dependencies-accessors/gc.properties
+++ b/src/Notes-master/.gradle/7.3/dependencies-accessors/gc.properties
--- a/src/Notes-master/.gradle/7.3/fileChanges/last-build.bin
+++ b/src/Notes-master/.gradle/7.3/fileChanges/last-build.bin
--- a/src/Notes-master/.gradle/7.3/fileHashes/fileHashes.lock
+++ b/src/Notes-master/.gradle/7.3/fileHashes/fileHashes.lock
--- a/src/Notes-master/.gradle/7.3/gc.properties
+++ b/src/Notes-master/.gradle/7.3/gc.properties
--- a/src/Notes-master/.gradle/7.4/checksums/checksums.lock
+++ b/src/Notes-master/.gradle/7.4/checksums/checksums.lock
--- a/src/Notes-master/.gradle/7.4/checksums/md5-checksums.bin
+++ b/src/Notes-master/.gradle/7.4/checksums/md5-checksums.bin
--- a/src/Notes-master/.gradle/7.4/checksums/sha1-checksums.bin
+++ b/src/Notes-master/.gradle/7.4/checksums/sha1-checksums.bin
--- a/src/Notes-master/.gradle/7.4/dependencies-accessors/dependencies-accessors.lock
+++ b/src/Notes-master/.gradle/7.4/dependencies-accessors/dependencies-accessors.lock
--- a/src/Notes-master/.gradle/7.4/dependencies-accessors/gc.properties
+++ b/src/Notes-master/.gradle/7.4/dependencies-accessors/gc.properties
--- a/src/Notes-master/.gradle/7.4/fileChanges/last-build.bin
+++ b/src/Notes-master/.gradle/7.4/fileChanges/last-build.bin
--- a/src/Notes-master/.gradle/7.4/fileHashes/fileHashes.lock
+++ b/src/Notes-master/.gradle/7.4/fileHashes/fileHashes.lock
--- a/src/Notes-master/.gradle/7.4/gc.properties
+++ b/src/Notes-master/.gradle/7.4/gc.properties
--- a/src/Notes-master/.gradle/7.5/checksums/checksums.lock
+++ b/src/Notes-master/.gradle/7.5/checksums/checksums.lock
--- a/src/Notes-master/.gradle/7.5/checksums/md5-checksums.bin
+++ b/src/Notes-master/.gradle/7.5/checksums/md5-checksums.bin
--- a/src/Notes-master/.gradle/7.5/checksums/sha1-checksums.bin
+++ b/src/Notes-master/.gradle/7.5/checksums/sha1-checksums.bin
--- a/src/Notes-master/.gradle/7.5/dependencies-accessors/dependencies-accessors.lock
+++ b/src/Notes-master/.gradle/7.5/dependencies-accessors/dependencies-accessors.lock
--- a/src/Notes-master/.gradle/7.5/dependencies-accessors/gc.properties
+++ b/src/Notes-master/.gradle/7.5/dependencies-accessors/gc.properties
--- a/src/Notes-master/.gradle/7.5/executionHistory/executionHistory.bin
+++ b/src/Notes-master/.gradle/7.5/executionHistory/executionHistory.bin
--- a/src/Notes-master/.gradle/7.5/executionHistory/executionHistory.lock
+++ b/src/Notes-master/.gradle/7.5/executionHistory/executionHistory.lock
--- a/src/Notes-master/.gradle/7.5/fileChanges/last-build.bin
+++ b/src/Notes-master/.gradle/7.5/fileChanges/last-build.bin
--- a/src/Notes-master/.gradle/7.5/fileHashes/fileHashes.bin
+++ b/src/Notes-master/.gradle/7.5/fileHashes/fileHashes.bin
--- a/src/Notes-master/.gradle/7.5/fileHashes/fileHashes.lock
+++ b/src/Notes-master/.gradle/7.5/fileHashes/fileHashes.lock
--- a/src/Notes-master/.gradle/7.5/fileHashes/resourceHashesCache.bin
+++ b/src/Notes-master/.gradle/7.5/fileHashes/resourceHashesCache.bin
--- a/src/Notes-master/.gradle/7.5/gc.properties
+++ b/src/Notes-master/.gradle/7.5/gc.properties
--- a/src/Notes-master/.gradle/buildOutputCleanup/built.bin
+++ b/src/Notes-master/.gradle/buildOutputCleanup/built.bin
--- a/src/Notes-master/.gradle/buildOutputCleanup/cache.properties
+++ b/src/Notes-master/.gradle/buildOutputCleanup/cache.properties
--- a/src/Notes-master/.gradle/buildOutputCleanup/cache.properties.lock
+++ b/src/Notes-master/.gradle/buildOutputCleanup/cache.properties.lock
--- a/src/Notes-master/.gradle/checksums/checksums.lock
+++ b/src/Notes-master/.gradle/checksums/checksums.lock
--- a/src/Notes-master/.gradle/configuration-cache/gc.properties
+++ b/src/Notes-master/.gradle/configuration-cache/gc.properties
--- a/src/Notes-master/.gradle/file-system.probe
+++ b/src/Notes-master/.gradle/file-system.probe
--- a/src/Notes-master/.gradle/vcs-1/gc.properties
+++ b/src/Notes-master/.gradle/vcs-1/gc.properties
--- a/src/Notes-master/.gradle/workspace-id.txt
+++ b/src/Notes-master/.gradle/workspace-id.txt
--- a/src/Notes-master/.gradle/workspace-id.txt.lock
+++ b/src/Notes-master/.gradle/workspace-id.txt.lock
--- a/src/Notes-master/.idea/gradle.xml
+++ b/src/Notes-master/.idea/gradle.xml
--- a/src/Notes-master/.idea/libraries/android_android_30.xml
+++ b/src/Notes-master/.idea/libraries/android_android_30.xml
--- a/src/Notes-master/.idea/libraries/org_apache_http_legacy_android_30.xml
+++ b/src/Notes-master/.idea/libraries/org_apache_http_legacy_android_30.xml
--- a/src/Notes-master/.idea/misc.xml
+++ b/src/Notes-master/.idea/misc.xml
--- a/src/Notes-master/.idea/modules.xml
+++ b/src/Notes-master/.idea/modules.xml
--- a/src/Notes-master/.idea/runConfigurations.xml
+++ b/src/Notes-master/.idea/runConfigurations.xml
--- a/src/Notes-master/.idea/workspace.xml
+++ b/src/Notes-master/.idea/workspace.xml
--- a/src/Notes-master/AndroidManifest.xml
+++ b/src/Notes-master/AndroidManifest.xml
--- a/src/Notes-master/NOTICE
+++ b/src/Notes-master/NOTICE
--- a/src/Notes-master/Notes-master.iml
+++ b/src/Notes-master/Notes-master.iml
--- a/src/Notes-master/Notes-master/.gitignore
+++ b/src/Notes-master/Notes-master/.gitignore
@ -0,0 +1,9 @@
 # generated files
 bin/
 gen/
 # Local configuration file (sdk path, etc)
 project.properties
 .settings/
 .classpath
 .project
--- a/src/Notes-master/Notes-master/.gradle/4.1/fileChanges/last-build.bin
+++ b/src/Notes-master/Notes-master/.gradle/4.1/fileChanges/last-build.bin
--- a/src/Notes-master/Notes-master/.gradle/4.1/fileContent/fileContent.lock
+++ b/src/Notes-master/Notes-master/.gradle/4.1/fileContent/fileContent.lock
--- a/src/Notes-master/Notes-master/.gradle/4.1/fileHashes/fileHashes.bin
+++ b/src/Notes-master/Notes-master/.gradle/4.1/fileHashes/fileHashes.bin
--- a/src/Notes-master/Notes-master/.gradle/4.1/fileHashes/fileHashes.lock
+++ b/src/Notes-master/Notes-master/.gradle/4.1/fileHashes/fileHashes.lock
--- a/src/Notes-master/Notes-master/.gradle/4.1/fileHashes/resourceHashesCache.bin
+++ b/src/Notes-master/Notes-master/.gradle/4.1/fileHashes/resourceHashesCache.bin
--- a/src/Notes-master/Notes-master/.gradle/4.1/javaCompile/classAnalysis.bin
+++ b/src/Notes-master/Notes-master/.gradle/4.1/javaCompile/classAnalysis.bin
--- a/src/Notes-master/Notes-master/.gradle/4.1/javaCompile/jarAnalysis.bin
+++ b/src/Notes-master/Notes-master/.gradle/4.1/javaCompile/jarAnalysis.bin
--- a/src/Notes-master/Notes-master/.gradle/4.1/javaCompile/javaCompile.lock
+++ b/src/Notes-master/Notes-master/.gradle/4.1/javaCompile/javaCompile.lock
--- a/src/Notes-master/Notes-master/.gradle/4.1/javaCompile/taskHistory.bin
+++ b/src/Notes-master/Notes-master/.gradle/4.1/javaCompile/taskHistory.bin
--- a/src/Notes-master/Notes-master/.gradle/4.1/javaCompile/taskJars.bin
+++ b/src/Notes-master/Notes-master/.gradle/4.1/javaCompile/taskJars.bin
--- a/src/Notes-master/Notes-master/.gradle/4.1/taskHistory/fileSnapshots.bin
+++ b/src/Notes-master/Notes-master/.gradle/4.1/taskHistory/fileSnapshots.bin
--- a/src/Notes-master/Notes-master/.gradle/4.1/taskHistory/taskHistory.bin
+++ b/src/Notes-master/Notes-master/.gradle/4.1/taskHistory/taskHistory.bin
--- a/src/Notes-master/Notes-master/.gradle/4.1/taskHistory/taskHistory.lock
+++ b/src/Notes-master/Notes-master/.gradle/4.1/taskHistory/taskHistory.lock
--- a/src/Notes-master/Notes-master/.gradle/5.1.1/fileChanges/last-build.bin
+++ b/src/Notes-master/Notes-master/.gradle/5.1.1/fileChanges/last-build.bin
--- a/src/Notes-master/Notes-master/.gradle/5.1.1/fileHashes/fileHashes.lock
+++ b/src/Notes-master/Notes-master/.gradle/5.1.1/fileHashes/fileHashes.lock
--- a/src/Notes-master/Notes-master/.gradle/5.1.1/gc.properties
+++ b/src/Notes-master/Notes-master/.gradle/5.1.1/gc.properties
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
对花对酒	9d62add76d	Merge branch 'a_branch' of https://bdgit.educoder.net/puf7qhzog/note into a_branch	2 years ago
对花对酒	5c20ed79d7	Merge branch 'a_branch' of https://bdgit.educoder.net/puf7qhzog/note into a_branch	2 years ago