diff --git a/Notes-master/.gradle/6.7.1/executionHistory/executionHistory.bin b/Notes-master/.gradle/6.7.1/executionHistory/executionHistory.bin
new file mode 100644
index 0000000..4de57c2
Binary files /dev/null and b/Notes-master/.gradle/6.7.1/executionHistory/executionHistory.bin differ
diff --git a/Notes-master/.gradle/6.7.1/executionHistory/executionHistory.lock b/Notes-master/.gradle/6.7.1/executionHistory/executionHistory.lock
new file mode 100644
index 0000000..4066ab1
Binary files /dev/null and b/Notes-master/.gradle/6.7.1/executionHistory/executionHistory.lock differ
diff --git a/xiaomi/.gradle/7.5/fileChanges/last-build.bin b/Notes-master/.gradle/6.7.1/fileChanges/last-build.bin
similarity index 100%
rename from xiaomi/.gradle/7.5/fileChanges/last-build.bin
rename to Notes-master/.gradle/6.7.1/fileChanges/last-build.bin
diff --git a/Notes-master/.gradle/6.7.1/fileHashes/fileHashes.bin b/Notes-master/.gradle/6.7.1/fileHashes/fileHashes.bin
new file mode 100644
index 0000000..48793bf
Binary files /dev/null and b/Notes-master/.gradle/6.7.1/fileHashes/fileHashes.bin differ
diff --git a/Notes-master/.gradle/6.7.1/fileHashes/fileHashes.lock b/Notes-master/.gradle/6.7.1/fileHashes/fileHashes.lock
new file mode 100644
index 0000000..2a5600f
Binary files /dev/null and b/Notes-master/.gradle/6.7.1/fileHashes/fileHashes.lock differ
diff --git a/Notes-master/.gradle/6.7.1/fileHashes/resourceHashesCache.bin b/Notes-master/.gradle/6.7.1/fileHashes/resourceHashesCache.bin
new file mode 100644
index 0000000..12f4691
Binary files /dev/null and b/Notes-master/.gradle/6.7.1/fileHashes/resourceHashesCache.bin differ
diff --git a/xiaomi/.gradle/7.5/dependencies-accessors/gc.properties b/Notes-master/.gradle/6.7.1/gc.properties
similarity index 100%
rename from xiaomi/.gradle/7.5/dependencies-accessors/gc.properties
rename to Notes-master/.gradle/6.7.1/gc.properties
diff --git a/Notes-master/.gradle/6.7.1/javaCompile/classAnalysis.bin b/Notes-master/.gradle/6.7.1/javaCompile/classAnalysis.bin
new file mode 100644
index 0000000..d2fcd32
Binary files /dev/null and b/Notes-master/.gradle/6.7.1/javaCompile/classAnalysis.bin differ
diff --git a/Notes-master/.gradle/6.7.1/javaCompile/jarAnalysis.bin b/Notes-master/.gradle/6.7.1/javaCompile/jarAnalysis.bin
new file mode 100644
index 0000000..1b655e8
Binary files /dev/null and b/Notes-master/.gradle/6.7.1/javaCompile/jarAnalysis.bin differ
diff --git a/Notes-master/.gradle/6.7.1/javaCompile/javaCompile.lock b/Notes-master/.gradle/6.7.1/javaCompile/javaCompile.lock
new file mode 100644
index 0000000..89e882f
Binary files /dev/null and b/Notes-master/.gradle/6.7.1/javaCompile/javaCompile.lock differ
diff --git a/Notes-master/.gradle/6.7.1/javaCompile/taskHistory.bin b/Notes-master/.gradle/6.7.1/javaCompile/taskHistory.bin
new file mode 100644
index 0000000..945fd9e
Binary files /dev/null and b/Notes-master/.gradle/6.7.1/javaCompile/taskHistory.bin differ
diff --git a/Notes-master/.gradle/7.2/dependencies-accessors/dependencies-accessors.lock b/Notes-master/.gradle/7.2/dependencies-accessors/dependencies-accessors.lock
new file mode 100644
index 0000000..26e9044
Binary files /dev/null and b/Notes-master/.gradle/7.2/dependencies-accessors/dependencies-accessors.lock differ
diff --git a/xiaomi/.gradle/7.5/gc.properties b/Notes-master/.gradle/7.2/dependencies-accessors/gc.properties
similarity index 100%
rename from xiaomi/.gradle/7.5/gc.properties
rename to Notes-master/.gradle/7.2/dependencies-accessors/gc.properties
diff --git a/Notes-master/.gradle/7.2/executionHistory/executionHistory.bin b/Notes-master/.gradle/7.2/executionHistory/executionHistory.bin
new file mode 100644
index 0000000..d1d8c6e
Binary files /dev/null and b/Notes-master/.gradle/7.2/executionHistory/executionHistory.bin differ
diff --git a/Notes-master/.gradle/7.2/executionHistory/executionHistory.lock b/Notes-master/.gradle/7.2/executionHistory/executionHistory.lock
new file mode 100644
index 0000000..6efae4b
Binary files /dev/null and b/Notes-master/.gradle/7.2/executionHistory/executionHistory.lock differ
diff --git a/Notes-master/.gradle/7.2/fileChanges/last-build.bin b/Notes-master/.gradle/7.2/fileChanges/last-build.bin
new file mode 100644
index 0000000..f76dd23
Binary files /dev/null and b/Notes-master/.gradle/7.2/fileChanges/last-build.bin differ
diff --git a/Notes-master/.gradle/7.2/fileHashes/fileHashes.bin b/Notes-master/.gradle/7.2/fileHashes/fileHashes.bin
new file mode 100644
index 0000000..06243d8
Binary files /dev/null and b/Notes-master/.gradle/7.2/fileHashes/fileHashes.bin differ
diff --git a/Notes-master/.gradle/7.2/fileHashes/fileHashes.lock b/Notes-master/.gradle/7.2/fileHashes/fileHashes.lock
new file mode 100644
index 0000000..f13b8c9
Binary files /dev/null and b/Notes-master/.gradle/7.2/fileHashes/fileHashes.lock differ
diff --git a/Notes-master/.gradle/7.2/fileHashes/resourceHashesCache.bin b/Notes-master/.gradle/7.2/fileHashes/resourceHashesCache.bin
new file mode 100644
index 0000000..6dbc693
Binary files /dev/null and b/Notes-master/.gradle/7.2/fileHashes/resourceHashesCache.bin differ
diff --git a/xiaomi/.gradle/configuration-cache/gc.properties b/Notes-master/.gradle/7.2/gc.properties
similarity index 100%
rename from xiaomi/.gradle/configuration-cache/gc.properties
rename to Notes-master/.gradle/7.2/gc.properties
diff --git a/Notes-master/.gradle/7.5.1/checksums/checksums.lock b/Notes-master/.gradle/7.5.1/checksums/checksums.lock
new file mode 100644
index 0000000..d01d3d9
Binary files /dev/null and b/Notes-master/.gradle/7.5.1/checksums/checksums.lock differ
diff --git a/Notes-master/.gradle/7.5.1/checksums/md5-checksums.bin b/Notes-master/.gradle/7.5.1/checksums/md5-checksums.bin
new file mode 100644
index 0000000..a061920
Binary files /dev/null and b/Notes-master/.gradle/7.5.1/checksums/md5-checksums.bin differ
diff --git a/Notes-master/.gradle/7.5.1/checksums/sha1-checksums.bin b/Notes-master/.gradle/7.5.1/checksums/sha1-checksums.bin
new file mode 100644
index 0000000..53638fb
Binary files /dev/null and b/Notes-master/.gradle/7.5.1/checksums/sha1-checksums.bin differ
diff --git a/Notes-master/.gradle/7.5.1/dependencies-accessors/dependencies-accessors.lock b/Notes-master/.gradle/7.5.1/dependencies-accessors/dependencies-accessors.lock
new file mode 100644
index 0000000..c2e50bb
Binary files /dev/null and b/Notes-master/.gradle/7.5.1/dependencies-accessors/dependencies-accessors.lock differ
diff --git a/xiaomi/.gradle/vcs-1/gc.properties b/Notes-master/.gradle/7.5.1/dependencies-accessors/gc.properties
similarity index 100%
rename from xiaomi/.gradle/vcs-1/gc.properties
rename to Notes-master/.gradle/7.5.1/dependencies-accessors/gc.properties
diff --git a/Notes-master/.gradle/7.5.1/executionHistory/executionHistory.bin b/Notes-master/.gradle/7.5.1/executionHistory/executionHistory.bin
new file mode 100644
index 0000000..df6f79b
Binary files /dev/null and b/Notes-master/.gradle/7.5.1/executionHistory/executionHistory.bin differ
diff --git a/Notes-master/.gradle/7.5.1/executionHistory/executionHistory.lock b/Notes-master/.gradle/7.5.1/executionHistory/executionHistory.lock
new file mode 100644
index 0000000..4fbe6f6
Binary files /dev/null and b/Notes-master/.gradle/7.5.1/executionHistory/executionHistory.lock differ
diff --git a/Notes-master/.gradle/7.5.1/fileChanges/last-build.bin b/Notes-master/.gradle/7.5.1/fileChanges/last-build.bin
new file mode 100644
index 0000000..f76dd23
Binary files /dev/null and b/Notes-master/.gradle/7.5.1/fileChanges/last-build.bin differ
diff --git a/Notes-master/.gradle/7.5.1/fileHashes/fileHashes.bin b/Notes-master/.gradle/7.5.1/fileHashes/fileHashes.bin
new file mode 100644
index 0000000..3a19a9a
Binary files /dev/null and b/Notes-master/.gradle/7.5.1/fileHashes/fileHashes.bin differ
diff --git a/Notes-master/.gradle/7.5.1/fileHashes/fileHashes.lock b/Notes-master/.gradle/7.5.1/fileHashes/fileHashes.lock
new file mode 100644
index 0000000..d410171
Binary files /dev/null and b/Notes-master/.gradle/7.5.1/fileHashes/fileHashes.lock differ
diff --git a/Notes-master/.gradle/7.5.1/fileHashes/resourceHashesCache.bin b/Notes-master/.gradle/7.5.1/fileHashes/resourceHashesCache.bin
new file mode 100644
index 0000000..3b52a4a
Binary files /dev/null and b/Notes-master/.gradle/7.5.1/fileHashes/resourceHashesCache.bin differ
diff --git a/Notes-master/.gradle/7.5.1/gc.properties b/Notes-master/.gradle/7.5.1/gc.properties
new file mode 100644
index 0000000..e69de29
diff --git a/Notes-master/.gradle/7.5/checksums/checksums.lock b/Notes-master/.gradle/7.5/checksums/checksums.lock
new file mode 100644
index 0000000..b71e1d8
Binary files /dev/null and b/Notes-master/.gradle/7.5/checksums/checksums.lock differ
diff --git a/Notes-master/.gradle/7.5/checksums/md5-checksums.bin b/Notes-master/.gradle/7.5/checksums/md5-checksums.bin
new file mode 100644
index 0000000..a8bbba3
Binary files /dev/null and b/Notes-master/.gradle/7.5/checksums/md5-checksums.bin differ
diff --git a/Notes-master/.gradle/7.5/checksums/sha1-checksums.bin b/Notes-master/.gradle/7.5/checksums/sha1-checksums.bin
new file mode 100644
index 0000000..b78ec68
Binary files /dev/null and b/Notes-master/.gradle/7.5/checksums/sha1-checksums.bin differ
diff --git a/Notes-master/.gradle/7.5/dependencies-accessors/dependencies-accessors.lock b/Notes-master/.gradle/7.5/dependencies-accessors/dependencies-accessors.lock
new file mode 100644
index 0000000..6fe56b6
Binary files /dev/null and b/Notes-master/.gradle/7.5/dependencies-accessors/dependencies-accessors.lock differ
diff --git a/Notes-master/.gradle/7.5/dependencies-accessors/gc.properties b/Notes-master/.gradle/7.5/dependencies-accessors/gc.properties
new file mode 100644
index 0000000..e69de29
diff --git a/Notes-master/.gradle/7.5/executionHistory/executionHistory.bin b/Notes-master/.gradle/7.5/executionHistory/executionHistory.bin
new file mode 100644
index 0000000..61c6490
Binary files /dev/null and b/Notes-master/.gradle/7.5/executionHistory/executionHistory.bin differ
diff --git a/Notes-master/.gradle/7.5/executionHistory/executionHistory.lock b/Notes-master/.gradle/7.5/executionHistory/executionHistory.lock
new file mode 100644
index 0000000..5ecb9a1
Binary files /dev/null and b/Notes-master/.gradle/7.5/executionHistory/executionHistory.lock differ
diff --git a/Notes-master/.gradle/7.5/fileChanges/last-build.bin b/Notes-master/.gradle/7.5/fileChanges/last-build.bin
new file mode 100644
index 0000000..f76dd23
Binary files /dev/null and b/Notes-master/.gradle/7.5/fileChanges/last-build.bin differ
diff --git a/Notes-master/.gradle/7.5/fileHashes/fileHashes.bin b/Notes-master/.gradle/7.5/fileHashes/fileHashes.bin
new file mode 100644
index 0000000..edc34a4
Binary files /dev/null and b/Notes-master/.gradle/7.5/fileHashes/fileHashes.bin differ
diff --git a/Notes-master/.gradle/7.5/fileHashes/fileHashes.lock b/Notes-master/.gradle/7.5/fileHashes/fileHashes.lock
new file mode 100644
index 0000000..9aa1278
Binary files /dev/null and b/Notes-master/.gradle/7.5/fileHashes/fileHashes.lock differ
diff --git a/Notes-master/.gradle/7.5/fileHashes/resourceHashesCache.bin b/Notes-master/.gradle/7.5/fileHashes/resourceHashesCache.bin
new file mode 100644
index 0000000..b737028
Binary files /dev/null and b/Notes-master/.gradle/7.5/fileHashes/resourceHashesCache.bin differ
diff --git a/Notes-master/.gradle/7.5/gc.properties b/Notes-master/.gradle/7.5/gc.properties
new file mode 100644
index 0000000..e69de29
diff --git a/Notes-master/.gradle/8.0.2/checksums/checksums.lock b/Notes-master/.gradle/8.0.2/checksums/checksums.lock
new file mode 100644
index 0000000..e796752
Binary files /dev/null and b/Notes-master/.gradle/8.0.2/checksums/checksums.lock differ
diff --git a/Notes-master/.gradle/8.0.2/checksums/md5-checksums.bin b/Notes-master/.gradle/8.0.2/checksums/md5-checksums.bin
new file mode 100644
index 0000000..d0488d9
Binary files /dev/null and b/Notes-master/.gradle/8.0.2/checksums/md5-checksums.bin differ
diff --git a/Notes-master/.gradle/8.0.2/checksums/sha1-checksums.bin b/Notes-master/.gradle/8.0.2/checksums/sha1-checksums.bin
new file mode 100644
index 0000000..15faa8d
Binary files /dev/null and b/Notes-master/.gradle/8.0.2/checksums/sha1-checksums.bin differ
diff --git a/Notes-master/.gradle/8.0.2/dependencies-accessors/dependencies-accessors.lock b/Notes-master/.gradle/8.0.2/dependencies-accessors/dependencies-accessors.lock
new file mode 100644
index 0000000..68b3272
Binary files /dev/null and b/Notes-master/.gradle/8.0.2/dependencies-accessors/dependencies-accessors.lock differ
diff --git a/Notes-master/.gradle/8.0.2/dependencies-accessors/gc.properties b/Notes-master/.gradle/8.0.2/dependencies-accessors/gc.properties
new file mode 100644
index 0000000..e69de29
diff --git a/Notes-master/.gradle/8.0.2/executionHistory/executionHistory.lock b/Notes-master/.gradle/8.0.2/executionHistory/executionHistory.lock
new file mode 100644
index 0000000..bdee804
Binary files /dev/null and b/Notes-master/.gradle/8.0.2/executionHistory/executionHistory.lock differ
diff --git a/Notes-master/.gradle/8.0.2/fileChanges/last-build.bin b/Notes-master/.gradle/8.0.2/fileChanges/last-build.bin
new file mode 100644
index 0000000..f76dd23
Binary files /dev/null and b/Notes-master/.gradle/8.0.2/fileChanges/last-build.bin differ
diff --git a/Notes-master/.gradle/8.0.2/fileHashes/fileHashes.lock b/Notes-master/.gradle/8.0.2/fileHashes/fileHashes.lock
new file mode 100644
index 0000000..ffc0dc9
Binary files /dev/null and b/Notes-master/.gradle/8.0.2/fileHashes/fileHashes.lock differ
diff --git a/Notes-master/.gradle/8.0.2/gc.properties b/Notes-master/.gradle/8.0.2/gc.properties
new file mode 100644
index 0000000..e69de29
diff --git a/Notes-master/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/Notes-master/.gradle/buildOutputCleanup/buildOutputCleanup.lock
new file mode 100644
index 0000000..c8fd3ff
Binary files /dev/null and b/Notes-master/.gradle/buildOutputCleanup/buildOutputCleanup.lock differ
diff --git a/Notes-master/.gradle/buildOutputCleanup/cache.properties b/Notes-master/.gradle/buildOutputCleanup/cache.properties
new file mode 100644
index 0000000..00b93ed
--- /dev/null
+++ b/Notes-master/.gradle/buildOutputCleanup/cache.properties
@@ -0,0 +1,2 @@
+#Wed Mar 08 15:51:08 CST 2023
+gradle.version=6.7.1
diff --git a/Notes-master/.gradle/buildOutputCleanup/outputFiles.bin b/Notes-master/.gradle/buildOutputCleanup/outputFiles.bin
new file mode 100644
index 0000000..e42d8ce
Binary files /dev/null and b/Notes-master/.gradle/buildOutputCleanup/outputFiles.bin differ
diff --git a/Notes-master/.gradle/checksums/checksums.lock b/Notes-master/.gradle/checksums/checksums.lock
new file mode 100644
index 0000000..9bcc0a1
Binary files /dev/null and b/Notes-master/.gradle/checksums/checksums.lock differ
diff --git a/Notes-master/.gradle/checksums/md5-checksums.bin b/Notes-master/.gradle/checksums/md5-checksums.bin
new file mode 100644
index 0000000..7c7a133
Binary files /dev/null and b/Notes-master/.gradle/checksums/md5-checksums.bin differ
diff --git a/Notes-master/.gradle/checksums/sha1-checksums.bin b/Notes-master/.gradle/checksums/sha1-checksums.bin
new file mode 100644
index 0000000..1fe3db8
Binary files /dev/null and b/Notes-master/.gradle/checksums/sha1-checksums.bin differ
diff --git a/Notes-master/.gradle/configuration-cache/gc.properties b/Notes-master/.gradle/configuration-cache/gc.properties
new file mode 100644
index 0000000..e69de29
diff --git a/Notes-master/.gradle/file-system.probe b/Notes-master/.gradle/file-system.probe
new file mode 100644
index 0000000..3b7560d
Binary files /dev/null and b/Notes-master/.gradle/file-system.probe differ
diff --git a/Notes-master/.gradle/vcs-1/gc.properties b/Notes-master/.gradle/vcs-1/gc.properties
new file mode 100644
index 0000000..e69de29
diff --git a/xiaomi/.idea/.gitignore b/Notes-master/.idea/.gitignore
similarity index 100%
rename from xiaomi/.idea/.gitignore
rename to Notes-master/.idea/.gitignore
diff --git a/Notes-master/.idea/compiler.xml b/Notes-master/.idea/compiler.xml
new file mode 100644
index 0000000..fb7f4a8
--- /dev/null
+++ b/Notes-master/.idea/compiler.xml
@@ -0,0 +1,6 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/Notes-master/.idea/deploymentTargetDropDown.xml b/Notes-master/.idea/deploymentTargetDropDown.xml
new file mode 100644
index 0000000..b4f063b
--- /dev/null
+++ b/Notes-master/.idea/deploymentTargetDropDown.xml
@@ -0,0 +1,17 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/xiaomi/.idea/gradle.xml b/Notes-master/.idea/gradle.xml
similarity index 76%
rename from xiaomi/.idea/gradle.xml
rename to Notes-master/.idea/gradle.xml
index be20462..3cda1c5 100644
--- a/xiaomi/.idea/gradle.xml
+++ b/Notes-master/.idea/gradle.xml
@@ -7,11 +7,13 @@
-
+
+
diff --git a/xiaomi/.idea/jarRepositories.xml b/Notes-master/.idea/jarRepositories.xml
similarity index 100%
rename from xiaomi/.idea/jarRepositories.xml
rename to Notes-master/.idea/jarRepositories.xml
diff --git a/Notes-master/.idea/misc.xml b/Notes-master/.idea/misc.xml
new file mode 100644
index 0000000..5da8073
--- /dev/null
+++ b/Notes-master/.idea/misc.xml
@@ -0,0 +1,8 @@
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/Notes-master/app/build.gradle b/Notes-master/app/build.gradle
new file mode 100644
index 0000000..8634256
--- /dev/null
+++ b/Notes-master/app/build.gradle
@@ -0,0 +1,27 @@
+apply plugin: 'com.android.application'
+
+android {
+ compileSdk 22
+
+ defaultConfig {
+ applicationId "net.micode.notes"
+ minSdkVersion 14
+ targetSdkVersion 14
+ }
+
+ buildTypes {
+ release {
+ minifyEnabled false
+ proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt'
+ }
+ }
+ compileOptions {
+ sourceCompatibility JavaVersion.VERSION_1_6
+ targetCompatibility JavaVersion.VERSION_1_6
+ }
+ dependenciesInfo {
+ includeInApk true
+ includeInBundle true
+ }
+ namespace 'net.micode.notes'
+}
diff --git a/xiaomi/app/build/generated/source/buildConfig/debug/net/micode/notes/BuildConfig.java b/Notes-master/app/build/generated/source/buildConfig/debug/net/micode/notes/BuildConfig.java
similarity index 100%
rename from xiaomi/app/build/generated/source/buildConfig/debug/net/micode/notes/BuildConfig.java
rename to Notes-master/app/build/generated/source/buildConfig/debug/net/micode/notes/BuildConfig.java
diff --git a/Notes-master/app/build/generated/source/buildConfig/release/net/micode/notes/BuildConfig.java b/Notes-master/app/build/generated/source/buildConfig/release/net/micode/notes/BuildConfig.java
new file mode 100644
index 0000000..6faa0c2
--- /dev/null
+++ b/Notes-master/app/build/generated/source/buildConfig/release/net/micode/notes/BuildConfig.java
@@ -0,0 +1,12 @@
+/**
+ * Automatically generated file. DO NOT MODIFY
+ */
+package net.micode.notes;
+
+public final class BuildConfig {
+ public static final boolean DEBUG = false;
+ public static final String APPLICATION_ID = "net.micode.notes";
+ public static final String BUILD_TYPE = "release";
+ public static final int VERSION_CODE = 1;
+ public static final String VERSION_NAME = "0.1";
+}
diff --git a/xiaomi/app/build/intermediates/annotation_processor_list/debug/annotationProcessors.json b/Notes-master/app/build/intermediates/annotation_processor_list/debug/annotationProcessors.json
similarity index 100%
rename from xiaomi/app/build/intermediates/annotation_processor_list/debug/annotationProcessors.json
rename to Notes-master/app/build/intermediates/annotation_processor_list/debug/annotationProcessors.json
diff --git a/Notes-master/app/build/intermediates/annotation_processor_list/release/annotationProcessors.json b/Notes-master/app/build/intermediates/annotation_processor_list/release/annotationProcessors.json
new file mode 100644
index 0000000..9e26dfe
--- /dev/null
+++ b/Notes-master/app/build/intermediates/annotation_processor_list/release/annotationProcessors.json
@@ -0,0 +1 @@
+{}
\ No newline at end of file
diff --git a/Notes-master/app/build/intermediates/apk_ide_redirect_file/debug/redirect.txt b/Notes-master/app/build/intermediates/apk_ide_redirect_file/debug/redirect.txt
new file mode 100644
index 0000000..66652a5
--- /dev/null
+++ b/Notes-master/app/build/intermediates/apk_ide_redirect_file/debug/redirect.txt
@@ -0,0 +1,2 @@
+#- File Locator -
+listingFile=../../../outputs/apk/debug/output-metadata.json
diff --git a/Notes-master/app/build/intermediates/app_metadata/debug/app-metadata.properties b/Notes-master/app/build/intermediates/app_metadata/debug/app-metadata.properties
new file mode 100644
index 0000000..08c4969
--- /dev/null
+++ b/Notes-master/app/build/intermediates/app_metadata/debug/app-metadata.properties
@@ -0,0 +1,2 @@
+appMetadataVersion=1.0
+androidGradlePluginVersion=4.2.2
\ No newline at end of file
diff --git a/xiaomi/app/build/intermediates/app_metadata/debug/app-metadata.properties b/Notes-master/app/build/intermediates/app_metadata/release/app-metadata.properties
similarity index 100%
rename from xiaomi/app/build/intermediates/app_metadata/debug/app-metadata.properties
rename to Notes-master/app/build/intermediates/app_metadata/release/app-metadata.properties
diff --git a/Notes-master/app/build/intermediates/compatible_screen_manifest/debug/output-metadata.json b/Notes-master/app/build/intermediates/compatible_screen_manifest/debug/output-metadata.json
new file mode 100644
index 0000000..07b12ed
--- /dev/null
+++ b/Notes-master/app/build/intermediates/compatible_screen_manifest/debug/output-metadata.json
@@ -0,0 +1,10 @@
+{
+ "version": 2,
+ "artifactType": {
+ "type": "COMPATIBLE_SCREEN_MANIFEST",
+ "kind": "Directory"
+ },
+ "applicationId": "net.micode.notes",
+ "variantName": "debug",
+ "elements": []
+}
\ No newline at end of file
diff --git a/Notes-master/app/build/intermediates/compatible_screen_manifest/release/output-metadata.json b/Notes-master/app/build/intermediates/compatible_screen_manifest/release/output-metadata.json
new file mode 100644
index 0000000..53f799b
--- /dev/null
+++ b/Notes-master/app/build/intermediates/compatible_screen_manifest/release/output-metadata.json
@@ -0,0 +1,10 @@
+{
+ "version": 3,
+ "artifactType": {
+ "type": "COMPATIBLE_SCREEN_MANIFEST",
+ "kind": "Directory"
+ },
+ "applicationId": "net.micode.notes",
+ "variantName": "release",
+ "elements": []
+}
\ No newline at end of file
diff --git a/Notes-master/app/build/intermediates/compile_and_runtime_not_namespaced_r_class_jar/debug/R.jar b/Notes-master/app/build/intermediates/compile_and_runtime_not_namespaced_r_class_jar/debug/R.jar
new file mode 100644
index 0000000..767aac4
Binary files /dev/null and b/Notes-master/app/build/intermediates/compile_and_runtime_not_namespaced_r_class_jar/debug/R.jar differ
diff --git a/Notes-master/app/build/intermediates/compile_and_runtime_not_namespaced_r_class_jar/release/R.jar b/Notes-master/app/build/intermediates/compile_and_runtime_not_namespaced_r_class_jar/release/R.jar
new file mode 100644
index 0000000..a54964f
Binary files /dev/null and b/Notes-master/app/build/intermediates/compile_and_runtime_not_namespaced_r_class_jar/release/R.jar differ
diff --git a/Notes-master/app/build/intermediates/default_proguard_files/global/proguard-android-optimize.txt-7.4.2 b/Notes-master/app/build/intermediates/default_proguard_files/global/proguard-android-optimize.txt-7.4.2
new file mode 100644
index 0000000..de0b268
--- /dev/null
+++ b/Notes-master/app/build/intermediates/default_proguard_files/global/proguard-android-optimize.txt-7.4.2
@@ -0,0 +1,117 @@
+# This is a configuration file for ProGuard.
+# http://proguard.sourceforge.net/index.html#manual/usage.html
+#
+# Starting with version 2.2 of the Android plugin for Gradle, this file is distributed together with
+# the plugin and unpacked at build-time. The files in $ANDROID_HOME are no longer maintained and
+# will be ignored by new version of the Android plugin for Gradle.
+
+# Optimizations: If you don't want to optimize, use the proguard-android.txt configuration file
+# instead of this one, which turns off the optimization flags.
+# Adding optimization introduces certain risks, since for example not all optimizations performed by
+# ProGuard works on all versions of Dalvik. The following flags turn off various optimizations
+# known to have issues, but the list may not be complete or up to date. (The "arithmetic"
+# optimization can be used if you are only targeting Android 2.0 or later.) Make sure you test
+# thoroughly if you go this route.
+-optimizations !code/simplification/arithmetic,!code/simplification/cast,!field/*,!class/merging/*
+-optimizationpasses 5
+-allowaccessmodification
+
+-dontusemixedcaseclassnames
+-dontskipnonpubliclibraryclasses
+-verbose
+
+# Preserve some attributes that may be required for reflection.
+-keepattributes AnnotationDefault,
+ EnclosingMethod,
+ InnerClasses,
+ RuntimeVisibleAnnotations,
+ RuntimeVisibleParameterAnnotations,
+ RuntimeVisibleTypeAnnotations,
+ Signature
+
+-keep public class com.google.vending.licensing.ILicensingService
+-keep public class com.android.vending.licensing.ILicensingService
+-keep public class com.google.android.vending.licensing.ILicensingService
+-dontnote com.android.vending.licensing.ILicensingService
+-dontnote com.google.vending.licensing.ILicensingService
+-dontnote com.google.android.vending.licensing.ILicensingService
+
+# For native methods, see http://proguard.sourceforge.net/manual/examples.html#native
+-keepclasseswithmembernames,includedescriptorclasses class * {
+ native ;
+}
+
+# Keep setters in Views so that animations can still work.
+-keepclassmembers public class * extends android.view.View {
+ void set*(***);
+ *** get*();
+}
+
+# We want to keep methods in Activity that could be used in the XML attribute onClick.
+-keepclassmembers class * extends android.app.Activity {
+ public void *(android.view.View);
+}
+
+# For enumeration classes, see http://proguard.sourceforge.net/manual/examples.html#enumerations
+-keepclassmembers enum * {
+ public static **[] values();
+ public static ** valueOf(java.lang.String);
+}
+
+-keepclassmembers class * implements android.os.Parcelable {
+ public static final ** CREATOR;
+}
+
+# Preserve annotated Javascript interface methods.
+-keepclassmembers class * {
+ @android.webkit.JavascriptInterface ;
+}
+
+# The support libraries contains references to newer platform versions.
+# Don't warn about those in case this app is linking against an older
+# platform version. We know about them, and they are safe.
+-dontnote android.support.**
+-dontnote androidx.**
+-dontwarn android.support.**
+-dontwarn androidx.**
+
+# This class is deprecated, but remains for backward compatibility.
+-dontwarn android.util.FloatMath
+
+# Understand the @Keep support annotation.
+-keep class android.support.annotation.Keep
+-keep class androidx.annotation.Keep
+
+-keep @android.support.annotation.Keep class * {*;}
+-keep @androidx.annotation.Keep class * {*;}
+
+-keepclasseswithmembers class * {
+ @android.support.annotation.Keep ;
+}
+
+-keepclasseswithmembers class * {
+ @androidx.annotation.Keep ;
+}
+
+-keepclasseswithmembers class * {
+ @android.support.annotation.Keep ;
+}
+
+-keepclasseswithmembers class * {
+ @androidx.annotation.Keep ;
+}
+
+-keepclasseswithmembers class * {
+ @android.support.annotation.Keep (...);
+}
+
+-keepclasseswithmembers class * {
+ @androidx.annotation.Keep (...);
+}
+
+# These classes are duplicated between android.jar and org.apache.http.legacy.jar.
+-dontnote org.apache.http.**
+-dontnote android.net.http.**
+
+# These classes are duplicated between android.jar and core-lambda-stubs.jar.
+-dontnote java.lang.invoke.**
diff --git a/Notes-master/app/build/intermediates/default_proguard_files/global/proguard-android.txt-7.4.2 b/Notes-master/app/build/intermediates/default_proguard_files/global/proguard-android.txt-7.4.2
new file mode 100644
index 0000000..3ca0d03
--- /dev/null
+++ b/Notes-master/app/build/intermediates/default_proguard_files/global/proguard-android.txt-7.4.2
@@ -0,0 +1,116 @@
+# This is a configuration file for ProGuard.
+# http://proguard.sourceforge.net/index.html#manual/usage.html
+#
+# Starting with version 2.2 of the Android plugin for Gradle, this file is distributed together with
+# the plugin and unpacked at build-time. The files in $ANDROID_HOME are no longer maintained and
+# will be ignored by new version of the Android plugin for Gradle.
+
+# Optimization is turned off by default. Dex does not like code run
+# through the ProGuard optimize steps (and performs some
+# of these optimizations on its own).
+# Note that if you want to enable optimization, you cannot just
+# include optimization flags in your own project configuration file;
+# instead you will need to point to the
+# "proguard-android-optimize.txt" file instead of this one from your
+# project.properties file.
+-dontoptimize
+
+-dontusemixedcaseclassnames
+-dontskipnonpubliclibraryclasses
+-verbose
+
+# Preserve some attributes that may be required for reflection.
+-keepattributes AnnotationDefault,
+ EnclosingMethod,
+ InnerClasses,
+ RuntimeVisibleAnnotations,
+ RuntimeVisibleParameterAnnotations,
+ RuntimeVisibleTypeAnnotations,
+ Signature
+
+-keep public class com.google.vending.licensing.ILicensingService
+-keep public class com.android.vending.licensing.ILicensingService
+-keep public class com.google.android.vending.licensing.ILicensingService
+-dontnote com.android.vending.licensing.ILicensingService
+-dontnote com.google.vending.licensing.ILicensingService
+-dontnote com.google.android.vending.licensing.ILicensingService
+
+# For native methods, see http://proguard.sourceforge.net/manual/examples.html#native
+-keepclasseswithmembernames,includedescriptorclasses class * {
+ native ;
+}
+
+# Keep setters in Views so that animations can still work.
+-keepclassmembers public class * extends android.view.View {
+ void set*(***);
+ *** get*();
+}
+
+# We want to keep methods in Activity that could be used in the XML attribute onClick.
+-keepclassmembers class * extends android.app.Activity {
+ public void *(android.view.View);
+}
+
+# For enumeration classes, see http://proguard.sourceforge.net/manual/examples.html#enumerations
+-keepclassmembers enum * {
+ public static **[] values();
+ public static ** valueOf(java.lang.String);
+}
+
+-keepclassmembers class * implements android.os.Parcelable {
+ public static final ** CREATOR;
+}
+
+# Preserve annotated Javascript interface methods.
+-keepclassmembers class * {
+ @android.webkit.JavascriptInterface ;
+}
+
+# The support libraries contains references to newer platform versions.
+# Don't warn about those in case this app is linking against an older
+# platform version. We know about them, and they are safe.
+-dontnote android.support.**
+-dontnote androidx.**
+-dontwarn android.support.**
+-dontwarn androidx.**
+
+# This class is deprecated, but remains for backward compatibility.
+-dontwarn android.util.FloatMath
+
+# Understand the @Keep support annotation.
+-keep class android.support.annotation.Keep
+-keep class androidx.annotation.Keep
+
+-keep @android.support.annotation.Keep class * {*;}
+-keep @androidx.annotation.Keep class * {*;}
+
+-keepclasseswithmembers class * {
+ @android.support.annotation.Keep ;
+}
+
+-keepclasseswithmembers class * {
+ @androidx.annotation.Keep ;
+}
+
+-keepclasseswithmembers class * {
+ @android.support.annotation.Keep ;
+}
+
+-keepclasseswithmembers class * {
+ @androidx.annotation.Keep ;
+}
+
+-keepclasseswithmembers class * {
+ @android.support.annotation.Keep (...);
+}
+
+-keepclasseswithmembers class * {
+ @androidx.annotation.Keep (...);
+}
+
+# These classes are duplicated between android.jar and org.apache.http.legacy.jar.
+-dontnote org.apache.http.**
+-dontnote android.net.http.**
+
+# These classes are duplicated between android.jar and core-lambda-stubs.jar.
+-dontnote java.lang.invoke.**
diff --git a/Notes-master/app/build/intermediates/default_proguard_files/global/proguard-defaults.txt-7.4.2 b/Notes-master/app/build/intermediates/default_proguard_files/global/proguard-defaults.txt-7.4.2
new file mode 100644
index 0000000..5fea5b5
--- /dev/null
+++ b/Notes-master/app/build/intermediates/default_proguard_files/global/proguard-defaults.txt-7.4.2
@@ -0,0 +1,117 @@
+# This is a configuration file for ProGuard.
+# http://proguard.sourceforge.net/index.html#manual/usage.html
+#
+# Starting with version 2.2 of the Android plugin for Gradle, this file is distributed together with
+# the plugin and unpacked at build-time. The files in $ANDROID_HOME are no longer maintained and
+# will be ignored by new version of the Android plugin for Gradle.
+
+# Optimizations can be turned on and off in the 'postProcessing' DSL block.
+# The configuration below is applied if optimizations are enabled.
+# Adding optimization introduces certain risks, since for example not all optimizations performed by
+# ProGuard works on all versions of Dalvik. The following flags turn off various optimizations
+# known to have issues, but the list may not be complete or up to date. (The "arithmetic"
+# optimization can be used if you are only targeting Android 2.0 or later.) Make sure you test
+# thoroughly if you go this route.
+-optimizations !code/simplification/arithmetic,!code/simplification/cast,!field/*,!class/merging/*
+-optimizationpasses 5
+-allowaccessmodification
+
+-dontusemixedcaseclassnames
+-dontskipnonpubliclibraryclasses
+-verbose
+
+# Preserve some attributes that may be required for reflection.
+-keepattributes AnnotationDefault,
+ EnclosingMethod,
+ InnerClasses,
+ RuntimeVisibleAnnotations,
+ RuntimeVisibleParameterAnnotations,
+ RuntimeVisibleTypeAnnotations,
+ Signature
+
+-keep public class com.google.vending.licensing.ILicensingService
+-keep public class com.android.vending.licensing.ILicensingService
+-keep public class com.google.android.vending.licensing.ILicensingService
+-dontnote com.android.vending.licensing.ILicensingService
+-dontnote com.google.vending.licensing.ILicensingService
+-dontnote com.google.android.vending.licensing.ILicensingService
+
+# For native methods, see http://proguard.sourceforge.net/manual/examples.html#native
+-keepclasseswithmembernames,includedescriptorclasses class * {
+ native ;
+}
+
+# Keep setters in Views so that animations can still work.
+-keepclassmembers public class * extends android.view.View {
+ void set*(***);
+ *** get*();
+}
+
+# We want to keep methods in Activity that could be used in the XML attribute onClick.
+-keepclassmembers class * extends android.app.Activity {
+ public void *(android.view.View);
+}
+
+# For enumeration classes, see http://proguard.sourceforge.net/manual/examples.html#enumerations
+-keepclassmembers enum * {
+ public static **[] values();
+ public static ** valueOf(java.lang.String);
+}
+
+-keepclassmembers class * implements android.os.Parcelable {
+ public static final ** CREATOR;
+}
+
+# Preserve annotated Javascript interface methods.
+-keepclassmembers class * {
+ @android.webkit.JavascriptInterface ;
+}
+
+# The support libraries contains references to newer platform versions.
+# Don't warn about those in case this app is linking against an older
+# platform version. We know about them, and they are safe.
+-dontnote android.support.**
+-dontnote androidx.**
+-dontwarn android.support.**
+-dontwarn androidx.**
+
+# This class is deprecated, but remains for backward compatibility.
+-dontwarn android.util.FloatMath
+
+# Understand the @Keep support annotation.
+-keep class android.support.annotation.Keep
+-keep class androidx.annotation.Keep
+
+-keep @android.support.annotation.Keep class * {*;}
+-keep @androidx.annotation.Keep class * {*;}
+
+-keepclasseswithmembers class * {
+ @android.support.annotation.Keep ;
+}
+
+-keepclasseswithmembers class * {
+ @androidx.annotation.Keep ;
+}
+
+-keepclasseswithmembers class * {
+ @android.support.annotation.Keep ;
+}
+
+-keepclasseswithmembers class * {
+ @androidx.annotation.Keep ;
+}
+
+-keepclasseswithmembers class * {
+ @android.support.annotation.Keep (...);
+}
+
+-keepclasseswithmembers class * {
+ @androidx.annotation.Keep (...);
+}
+
+# These classes are duplicated between android.jar and org.apache.http.legacy.jar.
+-dontnote org.apache.http.**
+-dontnote android.net.http.**
+
+# These classes are duplicated between android.jar and core-lambda-stubs.jar.
+-dontnote java.lang.invoke.**
diff --git a/Notes-master/app/build/intermediates/dex/debug/mergeDexDebug/classes.dex b/Notes-master/app/build/intermediates/dex/debug/mergeDexDebug/classes.dex
new file mode 100644
index 0000000..2259253
Binary files /dev/null and b/Notes-master/app/build/intermediates/dex/debug/mergeDexDebug/classes.dex differ
diff --git a/Notes-master/app/build/intermediates/dex_archive_input_jar_hashes/debug/out b/Notes-master/app/build/intermediates/dex_archive_input_jar_hashes/debug/out
new file mode 100644
index 0000000..8767e04
Binary files /dev/null and b/Notes-master/app/build/intermediates/dex_archive_input_jar_hashes/debug/out differ
diff --git a/xiaomi/app/build/intermediates/dex_number_of_buckets_file/debug/out b/Notes-master/app/build/intermediates/dex_number_of_buckets_file/debug/out
similarity index 100%
rename from xiaomi/app/build/intermediates/dex_number_of_buckets_file/debug/out
rename to Notes-master/app/build/intermediates/dex_number_of_buckets_file/debug/out
diff --git a/Notes-master/app/build/intermediates/incremental/debug-mergeJavaRes/merge-state b/Notes-master/app/build/intermediates/incremental/debug-mergeJavaRes/merge-state
new file mode 100644
index 0000000..d5ff387
Binary files /dev/null and b/Notes-master/app/build/intermediates/incremental/debug-mergeJavaRes/merge-state differ
diff --git a/Notes-master/app/build/intermediates/incremental/debug/mergeDebugResources/compile-file-map.properties b/Notes-master/app/build/intermediates/incremental/debug/mergeDebugResources/compile-file-map.properties
new file mode 100644
index 0000000..cc349d5
--- /dev/null
+++ b/Notes-master/app/build/intermediates/incremental/debug/mergeDebugResources/compile-file-map.properties
@@ -0,0 +1,96 @@
+#Wed Mar 08 15:31:34 CST 2023
+net.micode.notes.app-main-7\:/drawable-hdpi/font_super.png=E\:\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_super.png.flat
+net.micode.notes.app-main-7\:/drawable-hdpi/call_record.png=E\:\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_call_record.png.flat
+net.micode.notes.app-main-7\:/drawable-hdpi/new_note_normal.png=E\:\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_new_note_normal.png.flat
+net.micode.notes.app-main-7\:/drawable-hdpi/edit_yellow.9.png=E\:\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_yellow.9.png.flat
+net.micode.notes.app-main-7\:/drawable-hdpi/edit_title_green.9.png=E\:\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_green.9.png.flat
+net.micode.notes.app-main-7\:/menu/sub_folder.xml=E\:\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\menu_sub_folder.xml.flat
+net.micode.notes.app-main-7\:/drawable-hdpi/edit_title_yellow.9.png=E\:\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_yellow.9.png.flat
+net.micode.notes.app-main-7\:/drawable-hdpi/font_small.png=E\:\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_small.png.flat
+net.micode.notes.app-main-7\:/drawable-hdpi/widget_2x_white.png=E\:\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_white.png.flat
+net.micode.notes.app-main-7\:/drawable-hdpi/edit_white.9.png=E\:\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_white.9.png.flat
+net.micode.notes.app-main-7\:/layout/account_dialog_title.xml=E\:\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\layout_account_dialog_title.xml.flat
+net.micode.notes.app-main-7\:/drawable-hdpi/widget_4x_green.png=E\:\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_green.png.flat
+net.micode.notes.app-main-7\:/drawable-hdpi/list_blue_down.9.png=E\:\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_blue_down.9.png.flat
+net.micode.notes.app-main-7\:/color/secondary_text_dark.xml=E\:\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\color_secondary_text_dark.xml.flat
+net.micode.notes.app-main-7\:/layout/dialog_edit_text.xml=E\:\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\layout_dialog_edit_text.xml.flat
+net.micode.notes.app-main-7\:/layout/widget_4x.xml=E\:\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\layout_widget_4x.xml.flat
+net.micode.notes.app-main-7\:/drawable-hdpi/list_yellow_middle.9.png=E\:\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_middle.9.png.flat
+net.micode.notes.app-main-7\:/drawable-hdpi/menu_delete.png=E\:\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_menu_delete.png.flat
+net.micode.notes.app-main-7\:/drawable-hdpi/clock.png=E\:\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_clock.png.flat
+net.micode.notes.app-main-7\:/drawable-hdpi/font_normal.png=E\:\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_normal.png.flat
+net.micode.notes.app-main-7\:/drawable-hdpi/dropdown_icon.9.png=E\:\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_dropdown_icon.9.png.flat
+net.micode.notes.app-main-7\:/layout/note_edit.xml=E\:\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\layout_note_edit.xml.flat
+net.micode.notes.app-main-7\:/drawable-hdpi/edit_green.9.png=E\:\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_green.9.png.flat
+net.micode.notes.app-main-7\:/drawable-hdpi/list_green_single.9.png=E\:\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_green_single.9.png.flat
+net.micode.notes.app-main-7\:/drawable-hdpi/list_white_single.9.png=E\:\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_single.9.png.flat
+net.micode.notes.app-main-7\:/raw-zh-rCN/introduction=E\:\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\raw-zh-rCN_introduction.flat
+net.micode.notes.app-main-7\:/drawable-hdpi/widget_2x_green.png=E\:\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_green.png.flat
+net.micode.notes.app-main-7\:/xml/preferences.xml=E\:\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\xml_preferences.xml.flat
+net.micode.notes.app-main-7\:/drawable-hdpi/list_red_single.9.png=E\:\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_single.9.png.flat
+net.micode.notes.app-main-7\:/drawable-hdpi/delete.png=E\:\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_delete.png.flat
+net.micode.notes.app-main-7\:/menu/call_record_folder.xml=E\:\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\menu_call_record_folder.xml.flat
+net.micode.notes.app-main-7\:/drawable-hdpi/widget_2x_red.png=E\:\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_red.png.flat
+net.micode.notes.app-main-7\:/layout/widget_2x.xml=E\:\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\layout_widget_2x.xml.flat
+net.micode.notes.app-main-7\:/drawable-hdpi/menu_move.png=E\:\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_menu_move.png.flat
+net.micode.notes.app-main-7\:/drawable-hdpi/list_green_down.9.png=E\:\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_green_down.9.png.flat
+net.micode.notes.app-main-7\:/layout/note_edit_list_item.xml=E\:\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\layout_note_edit_list_item.xml.flat
+net.micode.notes.app-main-7\:/drawable-hdpi/widget_2x_blue.png=E\:\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_blue.png.flat
+net.micode.notes.app-main-7\:/layout/add_account_text.xml=E\:\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\layout_add_account_text.xml.flat
+net.micode.notes.app-main-7\:/xml/widget_4x_info.xml=E\:\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\xml_widget_4x_info.xml.flat
+net.micode.notes.app-main-7\:/drawable-hdpi/font_size_selector_bg.9.png=E\:\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_size_selector_bg.9.png.flat
+net.micode.notes.app-main-7\:/drawable-hdpi/selected.png=E\:\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_selected.png.flat
+net.micode.notes.app-main-7\:/drawable-hdpi/search_result.png=E\:\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_search_result.png.flat
+net.micode.notes.app-main-7\:/drawable-hdpi/widget_4x_white.png=E\:\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_white.png.flat
+net.micode.notes.app-main-7\:/drawable-hdpi/list_blue_middle.9.png=E\:\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_blue_middle.9.png.flat
+net.micode.notes.app-main-7\:/drawable-hdpi/list_green_middle.9.png=E\:\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_green_middle.9.png.flat
+net.micode.notes.app-main-7\:/drawable-hdpi/list_white_down.9.png=E\:\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_down.9.png.flat
+net.micode.notes.app-main-7\:/drawable-hdpi/list_blue_single.9.png=E\:\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_blue_single.9.png.flat
+net.micode.notes.app-main-7\:/drawable-hdpi/font_large.png=E\:\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_large.png.flat
+net.micode.notes.app-main-7\:/drawable-hdpi/list_yellow_up.9.png=E\:\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_up.9.png.flat
+net.micode.notes.app-main-7\:/drawable-hdpi/list_red_middle.9.png=E\:\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_middle.9.png.flat
+net.micode.notes.app-main-7\:/layout/settings_header.xml=E\:\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\layout_settings_header.xml.flat
+net.micode.notes.app-main-7\:/menu/note_list.xml=E\:\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\menu_note_list.xml.flat
+net.micode.notes.app-main-7\:/menu/call_note_edit.xml=E\:\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\menu_call_note_edit.xml.flat
+net.micode.notes.app-main-7\:/drawable/new_note.xml=E\:\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable_new_note.xml.flat
+net.micode.notes.app-main-7\:/drawable-hdpi/edit_red.9.png=E\:\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_red.9.png.flat
+net.micode.notes.app-main-7\:/layout/note_list.xml=E\:\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\layout_note_list.xml.flat
+net.micode.notes.app-main-7\:/color/primary_text_dark.xml=E\:\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\color_primary_text_dark.xml.flat
+net.micode.notes.app-main-7\:/layout/datetime_picker.xml=E\:\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\layout_datetime_picker.xml.flat
+net.micode.notes.app-main-7\:/raw/introduction=E\:\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\raw_introduction.flat
+net.micode.notes.app-main-7\:/drawable-hdpi/list_yellow_single.9.png=E\:\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_single.9.png.flat
+net.micode.notes.app-main-7\:/drawable-hdpi/widget_4x_yellow.png=E\:\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_yellow.png.flat
+net.micode.notes.app-main-7\:/drawable-hdpi/widget_4x_red.png=E\:\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_red.png.flat
+net.micode.notes.app-main-7\:/drawable-hdpi/title_alert.png=E\:\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_title_alert.png.flat
+net.micode.notes.app-main-7\:/drawable-hdpi/list_red_down.9.png=E\:\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_down.9.png.flat
+net.micode.notes.app-main-7\:/menu/note_list_options.xml=E\:\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\menu_note_list_options.xml.flat
+net.micode.notes.app-main-7\:/drawable-hdpi/widget_2x_yellow.png=E\:\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_yellow.png.flat
+net.micode.notes.app-main-7\:/drawable-hdpi/icon_app.png=E\:\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_icon_app.png.flat
+net.micode.notes.app-main-7\:/layout/note_item.xml=E\:\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\layout_note_item.xml.flat
+net.micode.notes.app-main-7\:/drawable-hdpi/list_background.png=E\:\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_background.png.flat
+net.micode.notes.app-main-7\:/drawable-hdpi/edit_title_red.9.png=E\:\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_red.9.png.flat
+net.micode.notes.app-main-7\:/drawable-hdpi/title_bar_bg.9.png=E\:\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_title_bar_bg.9.png.flat
+net.micode.notes.app-main-7\:/drawable-hdpi/list_footer_bg.9.png=E\:\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_footer_bg.9.png.flat
+net.micode.notes.app-main-7\:/drawable-hdpi/new_note_pressed.png=E\:\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_new_note_pressed.png.flat
+net.micode.notes.app-main-7\:/drawable-hdpi/list_green_up.9.png=E\:\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_green_up.9.png.flat
+net.micode.notes.app-main-7\:/layout/note_list_dropdown_menu.xml=E\:\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\layout_note_list_dropdown_menu.xml.flat
+net.micode.notes.app-main-7\:/layout/note_list_footer.xml=E\:\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\layout_note_list_footer.xml.flat
+net.micode.notes.app-main-7\:/drawable-hdpi/list_red_up.9.png=E\:\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_up.9.png.flat
+net.micode.notes.app-main-7\:/menu/note_list_dropdown.xml=E\:\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\menu_note_list_dropdown.xml.flat
+net.micode.notes.app-main-7\:/drawable-hdpi/list_white_up.9.png=E\:\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_up.9.png.flat
+net.micode.notes.app-main-7\:/drawable-hdpi/edit_title_blue.9.png=E\:\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_blue.9.png.flat
+net.micode.notes.app-main-7\:/drawable-hdpi/bg_color_btn_mask.png=E\:\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_bg_color_btn_mask.png.flat
+net.micode.notes.app-main-7\:/drawable-hdpi/edit_blue.9.png=E\:\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_blue.9.png.flat
+net.micode.notes.app-main-7\:/drawable-hdpi/bg_btn_set_color.png=E\:\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_bg_btn_set_color.png.flat
+net.micode.notes.app-main-7\:/drawable-hdpi/edit_title_white.9.png=E\:\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_white.9.png.flat
+net.micode.notes.app-main-7\:/xml/searchable.xml=E\:\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\xml_searchable.xml.flat
+net.micode.notes.app-main-7\:/drawable-hdpi/notification.png=E\:\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_notification.png.flat
+net.micode.notes.app-main-7\:/drawable-hdpi/list_blue_up.9.png=E\:\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_blue_up.9.png.flat
+net.micode.notes.app-main-7\:/xml/widget_2x_info.xml=E\:\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\xml_widget_2x_info.xml.flat
+net.micode.notes.app-main-7\:/drawable-hdpi/note_edit_color_selector_panel.png=E\:\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_note_edit_color_selector_panel.png.flat
+net.micode.notes.app-main-7\:/drawable-hdpi/list_white_middle.9.png=E\:\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_middle.9.png.flat
+net.micode.notes.app-main-7\:/layout/folder_list_item.xml=E\:\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\layout_folder_list_item.xml.flat
+net.micode.notes.app-main-7\:/drawable-hdpi/list_folder.9.png=E\:\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_folder.9.png.flat
+net.micode.notes.app-main-7\:/drawable-hdpi/widget_4x_blue.png=E\:\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_blue.png.flat
+net.micode.notes.app-main-7\:/drawable-hdpi/list_yellow_down.9.png=E\:\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_down.9.png.flat
+net.micode.notes.app-main-7\:/menu/note_edit.xml=E\:\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\menu_note_edit.xml.flat
diff --git a/Notes-master/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values-zh-rCN/values-zh-rCN.xml b/Notes-master/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values-zh-rCN/values-zh-rCN.xml
new file mode 100644
index 0000000..d65e0cc
--- /dev/null
+++ b/Notes-master/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values-zh-rCN/values-zh-rCN.xml
@@ -0,0 +1,108 @@
+
+
+
+ 短信
+ 邮件
+
+
+ %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 task同步便签记录
+ 同步账号
+ 添加账号
+ 新建便签背景颜色随机
+ 取消同步
+ 立即同步
+ 当前帐号 %1$s
+ 如更换同步帐号,过去的帐号同步信息将被清空,再次切换的同时可能会造成数据重复
+ 请选择google帐号,便签将与该帐号的google task内容同步。
+ 同步便签
+ 上次同步于 %1$s
+ 取消
+ 更换账号
+ 删除账号
+ 设置
+ 正在同步中,不能修改同步帐号
+ 同步帐号已设置为%1$s
+ 便签
+ 搜索便签
+ 正在搜索便签
+ 便签中的文字
+ 创建提醒
+ 导出成功
+ 与%1$s同步成功
+ 正在获取服务器便签列表...
+ 登录%1$s...
+ 正在同步本地便签...
+ 同步已取消
+ 同步失败
+ 同步成功
+ 同步便签...
+ 没有关联内容,点击新建便签。
+ 访客模式下,便签内容不可见
+
\ No newline at end of file
diff --git a/Notes-master/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values-zh-rTW/values-zh-rTW.xml b/Notes-master/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values-zh-rTW/values-zh-rTW.xml
new file mode 100644
index 0000000..226b5bc
--- /dev/null
+++ b/Notes-master/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values-zh-rTW/values-zh-rTW.xml
@@ -0,0 +1,108 @@
+
+
+
+ 短信
+ 郵件
+
+
+ %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/Notes-master/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values/values.xml b/Notes-master/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values/values.xml
new file mode 100644
index 0000000..e49b0c3
--- /dev/null
+++ b/Notes-master/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values/values.xml
@@ -0,0 +1,169 @@
+
+
+
+ -%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
+ New Folder
+ Delete
+ Deselect all
+ Export text
+ Change folder name
+ Delete folder
+ View folder
+ Large
+ Medium
+ Font size
+ Small
+ Super
+ Enter check list
+ Move to folder
+ Parent folder
+ Leave check list
+ Delete reminder
+ 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/Notes-master/app/build/intermediates/incremental/debug/mergeDebugResources/merger.xml b/Notes-master/app/build/intermediates/incremental/debug/mergeDebugResources/merger.xml
new file mode 100644
index 0000000..c156205
--- /dev/null
+++ b/Notes-master/app/build/intermediates/incremental/debug/mergeDebugResources/merger.xml
@@ -0,0 +1,56 @@
+
+
+ -%s
+ --%s
+ --%s
+ --%s
+
+ 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...SettingsSync 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\"
+
+ 短信
+ 邮件
+ 便签便签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 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新建便籤背景顏色隨機刪除通話便籤請輸入名稱正在搜索便籤搜索便籤便籤中的文字便籤設置取消
+ %1$s 條符合”%2$s“的搜尋結果
+
\ No newline at end of file
diff --git a/Notes-master/app/build/intermediates/incremental/mergeDebugAssets/merger.xml b/Notes-master/app/build/intermediates/incremental/mergeDebugAssets/merger.xml
new file mode 100644
index 0000000..81fa8a7
--- /dev/null
+++ b/Notes-master/app/build/intermediates/incremental/mergeDebugAssets/merger.xml
@@ -0,0 +1,2 @@
+
+
\ No newline at end of file
diff --git a/Notes-master/app/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml b/Notes-master/app/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml
new file mode 100644
index 0000000..d58faad
--- /dev/null
+++ b/Notes-master/app/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml
@@ -0,0 +1,2 @@
+
+
\ No newline at end of file
diff --git a/Notes-master/app/build/intermediates/incremental/mergeDebugResources/compile-file-map.properties b/Notes-master/app/build/intermediates/incremental/mergeDebugResources/compile-file-map.properties
new file mode 100644
index 0000000..09853a1
--- /dev/null
+++ b/Notes-master/app/build/intermediates/incremental/mergeDebugResources/compile-file-map.properties
@@ -0,0 +1,96 @@
+#Wed Mar 08 15:51:38 CST 2023
+E\:\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\delete.png=E\:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_delete.png.flat
+E\:\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\edit_blue.9.png=E\:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_edit_blue.9.png.flat
+E\:\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\selected.png=E\:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_selected.png.flat
+E\:\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\edit_title_yellow.9.png=E\:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_edit_title_yellow.9.png.flat
+E\:\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\font_large.png=E\:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_font_large.png.flat
+E\:\\Notes-master\\app\\src\\main\\res\\layout\\note_edit.xml=E\:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\layout_note_edit.xml.flat
+E\:\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\widget_4x_white.png=E\:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_widget_4x_white.png.flat
+E\:\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\list_yellow_down.9.png=E\:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_yellow_down.9.png.flat
+E\:\\Notes-master\\app\\src\\main\\res\\xml\\preferences.xml=E\:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\xml_preferences.xml.flat
+E\:\\Notes-master\\app\\src\\main\\res\\raw\\introduction=E\:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\raw_introduction.flat
+E\:\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\list_green_up.9.png=E\:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_green_up.9.png.flat
+E\:\\Notes-master\\app\\src\\main\\res\\color\\primary_text_dark.xml=E\:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\color_primary_text_dark.xml.flat
+E\:\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\notification.png=E\:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_notification.png.flat
+E\:\\Notes-master\\app\\src\\main\\res\\drawable\\new_note.xml=E\:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable_new_note.xml.flat
+E\:\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\search_result.png=E\:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_search_result.png.flat
+E\:\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\list_background.png=E\:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_background.png.flat
+E\:\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\menu_delete.png=E\:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_menu_delete.png.flat
+E\:\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\new_note_normal.png=E\:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_new_note_normal.png.flat
+E\:\\Notes-master\\app\\src\\main\\res\\menu\\note_edit.xml=E\:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\menu_note_edit.xml.flat
+E\:\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\bg_color_btn_mask.png=E\:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_bg_color_btn_mask.png.flat
+E\:\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\list_white_middle.9.png=E\:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_white_middle.9.png.flat
+E\:\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\note_edit_color_selector_panel.png=E\:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_note_edit_color_selector_panel.png.flat
+E\:\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\list_green_down.9.png=E\:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_green_down.9.png.flat
+E\:\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\bg_btn_set_color.png=E\:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_bg_btn_set_color.png.flat
+E\:\\Notes-master\\app\\src\\main\\res\\layout\\widget_4x.xml=E\:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\layout_widget_4x.xml.flat
+E\:\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\list_blue_single.9.png=E\:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_blue_single.9.png.flat
+E\:\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\clock.png=E\:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_clock.png.flat
+E\:\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\title_alert.png=E\:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_title_alert.png.flat
+E\:\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\widget_2x_white.png=E\:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_widget_2x_white.png.flat
+E\:\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\list_red_middle.9.png=E\:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_red_middle.9.png.flat
+E\:\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\list_white_down.9.png=E\:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_white_down.9.png.flat
+E\:\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\list_blue_down.9.png=E\:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_blue_down.9.png.flat
+E\:\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\edit_title_white.9.png=E\:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_edit_title_white.9.png.flat
+E\:\\Notes-master\\app\\src\\main\\res\\layout\\datetime_picker.xml=E\:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\layout_datetime_picker.xml.flat
+E\:\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\edit_yellow.9.png=E\:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_edit_yellow.9.png.flat
+E\:\\Notes-master\\app\\src\\main\\res\\menu\\sub_folder.xml=E\:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\menu_sub_folder.xml.flat
+E\:\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\widget_4x_red.png=E\:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_widget_4x_red.png.flat
+E\:\\Notes-master\\app\\src\\main\\res\\xml\\searchable.xml=E\:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\xml_searchable.xml.flat
+E\:\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\edit_title_red.9.png=E\:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_edit_title_red.9.png.flat
+E\:\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\edit_red.9.png=E\:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_edit_red.9.png.flat
+E\:\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\list_red_down.9.png=E\:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_red_down.9.png.flat
+E\:\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\widget_2x_blue.png=E\:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_widget_2x_blue.png.flat
+E\:\\Notes-master\\app\\src\\main\\res\\menu\\note_list_options.xml=E\:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\menu_note_list_options.xml.flat
+E\:\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\icon_app.png=E\:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_icon_app.png.flat
+E\:\\Notes-master\\app\\src\\main\\res\\raw-zh-rCN\\introduction=E\:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\raw-zh-rCN_introduction.flat
+E\:\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\font_super.png=E\:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_font_super.png.flat
+E\:\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\list_yellow_up.9.png=E\:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_yellow_up.9.png.flat
+E\:\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\list_yellow_middle.9.png=E\:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_yellow_middle.9.png.flat
+E\:\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\edit_white.9.png=E\:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_edit_white.9.png.flat
+E\:\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\edit_title_blue.9.png=E\:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_edit_title_blue.9.png.flat
+E\:\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\list_green_middle.9.png=E\:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_green_middle.9.png.flat
+E\:\\Notes-master\\app\\src\\main\\res\\layout\\widget_2x.xml=E\:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\layout_widget_2x.xml.flat
+E\:\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\list_red_single.9.png=E\:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_red_single.9.png.flat
+E\:\\Notes-master\\app\\src\\main\\res\\menu\\note_list.xml=E\:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\menu_note_list.xml.flat
+E\:\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\edit_title_green.9.png=E\:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_edit_title_green.9.png.flat
+E\:\\Notes-master\\app\\src\\main\\res\\menu\\call_record_folder.xml=E\:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\menu_call_record_folder.xml.flat
+E\:\\Notes-master\\app\\src\\main\\res\\layout\\note_list_dropdown_menu.xml=E\:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\layout_note_list_dropdown_menu.xml.flat
+E\:\\Notes-master\\app\\src\\main\\res\\layout\\folder_list_item.xml=E\:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\layout_folder_list_item.xml.flat
+E\:\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\new_note_pressed.png=E\:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_new_note_pressed.png.flat
+E\:\\Notes-master\\app\\src\\main\\res\\layout\\add_account_text.xml=E\:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\layout_add_account_text.xml.flat
+E\:\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\font_size_selector_bg.9.png=E\:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_font_size_selector_bg.9.png.flat
+E\:\\Notes-master\\app\\src\\main\\res\\layout\\note_item.xml=E\:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\layout_note_item.xml.flat
+E\:\\Notes-master\\app\\src\\main\\res\\xml\\widget_2x_info.xml=E\:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\xml_widget_2x_info.xml.flat
+E\:\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\font_normal.png=E\:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_font_normal.png.flat
+E\:\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\font_small.png=E\:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_font_small.png.flat
+E\:\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\widget_2x_red.png=E\:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_widget_2x_red.png.flat
+E\:\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\widget_2x_green.png=E\:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_widget_2x_green.png.flat
+E\:\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\list_blue_middle.9.png=E\:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_blue_middle.9.png.flat
+E\:\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\edit_green.9.png=E\:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_edit_green.9.png.flat
+E\:\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\widget_4x_blue.png=E\:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_widget_4x_blue.png.flat
+E\:\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\list_folder.9.png=E\:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_folder.9.png.flat
+E\:\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\widget_4x_yellow.png=E\:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_widget_4x_yellow.png.flat
+E\:\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\list_yellow_single.9.png=E\:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_yellow_single.9.png.flat
+E\:\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\list_footer_bg.9.png=E\:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_footer_bg.9.png.flat
+E\:\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\list_white_single.9.png=E\:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_white_single.9.png.flat
+E\:\\Notes-master\\app\\src\\main\\res\\menu\\call_note_edit.xml=E\:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\menu_call_note_edit.xml.flat
+E\:\\Notes-master\\app\\src\\main\\res\\xml\\widget_4x_info.xml=E\:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\xml_widget_4x_info.xml.flat
+E\:\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\widget_2x_yellow.png=E\:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_widget_2x_yellow.png.flat
+E\:\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\menu_move.png=E\:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_menu_move.png.flat
+E\:\\Notes-master\\app\\src\\main\\res\\layout\\note_list_footer.xml=E\:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\layout_note_list_footer.xml.flat
+E\:\\Notes-master\\app\\src\\main\\res\\layout\\note_edit_list_item.xml=E\:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\layout_note_edit_list_item.xml.flat
+E\:\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\list_red_up.9.png=E\:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_red_up.9.png.flat
+E\:\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\list_blue_up.9.png=E\:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_blue_up.9.png.flat
+E\:\\Notes-master\\app\\src\\main\\res\\layout\\note_list.xml=E\:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\layout_note_list.xml.flat
+E\:\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\dropdown_icon.9.png=E\:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_dropdown_icon.9.png.flat
+E\:\\Notes-master\\app\\src\\main\\res\\layout\\account_dialog_title.xml=E\:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\layout_account_dialog_title.xml.flat
+E\:\\Notes-master\\app\\src\\main\\res\\layout\\dialog_edit_text.xml=E\:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\layout_dialog_edit_text.xml.flat
+E\:\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\title_bar_bg.9.png=E\:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_title_bar_bg.9.png.flat
+E\:\\Notes-master\\app\\src\\main\\res\\menu\\note_list_dropdown.xml=E\:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\menu_note_list_dropdown.xml.flat
+E\:\\Notes-master\\app\\src\\main\\res\\layout\\settings_header.xml=E\:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\layout_settings_header.xml.flat
+E\:\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\list_white_up.9.png=E\:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_white_up.9.png.flat
+E\:\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\widget_4x_green.png=E\:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_widget_4x_green.png.flat
+E\:\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\list_green_single.9.png=E\:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_green_single.9.png.flat
+E\:\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\call_record.png=E\:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_call_record.png.flat
+E\:\\Notes-master\\app\\src\\main\\res\\color\\secondary_text_dark.xml=E\:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\color_secondary_text_dark.xml.flat
diff --git a/Notes-master/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-zh-rCN/values-zh-rCN.xml b/Notes-master/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-zh-rCN/values-zh-rCN.xml
new file mode 100644
index 0000000..d65e0cc
--- /dev/null
+++ b/Notes-master/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-zh-rCN/values-zh-rCN.xml
@@ -0,0 +1,108 @@
+
+
+
+ 短信
+ 邮件
+
+
+ %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 task同步便签记录
+ 同步账号
+ 添加账号
+ 新建便签背景颜色随机
+ 取消同步
+ 立即同步
+ 当前帐号 %1$s
+ 如更换同步帐号,过去的帐号同步信息将被清空,再次切换的同时可能会造成数据重复
+ 请选择google帐号,便签将与该帐号的google task内容同步。
+ 同步便签
+ 上次同步于 %1$s
+ 取消
+ 更换账号
+ 删除账号
+ 设置
+ 正在同步中,不能修改同步帐号
+ 同步帐号已设置为%1$s
+ 便签
+ 搜索便签
+ 正在搜索便签
+ 便签中的文字
+ 创建提醒
+ 导出成功
+ 与%1$s同步成功
+ 正在获取服务器便签列表...
+ 登录%1$s...
+ 正在同步本地便签...
+ 同步已取消
+ 同步失败
+ 同步成功
+ 同步便签...
+ 没有关联内容,点击新建便签。
+ 访客模式下,便签内容不可见
+
\ No newline at end of file
diff --git a/Notes-master/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-zh-rTW/values-zh-rTW.xml b/Notes-master/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-zh-rTW/values-zh-rTW.xml
new file mode 100644
index 0000000..226b5bc
--- /dev/null
+++ b/Notes-master/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-zh-rTW/values-zh-rTW.xml
@@ -0,0 +1,108 @@
+
+
+
+ 短信
+ 郵件
+
+
+ %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/Notes-master/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values/values.xml b/Notes-master/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values/values.xml
new file mode 100644
index 0000000..dfa7135
--- /dev/null
+++ b/Notes-master/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values/values.xml
@@ -0,0 +1,169 @@
+
+
+
+ -%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
+ New Folder
+ Delete
+ Deselect all
+ Export text
+ Change folder name
+ Delete folder
+ View folder
+ Large
+ Medium
+ Font size
+ Small
+ Super
+ Enter check list
+ Move to folder
+ Parent folder
+ Leave check list
+ Delete reminder
+ 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/Notes-master/app/build/intermediates/incremental/mergeDebugResources/merger.xml b/Notes-master/app/build/intermediates/incremental/mergeDebugResources/merger.xml
new file mode 100644
index 0000000..8c53f5a
--- /dev/null
+++ b/Notes-master/app/build/intermediates/incremental/mergeDebugResources/merger.xml
@@ -0,0 +1,56 @@
+
+
+ -%s
+ --%s
+ --%s
+ --%s
+
+ 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...SettingsSync 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\"
+
+ 短信
+ 邮件
+ 便签便签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 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新建便籤背景顏色隨機刪除通話便籤請輸入名稱正在搜索便籤搜索便籤便籤中的文字便籤設置取消
+ %1$s 條符合”%2$s“的搜尋結果
+
\ No newline at end of file
diff --git a/Notes-master/app/build/intermediates/incremental/mergeDebugShaders/merger.xml b/Notes-master/app/build/intermediates/incremental/mergeDebugShaders/merger.xml
new file mode 100644
index 0000000..db4033b
--- /dev/null
+++ b/Notes-master/app/build/intermediates/incremental/mergeDebugShaders/merger.xml
@@ -0,0 +1,2 @@
+
+
\ No newline at end of file
diff --git a/Notes-master/app/build/intermediates/incremental/mergeReleaseAssets/merger.xml b/Notes-master/app/build/intermediates/incremental/mergeReleaseAssets/merger.xml
new file mode 100644
index 0000000..7523efb
--- /dev/null
+++ b/Notes-master/app/build/intermediates/incremental/mergeReleaseAssets/merger.xml
@@ -0,0 +1,2 @@
+
+
\ No newline at end of file
diff --git a/Notes-master/app/build/intermediates/incremental/mergeReleaseJniLibFolders/merger.xml b/Notes-master/app/build/intermediates/incremental/mergeReleaseJniLibFolders/merger.xml
new file mode 100644
index 0000000..e535eef
--- /dev/null
+++ b/Notes-master/app/build/intermediates/incremental/mergeReleaseJniLibFolders/merger.xml
@@ -0,0 +1,2 @@
+
+
\ No newline at end of file
diff --git a/Notes-master/app/build/intermediates/incremental/mergeReleaseShaders/merger.xml b/Notes-master/app/build/intermediates/incremental/mergeReleaseShaders/merger.xml
new file mode 100644
index 0000000..be5fcb3
--- /dev/null
+++ b/Notes-master/app/build/intermediates/incremental/mergeReleaseShaders/merger.xml
@@ -0,0 +1,2 @@
+
+
\ No newline at end of file
diff --git a/Notes-master/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt b/Notes-master/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt
new file mode 100644
index 0000000..95546e5
--- /dev/null
+++ b/Notes-master/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt
@@ -0,0 +1,4 @@
+#Wed Mar 15 19:32:00 CST 2023
+base.0=E\:\\Notes-master\\app\\build\\intermediates\\dex\\debug\\mergeDexDebug\\classes.dex
+renamed.0=classes.dex
+path.0=classes.dex
diff --git a/Notes-master/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/androidResources b/Notes-master/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/androidResources
new file mode 100644
index 0000000..62a2faf
Binary files /dev/null and b/Notes-master/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/androidResources differ
diff --git a/Notes-master/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/javaResources0 b/Notes-master/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/javaResources0
new file mode 100644
index 0000000..945a7c5
Binary files /dev/null and b/Notes-master/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/javaResources0 differ
diff --git a/Notes-master/app/build/intermediates/incremental/release-mergeJavaRes/merge-state b/Notes-master/app/build/intermediates/incremental/release-mergeJavaRes/merge-state
new file mode 100644
index 0000000..1c983fc
Binary files /dev/null and b/Notes-master/app/build/intermediates/incremental/release-mergeJavaRes/merge-state differ
diff --git a/Notes-master/app/build/intermediates/incremental/release/mergeReleaseResources/compile-file-map.properties b/Notes-master/app/build/intermediates/incremental/release/mergeReleaseResources/compile-file-map.properties
new file mode 100644
index 0000000..eb11928
--- /dev/null
+++ b/Notes-master/app/build/intermediates/incremental/release/mergeReleaseResources/compile-file-map.properties
@@ -0,0 +1,96 @@
+#Wed Mar 08 09:16:06 CST 2023
+net.micode.notes.app-main-6\:/drawable-hdpi/widget_4x_yellow.png=E\:\\Notes-master\\app\\build\\intermediates\\merged_res\\release\\drawable-hdpi_widget_4x_yellow.png.flat
+net.micode.notes.app-main-6\:/menu/note_list_options.xml=E\:\\Notes-master\\app\\build\\intermediates\\merged_res\\release\\menu_note_list_options.xml.flat
+net.micode.notes.app-main-6\:/drawable-hdpi/list_green_middle.9.png=E\:\\Notes-master\\app\\build\\intermediates\\merged_res\\release\\drawable-hdpi_list_green_middle.9.png.flat
+net.micode.notes.app-main-6\:/drawable-hdpi/list_red_middle.9.png=E\:\\Notes-master\\app\\build\\intermediates\\merged_res\\release\\drawable-hdpi_list_red_middle.9.png.flat
+net.micode.notes.app-main-6\:/drawable-hdpi/search_result.png=E\:\\Notes-master\\app\\build\\intermediates\\merged_res\\release\\drawable-hdpi_search_result.png.flat
+net.micode.notes.app-main-6\:/menu/note_edit.xml=E\:\\Notes-master\\app\\build\\intermediates\\merged_res\\release\\menu_note_edit.xml.flat
+net.micode.notes.app-main-6\:/drawable-hdpi/widget_2x_yellow.png=E\:\\Notes-master\\app\\build\\intermediates\\merged_res\\release\\drawable-hdpi_widget_2x_yellow.png.flat
+net.micode.notes.app-main-6\:/menu/call_note_edit.xml=E\:\\Notes-master\\app\\build\\intermediates\\merged_res\\release\\menu_call_note_edit.xml.flat
+net.micode.notes.app-main-6\:/drawable-hdpi/list_blue_single.9.png=E\:\\Notes-master\\app\\build\\intermediates\\merged_res\\release\\drawable-hdpi_list_blue_single.9.png.flat
+net.micode.notes.app-main-6\:/drawable-hdpi/list_white_down.9.png=E\:\\Notes-master\\app\\build\\intermediates\\merged_res\\release\\drawable-hdpi_list_white_down.9.png.flat
+net.micode.notes.app-main-6\:/drawable-hdpi/edit_title_red.9.png=E\:\\Notes-master\\app\\build\\intermediates\\merged_res\\release\\drawable-hdpi_edit_title_red.9.png.flat
+net.micode.notes.app-main-6\:/drawable-hdpi/list_footer_bg.9.png=E\:\\Notes-master\\app\\build\\intermediates\\merged_res\\release\\drawable-hdpi_list_footer_bg.9.png.flat
+net.micode.notes.app-main-6\:/drawable-hdpi/widget_2x_green.png=E\:\\Notes-master\\app\\build\\intermediates\\merged_res\\release\\drawable-hdpi_widget_2x_green.png.flat
+net.micode.notes.app-main-6\:/drawable-hdpi/new_note_pressed.png=E\:\\Notes-master\\app\\build\\intermediates\\merged_res\\release\\drawable-hdpi_new_note_pressed.png.flat
+net.micode.notes.app-main-6\:/drawable-hdpi/list_white_up.9.png=E\:\\Notes-master\\app\\build\\intermediates\\merged_res\\release\\drawable-hdpi_list_white_up.9.png.flat
+net.micode.notes.app-main-6\:/drawable-hdpi/title_alert.png=E\:\\Notes-master\\app\\build\\intermediates\\merged_res\\release\\drawable-hdpi_title_alert.png.flat
+net.micode.notes.app-main-6\:/drawable-hdpi/icon_app.png=E\:\\Notes-master\\app\\build\\intermediates\\merged_res\\release\\drawable-hdpi_icon_app.png.flat
+net.micode.notes.app-main-6\:/layout/account_dialog_title.xml=E\:\\Notes-master\\app\\build\\intermediates\\merged_res\\release\\layout_account_dialog_title.xml.flat
+net.micode.notes.app-main-6\:/drawable-hdpi/title_bar_bg.9.png=E\:\\Notes-master\\app\\build\\intermediates\\merged_res\\release\\drawable-hdpi_title_bar_bg.9.png.flat
+net.micode.notes.app-main-6\:/layout/settings_header.xml=E\:\\Notes-master\\app\\build\\intermediates\\merged_res\\release\\layout_settings_header.xml.flat
+net.micode.notes.app-main-6\:/xml/searchable.xml=E\:\\Notes-master\\app\\build\\intermediates\\merged_res\\release\\xml_searchable.xml.flat
+net.micode.notes.app-main-6\:/layout/widget_4x.xml=E\:\\Notes-master\\app\\build\\intermediates\\merged_res\\release\\layout_widget_4x.xml.flat
+net.micode.notes.app-main-6\:/drawable-hdpi/notification.png=E\:\\Notes-master\\app\\build\\intermediates\\merged_res\\release\\drawable-hdpi_notification.png.flat
+net.micode.notes.app-main-6\:/drawable-hdpi/list_green_single.9.png=E\:\\Notes-master\\app\\build\\intermediates\\merged_res\\release\\drawable-hdpi_list_green_single.9.png.flat
+net.micode.notes.app-main-6\:/drawable-hdpi/list_blue_up.9.png=E\:\\Notes-master\\app\\build\\intermediates\\merged_res\\release\\drawable-hdpi_list_blue_up.9.png.flat
+net.micode.notes.app-main-6\:/drawable-hdpi/edit_blue.9.png=E\:\\Notes-master\\app\\build\\intermediates\\merged_res\\release\\drawable-hdpi_edit_blue.9.png.flat
+net.micode.notes.app-main-6\:/menu/note_list.xml=E\:\\Notes-master\\app\\build\\intermediates\\merged_res\\release\\menu_note_list.xml.flat
+net.micode.notes.app-main-6\:/layout/dialog_edit_text.xml=E\:\\Notes-master\\app\\build\\intermediates\\merged_res\\release\\layout_dialog_edit_text.xml.flat
+net.micode.notes.app-main-6\:/raw/introduction=E\:\\Notes-master\\app\\build\\intermediates\\merged_res\\release\\raw_introduction.flat
+net.micode.notes.app-main-6\:/drawable-hdpi/list_white_single.9.png=E\:\\Notes-master\\app\\build\\intermediates\\merged_res\\release\\drawable-hdpi_list_white_single.9.png.flat
+net.micode.notes.app-main-6\:/xml/widget_2x_info.xml=E\:\\Notes-master\\app\\build\\intermediates\\merged_res\\release\\xml_widget_2x_info.xml.flat
+net.micode.notes.app-main-6\:/drawable-hdpi/edit_red.9.png=E\:\\Notes-master\\app\\build\\intermediates\\merged_res\\release\\drawable-hdpi_edit_red.9.png.flat
+net.micode.notes.app-main-6\:/drawable-hdpi/list_red_up.9.png=E\:\\Notes-master\\app\\build\\intermediates\\merged_res\\release\\drawable-hdpi_list_red_up.9.png.flat
+net.micode.notes.app-main-6\:/layout/note_list_footer.xml=E\:\\Notes-master\\app\\build\\intermediates\\merged_res\\release\\layout_note_list_footer.xml.flat
+net.micode.notes.app-main-6\:/layout/folder_list_item.xml=E\:\\Notes-master\\app\\build\\intermediates\\merged_res\\release\\layout_folder_list_item.xml.flat
+net.micode.notes.app-main-6\:/raw-zh-rCN/introduction=E\:\\Notes-master\\app\\build\\intermediates\\merged_res\\release\\raw-zh-rCN_introduction.flat
+net.micode.notes.app-main-6\:/drawable-hdpi/edit_title_white.9.png=E\:\\Notes-master\\app\\build\\intermediates\\merged_res\\release\\drawable-hdpi_edit_title_white.9.png.flat
+net.micode.notes.app-main-6\:/drawable-hdpi/list_yellow_up.9.png=E\:\\Notes-master\\app\\build\\intermediates\\merged_res\\release\\drawable-hdpi_list_yellow_up.9.png.flat
+net.micode.notes.app-main-6\:/drawable-hdpi/widget_4x_green.png=E\:\\Notes-master\\app\\build\\intermediates\\merged_res\\release\\drawable-hdpi_widget_4x_green.png.flat
+net.micode.notes.app-main-6\:/drawable-hdpi/font_super.png=E\:\\Notes-master\\app\\build\\intermediates\\merged_res\\release\\drawable-hdpi_font_super.png.flat
+net.micode.notes.app-main-6\:/drawable-hdpi/list_yellow_down.9.png=E\:\\Notes-master\\app\\build\\intermediates\\merged_res\\release\\drawable-hdpi_list_yellow_down.9.png.flat
+net.micode.notes.app-main-6\:/drawable-hdpi/list_folder.9.png=E\:\\Notes-master\\app\\build\\intermediates\\merged_res\\release\\drawable-hdpi_list_folder.9.png.flat
+net.micode.notes.app-main-6\:/drawable-hdpi/list_blue_down.9.png=E\:\\Notes-master\\app\\build\\intermediates\\merged_res\\release\\drawable-hdpi_list_blue_down.9.png.flat
+net.micode.notes.app-main-6\:/drawable-hdpi/list_red_single.9.png=E\:\\Notes-master\\app\\build\\intermediates\\merged_res\\release\\drawable-hdpi_list_red_single.9.png.flat
+net.micode.notes.app-main-6\:/drawable-hdpi/list_yellow_single.9.png=E\:\\Notes-master\\app\\build\\intermediates\\merged_res\\release\\drawable-hdpi_list_yellow_single.9.png.flat
+net.micode.notes.app-main-6\:/layout/note_list_dropdown_menu.xml=E\:\\Notes-master\\app\\build\\intermediates\\merged_res\\release\\layout_note_list_dropdown_menu.xml.flat
+net.micode.notes.app-main-6\:/drawable-hdpi/dropdown_icon.9.png=E\:\\Notes-master\\app\\build\\intermediates\\merged_res\\release\\drawable-hdpi_dropdown_icon.9.png.flat
+net.micode.notes.app-main-6\:/drawable-hdpi/delete.png=E\:\\Notes-master\\app\\build\\intermediates\\merged_res\\release\\drawable-hdpi_delete.png.flat
+net.micode.notes.app-main-6\:/menu/note_list_dropdown.xml=E\:\\Notes-master\\app\\build\\intermediates\\merged_res\\release\\menu_note_list_dropdown.xml.flat
+net.micode.notes.app-main-6\:/layout/widget_2x.xml=E\:\\Notes-master\\app\\build\\intermediates\\merged_res\\release\\layout_widget_2x.xml.flat
+net.micode.notes.app-main-6\:/drawable-hdpi/list_background.png=E\:\\Notes-master\\app\\build\\intermediates\\merged_res\\release\\drawable-hdpi_list_background.png.flat
+net.micode.notes.app-main-6\:/xml/preferences.xml=E\:\\Notes-master\\app\\build\\intermediates\\merged_res\\release\\xml_preferences.xml.flat
+net.micode.notes.app-main-6\:/drawable-hdpi/bg_btn_set_color.png=E\:\\Notes-master\\app\\build\\intermediates\\merged_res\\release\\drawable-hdpi_bg_btn_set_color.png.flat
+net.micode.notes.app-main-6\:/color/primary_text_dark.xml=E\:\\Notes-master\\app\\build\\intermediates\\merged_res\\release\\color_primary_text_dark.xml.flat
+net.micode.notes.app-main-6\:/drawable-hdpi/list_green_up.9.png=E\:\\Notes-master\\app\\build\\intermediates\\merged_res\\release\\drawable-hdpi_list_green_up.9.png.flat
+net.micode.notes.app-main-6\:/menu/call_record_folder.xml=E\:\\Notes-master\\app\\build\\intermediates\\merged_res\\release\\menu_call_record_folder.xml.flat
+net.micode.notes.app-main-6\:/drawable-hdpi/edit_title_green.9.png=E\:\\Notes-master\\app\\build\\intermediates\\merged_res\\release\\drawable-hdpi_edit_title_green.9.png.flat
+net.micode.notes.app-main-6\:/drawable-hdpi/edit_green.9.png=E\:\\Notes-master\\app\\build\\intermediates\\merged_res\\release\\drawable-hdpi_edit_green.9.png.flat
+net.micode.notes.app-main-6\:/drawable-hdpi/edit_white.9.png=E\:\\Notes-master\\app\\build\\intermediates\\merged_res\\release\\drawable-hdpi_edit_white.9.png.flat
+net.micode.notes.app-main-6\:/drawable-hdpi/edit_title_yellow.9.png=E\:\\Notes-master\\app\\build\\intermediates\\merged_res\\release\\drawable-hdpi_edit_title_yellow.9.png.flat
+net.micode.notes.app-main-6\:/drawable-hdpi/note_edit_color_selector_panel.png=E\:\\Notes-master\\app\\build\\intermediates\\merged_res\\release\\drawable-hdpi_note_edit_color_selector_panel.png.flat
+net.micode.notes.app-main-6\:/layout/note_edit.xml=E\:\\Notes-master\\app\\build\\intermediates\\merged_res\\release\\layout_note_edit.xml.flat
+net.micode.notes.app-main-6\:/drawable-hdpi/font_normal.png=E\:\\Notes-master\\app\\build\\intermediates\\merged_res\\release\\drawable-hdpi_font_normal.png.flat
+net.micode.notes.app-main-6\:/drawable-hdpi/list_green_down.9.png=E\:\\Notes-master\\app\\build\\intermediates\\merged_res\\release\\drawable-hdpi_list_green_down.9.png.flat
+net.micode.notes.app-main-6\:/drawable-hdpi/call_record.png=E\:\\Notes-master\\app\\build\\intermediates\\merged_res\\release\\drawable-hdpi_call_record.png.flat
+net.micode.notes.app-main-6\:/drawable-hdpi/clock.png=E\:\\Notes-master\\app\\build\\intermediates\\merged_res\\release\\drawable-hdpi_clock.png.flat
+net.micode.notes.app-main-6\:/drawable-hdpi/widget_4x_red.png=E\:\\Notes-master\\app\\build\\intermediates\\merged_res\\release\\drawable-hdpi_widget_4x_red.png.flat
+net.micode.notes.app-main-6\:/drawable-hdpi/bg_color_btn_mask.png=E\:\\Notes-master\\app\\build\\intermediates\\merged_res\\release\\drawable-hdpi_bg_color_btn_mask.png.flat
+net.micode.notes.app-main-6\:/drawable-hdpi/widget_4x_white.png=E\:\\Notes-master\\app\\build\\intermediates\\merged_res\\release\\drawable-hdpi_widget_4x_white.png.flat
+net.micode.notes.app-main-6\:/layout/note_edit_list_item.xml=E\:\\Notes-master\\app\\build\\intermediates\\merged_res\\release\\layout_note_edit_list_item.xml.flat
+net.micode.notes.app-main-6\:/drawable-hdpi/widget_2x_blue.png=E\:\\Notes-master\\app\\build\\intermediates\\merged_res\\release\\drawable-hdpi_widget_2x_blue.png.flat
+net.micode.notes.app-main-6\:/drawable-hdpi/font_large.png=E\:\\Notes-master\\app\\build\\intermediates\\merged_res\\release\\drawable-hdpi_font_large.png.flat
+net.micode.notes.app-main-6\:/menu/sub_folder.xml=E\:\\Notes-master\\app\\build\\intermediates\\merged_res\\release\\menu_sub_folder.xml.flat
+net.micode.notes.app-main-6\:/drawable-hdpi/new_note_normal.png=E\:\\Notes-master\\app\\build\\intermediates\\merged_res\\release\\drawable-hdpi_new_note_normal.png.flat
+net.micode.notes.app-main-6\:/drawable-hdpi/font_small.png=E\:\\Notes-master\\app\\build\\intermediates\\merged_res\\release\\drawable-hdpi_font_small.png.flat
+net.micode.notes.app-main-6\:/layout/datetime_picker.xml=E\:\\Notes-master\\app\\build\\intermediates\\merged_res\\release\\layout_datetime_picker.xml.flat
+net.micode.notes.app-main-6\:/drawable-hdpi/widget_4x_blue.png=E\:\\Notes-master\\app\\build\\intermediates\\merged_res\\release\\drawable-hdpi_widget_4x_blue.png.flat
+net.micode.notes.app-main-6\:/layout/add_account_text.xml=E\:\\Notes-master\\app\\build\\intermediates\\merged_res\\release\\layout_add_account_text.xml.flat
+net.micode.notes.app-main-6\:/color/secondary_text_dark.xml=E\:\\Notes-master\\app\\build\\intermediates\\merged_res\\release\\color_secondary_text_dark.xml.flat
+net.micode.notes.app-main-6\:/drawable-hdpi/font_size_selector_bg.9.png=E\:\\Notes-master\\app\\build\\intermediates\\merged_res\\release\\drawable-hdpi_font_size_selector_bg.9.png.flat
+net.micode.notes.app-main-6\:/drawable-hdpi/selected.png=E\:\\Notes-master\\app\\build\\intermediates\\merged_res\\release\\drawable-hdpi_selected.png.flat
+net.micode.notes.app-main-6\:/drawable-hdpi/menu_delete.png=E\:\\Notes-master\\app\\build\\intermediates\\merged_res\\release\\drawable-hdpi_menu_delete.png.flat
+net.micode.notes.app-main-6\:/layout/note_item.xml=E\:\\Notes-master\\app\\build\\intermediates\\merged_res\\release\\layout_note_item.xml.flat
+net.micode.notes.app-main-6\:/drawable-hdpi/widget_2x_red.png=E\:\\Notes-master\\app\\build\\intermediates\\merged_res\\release\\drawable-hdpi_widget_2x_red.png.flat
+net.micode.notes.app-main-6\:/xml/widget_4x_info.xml=E\:\\Notes-master\\app\\build\\intermediates\\merged_res\\release\\xml_widget_4x_info.xml.flat
+net.micode.notes.app-main-6\:/drawable/new_note.xml=E\:\\Notes-master\\app\\build\\intermediates\\merged_res\\release\\drawable_new_note.xml.flat
+net.micode.notes.app-main-6\:/drawable-hdpi/widget_2x_white.png=E\:\\Notes-master\\app\\build\\intermediates\\merged_res\\release\\drawable-hdpi_widget_2x_white.png.flat
+net.micode.notes.app-main-6\:/drawable-hdpi/list_red_down.9.png=E\:\\Notes-master\\app\\build\\intermediates\\merged_res\\release\\drawable-hdpi_list_red_down.9.png.flat
+net.micode.notes.app-main-6\:/drawable-hdpi/menu_move.png=E\:\\Notes-master\\app\\build\\intermediates\\merged_res\\release\\drawable-hdpi_menu_move.png.flat
+net.micode.notes.app-main-6\:/layout/note_list.xml=E\:\\Notes-master\\app\\build\\intermediates\\merged_res\\release\\layout_note_list.xml.flat
+net.micode.notes.app-main-6\:/drawable-hdpi/list_yellow_middle.9.png=E\:\\Notes-master\\app\\build\\intermediates\\merged_res\\release\\drawable-hdpi_list_yellow_middle.9.png.flat
+net.micode.notes.app-main-6\:/drawable-hdpi/edit_yellow.9.png=E\:\\Notes-master\\app\\build\\intermediates\\merged_res\\release\\drawable-hdpi_edit_yellow.9.png.flat
+net.micode.notes.app-main-6\:/drawable-hdpi/edit_title_blue.9.png=E\:\\Notes-master\\app\\build\\intermediates\\merged_res\\release\\drawable-hdpi_edit_title_blue.9.png.flat
+net.micode.notes.app-main-6\:/drawable-hdpi/list_blue_middle.9.png=E\:\\Notes-master\\app\\build\\intermediates\\merged_res\\release\\drawable-hdpi_list_blue_middle.9.png.flat
+net.micode.notes.app-main-6\:/drawable-hdpi/list_white_middle.9.png=E\:\\Notes-master\\app\\build\\intermediates\\merged_res\\release\\drawable-hdpi_list_white_middle.9.png.flat
diff --git a/Notes-master/app/build/intermediates/incremental/release/mergeReleaseResources/merged.dir/values-zh-rCN/values-zh-rCN.xml b/Notes-master/app/build/intermediates/incremental/release/mergeReleaseResources/merged.dir/values-zh-rCN/values-zh-rCN.xml
new file mode 100644
index 0000000..d65e0cc
--- /dev/null
+++ b/Notes-master/app/build/intermediates/incremental/release/mergeReleaseResources/merged.dir/values-zh-rCN/values-zh-rCN.xml
@@ -0,0 +1,108 @@
+
+
+
+ 短信
+ 邮件
+
+
+ %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 task同步便签记录
+ 同步账号
+ 添加账号
+ 新建便签背景颜色随机
+ 取消同步
+ 立即同步
+ 当前帐号 %1$s
+ 如更换同步帐号,过去的帐号同步信息将被清空,再次切换的同时可能会造成数据重复
+ 请选择google帐号,便签将与该帐号的google task内容同步。
+ 同步便签
+ 上次同步于 %1$s
+ 取消
+ 更换账号
+ 删除账号
+ 设置
+ 正在同步中,不能修改同步帐号
+ 同步帐号已设置为%1$s
+ 便签
+ 搜索便签
+ 正在搜索便签
+ 便签中的文字
+ 创建提醒
+ 导出成功
+ 与%1$s同步成功
+ 正在获取服务器便签列表...
+ 登录%1$s...
+ 正在同步本地便签...
+ 同步已取消
+ 同步失败
+ 同步成功
+ 同步便签...
+ 没有关联内容,点击新建便签。
+ 访客模式下,便签内容不可见
+
\ No newline at end of file
diff --git a/Notes-master/app/build/intermediates/incremental/release/mergeReleaseResources/merged.dir/values-zh-rTW/values-zh-rTW.xml b/Notes-master/app/build/intermediates/incremental/release/mergeReleaseResources/merged.dir/values-zh-rTW/values-zh-rTW.xml
new file mode 100644
index 0000000..226b5bc
--- /dev/null
+++ b/Notes-master/app/build/intermediates/incremental/release/mergeReleaseResources/merged.dir/values-zh-rTW/values-zh-rTW.xml
@@ -0,0 +1,108 @@
+
+
+
+ 短信
+ 郵件
+
+
+ %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/Notes-master/app/build/intermediates/incremental/release/mergeReleaseResources/merged.dir/values/values.xml b/Notes-master/app/build/intermediates/incremental/release/mergeReleaseResources/merged.dir/values/values.xml
new file mode 100644
index 0000000..e49b0c3
--- /dev/null
+++ b/Notes-master/app/build/intermediates/incremental/release/mergeReleaseResources/merged.dir/values/values.xml
@@ -0,0 +1,169 @@
+
+
+
+ -%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
+ New Folder
+ Delete
+ Deselect all
+ Export text
+ Change folder name
+ Delete folder
+ View folder
+ Large
+ Medium
+ Font size
+ Small
+ Super
+ Enter check list
+ Move to folder
+ Parent folder
+ Leave check list
+ Delete reminder
+ 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/Notes-master/app/build/intermediates/incremental/release/mergeReleaseResources/merger.xml b/Notes-master/app/build/intermediates/incremental/release/mergeReleaseResources/merger.xml
new file mode 100644
index 0000000..3128cfa
--- /dev/null
+++ b/Notes-master/app/build/intermediates/incremental/release/mergeReleaseResources/merger.xml
@@ -0,0 +1,56 @@
+
+
+ -%s
+ --%s
+ --%s
+ --%s
+
+ 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...SettingsSync 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\"
+
+ 短信
+ 邮件
+ 便签便签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 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新建便籤背景顏色隨機刪除通話便籤請輸入名稱正在搜索便籤搜索便籤便籤中的文字便籤設置取消
+ %1$s 條符合”%2$s“的搜尋結果
+
\ No newline at end of file
diff --git a/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/BuildConfig.class b/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/BuildConfig.class
new file mode 100644
index 0000000..799e613
Binary files /dev/null and b/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/BuildConfig.class differ
diff --git a/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Contact.class b/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Contact.class
new file mode 100644
index 0000000..2a116a6
Binary files /dev/null and b/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Contact.class differ
diff --git a/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$CallNote.class b/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$CallNote.class
new file mode 100644
index 0000000..1f92aa9
Binary files /dev/null and b/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$CallNote.class differ
diff --git a/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$DataColumns.class b/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$DataColumns.class
new file mode 100644
index 0000000..2dca96a
Binary files /dev/null and b/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$DataColumns.class differ
diff --git a/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$DataConstants.class b/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$DataConstants.class
new file mode 100644
index 0000000..1f14a2d
Binary files /dev/null and b/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$DataConstants.class differ
diff --git a/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$NoteColumns.class b/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$NoteColumns.class
new file mode 100644
index 0000000..36315c7
Binary files /dev/null and b/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$NoteColumns.class differ
diff --git a/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$TextNote.class b/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$TextNote.class
new file mode 100644
index 0000000..483b1d2
Binary files /dev/null and b/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$TextNote.class differ
diff --git a/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes.class b/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes.class
new file mode 100644
index 0000000..3e2d98c
Binary files /dev/null and b/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes.class differ
diff --git a/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/data/NotesDatabaseHelper$TABLE.class b/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/data/NotesDatabaseHelper$TABLE.class
new file mode 100644
index 0000000..03731af
Binary files /dev/null and b/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/data/NotesDatabaseHelper$TABLE.class differ
diff --git a/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/data/NotesDatabaseHelper.class b/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/data/NotesDatabaseHelper.class
new file mode 100644
index 0000000..d324f0e
Binary files /dev/null and b/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/data/NotesDatabaseHelper.class differ
diff --git a/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/data/NotesProvider.class b/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/data/NotesProvider.class
new file mode 100644
index 0000000..8cbe650
Binary files /dev/null and b/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/data/NotesProvider.class differ
diff --git a/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/MetaData.class b/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/MetaData.class
new file mode 100644
index 0000000..af04e42
Binary files /dev/null and b/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/MetaData.class differ
diff --git a/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/Node.class b/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/Node.class
new file mode 100644
index 0000000..2b5118e
Binary files /dev/null and b/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/Node.class differ
diff --git a/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/SqlData.class b/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/SqlData.class
new file mode 100644
index 0000000..3ee81fa
Binary files /dev/null and b/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/SqlData.class differ
diff --git a/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/SqlNote.class b/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/SqlNote.class
new file mode 100644
index 0000000..6e535ed
Binary files /dev/null and b/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/SqlNote.class differ
diff --git a/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/Task.class b/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/Task.class
new file mode 100644
index 0000000..4cc41d4
Binary files /dev/null and b/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/Task.class differ
diff --git a/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/TaskList.class b/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/TaskList.class
new file mode 100644
index 0000000..1cf0ecc
Binary files /dev/null and b/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/TaskList.class differ
diff --git a/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/exception/ActionFailureException.class b/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/exception/ActionFailureException.class
new file mode 100644
index 0000000..9ae78d8
Binary files /dev/null and b/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/exception/ActionFailureException.class differ
diff --git a/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/exception/NetworkFailureException.class b/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/exception/NetworkFailureException.class
new file mode 100644
index 0000000..c29e580
Binary files /dev/null and b/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/exception/NetworkFailureException.class differ
diff --git a/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskASyncTask$1.class b/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskASyncTask$1.class
new file mode 100644
index 0000000..02960fb
Binary files /dev/null and b/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskASyncTask$1.class differ
diff --git a/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskASyncTask$OnCompleteListener.class b/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskASyncTask$OnCompleteListener.class
new file mode 100644
index 0000000..ebb2251
Binary files /dev/null and b/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskASyncTask$OnCompleteListener.class differ
diff --git a/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskASyncTask.class b/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskASyncTask.class
new file mode 100644
index 0000000..76b90ad
Binary files /dev/null and b/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskASyncTask.class differ
diff --git a/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskClient.class b/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskClient.class
new file mode 100644
index 0000000..fb82244
Binary files /dev/null and b/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskClient.class differ
diff --git a/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskManager.class b/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskManager.class
new file mode 100644
index 0000000..8d386f7
Binary files /dev/null and b/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskManager.class differ
diff --git a/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskSyncService$1.class b/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskSyncService$1.class
new file mode 100644
index 0000000..b20d33f
Binary files /dev/null and b/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskSyncService$1.class differ
diff --git a/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskSyncService.class b/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskSyncService.class
new file mode 100644
index 0000000..5230b78
Binary files /dev/null and b/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskSyncService.class differ
diff --git a/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/model/Note$NoteData.class b/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/model/Note$NoteData.class
new file mode 100644
index 0000000..1414892
Binary files /dev/null and b/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/model/Note$NoteData.class differ
diff --git a/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/model/Note.class b/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/model/Note.class
new file mode 100644
index 0000000..507fce6
Binary files /dev/null and b/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/model/Note.class differ
diff --git a/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/model/WorkingNote$NoteSettingChangedListener.class b/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/model/WorkingNote$NoteSettingChangedListener.class
new file mode 100644
index 0000000..6bbe48a
Binary files /dev/null and b/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/model/WorkingNote$NoteSettingChangedListener.class differ
diff --git a/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/model/WorkingNote.class b/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/model/WorkingNote.class
new file mode 100644
index 0000000..9502fc1
Binary files /dev/null and b/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/model/WorkingNote.class differ
diff --git a/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/BackupUtils$TextExport.class b/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/BackupUtils$TextExport.class
new file mode 100644
index 0000000..69b9e1b
Binary files /dev/null and b/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/BackupUtils$TextExport.class differ
diff --git a/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/BackupUtils.class b/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/BackupUtils.class
new file mode 100644
index 0000000..9a4a5ab
Binary files /dev/null and b/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/BackupUtils.class differ
diff --git a/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/DataUtils.class b/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/DataUtils.class
new file mode 100644
index 0000000..9dc9e7e
Binary files /dev/null and b/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/DataUtils.class differ
diff --git a/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/GTaskStringUtils.class b/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/GTaskStringUtils.class
new file mode 100644
index 0000000..93c2bc9
Binary files /dev/null and b/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/GTaskStringUtils.class differ
diff --git a/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$NoteBgResources.class b/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$NoteBgResources.class
new file mode 100644
index 0000000..4fbc40c
Binary files /dev/null and b/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$NoteBgResources.class differ
diff --git a/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$NoteItemBgResources.class b/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$NoteItemBgResources.class
new file mode 100644
index 0000000..e77df14
Binary files /dev/null and b/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$NoteItemBgResources.class differ
diff --git a/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$TextAppearanceResources.class b/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$TextAppearanceResources.class
new file mode 100644
index 0000000..59b0099
Binary files /dev/null and b/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$TextAppearanceResources.class differ
diff --git a/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$WidgetBgResources.class b/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$WidgetBgResources.class
new file mode 100644
index 0000000..30ee496
Binary files /dev/null and b/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$WidgetBgResources.class differ
diff --git a/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser.class b/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser.class
new file mode 100644
index 0000000..d5f24f4
Binary files /dev/null and b/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser.class differ
diff --git a/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/AlarmAlertActivity.class b/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/AlarmAlertActivity.class
new file mode 100644
index 0000000..57942b7
Binary files /dev/null and b/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/AlarmAlertActivity.class differ
diff --git a/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/AlarmInitReceiver.class b/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/AlarmInitReceiver.class
new file mode 100644
index 0000000..26eb557
Binary files /dev/null and b/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/AlarmInitReceiver.class differ
diff --git a/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/AlarmReceiver.class b/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/AlarmReceiver.class
new file mode 100644
index 0000000..68c5c88
Binary files /dev/null and b/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/AlarmReceiver.class differ
diff --git a/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$1.class b/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$1.class
new file mode 100644
index 0000000..eff3719
Binary files /dev/null and b/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$1.class differ
diff --git a/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$2.class b/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$2.class
new file mode 100644
index 0000000..0503834
Binary files /dev/null and b/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$2.class differ
diff --git a/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$3.class b/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$3.class
new file mode 100644
index 0000000..255d90a
Binary files /dev/null and b/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$3.class differ
diff --git a/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$4.class b/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$4.class
new file mode 100644
index 0000000..8e4286d
Binary files /dev/null and b/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$4.class differ
diff --git a/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$OnDateTimeChangedListener.class b/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$OnDateTimeChangedListener.class
new file mode 100644
index 0000000..86c542e
Binary files /dev/null and b/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$OnDateTimeChangedListener.class differ
diff --git a/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker.class b/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker.class
new file mode 100644
index 0000000..f8d8d53
Binary files /dev/null and b/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker.class differ
diff --git a/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePickerDialog$1.class b/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePickerDialog$1.class
new file mode 100644
index 0000000..f44100a
Binary files /dev/null and b/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePickerDialog$1.class differ
diff --git a/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePickerDialog$OnDateTimeSetListener.class b/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePickerDialog$OnDateTimeSetListener.class
new file mode 100644
index 0000000..5adfb41
Binary files /dev/null and b/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePickerDialog$OnDateTimeSetListener.class differ
diff --git a/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePickerDialog.class b/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePickerDialog.class
new file mode 100644
index 0000000..a611144
Binary files /dev/null and b/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePickerDialog.class differ
diff --git a/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DropdownMenu$1.class b/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DropdownMenu$1.class
new file mode 100644
index 0000000..8106f9a
Binary files /dev/null and b/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DropdownMenu$1.class differ
diff --git a/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DropdownMenu.class b/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DropdownMenu.class
new file mode 100644
index 0000000..55a70e0
Binary files /dev/null and b/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DropdownMenu.class differ
diff --git a/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/FoldersListAdapter$FolderListItem.class b/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/FoldersListAdapter$FolderListItem.class
new file mode 100644
index 0000000..8cdbc88
Binary files /dev/null and b/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/FoldersListAdapter$FolderListItem.class differ
diff --git a/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/FoldersListAdapter.class b/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/FoldersListAdapter.class
new file mode 100644
index 0000000..b78e25c
Binary files /dev/null and b/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/FoldersListAdapter.class differ
diff --git a/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$1.class b/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$1.class
new file mode 100644
index 0000000..d7ab232
Binary files /dev/null and b/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$1.class differ
diff --git a/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$2.class b/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$2.class
new file mode 100644
index 0000000..3b1d443
Binary files /dev/null and b/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$2.class differ
diff --git a/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$3.class b/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$3.class
new file mode 100644
index 0000000..4a2173b
Binary files /dev/null and b/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$3.class differ
diff --git a/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$HeadViewHolder.class b/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$HeadViewHolder.class
new file mode 100644
index 0000000..9ebe9c5
Binary files /dev/null and b/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$HeadViewHolder.class differ
diff --git a/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity.class b/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity.class
new file mode 100644
index 0000000..0800bd0
Binary files /dev/null and b/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity.class differ
diff --git a/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditText$1.class b/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditText$1.class
new file mode 100644
index 0000000..e0ab5ed
Binary files /dev/null and b/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditText$1.class differ
diff --git a/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditText$OnTextViewChangeListener.class b/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditText$OnTextViewChangeListener.class
new file mode 100644
index 0000000..3b31419
Binary files /dev/null and b/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditText$OnTextViewChangeListener.class differ
diff --git a/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditText.class b/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditText.class
new file mode 100644
index 0000000..5312f5d
Binary files /dev/null and b/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditText.class differ
diff --git a/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteItemData.class b/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteItemData.class
new file mode 100644
index 0000000..c946f96
Binary files /dev/null and b/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteItemData.class differ
diff --git a/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$1.class b/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$1.class
new file mode 100644
index 0000000..2c9e867
Binary files /dev/null and b/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$1.class differ
diff --git a/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$2.class b/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$2.class
new file mode 100644
index 0000000..749421d
Binary files /dev/null and b/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$2.class differ
diff --git a/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$3.class b/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$3.class
new file mode 100644
index 0000000..9e48fbf
Binary files /dev/null and b/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$3.class differ
diff --git a/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$4.class b/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$4.class
new file mode 100644
index 0000000..0fcdb77
Binary files /dev/null and b/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$4.class differ
diff --git a/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$5.class b/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$5.class
new file mode 100644
index 0000000..d5b72ac
Binary files /dev/null and b/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$5.class differ
diff --git a/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$6.class b/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$6.class
new file mode 100644
index 0000000..4265edc
Binary files /dev/null and b/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$6.class differ
diff --git a/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$7.class b/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$7.class
new file mode 100644
index 0000000..fe62e51
Binary files /dev/null and b/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$7.class differ
diff --git a/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$8.class b/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$8.class
new file mode 100644
index 0000000..e85c4df
Binary files /dev/null and b/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$8.class differ
diff --git a/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$9.class b/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$9.class
new file mode 100644
index 0000000..fbdd308
Binary files /dev/null and b/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$9.class differ
diff --git a/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$BackgroundQueryHandler.class b/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$BackgroundQueryHandler.class
new file mode 100644
index 0000000..dc224fc
Binary files /dev/null and b/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$BackgroundQueryHandler.class differ
diff --git a/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ListEditState.class b/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ListEditState.class
new file mode 100644
index 0000000..2e6cdfe
Binary files /dev/null and b/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ListEditState.class differ
diff --git a/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback$1.class b/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback$1.class
new file mode 100644
index 0000000..2f9a8cf
Binary files /dev/null and b/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback$1.class differ
diff --git a/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback$2.class b/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback$2.class
new file mode 100644
index 0000000..ac66193
Binary files /dev/null and b/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback$2.class differ
diff --git a/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback.class b/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback.class
new file mode 100644
index 0000000..539240b
Binary files /dev/null and b/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback.class differ
diff --git a/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$NewNoteOnTouchListener.class b/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$NewNoteOnTouchListener.class
new file mode 100644
index 0000000..83967cd
Binary files /dev/null and b/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$NewNoteOnTouchListener.class differ
diff --git a/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.class b/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.class
new file mode 100644
index 0000000..51ead04
Binary files /dev/null and b/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.class differ
diff --git a/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity.class b/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity.class
new file mode 100644
index 0000000..16e5005
Binary files /dev/null and b/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity.class differ
diff --git a/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListAdapter$AppWidgetAttribute.class b/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListAdapter$AppWidgetAttribute.class
new file mode 100644
index 0000000..5914578
Binary files /dev/null and b/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListAdapter$AppWidgetAttribute.class differ
diff --git a/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListAdapter.class b/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListAdapter.class
new file mode 100644
index 0000000..492682d
Binary files /dev/null and b/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListAdapter.class differ
diff --git a/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListItem.class b/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListItem.class
new file mode 100644
index 0000000..d88881e
Binary files /dev/null and b/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListItem.class differ
diff --git a/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$1.class b/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$1.class
new file mode 100644
index 0000000..a1adb13
Binary files /dev/null and b/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$1.class differ
diff --git a/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$2.class b/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$2.class
new file mode 100644
index 0000000..d2efa89
Binary files /dev/null and b/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$2.class differ
diff --git a/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$3.class b/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$3.class
new file mode 100644
index 0000000..499e024
Binary files /dev/null and b/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$3.class differ
diff --git a/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$4.class b/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$4.class
new file mode 100644
index 0000000..ee403d2
Binary files /dev/null and b/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$4.class differ
diff --git a/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$5.class b/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$5.class
new file mode 100644
index 0000000..811b0fc
Binary files /dev/null and b/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$5.class differ
diff --git a/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$6.class b/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$6.class
new file mode 100644
index 0000000..9b88bb9
Binary files /dev/null and b/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$6.class differ
diff --git a/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$7.class b/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$7.class
new file mode 100644
index 0000000..3bafdd6
Binary files /dev/null and b/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$7.class differ
diff --git a/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$8.class b/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$8.class
new file mode 100644
index 0000000..bd821d1
Binary files /dev/null and b/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$8.class differ
diff --git a/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$GTaskReceiver.class b/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$GTaskReceiver.class
new file mode 100644
index 0000000..123e6f0
Binary files /dev/null and b/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$GTaskReceiver.class differ
diff --git a/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity.class b/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity.class
new file mode 100644
index 0000000..9ab0f0a
Binary files /dev/null and b/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity.class differ
diff --git a/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider.class b/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider.class
new file mode 100644
index 0000000..35afaf6
Binary files /dev/null and b/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider.class differ
diff --git a/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider_2x.class b/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider_2x.class
new file mode 100644
index 0000000..ac50656
Binary files /dev/null and b/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider_2x.class differ
diff --git a/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider_4x.class b/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider_4x.class
new file mode 100644
index 0000000..02050c4
Binary files /dev/null and b/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider_4x.class differ
diff --git a/Notes-master/app/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt b/Notes-master/app/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt
new file mode 100644
index 0000000..f799f2c
--- /dev/null
+++ b/Notes-master/app/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt
@@ -0,0 +1,282 @@
+1
+2
+17
+21
+22 E:\Notes-master\app\src\main\AndroidManifest.xml:22:5-44
+23 android:minSdkVersion="14"
+23-->E:\Notes-master\app\src\main\AndroidManifest.xml:22:15-41
+24 android:targetSdkVersion="14" />
+24-->E:\Notes-master\app\src\main\AndroidManifest.xml:22:5-44
+25
+26
+27
+27-->E:\Notes-master\app\src\main\AndroidManifest.xml:25:5-81
+27-->E:\Notes-master\app\src\main\AndroidManifest.xml:25:22-78
+28
+29
+29-->E:\Notes-master\app\src\main\AndroidManifest.xml:27:5-88
+29-->E:\Notes-master\app\src\main\AndroidManifest.xml:27:22-85
+30
+31
+31-->E:\Notes-master\app\src\main\AndroidManifest.xml:29:5-67
+31-->E:\Notes-master\app\src\main\AndroidManifest.xml:29:22-64
+32
+33
+33-->E:\Notes-master\app\src\main\AndroidManifest.xml:31:5-72
+33-->E:\Notes-master\app\src\main\AndroidManifest.xml:31:22-69
+34
+35
+35-->E:\Notes-master\app\src\main\AndroidManifest.xml:33:5-74
+35-->E:\Notes-master\app\src\main\AndroidManifest.xml:33:22-71
+36
+37
+37-->E:\Notes-master\app\src\main\AndroidManifest.xml:35:5-80
+37-->E:\Notes-master\app\src\main\AndroidManifest.xml:35:22-77
+38
+39
+39-->E:\Notes-master\app\src\main\AndroidManifest.xml:37:5-71
+39-->E:\Notes-master\app\src\main\AndroidManifest.xml:37:22-68
+40
+41
+41-->E:\Notes-master\app\src\main\AndroidManifest.xml:39:5-74
+41-->E:\Notes-master\app\src\main\AndroidManifest.xml:39:22-71
+42
+43
+43-->E:\Notes-master\app\src\main\AndroidManifest.xml:41:5-81
+43-->E:\Notes-master\app\src\main\AndroidManifest.xml:41:22-78
+44
+45 E:\Notes-master\app\src\main\AndroidManifest.xml:43:5-157:19
+46 android:debuggable="true"
+47 android:icon="@drawable/icon_app"
+47-->E:\Notes-master\app\src\main\AndroidManifest.xml:44:9-42
+48 android:label="@string/app_name"
+48-->E:\Notes-master\app\src\main\AndroidManifest.xml:45:9-41
+49 android:testOnly="true" >
+50 E:\Notes-master\app\src\main\AndroidManifest.xml:46:9-59:20
+51 android:name="net.micode.notes.ui.NotesListActivity"
+51-->E:\Notes-master\app\src\main\AndroidManifest.xml:47:13-49
+52 android:configChanges="keyboardHidden|orientation|screenSize"
+52-->E:\Notes-master\app\src\main\AndroidManifest.xml:48:13-74
+53 android:label="@string/app_name"
+53-->E:\Notes-master\app\src\main\AndroidManifest.xml:49:13-45
+54 android:launchMode="singleTop"
+54-->E:\Notes-master\app\src\main\AndroidManifest.xml:50:13-43
+55 android:theme="@style/NoteTheme"
+55-->E:\Notes-master\app\src\main\AndroidManifest.xml:51:13-45
+56 android:uiOptions="splitActionBarWhenNarrow"
+56-->E:\Notes-master\app\src\main\AndroidManifest.xml:52:13-57
+57 android:windowSoftInputMode="adjustPan" >
+57-->E:\Notes-master\app\src\main\AndroidManifest.xml:53:13-52
+58
+58-->E:\Notes-master\app\src\main\AndroidManifest.xml:55:13-58:29
+59
+59-->E:\Notes-master\app\src\main\AndroidManifest.xml:56:17-69
+59-->E:\Notes-master\app\src\main\AndroidManifest.xml:56:25-66
+60
+61
+61-->E:\Notes-master\app\src\main\AndroidManifest.xml:57:17-77
+61-->E:\Notes-master\app\src\main\AndroidManifest.xml:57:27-74
+62
+63
+64 E:\Notes-master\app\src\main\AndroidManifest.xml:61:9-89:20
+65 android:name="net.micode.notes.ui.NoteEditActivity"
+65-->E:\Notes-master\app\src\main\AndroidManifest.xml:62:13-48
+66 android:configChanges="keyboardHidden|orientation|screenSize"
+66-->E:\Notes-master\app\src\main\AndroidManifest.xml:63:13-74
+67 android:launchMode="singleTop"
+67-->E:\Notes-master\app\src\main\AndroidManifest.xml:64:13-43
+68 android:theme="@style/NoteTheme" >
+68-->E:\Notes-master\app\src\main\AndroidManifest.xml:65:13-45
+69
+69-->E:\Notes-master\app\src\main\AndroidManifest.xml:67:13-72:29
+70
+70-->E:\Notes-master\app\src\main\AndroidManifest.xml:68:17-69
+70-->E:\Notes-master\app\src\main\AndroidManifest.xml:68:25-66
+71
+72
+72-->E:\Notes-master\app\src\main\AndroidManifest.xml:69:17-76
+72-->E:\Notes-master\app\src\main\AndroidManifest.xml:69:27-73
+73
+74
+74-->E:\Notes-master\app\src\main\AndroidManifest.xml:70:17-78
+74-->E:\Notes-master\app\src\main\AndroidManifest.xml:70:23-75
+75
+75-->E:\Notes-master\app\src\main\AndroidManifest.xml:70:17-78
+75-->E:\Notes-master\app\src\main\AndroidManifest.xml:70:23-75
+76
+77
+77-->E:\Notes-master\app\src\main\AndroidManifest.xml:74:13-79:29
+78
+78-->E:\Notes-master\app\src\main\AndroidManifest.xml:75:17-79
+78-->E:\Notes-master\app\src\main\AndroidManifest.xml:75:25-76
+79
+80
+80-->E:\Notes-master\app\src\main\AndroidManifest.xml:69:17-76
+80-->E:\Notes-master\app\src\main\AndroidManifest.xml:69:27-73
+81
+82
+82-->E:\Notes-master\app\src\main\AndroidManifest.xml:70:17-78
+82-->E:\Notes-master\app\src\main\AndroidManifest.xml:70:23-75
+83
+83-->E:\Notes-master\app\src\main\AndroidManifest.xml:70:17-78
+83-->E:\Notes-master\app\src\main\AndroidManifest.xml:70:23-75
+84
+85
+85-->E:\Notes-master\app\src\main\AndroidManifest.xml:81:13-84:29
+86
+86-->E:\Notes-master\app\src\main\AndroidManifest.xml:82:17-71
+86-->E:\Notes-master\app\src\main\AndroidManifest.xml:82:25-68
+87
+88
+88-->E:\Notes-master\app\src\main\AndroidManifest.xml:69:17-76
+88-->E:\Notes-master\app\src\main\AndroidManifest.xml:69:27-73
+89
+90
+91 E:\Notes-master\app\src\main\AndroidManifest.xml:86:13-88:54
+92 android:name="android.app.searchable"
+92-->E:\Notes-master\app\src\main\AndroidManifest.xml:87:17-54
+93 android:resource="@xml/searchable" />
+93-->E:\Notes-master\app\src\main\AndroidManifest.xml:88:17-51
+94
+95
+96 E:\Notes-master\app\src\main\AndroidManifest.xml:91:9-94:43
+97 android:name="net.micode.notes.data.NotesProvider"
+97-->E:\Notes-master\app\src\main\AndroidManifest.xml:92:13-63
+98 android:authorities="micode_notes"
+98-->E:\Notes-master\app\src\main\AndroidManifest.xml:93:13-47
+99 android:multiprocess="true" />
+99-->E:\Notes-master\app\src\main\AndroidManifest.xml:94:13-40
+100
+101 E:\Notes-master\app\src\main\AndroidManifest.xml:96:9-108:20
+102 android:name="net.micode.notes.widget.NoteWidgetProvider_2x"
+102-->E:\Notes-master\app\src\main\AndroidManifest.xml:97:13-57
+103 android:label="@string/app_widget2x2" >
+103-->E:\Notes-master\app\src\main\AndroidManifest.xml:98:13-50
+104
+104-->E:\Notes-master\app\src\main\AndroidManifest.xml:99:13-103:29
+105
+105-->E:\Notes-master\app\src\main\AndroidManifest.xml:100:17-84
+105-->E:\Notes-master\app\src\main\AndroidManifest.xml:100:25-81
+106
+106-->E:\Notes-master\app\src\main\AndroidManifest.xml:101:17-85
+106-->E:\Notes-master\app\src\main\AndroidManifest.xml:101:25-82
+107
+107-->E:\Notes-master\app\src\main\AndroidManifest.xml:102:17-85
+107-->E:\Notes-master\app\src\main\AndroidManifest.xml:102:25-82
+108
+109
+110 E:\Notes-master\app\src\main\AndroidManifest.xml:105:13-107:58
+111 android:name="android.appwidget.provider"
+111-->E:\Notes-master\app\src\main\AndroidManifest.xml:106:17-58
+112 android:resource="@xml/widget_2x_info" />
+112-->E:\Notes-master\app\src\main\AndroidManifest.xml:107:17-55
+113
+114 E:\Notes-master\app\src\main\AndroidManifest.xml:109:9-122:20
+115 android:name="net.micode.notes.widget.NoteWidgetProvider_4x"
+115-->E:\Notes-master\app\src\main\AndroidManifest.xml:110:13-57
+116 android:label="@string/app_widget4x4" >
+116-->E:\Notes-master\app\src\main\AndroidManifest.xml:111:13-50
+117
+117-->E:\Notes-master\app\src\main\AndroidManifest.xml:99:13-103:29
+118
+118-->E:\Notes-master\app\src\main\AndroidManifest.xml:100:17-84
+118-->E:\Notes-master\app\src\main\AndroidManifest.xml:100:25-81
+119
+119-->E:\Notes-master\app\src\main\AndroidManifest.xml:101:17-85
+119-->E:\Notes-master\app\src\main\AndroidManifest.xml:101:25-82
+120
+120-->E:\Notes-master\app\src\main\AndroidManifest.xml:102:17-85
+120-->E:\Notes-master\app\src\main\AndroidManifest.xml:102:25-82
+121
+122
+123 E:\Notes-master\app\src\main\AndroidManifest.xml:105:13-107:58
+124 android:name="android.appwidget.provider"
+124-->E:\Notes-master\app\src\main\AndroidManifest.xml:106:17-58
+125 android:resource="@xml/widget_4x_info" />
+125-->E:\Notes-master\app\src\main\AndroidManifest.xml:107:17-55
+126
+127
+127-->E:\Notes-master\app\src\main\AndroidManifest.xml:124:9-128:20
+127-->E:\Notes-master\app\src\main\AndroidManifest.xml:124:19-55
+128
+128-->E:\Notes-master\app\src\main\AndroidManifest.xml:125:13-127:29
+129
+129-->E:\Notes-master\app\src\main\AndroidManifest.xml:126:17-79
+129-->E:\Notes-master\app\src\main\AndroidManifest.xml:126:25-76
+130
+131
+132 E:\Notes-master\app\src\main\AndroidManifest.xml:130:9-133:20
+133 android:name="net.micode.notes.ui.AlarmReceiver"
+133-->E:\Notes-master\app\src\main\AndroidManifest.xml:131:13-61
+134 android:process=":remote" >
+134-->E:\Notes-master\app\src\main\AndroidManifest.xml:132:13-38
+135
+136
+137 E:\Notes-master\app\src\main\AndroidManifest.xml:135:9-140:20
+138 android:name="net.micode.notes.ui.AlarmAlertActivity"
+138-->E:\Notes-master\app\src\main\AndroidManifest.xml:136:13-50
+139 android:label="@string/app_name"
+139-->E:\Notes-master\app\src\main\AndroidManifest.xml:137:13-45
+140 android:launchMode="singleInstance"
+140-->E:\Notes-master\app\src\main\AndroidManifest.xml:138:13-48
+141 android:theme="@android:style/Theme.Holo.Wallpaper.NoTitleBar" >
+141-->E:\Notes-master\app\src\main\AndroidManifest.xml:139:13-75
+142
+143 E:\Notes-master\app\src\main\AndroidManifest.xml:142:9-147:20
+144 android:name="net.micode.notes.ui.NotesPreferenceActivity"
+144-->E:\Notes-master\app\src\main\AndroidManifest.xml:143:13-71
+145 android:label="@string/preferences_title"
+145-->E:\Notes-master\app\src\main\AndroidManifest.xml:144:13-54
+146 android:launchMode="singleTop"
+146-->E:\Notes-master\app\src\main\AndroidManifest.xml:145:13-43
+147 android:theme="@android:style/Theme.Holo.Light" >
+147-->E:\Notes-master\app\src\main\AndroidManifest.xml:146:13-60
+148
+149
+150 E:\Notes-master\app\src\main\AndroidManifest.xml:149:9-152:19
+151 android:name="net.micode.notes.gtask.remote.GTaskSyncService"
+151-->E:\Notes-master\app\src\main\AndroidManifest.xml:150:13-74
+152 android:exported="false" >
+152-->E:\Notes-master\app\src\main\AndroidManifest.xml:151:13-37
+153
+154
+155 E:\Notes-master\app\src\main\AndroidManifest.xml:154:9-156:52
+156 android:name="android.app.default_searchable"
+156-->E:\Notes-master\app\src\main\AndroidManifest.xml:155:13-58
+157 android:value=".ui.NoteEditActivity" />
+157-->E:\Notes-master\app\src\main\AndroidManifest.xml:156:13-49
+158
+159
+160
diff --git a/Notes-master/app/build/intermediates/manifest_merge_blame_file/release/manifest-merger-blame-release-report.txt b/Notes-master/app/build/intermediates/manifest_merge_blame_file/release/manifest-merger-blame-release-report.txt
new file mode 100644
index 0000000..c56bab1
--- /dev/null
+++ b/Notes-master/app/build/intermediates/manifest_merge_blame_file/release/manifest-merger-blame-release-report.txt
@@ -0,0 +1,271 @@
+1
+2
+17
+21
+22 E:\Notes-master\app\src\main\AndroidManifest.xml:23:5-44
+23 android:minSdkVersion="14"
+23-->E:\Notes-master\app\src\main\AndroidManifest.xml:23:15-41
+24 android:targetSdkVersion="14" />
+24-->E:\Notes-master\app\src\main\AndroidManifest.xml:23:5-44
+25
+26
+26-->E:\Notes-master\app\src\main\AndroidManifest.xml:25:5-81
+26-->E:\Notes-master\app\src\main\AndroidManifest.xml:25:22-78
+27
+27-->E:\Notes-master\app\src\main\AndroidManifest.xml:26:5-88
+27-->E:\Notes-master\app\src\main\AndroidManifest.xml:26:22-85
+28
+28-->E:\Notes-master\app\src\main\AndroidManifest.xml:27:5-67
+28-->E:\Notes-master\app\src\main\AndroidManifest.xml:27:22-64
+29
+29-->E:\Notes-master\app\src\main\AndroidManifest.xml:28:5-72
+29-->E:\Notes-master\app\src\main\AndroidManifest.xml:28:22-69
+30
+30-->E:\Notes-master\app\src\main\AndroidManifest.xml:29:5-74
+30-->E:\Notes-master\app\src\main\AndroidManifest.xml:29:22-71
+31
+31-->E:\Notes-master\app\src\main\AndroidManifest.xml:30:5-80
+31-->E:\Notes-master\app\src\main\AndroidManifest.xml:30:22-77
+32
+32-->E:\Notes-master\app\src\main\AndroidManifest.xml:31:5-71
+32-->E:\Notes-master\app\src\main\AndroidManifest.xml:31:22-68
+33
+33-->E:\Notes-master\app\src\main\AndroidManifest.xml:32:5-74
+33-->E:\Notes-master\app\src\main\AndroidManifest.xml:32:22-71
+34
+34-->E:\Notes-master\app\src\main\AndroidManifest.xml:33:5-81
+34-->E:\Notes-master\app\src\main\AndroidManifest.xml:33:22-78
+35
+36 E:\Notes-master\app\src\main\AndroidManifest.xml:35:5-149:19
+37 android:icon="@drawable/icon_app"
+37-->E:\Notes-master\app\src\main\AndroidManifest.xml:36:9-42
+38 android:label="@string/app_name" >
+38-->E:\Notes-master\app\src\main\AndroidManifest.xml:37:9-41
+39 E:\Notes-master\app\src\main\AndroidManifest.xml:38:9-51:20
+40 android:name="net.micode.notes.ui.NotesListActivity"
+40-->E:\Notes-master\app\src\main\AndroidManifest.xml:39:13-49
+41 android:configChanges="keyboardHidden|orientation|screenSize"
+41-->E:\Notes-master\app\src\main\AndroidManifest.xml:40:13-74
+42 android:label="@string/app_name"
+42-->E:\Notes-master\app\src\main\AndroidManifest.xml:41:13-45
+43 android:launchMode="singleTop"
+43-->E:\Notes-master\app\src\main\AndroidManifest.xml:42:13-43
+44 android:theme="@style/NoteTheme"
+44-->E:\Notes-master\app\src\main\AndroidManifest.xml:43:13-45
+45 android:uiOptions="splitActionBarWhenNarrow"
+45-->E:\Notes-master\app\src\main\AndroidManifest.xml:44:13-57
+46 android:windowSoftInputMode="adjustPan" >
+46-->E:\Notes-master\app\src\main\AndroidManifest.xml:45:13-52
+47
+47-->E:\Notes-master\app\src\main\AndroidManifest.xml:47:13-50:29
+48
+48-->E:\Notes-master\app\src\main\AndroidManifest.xml:48:17-69
+48-->E:\Notes-master\app\src\main\AndroidManifest.xml:48:25-66
+49
+50
+50-->E:\Notes-master\app\src\main\AndroidManifest.xml:49:17-77
+50-->E:\Notes-master\app\src\main\AndroidManifest.xml:49:27-74
+51
+52
+53 E:\Notes-master\app\src\main\AndroidManifest.xml:53:9-81:20
+54 android:name="net.micode.notes.ui.NoteEditActivity"
+54-->E:\Notes-master\app\src\main\AndroidManifest.xml:54:13-48
+55 android:configChanges="keyboardHidden|orientation|screenSize"
+55-->E:\Notes-master\app\src\main\AndroidManifest.xml:55:13-74
+56 android:launchMode="singleTop"
+56-->E:\Notes-master\app\src\main\AndroidManifest.xml:56:13-43
+57 android:theme="@style/NoteTheme" >
+57-->E:\Notes-master\app\src\main\AndroidManifest.xml:57:13-45
+58
+58-->E:\Notes-master\app\src\main\AndroidManifest.xml:59:13-64:29
+59
+59-->E:\Notes-master\app\src\main\AndroidManifest.xml:60:17-69
+59-->E:\Notes-master\app\src\main\AndroidManifest.xml:60:25-66
+60
+61
+61-->E:\Notes-master\app\src\main\AndroidManifest.xml:61:17-76
+61-->E:\Notes-master\app\src\main\AndroidManifest.xml:61:27-73
+62
+63
+63-->E:\Notes-master\app\src\main\AndroidManifest.xml:62:17-78
+63-->E:\Notes-master\app\src\main\AndroidManifest.xml:62:23-75
+64
+64-->E:\Notes-master\app\src\main\AndroidManifest.xml:62:17-78
+64-->E:\Notes-master\app\src\main\AndroidManifest.xml:62:23-75
+65
+66
+66-->E:\Notes-master\app\src\main\AndroidManifest.xml:66:13-71:29
+67
+67-->E:\Notes-master\app\src\main\AndroidManifest.xml:67:17-79
+67-->E:\Notes-master\app\src\main\AndroidManifest.xml:67:25-76
+68
+69
+69-->E:\Notes-master\app\src\main\AndroidManifest.xml:61:17-76
+69-->E:\Notes-master\app\src\main\AndroidManifest.xml:61:27-73
+70
+71
+71-->E:\Notes-master\app\src\main\AndroidManifest.xml:62:17-78
+71-->E:\Notes-master\app\src\main\AndroidManifest.xml:62:23-75
+72
+72-->E:\Notes-master\app\src\main\AndroidManifest.xml:62:17-78
+72-->E:\Notes-master\app\src\main\AndroidManifest.xml:62:23-75
+73
+74
+74-->E:\Notes-master\app\src\main\AndroidManifest.xml:73:13-76:29
+75
+75-->E:\Notes-master\app\src\main\AndroidManifest.xml:74:17-71
+75-->E:\Notes-master\app\src\main\AndroidManifest.xml:74:25-68
+76
+77
+77-->E:\Notes-master\app\src\main\AndroidManifest.xml:61:17-76
+77-->E:\Notes-master\app\src\main\AndroidManifest.xml:61:27-73
+78
+79
+80 E:\Notes-master\app\src\main\AndroidManifest.xml:78:13-80:54
+81 android:name="android.app.searchable"
+81-->E:\Notes-master\app\src\main\AndroidManifest.xml:79:17-54
+82 android:resource="@xml/searchable" />
+82-->E:\Notes-master\app\src\main\AndroidManifest.xml:80:17-51
+83
+84
+85 E:\Notes-master\app\src\main\AndroidManifest.xml:83:9-86:43
+86 android:name="net.micode.notes.data.NotesProvider"
+86-->E:\Notes-master\app\src\main\AndroidManifest.xml:84:13-63
+87 android:authorities="micode_notes"
+87-->E:\Notes-master\app\src\main\AndroidManifest.xml:85:13-47
+88 android:multiprocess="true" />
+88-->E:\Notes-master\app\src\main\AndroidManifest.xml:86:13-40
+89
+90 E:\Notes-master\app\src\main\AndroidManifest.xml:88:9-100:20
+91 android:name="net.micode.notes.widget.NoteWidgetProvider_2x"
+91-->E:\Notes-master\app\src\main\AndroidManifest.xml:89:13-57
+92 android:label="@string/app_widget2x2" >
+92-->E:\Notes-master\app\src\main\AndroidManifest.xml:90:13-50
+93
+93-->E:\Notes-master\app\src\main\AndroidManifest.xml:91:13-95:29
+94
+94-->E:\Notes-master\app\src\main\AndroidManifest.xml:92:17-84
+94-->E:\Notes-master\app\src\main\AndroidManifest.xml:92:25-81
+95
+95-->E:\Notes-master\app\src\main\AndroidManifest.xml:93:17-85
+95-->E:\Notes-master\app\src\main\AndroidManifest.xml:93:25-82
+96
+96-->E:\Notes-master\app\src\main\AndroidManifest.xml:94:17-85
+96-->E:\Notes-master\app\src\main\AndroidManifest.xml:94:25-82
+97
+98
+99 E:\Notes-master\app\src\main\AndroidManifest.xml:97:13-99:58
+100 android:name="android.appwidget.provider"
+100-->E:\Notes-master\app\src\main\AndroidManifest.xml:98:17-58
+101 android:resource="@xml/widget_2x_info" />
+101-->E:\Notes-master\app\src\main\AndroidManifest.xml:99:17-55
+102
+103 E:\Notes-master\app\src\main\AndroidManifest.xml:101:9-114:20
+104 android:name="net.micode.notes.widget.NoteWidgetProvider_4x"
+104-->E:\Notes-master\app\src\main\AndroidManifest.xml:102:13-57
+105 android:label="@string/app_widget4x4" >
+105-->E:\Notes-master\app\src\main\AndroidManifest.xml:103:13-50
+106
+106-->E:\Notes-master\app\src\main\AndroidManifest.xml:91:13-95:29
+107
+107-->E:\Notes-master\app\src\main\AndroidManifest.xml:92:17-84
+107-->E:\Notes-master\app\src\main\AndroidManifest.xml:92:25-81
+108
+108-->E:\Notes-master\app\src\main\AndroidManifest.xml:93:17-85
+108-->E:\Notes-master\app\src\main\AndroidManifest.xml:93:25-82
+109
+109-->E:\Notes-master\app\src\main\AndroidManifest.xml:94:17-85
+109-->E:\Notes-master\app\src\main\AndroidManifest.xml:94:25-82
+110
+111
+112 E:\Notes-master\app\src\main\AndroidManifest.xml:97:13-99:58
+113 android:name="android.appwidget.provider"
+113-->E:\Notes-master\app\src\main\AndroidManifest.xml:98:17-58
+114 android:resource="@xml/widget_4x_info" />
+114-->E:\Notes-master\app\src\main\AndroidManifest.xml:99:17-55
+115
+116
+116-->E:\Notes-master\app\src\main\AndroidManifest.xml:116:9-120:20
+116-->E:\Notes-master\app\src\main\AndroidManifest.xml:116:19-55
+117
+117-->E:\Notes-master\app\src\main\AndroidManifest.xml:117:13-119:29
+118
+118-->E:\Notes-master\app\src\main\AndroidManifest.xml:118:17-79
+118-->E:\Notes-master\app\src\main\AndroidManifest.xml:118:25-76
+119
+120
+121 E:\Notes-master\app\src\main\AndroidManifest.xml:122:9-125:20
+122 android:name="net.micode.notes.ui.AlarmReceiver"
+122-->E:\Notes-master\app\src\main\AndroidManifest.xml:123:13-61
+123 android:process=":remote" >
+123-->E:\Notes-master\app\src\main\AndroidManifest.xml:124:13-38
+124
+125
+126 E:\Notes-master\app\src\main\AndroidManifest.xml:127:9-132:20
+127 android:name="net.micode.notes.ui.AlarmAlertActivity"
+127-->E:\Notes-master\app\src\main\AndroidManifest.xml:128:13-50
+128 android:label="@string/app_name"
+128-->E:\Notes-master\app\src\main\AndroidManifest.xml:129:13-45
+129 android:launchMode="singleInstance"
+129-->E:\Notes-master\app\src\main\AndroidManifest.xml:130:13-48
+130 android:theme="@android:style/Theme.Holo.Wallpaper.NoTitleBar" >
+130-->E:\Notes-master\app\src\main\AndroidManifest.xml:131:13-75
+131
+132 E:\Notes-master\app\src\main\AndroidManifest.xml:134:9-139:20
+133 android:name="net.micode.notes.ui.NotesPreferenceActivity"
+133-->E:\Notes-master\app\src\main\AndroidManifest.xml:135:13-71
+134 android:label="@string/preferences_title"
+134-->E:\Notes-master\app\src\main\AndroidManifest.xml:136:13-54
+135 android:launchMode="singleTop"
+135-->E:\Notes-master\app\src\main\AndroidManifest.xml:137:13-43
+136 android:theme="@android:style/Theme.Holo.Light" >
+136-->E:\Notes-master\app\src\main\AndroidManifest.xml:138:13-60
+137
+138
+139 E:\Notes-master\app\src\main\AndroidManifest.xml:141:9-144:19
+140 android:name="net.micode.notes.gtask.remote.GTaskSyncService"
+140-->E:\Notes-master\app\src\main\AndroidManifest.xml:142:13-74
+141 android:exported="false" >
+141-->E:\Notes-master\app\src\main\AndroidManifest.xml:143:13-37
+142
+143
+144 E:\Notes-master\app\src\main\AndroidManifest.xml:146:9-148:52
+145 android:name="android.app.default_searchable"
+145-->E:\Notes-master\app\src\main\AndroidManifest.xml:147:13-58
+146 android:value=".ui.NoteEditActivity" />
+146-->E:\Notes-master\app\src\main\AndroidManifest.xml:148:13-49
+147
+148
+149
diff --git a/Notes-master/app/build/intermediates/merged_java_res/debug/base.jar b/Notes-master/app/build/intermediates/merged_java_res/debug/base.jar
new file mode 100644
index 0000000..15cb0ec
Binary files /dev/null and b/Notes-master/app/build/intermediates/merged_java_res/debug/base.jar differ
diff --git a/Notes-master/app/build/intermediates/merged_java_res/debug/out.jar b/Notes-master/app/build/intermediates/merged_java_res/debug/out.jar
new file mode 100644
index 0000000..15cb0ec
Binary files /dev/null and b/Notes-master/app/build/intermediates/merged_java_res/debug/out.jar differ
diff --git a/Notes-master/app/build/intermediates/merged_java_res/release/base.jar b/Notes-master/app/build/intermediates/merged_java_res/release/base.jar
new file mode 100644
index 0000000..15cb0ec
Binary files /dev/null and b/Notes-master/app/build/intermediates/merged_java_res/release/base.jar differ
diff --git a/Notes-master/app/build/intermediates/merged_manifest/debug/AndroidManifest.xml b/Notes-master/app/build/intermediates/merged_manifest/debug/AndroidManifest.xml
new file mode 100644
index 0000000..1f5b31c
--- /dev/null
+++ b/Notes-master/app/build/intermediates/merged_manifest/debug/AndroidManifest.xml
@@ -0,0 +1,160 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/Notes-master/app/build/intermediates/merged_manifest/release/AndroidManifest.xml b/Notes-master/app/build/intermediates/merged_manifest/release/AndroidManifest.xml
new file mode 100644
index 0000000..b3424d2
--- /dev/null
+++ b/Notes-master/app/build/intermediates/merged_manifest/release/AndroidManifest.xml
@@ -0,0 +1,149 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/Notes-master/app/build/intermediates/merged_manifests/debug/AndroidManifest.xml b/Notes-master/app/build/intermediates/merged_manifests/debug/AndroidManifest.xml
new file mode 100644
index 0000000..1f5b31c
--- /dev/null
+++ b/Notes-master/app/build/intermediates/merged_manifests/debug/AndroidManifest.xml
@@ -0,0 +1,160 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/Notes-master/app/build/intermediates/merged_manifests/debug/output-metadata.json b/Notes-master/app/build/intermediates/merged_manifests/debug/output-metadata.json
new file mode 100644
index 0000000..20afc9b
--- /dev/null
+++ b/Notes-master/app/build/intermediates/merged_manifests/debug/output-metadata.json
@@ -0,0 +1,18 @@
+{
+ "version": 2,
+ "artifactType": {
+ "type": "MERGED_MANIFESTS",
+ "kind": "Directory"
+ },
+ "applicationId": "net.micode.notes",
+ "variantName": "debug",
+ "elements": [
+ {
+ "type": "SINGLE",
+ "filters": [],
+ "versionCode": 1,
+ "versionName": "0.1",
+ "outputFile": "AndroidManifest.xml"
+ }
+ ]
+}
\ No newline at end of file
diff --git a/Notes-master/app/build/intermediates/merged_manifests/release/AndroidManifest.xml b/Notes-master/app/build/intermediates/merged_manifests/release/AndroidManifest.xml
new file mode 100644
index 0000000..b3424d2
--- /dev/null
+++ b/Notes-master/app/build/intermediates/merged_manifests/release/AndroidManifest.xml
@@ -0,0 +1,149 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/Notes-master/app/build/intermediates/merged_manifests/release/output-metadata.json b/Notes-master/app/build/intermediates/merged_manifests/release/output-metadata.json
new file mode 100644
index 0000000..dba4e33
--- /dev/null
+++ b/Notes-master/app/build/intermediates/merged_manifests/release/output-metadata.json
@@ -0,0 +1,20 @@
+{
+ "version": 3,
+ "artifactType": {
+ "type": "MERGED_MANIFESTS",
+ "kind": "Directory"
+ },
+ "applicationId": "net.micode.notes",
+ "variantName": "release",
+ "elements": [
+ {
+ "type": "SINGLE",
+ "filters": [],
+ "attributes": [],
+ "versionCode": 1,
+ "versionName": "0.1",
+ "outputFile": "AndroidManifest.xml"
+ }
+ ],
+ "elementType": "File"
+}
\ No newline at end of file
diff --git a/Notes-master/app/build/intermediates/merged_res/debug/color_primary_text_dark.xml.flat b/Notes-master/app/build/intermediates/merged_res/debug/color_primary_text_dark.xml.flat
new file mode 100644
index 0000000..802be34
Binary files /dev/null and b/Notes-master/app/build/intermediates/merged_res/debug/color_primary_text_dark.xml.flat differ
diff --git a/Notes-master/app/build/intermediates/merged_res/debug/color_secondary_text_dark.xml.flat b/Notes-master/app/build/intermediates/merged_res/debug/color_secondary_text_dark.xml.flat
new file mode 100644
index 0000000..2d9ddb4
Binary files /dev/null and b/Notes-master/app/build/intermediates/merged_res/debug/color_secondary_text_dark.xml.flat differ
diff --git a/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_bg_btn_set_color.png.flat b/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_bg_btn_set_color.png.flat
new file mode 100644
index 0000000..a783113
Binary files /dev/null and b/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_bg_btn_set_color.png.flat differ
diff --git a/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_bg_color_btn_mask.png.flat b/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_bg_color_btn_mask.png.flat
new file mode 100644
index 0000000..a9576bb
Binary files /dev/null and b/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_bg_color_btn_mask.png.flat differ
diff --git a/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_call_record.png.flat b/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_call_record.png.flat
new file mode 100644
index 0000000..0692876
Binary files /dev/null and b/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_call_record.png.flat differ
diff --git a/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_clock.png.flat b/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_clock.png.flat
new file mode 100644
index 0000000..a5cd8ef
Binary files /dev/null and b/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_clock.png.flat differ
diff --git a/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_delete.png.flat b/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_delete.png.flat
new file mode 100644
index 0000000..b5e283d
Binary files /dev/null and b/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_delete.png.flat differ
diff --git a/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_dropdown_icon.9.png.flat b/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_dropdown_icon.9.png.flat
new file mode 100644
index 0000000..74c78c0
Binary files /dev/null and b/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_dropdown_icon.9.png.flat differ
diff --git a/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_blue.9.png.flat b/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_blue.9.png.flat
new file mode 100644
index 0000000..5436926
Binary files /dev/null and b/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_blue.9.png.flat differ
diff --git a/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_green.9.png.flat b/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_green.9.png.flat
new file mode 100644
index 0000000..4d95a89
Binary files /dev/null and b/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_green.9.png.flat differ
diff --git a/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_red.9.png.flat b/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_red.9.png.flat
new file mode 100644
index 0000000..ce52bc1
Binary files /dev/null and b/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_red.9.png.flat differ
diff --git a/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_title_blue.9.png.flat b/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_title_blue.9.png.flat
new file mode 100644
index 0000000..b376e80
Binary files /dev/null and b/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_title_blue.9.png.flat differ
diff --git a/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_title_green.9.png.flat b/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_title_green.9.png.flat
new file mode 100644
index 0000000..b8cc9ab
Binary files /dev/null and b/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_title_green.9.png.flat differ
diff --git a/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_title_red.9.png.flat b/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_title_red.9.png.flat
new file mode 100644
index 0000000..2af509b
Binary files /dev/null and b/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_title_red.9.png.flat differ
diff --git a/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_title_white.9.png.flat b/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_title_white.9.png.flat
new file mode 100644
index 0000000..f3a6c60
Binary files /dev/null and b/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_title_white.9.png.flat differ
diff --git a/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_title_yellow.9.png.flat b/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_title_yellow.9.png.flat
new file mode 100644
index 0000000..8828ae3
Binary files /dev/null and b/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_title_yellow.9.png.flat differ
diff --git a/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_white.9.png.flat b/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_white.9.png.flat
new file mode 100644
index 0000000..8a98c38
Binary files /dev/null and b/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_white.9.png.flat differ
diff --git a/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_yellow.9.png.flat b/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_yellow.9.png.flat
new file mode 100644
index 0000000..4c9bdf9
Binary files /dev/null and b/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_yellow.9.png.flat differ
diff --git a/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_font_large.png.flat b/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_font_large.png.flat
new file mode 100644
index 0000000..1422573
Binary files /dev/null and b/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_font_large.png.flat differ
diff --git a/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_font_normal.png.flat b/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_font_normal.png.flat
new file mode 100644
index 0000000..704993a
Binary files /dev/null and b/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_font_normal.png.flat differ
diff --git a/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_font_size_selector_bg.9.png.flat b/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_font_size_selector_bg.9.png.flat
new file mode 100644
index 0000000..9a4b989
Binary files /dev/null and b/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_font_size_selector_bg.9.png.flat differ
diff --git a/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_font_small.png.flat b/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_font_small.png.flat
new file mode 100644
index 0000000..11857a4
Binary files /dev/null and b/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_font_small.png.flat differ
diff --git a/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_font_super.png.flat b/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_font_super.png.flat
new file mode 100644
index 0000000..2227ab8
Binary files /dev/null and b/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_font_super.png.flat differ
diff --git a/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_icon_app.png.flat b/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_icon_app.png.flat
new file mode 100644
index 0000000..27a8412
Binary files /dev/null and b/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_icon_app.png.flat differ
diff --git a/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_list_background.png.flat b/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_list_background.png.flat
new file mode 100644
index 0000000..0bda0bc
Binary files /dev/null and b/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_list_background.png.flat differ
diff --git a/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_list_blue_down.9.png.flat b/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_list_blue_down.9.png.flat
new file mode 100644
index 0000000..75f3cd0
Binary files /dev/null and b/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_list_blue_down.9.png.flat differ
diff --git a/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_list_blue_middle.9.png.flat b/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_list_blue_middle.9.png.flat
new file mode 100644
index 0000000..f82dd6d
Binary files /dev/null and b/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_list_blue_middle.9.png.flat differ
diff --git a/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_list_blue_single.9.png.flat b/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_list_blue_single.9.png.flat
new file mode 100644
index 0000000..d57fe3a
Binary files /dev/null and b/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_list_blue_single.9.png.flat differ
diff --git a/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_list_blue_up.9.png.flat b/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_list_blue_up.9.png.flat
new file mode 100644
index 0000000..683b6f1
Binary files /dev/null and b/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_list_blue_up.9.png.flat differ
diff --git a/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_list_folder.9.png.flat b/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_list_folder.9.png.flat
new file mode 100644
index 0000000..e75e056
Binary files /dev/null and b/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_list_folder.9.png.flat differ
diff --git a/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_list_footer_bg.9.png.flat b/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_list_footer_bg.9.png.flat
new file mode 100644
index 0000000..3f89243
Binary files /dev/null and b/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_list_footer_bg.9.png.flat differ
diff --git a/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_list_green_down.9.png.flat b/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_list_green_down.9.png.flat
new file mode 100644
index 0000000..6b24efc
Binary files /dev/null and b/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_list_green_down.9.png.flat differ
diff --git a/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_list_green_middle.9.png.flat b/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_list_green_middle.9.png.flat
new file mode 100644
index 0000000..4f7fa61
Binary files /dev/null and b/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_list_green_middle.9.png.flat differ
diff --git a/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_list_green_single.9.png.flat b/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_list_green_single.9.png.flat
new file mode 100644
index 0000000..725a39f
Binary files /dev/null and b/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_list_green_single.9.png.flat differ
diff --git a/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_list_green_up.9.png.flat b/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_list_green_up.9.png.flat
new file mode 100644
index 0000000..f7b11e8
Binary files /dev/null and b/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_list_green_up.9.png.flat differ
diff --git a/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_list_red_down.9.png.flat b/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_list_red_down.9.png.flat
new file mode 100644
index 0000000..82de739
Binary files /dev/null and b/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_list_red_down.9.png.flat differ
diff --git a/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_list_red_middle.9.png.flat b/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_list_red_middle.9.png.flat
new file mode 100644
index 0000000..224f699
Binary files /dev/null and b/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_list_red_middle.9.png.flat differ
diff --git a/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_list_red_single.9.png.flat b/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_list_red_single.9.png.flat
new file mode 100644
index 0000000..6c1bc35
Binary files /dev/null and b/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_list_red_single.9.png.flat differ
diff --git a/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_list_red_up.9.png.flat b/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_list_red_up.9.png.flat
new file mode 100644
index 0000000..d29584e
Binary files /dev/null and b/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_list_red_up.9.png.flat differ
diff --git a/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_list_white_down.9.png.flat b/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_list_white_down.9.png.flat
new file mode 100644
index 0000000..394cf64
Binary files /dev/null and b/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_list_white_down.9.png.flat differ
diff --git a/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_list_white_middle.9.png.flat b/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_list_white_middle.9.png.flat
new file mode 100644
index 0000000..6a55c1f
Binary files /dev/null and b/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_list_white_middle.9.png.flat differ
diff --git a/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_list_white_single.9.png.flat b/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_list_white_single.9.png.flat
new file mode 100644
index 0000000..d3094aa
Binary files /dev/null and b/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_list_white_single.9.png.flat differ
diff --git a/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_list_white_up.9.png.flat b/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_list_white_up.9.png.flat
new file mode 100644
index 0000000..a3558dd
Binary files /dev/null and b/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_list_white_up.9.png.flat differ
diff --git a/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_list_yellow_down.9.png.flat b/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_list_yellow_down.9.png.flat
new file mode 100644
index 0000000..e9e827a
Binary files /dev/null and b/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_list_yellow_down.9.png.flat differ
diff --git a/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_list_yellow_middle.9.png.flat b/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_list_yellow_middle.9.png.flat
new file mode 100644
index 0000000..812fbce
Binary files /dev/null and b/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_list_yellow_middle.9.png.flat differ
diff --git a/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_list_yellow_single.9.png.flat b/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_list_yellow_single.9.png.flat
new file mode 100644
index 0000000..c4a34ba
Binary files /dev/null and b/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_list_yellow_single.9.png.flat differ
diff --git a/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_list_yellow_up.9.png.flat b/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_list_yellow_up.9.png.flat
new file mode 100644
index 0000000..a0b2963
Binary files /dev/null and b/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_list_yellow_up.9.png.flat differ
diff --git a/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_menu_delete.png.flat b/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_menu_delete.png.flat
new file mode 100644
index 0000000..0d0a7c7
Binary files /dev/null and b/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_menu_delete.png.flat differ
diff --git a/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_menu_move.png.flat b/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_menu_move.png.flat
new file mode 100644
index 0000000..7b7b9c9
Binary files /dev/null and b/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_menu_move.png.flat differ
diff --git a/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_new_note_normal.png.flat b/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_new_note_normal.png.flat
new file mode 100644
index 0000000..ac802ba
Binary files /dev/null and b/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_new_note_normal.png.flat differ
diff --git a/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_new_note_pressed.png.flat b/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_new_note_pressed.png.flat
new file mode 100644
index 0000000..ee82d6c
Binary files /dev/null and b/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_new_note_pressed.png.flat differ
diff --git a/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_note_edit_color_selector_panel.png.flat b/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_note_edit_color_selector_panel.png.flat
new file mode 100644
index 0000000..8d48e8e
Binary files /dev/null and b/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_note_edit_color_selector_panel.png.flat differ
diff --git a/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_notification.png.flat b/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_notification.png.flat
new file mode 100644
index 0000000..dbeee0b
Binary files /dev/null and b/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_notification.png.flat differ
diff --git a/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_search_result.png.flat b/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_search_result.png.flat
new file mode 100644
index 0000000..e55822d
Binary files /dev/null and b/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_search_result.png.flat differ
diff --git a/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_selected.png.flat b/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_selected.png.flat
new file mode 100644
index 0000000..be2aedd
Binary files /dev/null and b/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_selected.png.flat differ
diff --git a/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_title_alert.png.flat b/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_title_alert.png.flat
new file mode 100644
index 0000000..8f6daec
Binary files /dev/null and b/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_title_alert.png.flat differ
diff --git a/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_title_bar_bg.9.png.flat b/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_title_bar_bg.9.png.flat
new file mode 100644
index 0000000..87aeb20
Binary files /dev/null and b/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_title_bar_bg.9.png.flat differ
diff --git a/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_2x_blue.png.flat b/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_2x_blue.png.flat
new file mode 100644
index 0000000..825e93d
Binary files /dev/null and b/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_2x_blue.png.flat differ
diff --git a/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_2x_green.png.flat b/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_2x_green.png.flat
new file mode 100644
index 0000000..e039b02
Binary files /dev/null and b/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_2x_green.png.flat differ
diff --git a/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_2x_red.png.flat b/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_2x_red.png.flat
new file mode 100644
index 0000000..a2eb42b
Binary files /dev/null and b/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_2x_red.png.flat differ
diff --git a/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_2x_white.png.flat b/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_2x_white.png.flat
new file mode 100644
index 0000000..c7eff78
Binary files /dev/null and b/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_2x_white.png.flat differ
diff --git a/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_2x_yellow.png.flat b/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_2x_yellow.png.flat
new file mode 100644
index 0000000..decfaad
Binary files /dev/null and b/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_2x_yellow.png.flat differ
diff --git a/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_4x_blue.png.flat b/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_4x_blue.png.flat
new file mode 100644
index 0000000..7c3cf3a
Binary files /dev/null and b/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_4x_blue.png.flat differ
diff --git a/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_4x_green.png.flat b/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_4x_green.png.flat
new file mode 100644
index 0000000..1c75d02
Binary files /dev/null and b/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_4x_green.png.flat differ
diff --git a/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_4x_red.png.flat b/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_4x_red.png.flat
new file mode 100644
index 0000000..e82e879
Binary files /dev/null and b/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_4x_red.png.flat differ
diff --git a/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_4x_white.png.flat b/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_4x_white.png.flat
new file mode 100644
index 0000000..366fd2c
Binary files /dev/null and b/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_4x_white.png.flat differ
diff --git a/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_4x_yellow.png.flat b/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_4x_yellow.png.flat
new file mode 100644
index 0000000..ac23b11
Binary files /dev/null and b/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_4x_yellow.png.flat differ
diff --git a/Notes-master/app/build/intermediates/merged_res/debug/drawable_new_note.xml.flat b/Notes-master/app/build/intermediates/merged_res/debug/drawable_new_note.xml.flat
new file mode 100644
index 0000000..8b4b3a5
Binary files /dev/null and b/Notes-master/app/build/intermediates/merged_res/debug/drawable_new_note.xml.flat differ
diff --git a/Notes-master/app/build/intermediates/merged_res/debug/layout_account_dialog_title.xml.flat b/Notes-master/app/build/intermediates/merged_res/debug/layout_account_dialog_title.xml.flat
new file mode 100644
index 0000000..5fdf154
Binary files /dev/null and b/Notes-master/app/build/intermediates/merged_res/debug/layout_account_dialog_title.xml.flat differ
diff --git a/Notes-master/app/build/intermediates/merged_res/debug/layout_add_account_text.xml.flat b/Notes-master/app/build/intermediates/merged_res/debug/layout_add_account_text.xml.flat
new file mode 100644
index 0000000..f2fd34a
Binary files /dev/null and b/Notes-master/app/build/intermediates/merged_res/debug/layout_add_account_text.xml.flat differ
diff --git a/Notes-master/app/build/intermediates/merged_res/debug/layout_datetime_picker.xml.flat b/Notes-master/app/build/intermediates/merged_res/debug/layout_datetime_picker.xml.flat
new file mode 100644
index 0000000..16cf2ef
Binary files /dev/null and b/Notes-master/app/build/intermediates/merged_res/debug/layout_datetime_picker.xml.flat differ
diff --git a/Notes-master/app/build/intermediates/merged_res/debug/layout_dialog_edit_text.xml.flat b/Notes-master/app/build/intermediates/merged_res/debug/layout_dialog_edit_text.xml.flat
new file mode 100644
index 0000000..afee10f
Binary files /dev/null and b/Notes-master/app/build/intermediates/merged_res/debug/layout_dialog_edit_text.xml.flat differ
diff --git a/Notes-master/app/build/intermediates/merged_res/debug/layout_folder_list_item.xml.flat b/Notes-master/app/build/intermediates/merged_res/debug/layout_folder_list_item.xml.flat
new file mode 100644
index 0000000..b3d34f5
Binary files /dev/null and b/Notes-master/app/build/intermediates/merged_res/debug/layout_folder_list_item.xml.flat differ
diff --git a/Notes-master/app/build/intermediates/merged_res/debug/layout_note_edit.xml.flat b/Notes-master/app/build/intermediates/merged_res/debug/layout_note_edit.xml.flat
new file mode 100644
index 0000000..951dd2f
Binary files /dev/null and b/Notes-master/app/build/intermediates/merged_res/debug/layout_note_edit.xml.flat differ
diff --git a/Notes-master/app/build/intermediates/merged_res/debug/layout_note_edit_list_item.xml.flat b/Notes-master/app/build/intermediates/merged_res/debug/layout_note_edit_list_item.xml.flat
new file mode 100644
index 0000000..544cfb6
Binary files /dev/null and b/Notes-master/app/build/intermediates/merged_res/debug/layout_note_edit_list_item.xml.flat differ
diff --git a/Notes-master/app/build/intermediates/merged_res/debug/layout_note_item.xml.flat b/Notes-master/app/build/intermediates/merged_res/debug/layout_note_item.xml.flat
new file mode 100644
index 0000000..2ae3d38
Binary files /dev/null and b/Notes-master/app/build/intermediates/merged_res/debug/layout_note_item.xml.flat differ
diff --git a/Notes-master/app/build/intermediates/merged_res/debug/layout_note_list.xml.flat b/Notes-master/app/build/intermediates/merged_res/debug/layout_note_list.xml.flat
new file mode 100644
index 0000000..b092461
Binary files /dev/null and b/Notes-master/app/build/intermediates/merged_res/debug/layout_note_list.xml.flat differ
diff --git a/Notes-master/app/build/intermediates/merged_res/debug/layout_note_list_dropdown_menu.xml.flat b/Notes-master/app/build/intermediates/merged_res/debug/layout_note_list_dropdown_menu.xml.flat
new file mode 100644
index 0000000..ef9a690
Binary files /dev/null and b/Notes-master/app/build/intermediates/merged_res/debug/layout_note_list_dropdown_menu.xml.flat differ
diff --git a/Notes-master/app/build/intermediates/merged_res/debug/layout_note_list_footer.xml.flat b/Notes-master/app/build/intermediates/merged_res/debug/layout_note_list_footer.xml.flat
new file mode 100644
index 0000000..48aa960
Binary files /dev/null and b/Notes-master/app/build/intermediates/merged_res/debug/layout_note_list_footer.xml.flat differ
diff --git a/Notes-master/app/build/intermediates/merged_res/debug/layout_settings_header.xml.flat b/Notes-master/app/build/intermediates/merged_res/debug/layout_settings_header.xml.flat
new file mode 100644
index 0000000..4b1a1cd
Binary files /dev/null and b/Notes-master/app/build/intermediates/merged_res/debug/layout_settings_header.xml.flat differ
diff --git a/Notes-master/app/build/intermediates/merged_res/debug/layout_widget_2x.xml.flat b/Notes-master/app/build/intermediates/merged_res/debug/layout_widget_2x.xml.flat
new file mode 100644
index 0000000..c923e71
Binary files /dev/null and b/Notes-master/app/build/intermediates/merged_res/debug/layout_widget_2x.xml.flat differ
diff --git a/Notes-master/app/build/intermediates/merged_res/debug/layout_widget_4x.xml.flat b/Notes-master/app/build/intermediates/merged_res/debug/layout_widget_4x.xml.flat
new file mode 100644
index 0000000..bd9974e
Binary files /dev/null and b/Notes-master/app/build/intermediates/merged_res/debug/layout_widget_4x.xml.flat differ
diff --git a/Notes-master/app/build/intermediates/merged_res/debug/menu_call_note_edit.xml.flat b/Notes-master/app/build/intermediates/merged_res/debug/menu_call_note_edit.xml.flat
new file mode 100644
index 0000000..c89b09d
Binary files /dev/null and b/Notes-master/app/build/intermediates/merged_res/debug/menu_call_note_edit.xml.flat differ
diff --git a/Notes-master/app/build/intermediates/merged_res/debug/menu_call_record_folder.xml.flat b/Notes-master/app/build/intermediates/merged_res/debug/menu_call_record_folder.xml.flat
new file mode 100644
index 0000000..504fc9c
Binary files /dev/null and b/Notes-master/app/build/intermediates/merged_res/debug/menu_call_record_folder.xml.flat differ
diff --git a/Notes-master/app/build/intermediates/merged_res/debug/menu_note_edit.xml.flat b/Notes-master/app/build/intermediates/merged_res/debug/menu_note_edit.xml.flat
new file mode 100644
index 0000000..c2c61cc
Binary files /dev/null and b/Notes-master/app/build/intermediates/merged_res/debug/menu_note_edit.xml.flat differ
diff --git a/Notes-master/app/build/intermediates/merged_res/debug/menu_note_list.xml.flat b/Notes-master/app/build/intermediates/merged_res/debug/menu_note_list.xml.flat
new file mode 100644
index 0000000..c138bc9
Binary files /dev/null and b/Notes-master/app/build/intermediates/merged_res/debug/menu_note_list.xml.flat differ
diff --git a/Notes-master/app/build/intermediates/merged_res/debug/menu_note_list_dropdown.xml.flat b/Notes-master/app/build/intermediates/merged_res/debug/menu_note_list_dropdown.xml.flat
new file mode 100644
index 0000000..6e3c761
Binary files /dev/null and b/Notes-master/app/build/intermediates/merged_res/debug/menu_note_list_dropdown.xml.flat differ
diff --git a/Notes-master/app/build/intermediates/merged_res/debug/menu_note_list_options.xml.flat b/Notes-master/app/build/intermediates/merged_res/debug/menu_note_list_options.xml.flat
new file mode 100644
index 0000000..60513de
Binary files /dev/null and b/Notes-master/app/build/intermediates/merged_res/debug/menu_note_list_options.xml.flat differ
diff --git a/Notes-master/app/build/intermediates/merged_res/debug/menu_sub_folder.xml.flat b/Notes-master/app/build/intermediates/merged_res/debug/menu_sub_folder.xml.flat
new file mode 100644
index 0000000..4e4f099
Binary files /dev/null and b/Notes-master/app/build/intermediates/merged_res/debug/menu_sub_folder.xml.flat differ
diff --git a/Notes-master/app/build/intermediates/merged_res/debug/raw-zh-rCN_introduction.flat b/Notes-master/app/build/intermediates/merged_res/debug/raw-zh-rCN_introduction.flat
new file mode 100644
index 0000000..17cb018
Binary files /dev/null and b/Notes-master/app/build/intermediates/merged_res/debug/raw-zh-rCN_introduction.flat differ
diff --git a/Notes-master/app/build/intermediates/merged_res/debug/raw_introduction.flat b/Notes-master/app/build/intermediates/merged_res/debug/raw_introduction.flat
new file mode 100644
index 0000000..608c6fd
Binary files /dev/null and b/Notes-master/app/build/intermediates/merged_res/debug/raw_introduction.flat differ
diff --git a/Notes-master/app/build/intermediates/merged_res/debug/values-zh-rCN_values-zh-rCN.arsc.flat b/Notes-master/app/build/intermediates/merged_res/debug/values-zh-rCN_values-zh-rCN.arsc.flat
new file mode 100644
index 0000000..035ddcd
Binary files /dev/null and b/Notes-master/app/build/intermediates/merged_res/debug/values-zh-rCN_values-zh-rCN.arsc.flat differ
diff --git a/Notes-master/app/build/intermediates/merged_res/debug/values-zh-rTW_values-zh-rTW.arsc.flat b/Notes-master/app/build/intermediates/merged_res/debug/values-zh-rTW_values-zh-rTW.arsc.flat
new file mode 100644
index 0000000..1043ced
Binary files /dev/null and b/Notes-master/app/build/intermediates/merged_res/debug/values-zh-rTW_values-zh-rTW.arsc.flat differ
diff --git a/Notes-master/app/build/intermediates/merged_res/debug/values_values.arsc.flat b/Notes-master/app/build/intermediates/merged_res/debug/values_values.arsc.flat
new file mode 100644
index 0000000..ea0ebfc
Binary files /dev/null and b/Notes-master/app/build/intermediates/merged_res/debug/values_values.arsc.flat differ
diff --git a/Notes-master/app/build/intermediates/merged_res/debug/xml_preferences.xml.flat b/Notes-master/app/build/intermediates/merged_res/debug/xml_preferences.xml.flat
new file mode 100644
index 0000000..e36a338
Binary files /dev/null and b/Notes-master/app/build/intermediates/merged_res/debug/xml_preferences.xml.flat differ
diff --git a/Notes-master/app/build/intermediates/merged_res/debug/xml_searchable.xml.flat b/Notes-master/app/build/intermediates/merged_res/debug/xml_searchable.xml.flat
new file mode 100644
index 0000000..c4dc076
Binary files /dev/null and b/Notes-master/app/build/intermediates/merged_res/debug/xml_searchable.xml.flat differ
diff --git a/Notes-master/app/build/intermediates/merged_res/debug/xml_widget_2x_info.xml.flat b/Notes-master/app/build/intermediates/merged_res/debug/xml_widget_2x_info.xml.flat
new file mode 100644
index 0000000..b960844
Binary files /dev/null and b/Notes-master/app/build/intermediates/merged_res/debug/xml_widget_2x_info.xml.flat differ
diff --git a/Notes-master/app/build/intermediates/merged_res/debug/xml_widget_4x_info.xml.flat b/Notes-master/app/build/intermediates/merged_res/debug/xml_widget_4x_info.xml.flat
new file mode 100644
index 0000000..1605ca0
Binary files /dev/null and b/Notes-master/app/build/intermediates/merged_res/debug/xml_widget_4x_info.xml.flat differ
diff --git a/Notes-master/app/build/intermediates/merged_res/release/color_primary_text_dark.xml.flat b/Notes-master/app/build/intermediates/merged_res/release/color_primary_text_dark.xml.flat
new file mode 100644
index 0000000..e5df6da
Binary files /dev/null and b/Notes-master/app/build/intermediates/merged_res/release/color_primary_text_dark.xml.flat differ
diff --git a/Notes-master/app/build/intermediates/merged_res/release/color_secondary_text_dark.xml.flat b/Notes-master/app/build/intermediates/merged_res/release/color_secondary_text_dark.xml.flat
new file mode 100644
index 0000000..8cc05db
Binary files /dev/null and b/Notes-master/app/build/intermediates/merged_res/release/color_secondary_text_dark.xml.flat differ
diff --git a/Notes-master/app/build/intermediates/merged_res/release/drawable-hdpi_bg_btn_set_color.png.flat b/Notes-master/app/build/intermediates/merged_res/release/drawable-hdpi_bg_btn_set_color.png.flat
new file mode 100644
index 0000000..6ca369f
Binary files /dev/null and b/Notes-master/app/build/intermediates/merged_res/release/drawable-hdpi_bg_btn_set_color.png.flat differ
diff --git a/Notes-master/app/build/intermediates/merged_res/release/drawable-hdpi_bg_color_btn_mask.png.flat b/Notes-master/app/build/intermediates/merged_res/release/drawable-hdpi_bg_color_btn_mask.png.flat
new file mode 100644
index 0000000..1b65ec7
Binary files /dev/null and b/Notes-master/app/build/intermediates/merged_res/release/drawable-hdpi_bg_color_btn_mask.png.flat differ
diff --git a/Notes-master/app/build/intermediates/merged_res/release/drawable-hdpi_call_record.png.flat b/Notes-master/app/build/intermediates/merged_res/release/drawable-hdpi_call_record.png.flat
new file mode 100644
index 0000000..7d8d438
Binary files /dev/null and b/Notes-master/app/build/intermediates/merged_res/release/drawable-hdpi_call_record.png.flat differ
diff --git a/Notes-master/app/build/intermediates/merged_res/release/drawable-hdpi_clock.png.flat b/Notes-master/app/build/intermediates/merged_res/release/drawable-hdpi_clock.png.flat
new file mode 100644
index 0000000..1cdbd6b
Binary files /dev/null and b/Notes-master/app/build/intermediates/merged_res/release/drawable-hdpi_clock.png.flat differ
diff --git a/Notes-master/app/build/intermediates/merged_res/release/drawable-hdpi_delete.png.flat b/Notes-master/app/build/intermediates/merged_res/release/drawable-hdpi_delete.png.flat
new file mode 100644
index 0000000..9af501e
Binary files /dev/null and b/Notes-master/app/build/intermediates/merged_res/release/drawable-hdpi_delete.png.flat differ
diff --git a/Notes-master/app/build/intermediates/merged_res/release/drawable-hdpi_dropdown_icon.9.png.flat b/Notes-master/app/build/intermediates/merged_res/release/drawable-hdpi_dropdown_icon.9.png.flat
new file mode 100644
index 0000000..f80e058
Binary files /dev/null and b/Notes-master/app/build/intermediates/merged_res/release/drawable-hdpi_dropdown_icon.9.png.flat differ
diff --git a/Notes-master/app/build/intermediates/merged_res/release/drawable-hdpi_edit_blue.9.png.flat b/Notes-master/app/build/intermediates/merged_res/release/drawable-hdpi_edit_blue.9.png.flat
new file mode 100644
index 0000000..be22aa0
Binary files /dev/null and b/Notes-master/app/build/intermediates/merged_res/release/drawable-hdpi_edit_blue.9.png.flat differ
diff --git a/Notes-master/app/build/intermediates/merged_res/release/drawable-hdpi_edit_green.9.png.flat b/Notes-master/app/build/intermediates/merged_res/release/drawable-hdpi_edit_green.9.png.flat
new file mode 100644
index 0000000..2a07d4f
Binary files /dev/null and b/Notes-master/app/build/intermediates/merged_res/release/drawable-hdpi_edit_green.9.png.flat differ
diff --git a/Notes-master/app/build/intermediates/merged_res/release/drawable-hdpi_edit_red.9.png.flat b/Notes-master/app/build/intermediates/merged_res/release/drawable-hdpi_edit_red.9.png.flat
new file mode 100644
index 0000000..b71467d
Binary files /dev/null and b/Notes-master/app/build/intermediates/merged_res/release/drawable-hdpi_edit_red.9.png.flat differ
diff --git a/Notes-master/app/build/intermediates/merged_res/release/drawable-hdpi_edit_title_blue.9.png.flat b/Notes-master/app/build/intermediates/merged_res/release/drawable-hdpi_edit_title_blue.9.png.flat
new file mode 100644
index 0000000..9cf62b3
Binary files /dev/null and b/Notes-master/app/build/intermediates/merged_res/release/drawable-hdpi_edit_title_blue.9.png.flat differ
diff --git a/Notes-master/app/build/intermediates/merged_res/release/drawable-hdpi_edit_title_green.9.png.flat b/Notes-master/app/build/intermediates/merged_res/release/drawable-hdpi_edit_title_green.9.png.flat
new file mode 100644
index 0000000..f77ea7d
Binary files /dev/null and b/Notes-master/app/build/intermediates/merged_res/release/drawable-hdpi_edit_title_green.9.png.flat differ
diff --git a/Notes-master/app/build/intermediates/merged_res/release/drawable-hdpi_edit_title_red.9.png.flat b/Notes-master/app/build/intermediates/merged_res/release/drawable-hdpi_edit_title_red.9.png.flat
new file mode 100644
index 0000000..4b9e264
Binary files /dev/null and b/Notes-master/app/build/intermediates/merged_res/release/drawable-hdpi_edit_title_red.9.png.flat differ
diff --git a/Notes-master/app/build/intermediates/merged_res/release/drawable-hdpi_edit_title_white.9.png.flat b/Notes-master/app/build/intermediates/merged_res/release/drawable-hdpi_edit_title_white.9.png.flat
new file mode 100644
index 0000000..cbb044c
Binary files /dev/null and b/Notes-master/app/build/intermediates/merged_res/release/drawable-hdpi_edit_title_white.9.png.flat differ
diff --git a/Notes-master/app/build/intermediates/merged_res/release/drawable-hdpi_edit_title_yellow.9.png.flat b/Notes-master/app/build/intermediates/merged_res/release/drawable-hdpi_edit_title_yellow.9.png.flat
new file mode 100644
index 0000000..14d4feb
Binary files /dev/null and b/Notes-master/app/build/intermediates/merged_res/release/drawable-hdpi_edit_title_yellow.9.png.flat differ
diff --git a/Notes-master/app/build/intermediates/merged_res/release/drawable-hdpi_edit_white.9.png.flat b/Notes-master/app/build/intermediates/merged_res/release/drawable-hdpi_edit_white.9.png.flat
new file mode 100644
index 0000000..9226aa6
Binary files /dev/null and b/Notes-master/app/build/intermediates/merged_res/release/drawable-hdpi_edit_white.9.png.flat differ
diff --git a/Notes-master/app/build/intermediates/merged_res/release/drawable-hdpi_edit_yellow.9.png.flat b/Notes-master/app/build/intermediates/merged_res/release/drawable-hdpi_edit_yellow.9.png.flat
new file mode 100644
index 0000000..d49f07e
Binary files /dev/null and b/Notes-master/app/build/intermediates/merged_res/release/drawable-hdpi_edit_yellow.9.png.flat differ
diff --git a/Notes-master/app/build/intermediates/merged_res/release/drawable-hdpi_font_large.png.flat b/Notes-master/app/build/intermediates/merged_res/release/drawable-hdpi_font_large.png.flat
new file mode 100644
index 0000000..6584cdc
Binary files /dev/null and b/Notes-master/app/build/intermediates/merged_res/release/drawable-hdpi_font_large.png.flat differ
diff --git a/Notes-master/app/build/intermediates/merged_res/release/drawable-hdpi_font_normal.png.flat b/Notes-master/app/build/intermediates/merged_res/release/drawable-hdpi_font_normal.png.flat
new file mode 100644
index 0000000..72f899f
Binary files /dev/null and b/Notes-master/app/build/intermediates/merged_res/release/drawable-hdpi_font_normal.png.flat differ
diff --git a/Notes-master/app/build/intermediates/merged_res/release/drawable-hdpi_font_size_selector_bg.9.png.flat b/Notes-master/app/build/intermediates/merged_res/release/drawable-hdpi_font_size_selector_bg.9.png.flat
new file mode 100644
index 0000000..0400aeb
Binary files /dev/null and b/Notes-master/app/build/intermediates/merged_res/release/drawable-hdpi_font_size_selector_bg.9.png.flat differ
diff --git a/Notes-master/app/build/intermediates/merged_res/release/drawable-hdpi_font_small.png.flat b/Notes-master/app/build/intermediates/merged_res/release/drawable-hdpi_font_small.png.flat
new file mode 100644
index 0000000..b25dfab
Binary files /dev/null and b/Notes-master/app/build/intermediates/merged_res/release/drawable-hdpi_font_small.png.flat differ
diff --git a/Notes-master/app/build/intermediates/merged_res/release/drawable-hdpi_font_super.png.flat b/Notes-master/app/build/intermediates/merged_res/release/drawable-hdpi_font_super.png.flat
new file mode 100644
index 0000000..d31dcb6
Binary files /dev/null and b/Notes-master/app/build/intermediates/merged_res/release/drawable-hdpi_font_super.png.flat differ
diff --git a/Notes-master/app/build/intermediates/merged_res/release/drawable-hdpi_icon_app.png.flat b/Notes-master/app/build/intermediates/merged_res/release/drawable-hdpi_icon_app.png.flat
new file mode 100644
index 0000000..8bbb2f3
Binary files /dev/null and b/Notes-master/app/build/intermediates/merged_res/release/drawable-hdpi_icon_app.png.flat differ
diff --git a/Notes-master/app/build/intermediates/merged_res/release/drawable-hdpi_list_background.png.flat b/Notes-master/app/build/intermediates/merged_res/release/drawable-hdpi_list_background.png.flat
new file mode 100644
index 0000000..534b0cf
Binary files /dev/null and b/Notes-master/app/build/intermediates/merged_res/release/drawable-hdpi_list_background.png.flat differ
diff --git a/Notes-master/app/build/intermediates/merged_res/release/drawable-hdpi_list_blue_down.9.png.flat b/Notes-master/app/build/intermediates/merged_res/release/drawable-hdpi_list_blue_down.9.png.flat
new file mode 100644
index 0000000..ca41f40
Binary files /dev/null and b/Notes-master/app/build/intermediates/merged_res/release/drawable-hdpi_list_blue_down.9.png.flat differ
diff --git a/Notes-master/app/build/intermediates/merged_res/release/drawable-hdpi_list_blue_middle.9.png.flat b/Notes-master/app/build/intermediates/merged_res/release/drawable-hdpi_list_blue_middle.9.png.flat
new file mode 100644
index 0000000..7302f30
Binary files /dev/null and b/Notes-master/app/build/intermediates/merged_res/release/drawable-hdpi_list_blue_middle.9.png.flat differ
diff --git a/Notes-master/app/build/intermediates/merged_res/release/drawable-hdpi_list_blue_single.9.png.flat b/Notes-master/app/build/intermediates/merged_res/release/drawable-hdpi_list_blue_single.9.png.flat
new file mode 100644
index 0000000..02a4f77
Binary files /dev/null and b/Notes-master/app/build/intermediates/merged_res/release/drawable-hdpi_list_blue_single.9.png.flat differ
diff --git a/Notes-master/app/build/intermediates/merged_res/release/drawable-hdpi_list_blue_up.9.png.flat b/Notes-master/app/build/intermediates/merged_res/release/drawable-hdpi_list_blue_up.9.png.flat
new file mode 100644
index 0000000..4382694
Binary files /dev/null and b/Notes-master/app/build/intermediates/merged_res/release/drawable-hdpi_list_blue_up.9.png.flat differ
diff --git a/Notes-master/app/build/intermediates/merged_res/release/drawable-hdpi_list_folder.9.png.flat b/Notes-master/app/build/intermediates/merged_res/release/drawable-hdpi_list_folder.9.png.flat
new file mode 100644
index 0000000..b4e71dc
Binary files /dev/null and b/Notes-master/app/build/intermediates/merged_res/release/drawable-hdpi_list_folder.9.png.flat differ
diff --git a/Notes-master/app/build/intermediates/merged_res/release/drawable-hdpi_list_footer_bg.9.png.flat b/Notes-master/app/build/intermediates/merged_res/release/drawable-hdpi_list_footer_bg.9.png.flat
new file mode 100644
index 0000000..b230b8f
Binary files /dev/null and b/Notes-master/app/build/intermediates/merged_res/release/drawable-hdpi_list_footer_bg.9.png.flat differ
diff --git a/Notes-master/app/build/intermediates/merged_res/release/drawable-hdpi_list_green_down.9.png.flat b/Notes-master/app/build/intermediates/merged_res/release/drawable-hdpi_list_green_down.9.png.flat
new file mode 100644
index 0000000..633e0e7
Binary files /dev/null and b/Notes-master/app/build/intermediates/merged_res/release/drawable-hdpi_list_green_down.9.png.flat differ
diff --git a/Notes-master/app/build/intermediates/merged_res/release/drawable-hdpi_list_green_middle.9.png.flat b/Notes-master/app/build/intermediates/merged_res/release/drawable-hdpi_list_green_middle.9.png.flat
new file mode 100644
index 0000000..d432a14
Binary files /dev/null and b/Notes-master/app/build/intermediates/merged_res/release/drawable-hdpi_list_green_middle.9.png.flat differ
diff --git a/Notes-master/app/build/intermediates/merged_res/release/drawable-hdpi_list_green_single.9.png.flat b/Notes-master/app/build/intermediates/merged_res/release/drawable-hdpi_list_green_single.9.png.flat
new file mode 100644
index 0000000..5a72f21
Binary files /dev/null and b/Notes-master/app/build/intermediates/merged_res/release/drawable-hdpi_list_green_single.9.png.flat differ
diff --git a/Notes-master/app/build/intermediates/merged_res/release/drawable-hdpi_list_green_up.9.png.flat b/Notes-master/app/build/intermediates/merged_res/release/drawable-hdpi_list_green_up.9.png.flat
new file mode 100644
index 0000000..3e628af
Binary files /dev/null and b/Notes-master/app/build/intermediates/merged_res/release/drawable-hdpi_list_green_up.9.png.flat differ
diff --git a/Notes-master/app/build/intermediates/merged_res/release/drawable-hdpi_list_red_down.9.png.flat b/Notes-master/app/build/intermediates/merged_res/release/drawable-hdpi_list_red_down.9.png.flat
new file mode 100644
index 0000000..a4b4193
Binary files /dev/null and b/Notes-master/app/build/intermediates/merged_res/release/drawable-hdpi_list_red_down.9.png.flat differ
diff --git a/Notes-master/app/build/intermediates/merged_res/release/drawable-hdpi_list_red_middle.9.png.flat b/Notes-master/app/build/intermediates/merged_res/release/drawable-hdpi_list_red_middle.9.png.flat
new file mode 100644
index 0000000..7ae0f98
Binary files /dev/null and b/Notes-master/app/build/intermediates/merged_res/release/drawable-hdpi_list_red_middle.9.png.flat differ
diff --git a/Notes-master/app/build/intermediates/merged_res/release/drawable-hdpi_list_red_single.9.png.flat b/Notes-master/app/build/intermediates/merged_res/release/drawable-hdpi_list_red_single.9.png.flat
new file mode 100644
index 0000000..6cbb18b
Binary files /dev/null and b/Notes-master/app/build/intermediates/merged_res/release/drawable-hdpi_list_red_single.9.png.flat differ
diff --git a/Notes-master/app/build/intermediates/merged_res/release/drawable-hdpi_list_red_up.9.png.flat b/Notes-master/app/build/intermediates/merged_res/release/drawable-hdpi_list_red_up.9.png.flat
new file mode 100644
index 0000000..a4a6692
Binary files /dev/null and b/Notes-master/app/build/intermediates/merged_res/release/drawable-hdpi_list_red_up.9.png.flat differ
diff --git a/Notes-master/app/build/intermediates/merged_res/release/drawable-hdpi_list_white_down.9.png.flat b/Notes-master/app/build/intermediates/merged_res/release/drawable-hdpi_list_white_down.9.png.flat
new file mode 100644
index 0000000..9623c13
Binary files /dev/null and b/Notes-master/app/build/intermediates/merged_res/release/drawable-hdpi_list_white_down.9.png.flat differ
diff --git a/Notes-master/app/build/intermediates/merged_res/release/drawable-hdpi_list_white_middle.9.png.flat b/Notes-master/app/build/intermediates/merged_res/release/drawable-hdpi_list_white_middle.9.png.flat
new file mode 100644
index 0000000..404ea2c
Binary files /dev/null and b/Notes-master/app/build/intermediates/merged_res/release/drawable-hdpi_list_white_middle.9.png.flat differ
diff --git a/Notes-master/app/build/intermediates/merged_res/release/drawable-hdpi_list_white_single.9.png.flat b/Notes-master/app/build/intermediates/merged_res/release/drawable-hdpi_list_white_single.9.png.flat
new file mode 100644
index 0000000..4bb304b
Binary files /dev/null and b/Notes-master/app/build/intermediates/merged_res/release/drawable-hdpi_list_white_single.9.png.flat differ
diff --git a/Notes-master/app/build/intermediates/merged_res/release/drawable-hdpi_list_white_up.9.png.flat b/Notes-master/app/build/intermediates/merged_res/release/drawable-hdpi_list_white_up.9.png.flat
new file mode 100644
index 0000000..449a2d8
Binary files /dev/null and b/Notes-master/app/build/intermediates/merged_res/release/drawable-hdpi_list_white_up.9.png.flat differ
diff --git a/Notes-master/app/build/intermediates/merged_res/release/drawable-hdpi_list_yellow_down.9.png.flat b/Notes-master/app/build/intermediates/merged_res/release/drawable-hdpi_list_yellow_down.9.png.flat
new file mode 100644
index 0000000..74c5445
Binary files /dev/null and b/Notes-master/app/build/intermediates/merged_res/release/drawable-hdpi_list_yellow_down.9.png.flat differ
diff --git a/Notes-master/app/build/intermediates/merged_res/release/drawable-hdpi_list_yellow_middle.9.png.flat b/Notes-master/app/build/intermediates/merged_res/release/drawable-hdpi_list_yellow_middle.9.png.flat
new file mode 100644
index 0000000..99bbe37
Binary files /dev/null and b/Notes-master/app/build/intermediates/merged_res/release/drawable-hdpi_list_yellow_middle.9.png.flat differ
diff --git a/Notes-master/app/build/intermediates/merged_res/release/drawable-hdpi_list_yellow_single.9.png.flat b/Notes-master/app/build/intermediates/merged_res/release/drawable-hdpi_list_yellow_single.9.png.flat
new file mode 100644
index 0000000..cfab562
Binary files /dev/null and b/Notes-master/app/build/intermediates/merged_res/release/drawable-hdpi_list_yellow_single.9.png.flat differ
diff --git a/Notes-master/app/build/intermediates/merged_res/release/drawable-hdpi_list_yellow_up.9.png.flat b/Notes-master/app/build/intermediates/merged_res/release/drawable-hdpi_list_yellow_up.9.png.flat
new file mode 100644
index 0000000..afdf9b0
Binary files /dev/null and b/Notes-master/app/build/intermediates/merged_res/release/drawable-hdpi_list_yellow_up.9.png.flat differ
diff --git a/Notes-master/app/build/intermediates/merged_res/release/drawable-hdpi_menu_delete.png.flat b/Notes-master/app/build/intermediates/merged_res/release/drawable-hdpi_menu_delete.png.flat
new file mode 100644
index 0000000..94f1459
Binary files /dev/null and b/Notes-master/app/build/intermediates/merged_res/release/drawable-hdpi_menu_delete.png.flat differ
diff --git a/Notes-master/app/build/intermediates/merged_res/release/drawable-hdpi_menu_move.png.flat b/Notes-master/app/build/intermediates/merged_res/release/drawable-hdpi_menu_move.png.flat
new file mode 100644
index 0000000..508aa13
Binary files /dev/null and b/Notes-master/app/build/intermediates/merged_res/release/drawable-hdpi_menu_move.png.flat differ
diff --git a/Notes-master/app/build/intermediates/merged_res/release/drawable-hdpi_new_note_normal.png.flat b/Notes-master/app/build/intermediates/merged_res/release/drawable-hdpi_new_note_normal.png.flat
new file mode 100644
index 0000000..25d1ab6
Binary files /dev/null and b/Notes-master/app/build/intermediates/merged_res/release/drawable-hdpi_new_note_normal.png.flat differ
diff --git a/Notes-master/app/build/intermediates/merged_res/release/drawable-hdpi_new_note_pressed.png.flat b/Notes-master/app/build/intermediates/merged_res/release/drawable-hdpi_new_note_pressed.png.flat
new file mode 100644
index 0000000..1a6ecf8
Binary files /dev/null and b/Notes-master/app/build/intermediates/merged_res/release/drawable-hdpi_new_note_pressed.png.flat differ
diff --git a/Notes-master/app/build/intermediates/merged_res/release/drawable-hdpi_note_edit_color_selector_panel.png.flat b/Notes-master/app/build/intermediates/merged_res/release/drawable-hdpi_note_edit_color_selector_panel.png.flat
new file mode 100644
index 0000000..fedc87f
Binary files /dev/null and b/Notes-master/app/build/intermediates/merged_res/release/drawable-hdpi_note_edit_color_selector_panel.png.flat differ
diff --git a/Notes-master/app/build/intermediates/merged_res/release/drawable-hdpi_notification.png.flat b/Notes-master/app/build/intermediates/merged_res/release/drawable-hdpi_notification.png.flat
new file mode 100644
index 0000000..92d3cad
Binary files /dev/null and b/Notes-master/app/build/intermediates/merged_res/release/drawable-hdpi_notification.png.flat differ
diff --git a/Notes-master/app/build/intermediates/merged_res/release/drawable-hdpi_search_result.png.flat b/Notes-master/app/build/intermediates/merged_res/release/drawable-hdpi_search_result.png.flat
new file mode 100644
index 0000000..f8290b4
Binary files /dev/null and b/Notes-master/app/build/intermediates/merged_res/release/drawable-hdpi_search_result.png.flat differ
diff --git a/Notes-master/app/build/intermediates/merged_res/release/drawable-hdpi_selected.png.flat b/Notes-master/app/build/intermediates/merged_res/release/drawable-hdpi_selected.png.flat
new file mode 100644
index 0000000..b42c32d
Binary files /dev/null and b/Notes-master/app/build/intermediates/merged_res/release/drawable-hdpi_selected.png.flat differ
diff --git a/Notes-master/app/build/intermediates/merged_res/release/drawable-hdpi_title_alert.png.flat b/Notes-master/app/build/intermediates/merged_res/release/drawable-hdpi_title_alert.png.flat
new file mode 100644
index 0000000..8255468
Binary files /dev/null and b/Notes-master/app/build/intermediates/merged_res/release/drawable-hdpi_title_alert.png.flat differ
diff --git a/Notes-master/app/build/intermediates/merged_res/release/drawable-hdpi_title_bar_bg.9.png.flat b/Notes-master/app/build/intermediates/merged_res/release/drawable-hdpi_title_bar_bg.9.png.flat
new file mode 100644
index 0000000..fb37689
Binary files /dev/null and b/Notes-master/app/build/intermediates/merged_res/release/drawable-hdpi_title_bar_bg.9.png.flat differ
diff --git a/Notes-master/app/build/intermediates/merged_res/release/drawable-hdpi_widget_2x_blue.png.flat b/Notes-master/app/build/intermediates/merged_res/release/drawable-hdpi_widget_2x_blue.png.flat
new file mode 100644
index 0000000..cb34e2a
Binary files /dev/null and b/Notes-master/app/build/intermediates/merged_res/release/drawable-hdpi_widget_2x_blue.png.flat differ
diff --git a/Notes-master/app/build/intermediates/merged_res/release/drawable-hdpi_widget_2x_green.png.flat b/Notes-master/app/build/intermediates/merged_res/release/drawable-hdpi_widget_2x_green.png.flat
new file mode 100644
index 0000000..49c0b08
Binary files /dev/null and b/Notes-master/app/build/intermediates/merged_res/release/drawable-hdpi_widget_2x_green.png.flat differ
diff --git a/Notes-master/app/build/intermediates/merged_res/release/drawable-hdpi_widget_2x_red.png.flat b/Notes-master/app/build/intermediates/merged_res/release/drawable-hdpi_widget_2x_red.png.flat
new file mode 100644
index 0000000..466a0d7
Binary files /dev/null and b/Notes-master/app/build/intermediates/merged_res/release/drawable-hdpi_widget_2x_red.png.flat differ
diff --git a/Notes-master/app/build/intermediates/merged_res/release/drawable-hdpi_widget_2x_white.png.flat b/Notes-master/app/build/intermediates/merged_res/release/drawable-hdpi_widget_2x_white.png.flat
new file mode 100644
index 0000000..0ab58ed
Binary files /dev/null and b/Notes-master/app/build/intermediates/merged_res/release/drawable-hdpi_widget_2x_white.png.flat differ
diff --git a/Notes-master/app/build/intermediates/merged_res/release/drawable-hdpi_widget_2x_yellow.png.flat b/Notes-master/app/build/intermediates/merged_res/release/drawable-hdpi_widget_2x_yellow.png.flat
new file mode 100644
index 0000000..1af046e
Binary files /dev/null and b/Notes-master/app/build/intermediates/merged_res/release/drawable-hdpi_widget_2x_yellow.png.flat differ
diff --git a/Notes-master/app/build/intermediates/merged_res/release/drawable-hdpi_widget_4x_blue.png.flat b/Notes-master/app/build/intermediates/merged_res/release/drawable-hdpi_widget_4x_blue.png.flat
new file mode 100644
index 0000000..3490b10
Binary files /dev/null and b/Notes-master/app/build/intermediates/merged_res/release/drawable-hdpi_widget_4x_blue.png.flat differ
diff --git a/Notes-master/app/build/intermediates/merged_res/release/drawable-hdpi_widget_4x_green.png.flat b/Notes-master/app/build/intermediates/merged_res/release/drawable-hdpi_widget_4x_green.png.flat
new file mode 100644
index 0000000..cf47d36
Binary files /dev/null and b/Notes-master/app/build/intermediates/merged_res/release/drawable-hdpi_widget_4x_green.png.flat differ
diff --git a/Notes-master/app/build/intermediates/merged_res/release/drawable-hdpi_widget_4x_red.png.flat b/Notes-master/app/build/intermediates/merged_res/release/drawable-hdpi_widget_4x_red.png.flat
new file mode 100644
index 0000000..ba4bb3c
Binary files /dev/null and b/Notes-master/app/build/intermediates/merged_res/release/drawable-hdpi_widget_4x_red.png.flat differ
diff --git a/Notes-master/app/build/intermediates/merged_res/release/drawable-hdpi_widget_4x_white.png.flat b/Notes-master/app/build/intermediates/merged_res/release/drawable-hdpi_widget_4x_white.png.flat
new file mode 100644
index 0000000..fd9a34e
Binary files /dev/null and b/Notes-master/app/build/intermediates/merged_res/release/drawable-hdpi_widget_4x_white.png.flat differ
diff --git a/Notes-master/app/build/intermediates/merged_res/release/drawable-hdpi_widget_4x_yellow.png.flat b/Notes-master/app/build/intermediates/merged_res/release/drawable-hdpi_widget_4x_yellow.png.flat
new file mode 100644
index 0000000..2519864
Binary files /dev/null and b/Notes-master/app/build/intermediates/merged_res/release/drawable-hdpi_widget_4x_yellow.png.flat differ
diff --git a/Notes-master/app/build/intermediates/merged_res/release/drawable_new_note.xml.flat b/Notes-master/app/build/intermediates/merged_res/release/drawable_new_note.xml.flat
new file mode 100644
index 0000000..eec4deb
Binary files /dev/null and b/Notes-master/app/build/intermediates/merged_res/release/drawable_new_note.xml.flat differ
diff --git a/Notes-master/app/build/intermediates/merged_res/release/layout_account_dialog_title.xml.flat b/Notes-master/app/build/intermediates/merged_res/release/layout_account_dialog_title.xml.flat
new file mode 100644
index 0000000..1bbe3ab
Binary files /dev/null and b/Notes-master/app/build/intermediates/merged_res/release/layout_account_dialog_title.xml.flat differ
diff --git a/Notes-master/app/build/intermediates/merged_res/release/layout_add_account_text.xml.flat b/Notes-master/app/build/intermediates/merged_res/release/layout_add_account_text.xml.flat
new file mode 100644
index 0000000..305e7a6
Binary files /dev/null and b/Notes-master/app/build/intermediates/merged_res/release/layout_add_account_text.xml.flat differ
diff --git a/Notes-master/app/build/intermediates/merged_res/release/layout_datetime_picker.xml.flat b/Notes-master/app/build/intermediates/merged_res/release/layout_datetime_picker.xml.flat
new file mode 100644
index 0000000..61742b5
Binary files /dev/null and b/Notes-master/app/build/intermediates/merged_res/release/layout_datetime_picker.xml.flat differ
diff --git a/Notes-master/app/build/intermediates/merged_res/release/layout_dialog_edit_text.xml.flat b/Notes-master/app/build/intermediates/merged_res/release/layout_dialog_edit_text.xml.flat
new file mode 100644
index 0000000..78701a1
Binary files /dev/null and b/Notes-master/app/build/intermediates/merged_res/release/layout_dialog_edit_text.xml.flat differ
diff --git a/Notes-master/app/build/intermediates/merged_res/release/layout_folder_list_item.xml.flat b/Notes-master/app/build/intermediates/merged_res/release/layout_folder_list_item.xml.flat
new file mode 100644
index 0000000..7b3fb68
Binary files /dev/null and b/Notes-master/app/build/intermediates/merged_res/release/layout_folder_list_item.xml.flat differ
diff --git a/Notes-master/app/build/intermediates/merged_res/release/layout_note_edit.xml.flat b/Notes-master/app/build/intermediates/merged_res/release/layout_note_edit.xml.flat
new file mode 100644
index 0000000..6c97e3d
Binary files /dev/null and b/Notes-master/app/build/intermediates/merged_res/release/layout_note_edit.xml.flat differ
diff --git a/Notes-master/app/build/intermediates/merged_res/release/layout_note_edit_list_item.xml.flat b/Notes-master/app/build/intermediates/merged_res/release/layout_note_edit_list_item.xml.flat
new file mode 100644
index 0000000..006b151
Binary files /dev/null and b/Notes-master/app/build/intermediates/merged_res/release/layout_note_edit_list_item.xml.flat differ
diff --git a/Notes-master/app/build/intermediates/merged_res/release/layout_note_item.xml.flat b/Notes-master/app/build/intermediates/merged_res/release/layout_note_item.xml.flat
new file mode 100644
index 0000000..1c3342f
Binary files /dev/null and b/Notes-master/app/build/intermediates/merged_res/release/layout_note_item.xml.flat differ
diff --git a/Notes-master/app/build/intermediates/merged_res/release/layout_note_list.xml.flat b/Notes-master/app/build/intermediates/merged_res/release/layout_note_list.xml.flat
new file mode 100644
index 0000000..8f48256
Binary files /dev/null and b/Notes-master/app/build/intermediates/merged_res/release/layout_note_list.xml.flat differ
diff --git a/Notes-master/app/build/intermediates/merged_res/release/layout_note_list_dropdown_menu.xml.flat b/Notes-master/app/build/intermediates/merged_res/release/layout_note_list_dropdown_menu.xml.flat
new file mode 100644
index 0000000..749f04b
Binary files /dev/null and b/Notes-master/app/build/intermediates/merged_res/release/layout_note_list_dropdown_menu.xml.flat differ
diff --git a/Notes-master/app/build/intermediates/merged_res/release/layout_note_list_footer.xml.flat b/Notes-master/app/build/intermediates/merged_res/release/layout_note_list_footer.xml.flat
new file mode 100644
index 0000000..98f56f4
Binary files /dev/null and b/Notes-master/app/build/intermediates/merged_res/release/layout_note_list_footer.xml.flat differ
diff --git a/Notes-master/app/build/intermediates/merged_res/release/layout_settings_header.xml.flat b/Notes-master/app/build/intermediates/merged_res/release/layout_settings_header.xml.flat
new file mode 100644
index 0000000..9caf2e6
Binary files /dev/null and b/Notes-master/app/build/intermediates/merged_res/release/layout_settings_header.xml.flat differ
diff --git a/Notes-master/app/build/intermediates/merged_res/release/layout_widget_2x.xml.flat b/Notes-master/app/build/intermediates/merged_res/release/layout_widget_2x.xml.flat
new file mode 100644
index 0000000..a74989a
Binary files /dev/null and b/Notes-master/app/build/intermediates/merged_res/release/layout_widget_2x.xml.flat differ
diff --git a/Notes-master/app/build/intermediates/merged_res/release/layout_widget_4x.xml.flat b/Notes-master/app/build/intermediates/merged_res/release/layout_widget_4x.xml.flat
new file mode 100644
index 0000000..94470b7
Binary files /dev/null and b/Notes-master/app/build/intermediates/merged_res/release/layout_widget_4x.xml.flat differ
diff --git a/Notes-master/app/build/intermediates/merged_res/release/menu_call_note_edit.xml.flat b/Notes-master/app/build/intermediates/merged_res/release/menu_call_note_edit.xml.flat
new file mode 100644
index 0000000..7b10945
Binary files /dev/null and b/Notes-master/app/build/intermediates/merged_res/release/menu_call_note_edit.xml.flat differ
diff --git a/Notes-master/app/build/intermediates/merged_res/release/menu_call_record_folder.xml.flat b/Notes-master/app/build/intermediates/merged_res/release/menu_call_record_folder.xml.flat
new file mode 100644
index 0000000..5cbb9e9
Binary files /dev/null and b/Notes-master/app/build/intermediates/merged_res/release/menu_call_record_folder.xml.flat differ
diff --git a/Notes-master/app/build/intermediates/merged_res/release/menu_note_edit.xml.flat b/Notes-master/app/build/intermediates/merged_res/release/menu_note_edit.xml.flat
new file mode 100644
index 0000000..c025a60
Binary files /dev/null and b/Notes-master/app/build/intermediates/merged_res/release/menu_note_edit.xml.flat differ
diff --git a/Notes-master/app/build/intermediates/merged_res/release/menu_note_list.xml.flat b/Notes-master/app/build/intermediates/merged_res/release/menu_note_list.xml.flat
new file mode 100644
index 0000000..4316da7
Binary files /dev/null and b/Notes-master/app/build/intermediates/merged_res/release/menu_note_list.xml.flat differ
diff --git a/Notes-master/app/build/intermediates/merged_res/release/menu_note_list_dropdown.xml.flat b/Notes-master/app/build/intermediates/merged_res/release/menu_note_list_dropdown.xml.flat
new file mode 100644
index 0000000..7d74a65
Binary files /dev/null and b/Notes-master/app/build/intermediates/merged_res/release/menu_note_list_dropdown.xml.flat differ
diff --git a/Notes-master/app/build/intermediates/merged_res/release/menu_note_list_options.xml.flat b/Notes-master/app/build/intermediates/merged_res/release/menu_note_list_options.xml.flat
new file mode 100644
index 0000000..9210c15
Binary files /dev/null and b/Notes-master/app/build/intermediates/merged_res/release/menu_note_list_options.xml.flat differ
diff --git a/Notes-master/app/build/intermediates/merged_res/release/menu_sub_folder.xml.flat b/Notes-master/app/build/intermediates/merged_res/release/menu_sub_folder.xml.flat
new file mode 100644
index 0000000..ad66757
Binary files /dev/null and b/Notes-master/app/build/intermediates/merged_res/release/menu_sub_folder.xml.flat differ
diff --git a/Notes-master/app/build/intermediates/merged_res/release/raw-zh-rCN_introduction.flat b/Notes-master/app/build/intermediates/merged_res/release/raw-zh-rCN_introduction.flat
new file mode 100644
index 0000000..68b46ae
Binary files /dev/null and b/Notes-master/app/build/intermediates/merged_res/release/raw-zh-rCN_introduction.flat differ
diff --git a/Notes-master/app/build/intermediates/merged_res/release/raw_introduction.flat b/Notes-master/app/build/intermediates/merged_res/release/raw_introduction.flat
new file mode 100644
index 0000000..02a9e4e
Binary files /dev/null and b/Notes-master/app/build/intermediates/merged_res/release/raw_introduction.flat differ
diff --git a/Notes-master/app/build/intermediates/merged_res/release/values-zh-rCN_values-zh-rCN.arsc.flat b/Notes-master/app/build/intermediates/merged_res/release/values-zh-rCN_values-zh-rCN.arsc.flat
new file mode 100644
index 0000000..0513a6a
Binary files /dev/null and b/Notes-master/app/build/intermediates/merged_res/release/values-zh-rCN_values-zh-rCN.arsc.flat differ
diff --git a/Notes-master/app/build/intermediates/merged_res/release/values-zh-rTW_values-zh-rTW.arsc.flat b/Notes-master/app/build/intermediates/merged_res/release/values-zh-rTW_values-zh-rTW.arsc.flat
new file mode 100644
index 0000000..f664064
Binary files /dev/null and b/Notes-master/app/build/intermediates/merged_res/release/values-zh-rTW_values-zh-rTW.arsc.flat differ
diff --git a/Notes-master/app/build/intermediates/merged_res/release/values_values.arsc.flat b/Notes-master/app/build/intermediates/merged_res/release/values_values.arsc.flat
new file mode 100644
index 0000000..377b7f8
Binary files /dev/null and b/Notes-master/app/build/intermediates/merged_res/release/values_values.arsc.flat differ
diff --git a/Notes-master/app/build/intermediates/merged_res/release/xml_preferences.xml.flat b/Notes-master/app/build/intermediates/merged_res/release/xml_preferences.xml.flat
new file mode 100644
index 0000000..752f47f
Binary files /dev/null and b/Notes-master/app/build/intermediates/merged_res/release/xml_preferences.xml.flat differ
diff --git a/Notes-master/app/build/intermediates/merged_res/release/xml_searchable.xml.flat b/Notes-master/app/build/intermediates/merged_res/release/xml_searchable.xml.flat
new file mode 100644
index 0000000..625e86f
Binary files /dev/null and b/Notes-master/app/build/intermediates/merged_res/release/xml_searchable.xml.flat differ
diff --git a/Notes-master/app/build/intermediates/merged_res/release/xml_widget_2x_info.xml.flat b/Notes-master/app/build/intermediates/merged_res/release/xml_widget_2x_info.xml.flat
new file mode 100644
index 0000000..ad294be
Binary files /dev/null and b/Notes-master/app/build/intermediates/merged_res/release/xml_widget_2x_info.xml.flat differ
diff --git a/Notes-master/app/build/intermediates/merged_res/release/xml_widget_4x_info.xml.flat b/Notes-master/app/build/intermediates/merged_res/release/xml_widget_4x_info.xml.flat
new file mode 100644
index 0000000..4d8a2a5
Binary files /dev/null and b/Notes-master/app/build/intermediates/merged_res/release/xml_widget_4x_info.xml.flat differ
diff --git a/Notes-master/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/debug.json b/Notes-master/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/debug.json
new file mode 100644
index 0000000..19226e0
--- /dev/null
+++ b/Notes-master/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/debug.json
@@ -0,0 +1,186 @@
+{
+ "logs": [
+ {
+ "outputFile": "E:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\values-zh-rTW_values-zh-rTW.arsc.flat",
+ "map": [
+ {
+ "source": "E:\\Notes-master\\app\\src\\main\\res\\values-zh-rTW\\arrays.xml",
+ "from": {
+ "startLines": "18",
+ "startColumns": "4",
+ "startOffsets": "712",
+ "endLines": "21",
+ "endColumns": "19",
+ "endOffsets": "817"
+ },
+ "to": {
+ "startLines": "2",
+ "startColumns": "4",
+ "startOffsets": "105",
+ "endLines": "5",
+ "endColumns": "19",
+ "endOffsets": "210"
+ }
+ },
+ {
+ "source": "E:\\Notes-master\\app\\src\\main\\res\\values-zh-rTW\\strings.xml",
+ "from": {
+ "startLines": "122,72,71,70,69,19,20,21,112,113,121,120,26,76,77,75,74,73,89,88,87,79,61,29,30,80,37,114,68,64,39,45,50,40,60,59,58,54,53,51,52,55,56,46,67,57,65,44,49,48,47,63,43,62,41,42,66,28,34,36,33,35,32,31,25,24,96,95,98,110,103,102,104,105,107,106,97,101,99,100,94,108,109,119,117,116,118,27,78,86,91,90,92,85,84,83,82,22,23",
+ "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
+ "startOffsets": "6507,3575,3509,3436,3386,827,867,915,6057,6102,6453,6403,1199,3835,3903,3776,3710,3647,4565,4505,4442,4035,2957,1369,1422,4089,1768,6159,3327,3114,1878,2159,2405,1931,2897,2844,2793,2598,2550,2456,2504,2644,2691,2202,3268,2741,3157,2116,2358,2302,2247,3059,2072,3017,1981,2022,3209,1318,1623,1719,1576,1672,1529,1484,1148,1095,4940,4881,5081,5982,5392,5323,5456,5534,5717,5644,5015,5268,5138,5203,4832,5821,5904,6365,6258,6210,6303,1261,3980,4383,4678,4620,4745,4335,4290,4242,4191,963,1029",
+ "endLines": "124,72,71,70,69,19,20,21,112,113,121,120,26,76,77,75,74,73,89,88,87,79,61,29,30,80,37,114,68,64,39,45,50,40,60,59,58,54,53,51,52,55,56,46,67,57,65,44,49,48,47,63,43,62,41,42,66,28,34,36,33,35,32,31,25,24,96,95,98,110,103,102,104,105,107,106,97,101,99,100,94,108,109,119,117,116,118,27,78,86,91,90,92,85,84,83,82,22,23",
+ "endColumns": "14,71,65,72,49,39,47,47,44,56,53,49,61,67,76,58,65,62,54,59,62,53,59,52,61,83,79,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65",
+ "endOffsets": "6679,3642,3570,3504,3431,862,910,958,6097,6154,6502,6448,1256,3898,3975,3830,3771,3705,4615,4560,4500,4084,3012,1417,1479,4168,1843,6204,3381,3152,1926,2197,2451,1976,2952,2892,2839,2639,2593,2499,2545,2686,2736,2242,3322,2788,3204,2154,2400,2353,2297,3109,2111,3054,2017,2067,3263,1364,1667,1763,1618,1714,1571,1524,1194,1143,5010,4935,5133,6051,5451,5387,5529,5639,5816,5712,5076,5318,5198,5263,4876,5899,5977,6398,6298,6253,6360,1313,4030,4437,4740,4673,4802,4378,4330,4285,4237,1024,1090"
+ },
+ "to": {
+ "startLines": "6,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106",
+ "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
+ "startOffsets": "215,384,456,522,595,645,685,733,781,826,883,937,987,1049,1117,1194,1253,1319,1382,1437,1497,1560,1614,1674,1727,1789,1873,1953,2003,2062,2105,2158,2201,2252,2302,2362,2415,2466,2512,2560,2608,2654,2701,2751,2796,2855,2907,2959,3002,3049,3105,3160,3215,3259,3301,3342,3392,3451,3502,3551,3600,3647,3694,3741,3786,3837,3890,3965,4024,4081,4155,4219,4288,4366,4476,4580,4653,4719,4774,4839,4904,4953,5036,5114,5152,5197,5245,5307,5364,5419,5478,5545,5603,5665,5713,5758,5806,5857,5923",
+ "endLines": "8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106",
+ "endColumns": "14,71,65,72,49,39,47,47,44,56,53,49,61,67,76,58,65,62,54,59,62,53,59,52,61,83,79,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65",
+ "endOffsets": "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,2153,2196,2247,2297,2357,2410,2461,2507,2555,2603,2649,2696,2746,2791,2850,2902,2954,2997,3044,3100,3155,3210,3254,3296,3337,3387,3446,3497,3546,3595,3642,3689,3736,3781,3832,3885,3960,4019,4076,4150,4214,4283,4361,4471,4575,4648,4714,4769,4834,4899,4948,5031,5109,5147,5192,5240,5302,5359,5414,5473,5540,5598,5660,5708,5753,5801,5852,5918,5984"
+ }
+ }
+ ]
+ },
+ {
+ "outputFile": "E:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\values-zh-rCN_values-zh-rCN.arsc.flat",
+ "map": [
+ {
+ "source": "E:\\Notes-master\\app\\src\\main\\res\\values-zh-rCN\\strings.xml",
+ "from": {
+ "startLines": "121,71,70,69,68,19,20,21,112,113,120,119,26,77,78,76,75,74,90,89,88,80,60,29,30,81,72,114,67,63,38,44,49,39,59,58,57,53,52,50,51,54,55,45,66,56,64,43,48,47,46,62,42,61,40,41,65,28,34,36,33,35,32,31,25,24,97,96,99,111,104,103,105,106,108,107,98,102,100,101,95,109,110,118,116,115,117,27,79,87,92,91,93,86,85,84,83,22,23",
+ "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
+ "startOffsets": "6532,3495,3429,3356,3306,827,867,915,6083,6128,6478,6428,1199,3861,3929,3802,3737,3674,4592,4532,4469,4061,2877,1369,1422,4115,3568,6185,3247,3034,1798,2079,2325,1851,2817,2764,2713,2518,2470,2376,2424,2564,2611,2122,3188,2661,3077,2036,2278,2222,2167,2979,1992,2937,1901,1942,3129,1318,1623,1719,1576,1672,1529,1484,1148,1095,4967,4908,5108,6009,5419,5350,5483,5561,5744,5671,5042,5295,5165,5230,4859,5848,5931,6390,6283,6235,6328,1261,4006,4410,4705,4647,4772,4362,4317,4269,4218,963,1029",
+ "endLines": "123,71,70,69,68,19,20,21,112,113,120,119,26,77,78,76,75,74,90,89,88,80,60,29,30,81,72,114,67,63,38,44,49,39,59,58,57,53,52,50,51,54,55,45,66,56,64,43,48,47,46,62,42,61,40,41,65,28,34,36,33,35,32,31,25,24,97,96,99,111,104,103,105,106,108,107,98,102,100,101,95,109,110,118,116,115,117,27,79,87,92,91,93,86,85,84,83,22,23",
+ "endColumns": "14,72,65,72,49,39,47,47,44,56,53,49,61,67,76,58,64,62,54,59,62,53,59,52,61,84,80,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65",
+ "endOffsets": "6704,3563,3490,3424,3351,862,910,958,6123,6180,6527,6473,1256,3924,4001,3856,3797,3732,4642,4587,4527,4110,2932,1417,1479,4195,3644,6230,3301,3072,1846,2117,2371,1896,2872,2812,2759,2559,2513,2419,2465,2606,2656,2162,3242,2708,3124,2074,2320,2273,2217,3029,2031,2974,1937,1987,3183,1364,1667,1763,1618,1714,1571,1524,1194,1143,5037,4962,5160,6078,5478,5414,5556,5666,5843,5739,5103,5345,5225,5290,4903,5926,6004,6423,6323,6278,6385,1313,4056,4464,4767,4700,4829,4405,4357,4312,4264,1024,1090"
+ },
+ "to": {
+ "startLines": "6,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106",
+ "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
+ "startOffsets": "215,384,457,523,596,646,686,734,782,827,884,938,988,1050,1118,1195,1254,1319,1382,1437,1497,1560,1614,1674,1727,1789,1874,1955,2005,2064,2107,2160,2203,2254,2304,2364,2417,2468,2514,2562,2610,2656,2703,2753,2798,2857,2909,2961,3004,3051,3107,3162,3217,3261,3303,3344,3394,3453,3504,3553,3602,3649,3696,3743,3788,3839,3892,3967,4026,4083,4157,4221,4290,4368,4478,4582,4655,4721,4776,4841,4906,4955,5038,5116,5154,5199,5247,5309,5366,5421,5480,5547,5605,5667,5715,5760,5808,5859,5925",
+ "endLines": "8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106",
+ "endColumns": "14,72,65,72,49,39,47,47,44,56,53,49,61,67,76,58,64,62,54,59,62,53,59,52,61,84,80,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65",
+ "endOffsets": "379,452,518,591,641,681,729,777,822,879,933,983,1045,1113,1190,1249,1314,1377,1432,1492,1555,1609,1669,1722,1784,1869,1950,2000,2059,2102,2155,2198,2249,2299,2359,2412,2463,2509,2557,2605,2651,2698,2748,2793,2852,2904,2956,2999,3046,3102,3157,3212,3256,3298,3339,3389,3448,3499,3548,3597,3644,3691,3738,3783,3834,3887,3962,4021,4078,4152,4216,4285,4363,4473,4577,4650,4716,4771,4836,4901,4950,5033,5111,5149,5194,5242,5304,5361,5416,5475,5542,5600,5662,5710,5755,5803,5854,5920,5986"
+ }
+ },
+ {
+ "source": "E:\\Notes-master\\app\\src\\main\\res\\values-zh-rCN\\arrays.xml",
+ "from": {
+ "startLines": "18",
+ "startColumns": "4",
+ "startOffsets": "712",
+ "endLines": "21",
+ "endColumns": "19",
+ "endOffsets": "817"
+ },
+ "to": {
+ "startLines": "2",
+ "startColumns": "4",
+ "startOffsets": "105",
+ "endLines": "5",
+ "endColumns": "19",
+ "endOffsets": "210"
+ }
+ }
+ ]
+ },
+ {
+ "outputFile": "E:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\values_values.arsc.flat",
+ "map": [
+ {
+ "source": "E:\\Notes-master\\app\\src\\main\\res\\values\\styles.xml",
+ "from": {
+ "startLines": "50,55,64,60,22,26,30,35,40,18,45",
+ "startColumns": "4,4,4,4,4,4,4,4,4,4,4",
+ "startOffsets": "2062,2267,2640,2479,895,1078,1263,1449,1653,712,1860",
+ "endLines": "53,58,67,62,25,29,33,38,43,21,48",
+ "endColumns": "12,12,12,12,12,12,12,12,12,12,12",
+ "endOffsets": "2261,2473,2843,2634,1073,1258,1443,1647,1854,890,2056"
+ },
+ "to": {
+ "startLines": "125,129,133,137,140,144,148,152,156,160,164",
+ "startColumns": "4,4,4,4,4,4,4,4,4,4,4",
+ "startOffsets": "8276,8480,8691,8898,9058,9241,9426,9611,9814,10020,10203",
+ "endLines": "128,132,136,139,143,147,151,155,159,163,167",
+ "endColumns": "12,12,12,12,12,12,12,12,12,12,12",
+ "endOffsets": "8475,8686,8893,9053,9236,9421,9606,9809,10015,10198,10399"
+ }
+ },
+ {
+ "source": "E:\\Notes-master\\app\\src\\main\\res\\values\\colors.xml",
+ "from": {
+ "startLines": "18",
+ "startColumns": "4",
+ "startOffsets": "712",
+ "endColumns": "56",
+ "endOffsets": "764"
+ },
+ "to": {
+ "startLines": "12",
+ "startColumns": "4",
+ "startOffsets": "532",
+ "endColumns": "56",
+ "endOffsets": "584"
+ }
+ },
+ {
+ "source": "E:\\Notes-master\\app\\src\\main\\res\\values\\arrays.xml",
+ "from": {
+ "startLines": "19,26",
+ "startColumns": "4,4",
+ "startOffsets": "739,1047",
+ "endLines": "24,29",
+ "endColumns": "19,19",
+ "endOffsets": "1041,1162"
+ },
+ "to": {
+ "startLines": "2,8",
+ "startColumns": "4,4",
+ "startOffsets": "105,412",
+ "endLines": "7,11",
+ "endColumns": "19,19",
+ "endOffsets": "407,527"
+ }
+ },
+ {
+ "source": "E:\\Notes-master\\app\\src\\main\\res\\values\\strings.xml",
+ "from": {
+ "startLines": "128,72,75,74,73,19,20,21,118,119,127,126,26,81,82,80,79,78,94,93,92,84,39,38,64,29,30,85,41,76,120,71,67,42,48,53,43,63,62,61,57,56,54,55,58,59,49,70,60,68,47,52,51,50,66,46,65,44,45,69,28,34,36,33,35,32,31,25,24,101,100,104,116,109,108,110,111,113,112,102,103,107,105,106,99,114,115,125,123,122,124,27,83,91,96,95,97,90,89,88,87,22,23",
+ "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
+ "startOffsets": "8008,3898,4159,4063,3994,827,870,922,7506,7555,7950,7899,1282,4613,4707,4542,4458,4375,5574,5491,5389,4883,2004,1953,3397,1486,1539,4944,2097,4242,7618,3827,3582,2156,2471,2772,2214,3326,3265,3208,2986,2934,2831,2884,3036,3086,2518,3761,3146,3631,2424,2717,2629,2571,3520,2374,3475,2271,2314,3694,1431,1750,1858,1703,1805,1647,1599,1227,1174,6030,5963,6271,7409,6635,6554,6709,6798,7040,6961,6114,6189,6495,6335,6415,5908,7184,7306,7858,7731,7674,7784,1366,4815,5303,5709,5640,5789,5244,5189,5127,5067,974,1084",
+ "endLines": "132,72,75,74,73,19,20,21,118,119,127,126,26,81,82,80,79,78,94,93,92,84,39,38,64,29,30,85,41,76,120,71,67,42,48,53,43,63,62,61,57,56,54,55,58,59,49,70,60,68,47,52,51,50,66,46,65,44,45,69,28,34,36,33,35,32,31,25,24,101,100,104,116,109,108,110,111,113,112,102,103,107,105,106,99,114,115,125,123,122,124,27,83,91,96,95,97,90,89,88,87,22,23",
+ "endColumns": "14,95,82,95,68,42,51,51,48,62,57,50,83,93,107,70,83,82,65,82,101,60,61,50,77,52,59,104,58,101,54,70,48,57,46,58,56,70,60,56,49,51,52,49,49,59,52,65,61,62,46,54,87,57,61,49,44,42,59,66,54,54,52,46,52,55,47,54,52,83,66,63,95,73,80,88,162,143,78,74,81,58,79,79,54,121,102,40,52,56,73,64,67,85,79,68,93,58,54,61,59,109,89",
+ "endOffsets": "8412,3989,4237,4154,4058,865,917,969,7550,7613,8003,7945,1361,4702,4810,4608,4537,4453,5635,5569,5486,4939,2061,1999,3470,1534,1594,5044,2151,4339,7668,3893,3626,2209,2513,2826,2266,3392,3321,3260,3031,2981,2879,2929,3081,3141,2566,3822,3203,3689,2466,2767,2712,2624,3577,2419,3515,2309,2369,3756,1481,1800,1906,1745,1853,1698,1642,1277,1222,6109,6025,6330,7500,6704,6630,6793,6956,7179,7035,6184,6266,6549,6410,6490,5958,7301,7404,7894,7779,7726,7853,1426,4878,5384,5784,5704,5878,5298,5239,5184,5122,1079,1169"
+ },
+ "to": {
+ "startLines": "18,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124",
+ "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
+ "startOffsets": "851,1244,1340,1423,1519,1588,1631,1683,1735,1784,1847,1905,1956,2040,2134,2242,2313,2397,2480,2546,2629,2731,2792,2854,2905,2983,3036,3096,3201,3260,3362,3417,3488,3537,3595,3642,3701,3758,3829,3890,3947,3997,4049,4102,4152,4202,4262,4315,4381,4443,4506,4553,4608,4696,4754,4816,4866,4911,4954,5014,5081,5136,5191,5244,5291,5344,5400,5448,5503,5556,5640,5707,5771,5867,5941,6022,6111,6274,6418,6497,6572,6654,6713,6793,6873,6928,7050,7153,7194,7247,7304,7378,7443,7511,7597,7677,7746,7840,7899,7954,8016,8076,8186",
+ "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",
+ "endColumns": "14,95,82,95,68,42,51,51,48,62,57,50,83,93,107,70,83,82,65,82,101,60,61,50,77,52,59,104,58,101,54,70,48,57,46,58,56,70,60,56,49,51,52,49,49,59,52,65,61,62,46,54,87,57,61,49,44,42,59,66,54,54,52,46,52,55,47,54,52,83,66,63,95,73,80,88,162,143,78,74,81,58,79,79,54,121,102,40,52,56,73,64,67,85,79,68,93,58,54,61,59,109,89",
+ "endOffsets": "1239,1335,1418,1514,1583,1626,1678,1730,1779,1842,1900,1951,2035,2129,2237,2308,2392,2475,2541,2624,2726,2787,2849,2900,2978,3031,3091,3196,3255,3357,3412,3483,3532,3590,3637,3696,3753,3824,3885,3942,3992,4044,4097,4147,4197,4257,4310,4376,4438,4501,4548,4603,4691,4749,4811,4861,4906,4949,5009,5076,5131,5186,5239,5286,5339,5395,5443,5498,5551,5635,5702,5766,5862,5936,6017,6106,6269,6413,6492,6567,6649,6708,6788,6868,6923,7045,7148,7189,7242,7299,7373,7438,7506,7592,7672,7741,7835,7894,7949,8011,8071,8181,8271"
+ }
+ },
+ {
+ "source": "E:\\Notes-master\\app\\src\\main\\res\\values\\dimens.xml",
+ "from": {
+ "startLines": "19,20,21,22,18",
+ "startColumns": "4,4,4,4,4",
+ "startOffsets": "764,816,869,922,712",
+ "endColumns": "51,52,52,51,51",
+ "endOffsets": "811,864,917,969,759"
+ },
+ "to": {
+ "startLines": "13,14,15,16,17",
+ "startColumns": "4,4,4,4,4",
+ "startOffsets": "589,641,694,747,799",
+ "endColumns": "51,52,52,51,51",
+ "endOffsets": "636,689,742,794,846"
+ }
+ }
+ ]
+ }
+ ]
+}
\ No newline at end of file
diff --git a/Notes-master/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rCN.json b/Notes-master/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rCN.json
new file mode 100644
index 0000000..eca61bc
--- /dev/null
+++ b/Notes-master/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rCN.json
@@ -0,0 +1,47 @@
+{
+ "logs": [
+ {
+ "outputFile": "E:\\Notes-master\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-zh-rCN\\values-zh-rCN.xml",
+ "map": [
+ {
+ "source": "E:\\Notes-master\\app\\src\\main\\res\\values-zh-rCN\\strings.xml",
+ "from": {
+ "startLines": "121,71,70,69,68,19,20,21,112,113,120,119,26,77,78,76,75,74,90,89,88,80,60,29,30,81,72,114,67,63,38,44,49,39,59,58,57,53,52,50,51,54,55,45,66,56,64,43,48,47,46,62,42,61,40,41,65,28,34,36,33,35,32,31,25,24,97,96,99,111,104,103,105,106,108,107,98,102,100,101,95,109,110,118,116,115,117,27,79,87,92,91,93,86,85,84,83,22,23",
+ "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
+ "startOffsets": "6532,3495,3429,3356,3306,827,867,915,6083,6128,6478,6428,1199,3861,3929,3802,3737,3674,4592,4532,4469,4061,2877,1369,1422,4115,3568,6185,3247,3034,1798,2079,2325,1851,2817,2764,2713,2518,2470,2376,2424,2564,2611,2122,3188,2661,3077,2036,2278,2222,2167,2979,1992,2937,1901,1942,3129,1318,1623,1719,1576,1672,1529,1484,1148,1095,4967,4908,5108,6009,5419,5350,5483,5561,5744,5671,5042,5295,5165,5230,4859,5848,5931,6390,6283,6235,6328,1261,4006,4410,4705,4647,4772,4362,4317,4269,4218,963,1029",
+ "endLines": "123,71,70,69,68,19,20,21,112,113,120,119,26,77,78,76,75,74,90,89,88,80,60,29,30,81,72,114,67,63,38,44,49,39,59,58,57,53,52,50,51,54,55,45,66,56,64,43,48,47,46,62,42,61,40,41,65,28,34,36,33,35,32,31,25,24,97,96,99,111,104,103,105,106,108,107,98,102,100,101,95,109,110,118,116,115,117,27,79,87,92,91,93,86,85,84,83,22,23",
+ "endColumns": "14,72,65,72,49,39,47,47,44,56,53,49,61,67,76,58,64,62,54,59,62,53,59,52,61,84,80,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65",
+ "endOffsets": "6704,3563,3490,3424,3351,862,910,958,6123,6180,6527,6473,1256,3924,4001,3856,3797,3732,4642,4587,4527,4110,2932,1417,1479,4195,3644,6230,3301,3072,1846,2117,2371,1896,2872,2812,2759,2559,2513,2419,2465,2606,2656,2162,3242,2708,3124,2074,2320,2273,2217,3029,2031,2974,1937,1987,3183,1364,1667,1763,1618,1714,1571,1524,1194,1143,5037,4962,5160,6078,5478,5414,5556,5666,5843,5739,5103,5345,5225,5290,4903,5926,6004,6423,6323,6278,6385,1313,4056,4464,4767,4700,4829,4405,4357,4312,4264,1024,1090"
+ },
+ "to": {
+ "startLines": "6,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106",
+ "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
+ "startOffsets": "215,384,457,523,596,646,686,734,782,827,884,938,988,1050,1118,1195,1254,1319,1382,1437,1497,1560,1614,1674,1727,1789,1874,1955,2005,2064,2107,2160,2203,2254,2304,2364,2417,2468,2514,2562,2610,2656,2703,2753,2798,2857,2909,2961,3004,3051,3107,3162,3217,3261,3303,3344,3394,3453,3504,3553,3602,3649,3696,3743,3788,3839,3892,3967,4026,4083,4157,4221,4290,4368,4478,4582,4655,4721,4776,4841,4906,4955,5038,5116,5154,5199,5247,5309,5366,5421,5480,5547,5605,5667,5715,5760,5808,5859,5925",
+ "endLines": "8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106",
+ "endColumns": "14,72,65,72,49,39,47,47,44,56,53,49,61,67,76,58,64,62,54,59,62,53,59,52,61,84,80,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65",
+ "endOffsets": "379,452,518,591,641,681,729,777,822,879,933,983,1045,1113,1190,1249,1314,1377,1432,1492,1555,1609,1669,1722,1784,1869,1950,2000,2059,2102,2155,2198,2249,2299,2359,2412,2463,2509,2557,2605,2651,2698,2748,2793,2852,2904,2956,2999,3046,3102,3157,3212,3256,3298,3339,3389,3448,3499,3548,3597,3644,3691,3738,3783,3834,3887,3962,4021,4078,4152,4216,4285,4363,4473,4577,4650,4716,4771,4836,4901,4950,5033,5111,5149,5194,5242,5304,5361,5416,5475,5542,5600,5662,5710,5755,5803,5854,5920,5986"
+ }
+ },
+ {
+ "source": "E:\\Notes-master\\app\\src\\main\\res\\values-zh-rCN\\arrays.xml",
+ "from": {
+ "startLines": "18",
+ "startColumns": "4",
+ "startOffsets": "712",
+ "endLines": "21",
+ "endColumns": "19",
+ "endOffsets": "817"
+ },
+ "to": {
+ "startLines": "2",
+ "startColumns": "4",
+ "startOffsets": "105",
+ "endLines": "5",
+ "endColumns": "19",
+ "endOffsets": "210"
+ }
+ }
+ ]
+ }
+ ]
+}
\ No newline at end of file
diff --git a/Notes-master/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rTW.json b/Notes-master/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rTW.json
new file mode 100644
index 0000000..cbd9474
--- /dev/null
+++ b/Notes-master/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rTW.json
@@ -0,0 +1,47 @@
+{
+ "logs": [
+ {
+ "outputFile": "E:\\Notes-master\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-zh-rTW\\values-zh-rTW.xml",
+ "map": [
+ {
+ "source": "E:\\Notes-master\\app\\src\\main\\res\\values-zh-rTW\\arrays.xml",
+ "from": {
+ "startLines": "18",
+ "startColumns": "4",
+ "startOffsets": "712",
+ "endLines": "21",
+ "endColumns": "19",
+ "endOffsets": "817"
+ },
+ "to": {
+ "startLines": "2",
+ "startColumns": "4",
+ "startOffsets": "105",
+ "endLines": "5",
+ "endColumns": "19",
+ "endOffsets": "210"
+ }
+ },
+ {
+ "source": "E:\\Notes-master\\app\\src\\main\\res\\values-zh-rTW\\strings.xml",
+ "from": {
+ "startLines": "122,72,71,70,69,19,20,21,112,113,121,120,26,76,77,75,74,73,89,88,87,79,61,29,30,80,37,114,68,64,39,45,50,40,60,59,58,54,53,51,52,55,56,46,67,57,65,44,49,48,47,63,43,62,41,42,66,28,34,36,33,35,32,31,25,24,96,95,98,110,103,102,104,105,107,106,97,101,99,100,94,108,109,119,117,116,118,27,78,86,91,90,92,85,84,83,82,22,23",
+ "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
+ "startOffsets": "6507,3575,3509,3436,3386,827,867,915,6057,6102,6453,6403,1199,3835,3903,3776,3710,3647,4565,4505,4442,4035,2957,1369,1422,4089,1768,6159,3327,3114,1878,2159,2405,1931,2897,2844,2793,2598,2550,2456,2504,2644,2691,2202,3268,2741,3157,2116,2358,2302,2247,3059,2072,3017,1981,2022,3209,1318,1623,1719,1576,1672,1529,1484,1148,1095,4940,4881,5081,5982,5392,5323,5456,5534,5717,5644,5015,5268,5138,5203,4832,5821,5904,6365,6258,6210,6303,1261,3980,4383,4678,4620,4745,4335,4290,4242,4191,963,1029",
+ "endLines": "124,72,71,70,69,19,20,21,112,113,121,120,26,76,77,75,74,73,89,88,87,79,61,29,30,80,37,114,68,64,39,45,50,40,60,59,58,54,53,51,52,55,56,46,67,57,65,44,49,48,47,63,43,62,41,42,66,28,34,36,33,35,32,31,25,24,96,95,98,110,103,102,104,105,107,106,97,101,99,100,94,108,109,119,117,116,118,27,78,86,91,90,92,85,84,83,82,22,23",
+ "endColumns": "14,71,65,72,49,39,47,47,44,56,53,49,61,67,76,58,65,62,54,59,62,53,59,52,61,83,79,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65",
+ "endOffsets": "6679,3642,3570,3504,3431,862,910,958,6097,6154,6502,6448,1256,3898,3975,3830,3771,3705,4615,4560,4500,4084,3012,1417,1479,4168,1843,6204,3381,3152,1926,2197,2451,1976,2952,2892,2839,2639,2593,2499,2545,2686,2736,2242,3322,2788,3204,2154,2400,2353,2297,3109,2111,3054,2017,2067,3263,1364,1667,1763,1618,1714,1571,1524,1194,1143,5010,4935,5133,6051,5451,5387,5529,5639,5816,5712,5076,5318,5198,5263,4876,5899,5977,6398,6298,6253,6360,1313,4030,4437,4740,4673,4802,4378,4330,4285,4237,1024,1090"
+ },
+ "to": {
+ "startLines": "6,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106",
+ "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
+ "startOffsets": "215,384,456,522,595,645,685,733,781,826,883,937,987,1049,1117,1194,1253,1319,1382,1437,1497,1560,1614,1674,1727,1789,1873,1953,2003,2062,2105,2158,2201,2252,2302,2362,2415,2466,2512,2560,2608,2654,2701,2751,2796,2855,2907,2959,3002,3049,3105,3160,3215,3259,3301,3342,3392,3451,3502,3551,3600,3647,3694,3741,3786,3837,3890,3965,4024,4081,4155,4219,4288,4366,4476,4580,4653,4719,4774,4839,4904,4953,5036,5114,5152,5197,5245,5307,5364,5419,5478,5545,5603,5665,5713,5758,5806,5857,5923",
+ "endLines": "8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106",
+ "endColumns": "14,71,65,72,49,39,47,47,44,56,53,49,61,67,76,58,65,62,54,59,62,53,59,52,61,83,79,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65",
+ "endOffsets": "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,2153,2196,2247,2297,2357,2410,2461,2507,2555,2603,2649,2696,2746,2791,2850,2902,2954,2997,3044,3100,3155,3210,3254,3296,3337,3387,3446,3497,3546,3595,3642,3689,3736,3781,3832,3885,3960,4019,4076,4150,4214,4283,4361,4471,4575,4648,4714,4769,4834,4899,4948,5031,5109,5147,5192,5240,5302,5359,5414,5473,5540,5598,5660,5708,5753,5801,5852,5918,5984"
+ }
+ }
+ ]
+ }
+ ]
+}
\ No newline at end of file
diff --git a/Notes-master/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values.json b/Notes-master/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values.json
new file mode 100644
index 0000000..cc16193
--- /dev/null
+++ b/Notes-master/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values.json
@@ -0,0 +1,100 @@
+{
+ "logs": [
+ {
+ "outputFile": "E:\\Notes-master\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values\\values.xml",
+ "map": [
+ {
+ "source": "E:\\Notes-master\\app\\src\\main\\res\\values\\styles.xml",
+ "from": {
+ "startLines": "50,55,64,60,22,26,30,35,40,18,45",
+ "startColumns": "4,4,4,4,4,4,4,4,4,4,4",
+ "startOffsets": "2062,2267,2640,2479,895,1078,1263,1449,1653,712,1860",
+ "endLines": "53,58,67,62,25,29,33,38,43,21,48",
+ "endColumns": "12,12,12,12,12,12,12,12,12,12,12",
+ "endOffsets": "2261,2473,2843,2634,1073,1258,1443,1647,1854,890,2056"
+ },
+ "to": {
+ "startLines": "125,129,133,137,140,144,148,152,156,160,164",
+ "startColumns": "4,4,4,4,4,4,4,4,4,4,4",
+ "startOffsets": "8276,8480,8691,8898,9058,9241,9426,9611,9814,10020,10203",
+ "endLines": "128,132,136,139,143,147,151,155,159,163,167",
+ "endColumns": "12,12,12,12,12,12,12,12,12,12,12",
+ "endOffsets": "8475,8686,8893,9053,9236,9421,9606,9809,10015,10198,10399"
+ }
+ },
+ {
+ "source": "E:\\Notes-master\\app\\src\\main\\res\\values\\colors.xml",
+ "from": {
+ "startLines": "18",
+ "startColumns": "4",
+ "startOffsets": "712",
+ "endColumns": "56",
+ "endOffsets": "764"
+ },
+ "to": {
+ "startLines": "12",
+ "startColumns": "4",
+ "startOffsets": "532",
+ "endColumns": "56",
+ "endOffsets": "584"
+ }
+ },
+ {
+ "source": "E:\\Notes-master\\app\\src\\main\\res\\values\\arrays.xml",
+ "from": {
+ "startLines": "19,26",
+ "startColumns": "4,4",
+ "startOffsets": "739,1047",
+ "endLines": "24,29",
+ "endColumns": "19,19",
+ "endOffsets": "1041,1162"
+ },
+ "to": {
+ "startLines": "2,8",
+ "startColumns": "4,4",
+ "startOffsets": "105,412",
+ "endLines": "7,11",
+ "endColumns": "19,19",
+ "endOffsets": "407,527"
+ }
+ },
+ {
+ "source": "E:\\Notes-master\\app\\src\\main\\res\\values\\strings.xml",
+ "from": {
+ "startLines": "128,72,75,74,73,19,20,21,118,119,127,126,26,81,82,80,79,78,94,93,92,84,39,38,64,29,30,85,41,76,120,71,67,42,48,53,43,63,62,61,57,56,54,55,58,59,49,70,60,68,47,52,51,50,66,46,65,44,45,69,28,34,36,33,35,32,31,25,24,101,100,104,116,109,108,110,111,113,112,102,103,107,105,106,99,114,115,125,123,122,124,27,83,91,96,95,97,90,89,88,87,22,23",
+ "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
+ "startOffsets": "8008,3898,4159,4063,3994,827,870,922,7506,7555,7950,7899,1282,4613,4707,4542,4458,4375,5574,5491,5389,4883,2004,1953,3397,1486,1539,4944,2097,4242,7618,3827,3582,2156,2471,2772,2214,3326,3265,3208,2986,2934,2831,2884,3036,3086,2518,3761,3146,3631,2424,2717,2629,2571,3520,2374,3475,2271,2314,3694,1431,1750,1858,1703,1805,1647,1599,1227,1174,6030,5963,6271,7409,6635,6554,6709,6798,7040,6961,6114,6189,6495,6335,6415,5908,7184,7306,7858,7731,7674,7784,1366,4815,5303,5709,5640,5789,5244,5189,5127,5067,974,1084",
+ "endLines": "132,72,75,74,73,19,20,21,118,119,127,126,26,81,82,80,79,78,94,93,92,84,39,38,64,29,30,85,41,76,120,71,67,42,48,53,43,63,62,61,57,56,54,55,58,59,49,70,60,68,47,52,51,50,66,46,65,44,45,69,28,34,36,33,35,32,31,25,24,101,100,104,116,109,108,110,111,113,112,102,103,107,105,106,99,114,115,125,123,122,124,27,83,91,96,95,97,90,89,88,87,22,23",
+ "endColumns": "14,95,82,95,68,42,51,51,48,62,57,50,83,93,107,70,83,82,65,82,101,60,61,50,77,52,59,104,58,101,54,70,48,57,46,58,56,70,60,56,49,51,52,49,49,59,52,65,61,62,46,54,87,57,61,49,44,42,59,66,54,54,52,46,52,55,47,54,52,83,66,63,95,73,80,88,162,143,78,74,81,58,79,79,54,121,102,40,52,56,73,64,67,85,79,68,93,58,54,61,59,109,89",
+ "endOffsets": "8412,3989,4237,4154,4058,865,917,969,7550,7613,8003,7945,1361,4702,4810,4608,4537,4453,5635,5569,5486,4939,2061,1999,3470,1534,1594,5044,2151,4339,7668,3893,3626,2209,2513,2826,2266,3392,3321,3260,3031,2981,2879,2929,3081,3141,2566,3822,3203,3689,2466,2767,2712,2624,3577,2419,3515,2309,2369,3756,1481,1800,1906,1745,1853,1698,1642,1277,1222,6109,6025,6330,7500,6704,6630,6793,6956,7179,7035,6184,6266,6549,6410,6490,5958,7301,7404,7894,7779,7726,7853,1426,4878,5384,5784,5704,5878,5298,5239,5184,5122,1079,1169"
+ },
+ "to": {
+ "startLines": "18,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124",
+ "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
+ "startOffsets": "851,1244,1340,1423,1519,1588,1631,1683,1735,1784,1847,1905,1956,2040,2134,2242,2313,2397,2480,2546,2629,2731,2792,2854,2905,2983,3036,3096,3201,3260,3362,3417,3488,3537,3595,3642,3701,3758,3829,3890,3947,3997,4049,4102,4152,4202,4262,4315,4381,4443,4506,4553,4608,4696,4754,4816,4866,4911,4954,5014,5081,5136,5191,5244,5291,5344,5400,5448,5503,5556,5640,5707,5771,5867,5941,6022,6111,6274,6418,6497,6572,6654,6713,6793,6873,6928,7050,7153,7194,7247,7304,7378,7443,7511,7597,7677,7746,7840,7899,7954,8016,8076,8186",
+ "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",
+ "endColumns": "14,95,82,95,68,42,51,51,48,62,57,50,83,93,107,70,83,82,65,82,101,60,61,50,77,52,59,104,58,101,54,70,48,57,46,58,56,70,60,56,49,51,52,49,49,59,52,65,61,62,46,54,87,57,61,49,44,42,59,66,54,54,52,46,52,55,47,54,52,83,66,63,95,73,80,88,162,143,78,74,81,58,79,79,54,121,102,40,52,56,73,64,67,85,79,68,93,58,54,61,59,109,89",
+ "endOffsets": "1239,1335,1418,1514,1583,1626,1678,1730,1779,1842,1900,1951,2035,2129,2237,2308,2392,2475,2541,2624,2726,2787,2849,2900,2978,3031,3091,3196,3255,3357,3412,3483,3532,3590,3637,3696,3753,3824,3885,3942,3992,4044,4097,4147,4197,4257,4310,4376,4438,4501,4548,4603,4691,4749,4811,4861,4906,4949,5009,5076,5131,5186,5239,5286,5339,5395,5443,5498,5551,5635,5702,5766,5862,5936,6017,6106,6269,6413,6492,6567,6649,6708,6788,6868,6923,7045,7148,7189,7242,7299,7373,7438,7506,7592,7672,7741,7835,7894,7949,8011,8071,8181,8271"
+ }
+ },
+ {
+ "source": "E:\\Notes-master\\app\\src\\main\\res\\values\\dimens.xml",
+ "from": {
+ "startLines": "19,20,21,22,18",
+ "startColumns": "4,4,4,4,4",
+ "startOffsets": "764,816,869,922,712",
+ "endColumns": "51,52,52,51,51",
+ "endOffsets": "811,864,917,969,759"
+ },
+ "to": {
+ "startLines": "13,14,15,16,17",
+ "startColumns": "4,4,4,4,4",
+ "startOffsets": "589,641,694,747,799",
+ "endColumns": "51,52,52,51,51",
+ "endOffsets": "636,689,742,794,846"
+ }
+ }
+ ]
+ }
+ ]
+}
\ No newline at end of file
diff --git a/Notes-master/app/build/intermediates/merged_res_blame_folder/debug/out/single/debug.json b/Notes-master/app/build/intermediates/merged_res_blame_folder/debug/out/single/debug.json
new file mode 100644
index 0000000..4af68a7
--- /dev/null
+++ b/Notes-master/app/build/intermediates/merged_res_blame_folder/debug/out/single/debug.json
@@ -0,0 +1,382 @@
+[
+ {
+ "merged": "E:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_edit_green.9.png.flat",
+ "source": "E:\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\edit_green.9.png"
+ },
+ {
+ "merged": "E:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\menu_call_record_folder.xml.flat",
+ "source": "E:\\Notes-master\\app\\src\\main\\res\\menu\\call_record_folder.xml"
+ },
+ {
+ "merged": "E:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\layout_note_list_dropdown_menu.xml.flat",
+ "source": "E:\\Notes-master\\app\\src\\main\\res\\layout\\note_list_dropdown_menu.xml"
+ },
+ {
+ "merged": "E:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_font_small.png.flat",
+ "source": "E:\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\font_small.png"
+ },
+ {
+ "merged": "E:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_white_down.9.png.flat",
+ "source": "E:\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\list_white_down.9.png"
+ },
+ {
+ "merged": "E:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_widget_4x_white.png.flat",
+ "source": "E:\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\widget_4x_white.png"
+ },
+ {
+ "merged": "E:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\menu_note_list_options.xml.flat",
+ "source": "E:\\Notes-master\\app\\src\\main\\res\\menu\\note_list_options.xml"
+ },
+ {
+ "merged": "E:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_note_edit_color_selector_panel.png.flat",
+ "source": "E:\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\note_edit_color_selector_panel.png"
+ },
+ {
+ "merged": "E:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\layout_widget_2x.xml.flat",
+ "source": "E:\\Notes-master\\app\\src\\main\\res\\layout\\widget_2x.xml"
+ },
+ {
+ "merged": "E:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_title_bar_bg.9.png.flat",
+ "source": "E:\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\title_bar_bg.9.png"
+ },
+ {
+ "merged": "E:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_edit_title_green.9.png.flat",
+ "source": "E:\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\edit_title_green.9.png"
+ },
+ {
+ "merged": "E:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_red_single.9.png.flat",
+ "source": "E:\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\list_red_single.9.png"
+ },
+ {
+ "merged": "E:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\xml_widget_4x_info.xml.flat",
+ "source": "E:\\Notes-master\\app\\src\\main\\res\\xml\\widget_4x_info.xml"
+ },
+ {
+ "merged": "E:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_new_note_pressed.png.flat",
+ "source": "E:\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\new_note_pressed.png"
+ },
+ {
+ "merged": "E:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\layout_note_list_footer.xml.flat",
+ "source": "E:\\Notes-master\\app\\src\\main\\res\\layout\\note_list_footer.xml"
+ },
+ {
+ "merged": "E:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_white_middle.9.png.flat",
+ "source": "E:\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\list_white_middle.9.png"
+ },
+ {
+ "merged": "E:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\layout_note_item.xml.flat",
+ "source": "E:\\Notes-master\\app\\src\\main\\res\\layout\\note_item.xml"
+ },
+ {
+ "merged": "E:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_widget_2x_yellow.png.flat",
+ "source": "E:\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\widget_2x_yellow.png"
+ },
+ {
+ "merged": "E:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_yellow_up.9.png.flat",
+ "source": "E:\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\list_yellow_up.9.png"
+ },
+ {
+ "merged": "E:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_icon_app.png.flat",
+ "source": "E:\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\icon_app.png"
+ },
+ {
+ "merged": "E:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_widget_4x_red.png.flat",
+ "source": "E:\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\widget_4x_red.png"
+ },
+ {
+ "merged": "E:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\layout_note_list.xml.flat",
+ "source": "E:\\Notes-master\\app\\src\\main\\res\\layout\\note_list.xml"
+ },
+ {
+ "merged": "E:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_delete.png.flat",
+ "source": "E:\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\delete.png"
+ },
+ {
+ "merged": "E:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_bg_color_btn_mask.png.flat",
+ "source": "E:\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\bg_color_btn_mask.png"
+ },
+ {
+ "merged": "E:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_font_normal.png.flat",
+ "source": "E:\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\font_normal.png"
+ },
+ {
+ "merged": "E:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\raw-zh-rCN_introduction.flat",
+ "source": "E:\\Notes-master\\app\\src\\main\\res\\raw-zh-rCN\\introduction"
+ },
+ {
+ "merged": "E:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_notification.png.flat",
+ "source": "E:\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\notification.png"
+ },
+ {
+ "merged": "E:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_font_large.png.flat",
+ "source": "E:\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\font_large.png"
+ },
+ {
+ "merged": "E:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\xml_preferences.xml.flat",
+ "source": "E:\\Notes-master\\app\\src\\main\\res\\xml\\preferences.xml"
+ },
+ {
+ "merged": "E:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\color_secondary_text_dark.xml.flat",
+ "source": "E:\\Notes-master\\app\\src\\main\\res\\color\\secondary_text_dark.xml"
+ },
+ {
+ "merged": "E:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_widget_2x_white.png.flat",
+ "source": "E:\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\widget_2x_white.png"
+ },
+ {
+ "merged": "E:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_dropdown_icon.9.png.flat",
+ "source": "E:\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\dropdown_icon.9.png"
+ },
+ {
+ "merged": "E:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_blue_single.9.png.flat",
+ "source": "E:\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\list_blue_single.9.png"
+ },
+ {
+ "merged": "E:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\layout_settings_header.xml.flat",
+ "source": "E:\\Notes-master\\app\\src\\main\\res\\layout\\settings_header.xml"
+ },
+ {
+ "merged": "E:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_red_down.9.png.flat",
+ "source": "E:\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\list_red_down.9.png"
+ },
+ {
+ "merged": "E:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_new_note_normal.png.flat",
+ "source": "E:\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\new_note_normal.png"
+ },
+ {
+ "merged": "E:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_edit_yellow.9.png.flat",
+ "source": "E:\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\edit_yellow.9.png"
+ },
+ {
+ "merged": "E:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_white_up.9.png.flat",
+ "source": "E:\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\list_white_up.9.png"
+ },
+ {
+ "merged": "E:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_search_result.png.flat",
+ "source": "E:\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\search_result.png"
+ },
+ {
+ "merged": "E:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_edit_white.9.png.flat",
+ "source": "E:\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\edit_white.9.png"
+ },
+ {
+ "merged": "E:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_green_down.9.png.flat",
+ "source": "E:\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\list_green_down.9.png"
+ },
+ {
+ "merged": "E:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_red_middle.9.png.flat",
+ "source": "E:\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\list_red_middle.9.png"
+ },
+ {
+ "merged": "E:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_widget_2x_blue.png.flat",
+ "source": "E:\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\widget_2x_blue.png"
+ },
+ {
+ "merged": "E:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\menu_note_list_dropdown.xml.flat",
+ "source": "E:\\Notes-master\\app\\src\\main\\res\\menu\\note_list_dropdown.xml"
+ },
+ {
+ "merged": "E:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_widget_2x_green.png.flat",
+ "source": "E:\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\widget_2x_green.png"
+ },
+ {
+ "merged": "E:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\layout_note_edit.xml.flat",
+ "source": "E:\\Notes-master\\app\\src\\main\\res\\layout\\note_edit.xml"
+ },
+ {
+ "merged": "E:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_folder.9.png.flat",
+ "source": "E:\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\list_folder.9.png"
+ },
+ {
+ "merged": "E:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\layout_account_dialog_title.xml.flat",
+ "source": "E:\\Notes-master\\app\\src\\main\\res\\layout\\account_dialog_title.xml"
+ },
+ {
+ "merged": "E:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_widget_2x_red.png.flat",
+ "source": "E:\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\widget_2x_red.png"
+ },
+ {
+ "merged": "E:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_footer_bg.9.png.flat",
+ "source": "E:\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\list_footer_bg.9.png"
+ },
+ {
+ "merged": "E:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_widget_4x_yellow.png.flat",
+ "source": "E:\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\widget_4x_yellow.png"
+ },
+ {
+ "merged": "E:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_yellow_middle.9.png.flat",
+ "source": "E:\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\list_yellow_middle.9.png"
+ },
+ {
+ "merged": "E:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\menu_sub_folder.xml.flat",
+ "source": "E:\\Notes-master\\app\\src\\main\\res\\menu\\sub_folder.xml"
+ },
+ {
+ "merged": "E:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\xml_searchable.xml.flat",
+ "source": "E:\\Notes-master\\app\\src\\main\\res\\xml\\searchable.xml"
+ },
+ {
+ "merged": "E:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_bg_btn_set_color.png.flat",
+ "source": "E:\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\bg_btn_set_color.png"
+ },
+ {
+ "merged": "E:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_red_up.9.png.flat",
+ "source": "E:\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\list_red_up.9.png"
+ },
+ {
+ "merged": "E:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_blue_up.9.png.flat",
+ "source": "E:\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\list_blue_up.9.png"
+ },
+ {
+ "merged": "E:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_edit_title_blue.9.png.flat",
+ "source": "E:\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\edit_title_blue.9.png"
+ },
+ {
+ "merged": "E:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\menu_call_note_edit.xml.flat",
+ "source": "E:\\Notes-master\\app\\src\\main\\res\\menu\\call_note_edit.xml"
+ },
+ {
+ "merged": "E:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\layout_folder_list_item.xml.flat",
+ "source": "E:\\Notes-master\\app\\src\\main\\res\\layout\\folder_list_item.xml"
+ },
+ {
+ "merged": "E:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_yellow_single.9.png.flat",
+ "source": "E:\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\list_yellow_single.9.png"
+ },
+ {
+ "merged": "E:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_yellow_down.9.png.flat",
+ "source": "E:\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\list_yellow_down.9.png"
+ },
+ {
+ "merged": "E:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_edit_red.9.png.flat",
+ "source": "E:\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\edit_red.9.png"
+ },
+ {
+ "merged": "E:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_background.png.flat",
+ "source": "E:\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\list_background.png"
+ },
+ {
+ "merged": "E:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_title_alert.png.flat",
+ "source": "E:\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\title_alert.png"
+ },
+ {
+ "merged": "E:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\raw_introduction.flat",
+ "source": "E:\\Notes-master\\app\\src\\main\\res\\raw\\introduction"
+ },
+ {
+ "merged": "E:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\menu_note_edit.xml.flat",
+ "source": "E:\\Notes-master\\app\\src\\main\\res\\menu\\note_edit.xml"
+ },
+ {
+ "merged": "E:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_font_size_selector_bg.9.png.flat",
+ "source": "E:\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\font_size_selector_bg.9.png"
+ },
+ {
+ "merged": "E:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_widget_4x_green.png.flat",
+ "source": "E:\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\widget_4x_green.png"
+ },
+ {
+ "merged": "E:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\layout_dialog_edit_text.xml.flat",
+ "source": "E:\\Notes-master\\app\\src\\main\\res\\layout\\dialog_edit_text.xml"
+ },
+ {
+ "merged": "E:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\layout_widget_4x.xml.flat",
+ "source": "E:\\Notes-master\\app\\src\\main\\res\\layout\\widget_4x.xml"
+ },
+ {
+ "merged": "E:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\layout_datetime_picker.xml.flat",
+ "source": "E:\\Notes-master\\app\\src\\main\\res\\layout\\datetime_picker.xml"
+ },
+ {
+ "merged": "E:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_edit_title_red.9.png.flat",
+ "source": "E:\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\edit_title_red.9.png"
+ },
+ {
+ "merged": "E:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_clock.png.flat",
+ "source": "E:\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\clock.png"
+ },
+ {
+ "merged": "E:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_edit_title_yellow.9.png.flat",
+ "source": "E:\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\edit_title_yellow.9.png"
+ },
+ {
+ "merged": "E:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_green_single.9.png.flat",
+ "source": "E:\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\list_green_single.9.png"
+ },
+ {
+ "merged": "E:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable_new_note.xml.flat",
+ "source": "E:\\Notes-master\\app\\src\\main\\res\\drawable\\new_note.xml"
+ },
+ {
+ "merged": "E:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_menu_delete.png.flat",
+ "source": "E:\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\menu_delete.png"
+ },
+ {
+ "merged": "E:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_blue_middle.9.png.flat",
+ "source": "E:\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\list_blue_middle.9.png"
+ },
+ {
+ "merged": "E:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\layout_add_account_text.xml.flat",
+ "source": "E:\\Notes-master\\app\\src\\main\\res\\layout\\add_account_text.xml"
+ },
+ {
+ "merged": "E:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\color_primary_text_dark.xml.flat",
+ "source": "E:\\Notes-master\\app\\src\\main\\res\\color\\primary_text_dark.xml"
+ },
+ {
+ "merged": "E:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_green_up.9.png.flat",
+ "source": "E:\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\list_green_up.9.png"
+ },
+ {
+ "merged": "E:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_blue_down.9.png.flat",
+ "source": "E:\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\list_blue_down.9.png"
+ },
+ {
+ "merged": "E:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_font_super.png.flat",
+ "source": "E:\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\font_super.png"
+ },
+ {
+ "merged": "E:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\layout_note_edit_list_item.xml.flat",
+ "source": "E:\\Notes-master\\app\\src\\main\\res\\layout\\note_edit_list_item.xml"
+ },
+ {
+ "merged": "E:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_selected.png.flat",
+ "source": "E:\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\selected.png"
+ },
+ {
+ "merged": "E:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_menu_move.png.flat",
+ "source": "E:\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\menu_move.png"
+ },
+ {
+ "merged": "E:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_widget_4x_blue.png.flat",
+ "source": "E:\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\widget_4x_blue.png"
+ },
+ {
+ "merged": "E:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_edit_title_white.9.png.flat",
+ "source": "E:\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\edit_title_white.9.png"
+ },
+ {
+ "merged": "E:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_call_record.png.flat",
+ "source": "E:\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\call_record.png"
+ },
+ {
+ "merged": "E:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\xml_widget_2x_info.xml.flat",
+ "source": "E:\\Notes-master\\app\\src\\main\\res\\xml\\widget_2x_info.xml"
+ },
+ {
+ "merged": "E:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_edit_blue.9.png.flat",
+ "source": "E:\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\edit_blue.9.png"
+ },
+ {
+ "merged": "E:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\menu_note_list.xml.flat",
+ "source": "E:\\Notes-master\\app\\src\\main\\res\\menu\\note_list.xml"
+ },
+ {
+ "merged": "E:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_white_single.9.png.flat",
+ "source": "E:\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\list_white_single.9.png"
+ },
+ {
+ "merged": "E:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_green_middle.9.png.flat",
+ "source": "E:\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\list_green_middle.9.png"
+ }
+]
\ No newline at end of file
diff --git a/Notes-master/app/build/intermediates/merged_res_blame_folder/release/out/multi-v2/release.json b/Notes-master/app/build/intermediates/merged_res_blame_folder/release/out/multi-v2/release.json
new file mode 100644
index 0000000..73044dd
--- /dev/null
+++ b/Notes-master/app/build/intermediates/merged_res_blame_folder/release/out/multi-v2/release.json
@@ -0,0 +1,186 @@
+{
+ "logs": [
+ {
+ "outputFile": "net.micode.notes.app-merged_res-5:/values-zh-rCN_values-zh-rCN.arsc.flat",
+ "map": [
+ {
+ "source": "E:\\Notes-master\\app\\src\\main\\res\\values-zh-rCN\\strings.xml",
+ "from": {
+ "startLines": "121,71,70,69,68,19,20,21,112,113,120,119,26,77,78,76,75,74,90,89,88,80,60,29,30,81,72,114,67,63,38,44,49,39,59,58,57,53,52,50,51,54,55,45,66,56,64,43,48,47,46,62,42,61,40,41,65,28,34,36,33,35,32,31,25,24,97,96,99,111,104,103,105,106,108,107,98,102,100,101,95,109,110,118,116,115,117,27,79,87,92,91,93,86,85,84,83,22,23",
+ "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
+ "startOffsets": "6532,3495,3429,3356,3306,827,867,915,6083,6128,6478,6428,1199,3861,3929,3802,3737,3674,4592,4532,4469,4061,2877,1369,1422,4115,3568,6185,3247,3034,1798,2079,2325,1851,2817,2764,2713,2518,2470,2376,2424,2564,2611,2122,3188,2661,3077,2036,2278,2222,2167,2979,1992,2937,1901,1942,3129,1318,1623,1719,1576,1672,1529,1484,1148,1095,4967,4908,5108,6009,5419,5350,5483,5561,5744,5671,5042,5295,5165,5230,4859,5848,5931,6390,6283,6235,6328,1261,4006,4410,4705,4647,4772,4362,4317,4269,4218,963,1029",
+ "endLines": "123,71,70,69,68,19,20,21,112,113,120,119,26,77,78,76,75,74,90,89,88,80,60,29,30,81,72,114,67,63,38,44,49,39,59,58,57,53,52,50,51,54,55,45,66,56,64,43,48,47,46,62,42,61,40,41,65,28,34,36,33,35,32,31,25,24,97,96,99,111,104,103,105,106,108,107,98,102,100,101,95,109,110,118,116,115,117,27,79,87,92,91,93,86,85,84,83,22,23",
+ "endColumns": "14,72,65,72,49,39,47,47,44,56,53,49,61,67,76,58,64,62,54,59,62,53,59,52,61,84,80,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65",
+ "endOffsets": "6704,3563,3490,3424,3351,862,910,958,6123,6180,6527,6473,1256,3924,4001,3856,3797,3732,4642,4587,4527,4110,2932,1417,1479,4195,3644,6230,3301,3072,1846,2117,2371,1896,2872,2812,2759,2559,2513,2419,2465,2606,2656,2162,3242,2708,3124,2074,2320,2273,2217,3029,2031,2974,1937,1987,3183,1364,1667,1763,1618,1714,1571,1524,1194,1143,5037,4962,5160,6078,5478,5414,5556,5666,5843,5739,5103,5345,5225,5290,4903,5926,6004,6423,6323,6278,6385,1313,4056,4464,4767,4700,4829,4405,4357,4312,4264,1024,1090"
+ },
+ "to": {
+ "startLines": "6,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106",
+ "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
+ "startOffsets": "215,384,457,523,596,646,686,734,782,827,884,938,988,1050,1118,1195,1254,1319,1382,1437,1497,1560,1614,1674,1727,1789,1874,1955,2005,2064,2107,2160,2203,2254,2304,2364,2417,2468,2514,2562,2610,2656,2703,2753,2798,2857,2909,2961,3004,3051,3107,3162,3217,3261,3303,3344,3394,3453,3504,3553,3602,3649,3696,3743,3788,3839,3892,3967,4026,4083,4157,4221,4290,4368,4478,4582,4655,4721,4776,4841,4906,4955,5038,5116,5154,5199,5247,5309,5366,5421,5480,5547,5605,5667,5715,5760,5808,5859,5925",
+ "endLines": "8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106",
+ "endColumns": "14,72,65,72,49,39,47,47,44,56,53,49,61,67,76,58,64,62,54,59,62,53,59,52,61,84,80,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65",
+ "endOffsets": "379,452,518,591,641,681,729,777,822,879,933,983,1045,1113,1190,1249,1314,1377,1432,1492,1555,1609,1669,1722,1784,1869,1950,2000,2059,2102,2155,2198,2249,2299,2359,2412,2463,2509,2557,2605,2651,2698,2748,2793,2852,2904,2956,2999,3046,3102,3157,3212,3256,3298,3339,3389,3448,3499,3548,3597,3644,3691,3738,3783,3834,3887,3962,4021,4078,4152,4216,4285,4363,4473,4577,4650,4716,4771,4836,4901,4950,5033,5111,5149,5194,5242,5304,5361,5416,5475,5542,5600,5662,5710,5755,5803,5854,5920,5986"
+ }
+ },
+ {
+ "source": "E:\\Notes-master\\app\\src\\main\\res\\values-zh-rCN\\arrays.xml",
+ "from": {
+ "startLines": "18",
+ "startColumns": "4",
+ "startOffsets": "712",
+ "endLines": "21",
+ "endColumns": "19",
+ "endOffsets": "817"
+ },
+ "to": {
+ "startLines": "2",
+ "startColumns": "4",
+ "startOffsets": "105",
+ "endLines": "5",
+ "endColumns": "19",
+ "endOffsets": "210"
+ }
+ }
+ ]
+ },
+ {
+ "outputFile": "net.micode.notes.app-merged_res-5:/values_values.arsc.flat",
+ "map": [
+ {
+ "source": "E:\\Notes-master\\app\\src\\main\\res\\values\\styles.xml",
+ "from": {
+ "startLines": "50,55,64,60,22,26,30,35,40,18,45",
+ "startColumns": "4,4,4,4,4,4,4,4,4,4,4",
+ "startOffsets": "2062,2267,2640,2479,895,1078,1263,1449,1653,712,1860",
+ "endLines": "53,58,67,62,25,29,33,38,43,21,48",
+ "endColumns": "12,12,12,12,12,12,12,12,12,12,12",
+ "endOffsets": "2261,2473,2843,2634,1073,1258,1443,1647,1854,890,2056"
+ },
+ "to": {
+ "startLines": "125,129,133,137,140,144,148,152,156,160,164",
+ "startColumns": "4,4,4,4,4,4,4,4,4,4,4",
+ "startOffsets": "8124,8328,8539,8746,8906,9089,9274,9459,9662,9868,10051",
+ "endLines": "128,132,136,139,143,147,151,155,159,163,167",
+ "endColumns": "12,12,12,12,12,12,12,12,12,12,12",
+ "endOffsets": "8323,8534,8741,8901,9084,9269,9454,9657,9863,10046,10247"
+ }
+ },
+ {
+ "source": "E:\\Notes-master\\app\\src\\main\\res\\values\\colors.xml",
+ "from": {
+ "startLines": "18",
+ "startColumns": "4",
+ "startOffsets": "712",
+ "endColumns": "56",
+ "endOffsets": "764"
+ },
+ "to": {
+ "startLines": "12",
+ "startColumns": "4",
+ "startOffsets": "420",
+ "endColumns": "56",
+ "endOffsets": "472"
+ }
+ },
+ {
+ "source": "E:\\Notes-master\\app\\src\\main\\res\\values\\arrays.xml",
+ "from": {
+ "startLines": "19,26",
+ "startColumns": "4,4",
+ "startOffsets": "739,1047",
+ "endLines": "24,29",
+ "endColumns": "19,19",
+ "endOffsets": "1041,1162"
+ },
+ "to": {
+ "startLines": "2,8",
+ "startColumns": "4,4",
+ "startOffsets": "105,300",
+ "endLines": "7,11",
+ "endColumns": "19,19",
+ "endOffsets": "295,415"
+ }
+ },
+ {
+ "source": "E:\\Notes-master\\app\\src\\main\\res\\values\\strings.xml",
+ "from": {
+ "startLines": "128,72,75,74,73,19,20,21,118,119,127,126,26,81,82,80,79,78,94,93,92,84,39,38,64,29,30,85,41,76,120,71,67,42,48,53,43,63,62,61,57,56,54,55,58,59,49,70,60,68,47,52,51,50,66,46,65,44,45,69,28,34,36,33,35,32,31,25,24,101,100,104,116,109,108,110,111,113,112,102,103,107,105,106,99,114,115,125,123,122,124,27,83,91,96,95,97,90,89,88,87,22,23",
+ "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
+ "startOffsets": "8008,3898,4159,4063,3994,827,870,922,7506,7555,7950,7899,1282,4613,4707,4542,4458,4375,5574,5491,5389,4883,2004,1953,3397,1486,1539,4944,2097,4242,7618,3827,3582,2156,2471,2772,2214,3326,3265,3208,2986,2934,2831,2884,3036,3086,2518,3761,3146,3631,2424,2717,2629,2571,3520,2374,3475,2271,2314,3694,1431,1750,1858,1703,1805,1647,1599,1227,1174,6030,5963,6271,7409,6635,6554,6709,6798,7040,6961,6114,6189,6495,6335,6415,5908,7184,7306,7858,7731,7674,7784,1366,4815,5303,5709,5640,5789,5244,5189,5127,5067,974,1084",
+ "endLines": "132,72,75,74,73,19,20,21,118,119,127,126,26,81,82,80,79,78,94,93,92,84,39,38,64,29,30,85,41,76,120,71,67,42,48,53,43,63,62,61,57,56,54,55,58,59,49,70,60,68,47,52,51,50,66,46,65,44,45,69,28,34,36,33,35,32,31,25,24,101,100,104,116,109,108,110,111,113,112,102,103,107,105,106,99,114,115,125,123,122,124,27,83,91,96,95,97,90,89,88,87,22,23",
+ "endColumns": "14,95,82,95,68,42,51,51,48,62,57,50,83,93,107,70,83,82,65,82,101,60,61,50,77,52,59,104,58,101,54,70,48,57,46,58,56,70,60,56,49,51,52,49,49,59,52,65,61,62,46,54,87,57,61,49,44,42,59,66,54,54,52,46,52,55,47,54,52,83,66,63,95,73,80,88,162,143,78,74,81,58,79,79,54,121,102,40,52,56,73,64,67,85,79,68,93,58,54,61,59,109,89",
+ "endOffsets": "8412,3989,4237,4154,4058,865,917,969,7550,7613,8003,7945,1361,4702,4810,4608,4537,4453,5635,5569,5486,4939,2061,1999,3470,1534,1594,5044,2151,4339,7668,3893,3626,2209,2513,2826,2266,3392,3321,3260,3031,2981,2879,2929,3081,3141,2566,3822,3203,3689,2466,2767,2712,2624,3577,2419,3515,2309,2369,3756,1481,1800,1906,1745,1853,1698,1642,1277,1222,6109,6025,6330,7500,6704,6630,6793,6956,7179,7035,6184,6266,6549,6410,6490,5958,7301,7404,7894,7779,7726,7853,1426,4878,5384,5784,5704,5878,5298,5239,5184,5122,1079,1169"
+ },
+ "to": {
+ "startLines": "18,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124",
+ "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
+ "startOffsets": "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,2884,2944,3049,3108,3210,3265,3336,3385,3443,3490,3549,3606,3677,3738,3795,3845,3897,3950,4000,4050,4110,4163,4229,4291,4354,4401,4456,4544,4602,4664,4714,4759,4802,4862,4929,4984,5039,5092,5139,5192,5248,5296,5351,5404,5488,5555,5619,5715,5789,5870,5959,6122,6266,6345,6420,6502,6561,6641,6721,6776,6898,7001,7042,7095,7152,7226,7291,7359,7445,7525,7594,7688,7747,7802,7864,7924,8034",
+ "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",
+ "endColumns": "14,95,82,95,68,42,51,51,48,62,57,50,83,93,107,70,83,82,65,82,101,60,61,50,77,52,59,104,58,101,54,70,48,57,46,58,56,70,60,56,49,51,52,49,49,59,52,65,61,62,46,54,87,57,61,49,44,42,59,66,54,54,52,46,52,55,47,54,52,83,66,63,95,73,80,88,162,143,78,74,81,58,79,79,54,121,102,40,52,56,73,64,67,85,79,68,93,58,54,61,59,109,89",
+ "endOffsets": "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,2879,2939,3044,3103,3205,3260,3331,3380,3438,3485,3544,3601,3672,3733,3790,3840,3892,3945,3995,4045,4105,4158,4224,4286,4349,4396,4451,4539,4597,4659,4709,4754,4797,4857,4924,4979,5034,5087,5134,5187,5243,5291,5346,5399,5483,5550,5614,5710,5784,5865,5954,6117,6261,6340,6415,6497,6556,6636,6716,6771,6893,6996,7037,7090,7147,7221,7286,7354,7440,7520,7589,7683,7742,7797,7859,7919,8029,8119"
+ }
+ },
+ {
+ "source": "E:\\Notes-master\\app\\src\\main\\res\\values\\dimens.xml",
+ "from": {
+ "startLines": "19,20,21,22,18",
+ "startColumns": "4,4,4,4,4",
+ "startOffsets": "764,816,869,922,712",
+ "endColumns": "51,52,52,51,51",
+ "endOffsets": "811,864,917,969,759"
+ },
+ "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"
+ }
+ }
+ ]
+ },
+ {
+ "outputFile": "net.micode.notes.app-merged_res-5:/values-zh-rTW_values-zh-rTW.arsc.flat",
+ "map": [
+ {
+ "source": "E:\\Notes-master\\app\\src\\main\\res\\values-zh-rTW\\arrays.xml",
+ "from": {
+ "startLines": "18",
+ "startColumns": "4",
+ "startOffsets": "712",
+ "endLines": "21",
+ "endColumns": "19",
+ "endOffsets": "817"
+ },
+ "to": {
+ "startLines": "2",
+ "startColumns": "4",
+ "startOffsets": "105",
+ "endLines": "5",
+ "endColumns": "19",
+ "endOffsets": "210"
+ }
+ },
+ {
+ "source": "E:\\Notes-master\\app\\src\\main\\res\\values-zh-rTW\\strings.xml",
+ "from": {
+ "startLines": "122,72,71,70,69,19,20,21,112,113,121,120,26,76,77,75,74,73,89,88,87,79,61,29,30,80,37,114,68,64,39,45,50,40,60,59,58,54,53,51,52,55,56,46,67,57,65,44,49,48,47,63,43,62,41,42,66,28,34,36,33,35,32,31,25,24,96,95,98,110,103,102,104,105,107,106,97,101,99,100,94,108,109,119,117,116,118,27,78,86,91,90,92,85,84,83,82,22,23",
+ "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
+ "startOffsets": "6507,3575,3509,3436,3386,827,867,915,6057,6102,6453,6403,1199,3835,3903,3776,3710,3647,4565,4505,4442,4035,2957,1369,1422,4089,1768,6159,3327,3114,1878,2159,2405,1931,2897,2844,2793,2598,2550,2456,2504,2644,2691,2202,3268,2741,3157,2116,2358,2302,2247,3059,2072,3017,1981,2022,3209,1318,1623,1719,1576,1672,1529,1484,1148,1095,4940,4881,5081,5982,5392,5323,5456,5534,5717,5644,5015,5268,5138,5203,4832,5821,5904,6365,6258,6210,6303,1261,3980,4383,4678,4620,4745,4335,4290,4242,4191,963,1029",
+ "endLines": "124,72,71,70,69,19,20,21,112,113,121,120,26,76,77,75,74,73,89,88,87,79,61,29,30,80,37,114,68,64,39,45,50,40,60,59,58,54,53,51,52,55,56,46,67,57,65,44,49,48,47,63,43,62,41,42,66,28,34,36,33,35,32,31,25,24,96,95,98,110,103,102,104,105,107,106,97,101,99,100,94,108,109,119,117,116,118,27,78,86,91,90,92,85,84,83,82,22,23",
+ "endColumns": "14,71,65,72,49,39,47,47,44,56,53,49,61,67,76,58,65,62,54,59,62,53,59,52,61,83,79,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65",
+ "endOffsets": "6679,3642,3570,3504,3431,862,910,958,6097,6154,6502,6448,1256,3898,3975,3830,3771,3705,4615,4560,4500,4084,3012,1417,1479,4168,1843,6204,3381,3152,1926,2197,2451,1976,2952,2892,2839,2639,2593,2499,2545,2686,2736,2242,3322,2788,3204,2154,2400,2353,2297,3109,2111,3054,2017,2067,3263,1364,1667,1763,1618,1714,1571,1524,1194,1143,5010,4935,5133,6051,5451,5387,5529,5639,5816,5712,5076,5318,5198,5263,4876,5899,5977,6398,6298,6253,6360,1313,4030,4437,4740,4673,4802,4378,4330,4285,4237,1024,1090"
+ },
+ "to": {
+ "startLines": "6,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106",
+ "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
+ "startOffsets": "215,384,456,522,595,645,685,733,781,826,883,937,987,1049,1117,1194,1253,1319,1382,1437,1497,1560,1614,1674,1727,1789,1873,1953,2003,2062,2105,2158,2201,2252,2302,2362,2415,2466,2512,2560,2608,2654,2701,2751,2796,2855,2907,2959,3002,3049,3105,3160,3215,3259,3301,3342,3392,3451,3502,3551,3600,3647,3694,3741,3786,3837,3890,3965,4024,4081,4155,4219,4288,4366,4476,4580,4653,4719,4774,4839,4904,4953,5036,5114,5152,5197,5245,5307,5364,5419,5478,5545,5603,5665,5713,5758,5806,5857,5923",
+ "endLines": "8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106",
+ "endColumns": "14,71,65,72,49,39,47,47,44,56,53,49,61,67,76,58,65,62,54,59,62,53,59,52,61,83,79,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65",
+ "endOffsets": "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,2153,2196,2247,2297,2357,2410,2461,2507,2555,2603,2649,2696,2746,2791,2850,2902,2954,2997,3044,3100,3155,3210,3254,3296,3337,3387,3446,3497,3546,3595,3642,3689,3736,3781,3832,3885,3960,4019,4076,4150,4214,4283,4361,4471,4575,4648,4714,4769,4834,4899,4948,5031,5109,5147,5192,5240,5302,5359,5414,5473,5540,5598,5660,5708,5753,5801,5852,5918,5984"
+ }
+ }
+ ]
+ }
+ ]
+}
\ No newline at end of file
diff --git a/Notes-master/app/build/intermediates/merged_res_blame_folder/release/out/multi-v2/values-zh-rCN.json b/Notes-master/app/build/intermediates/merged_res_blame_folder/release/out/multi-v2/values-zh-rCN.json
new file mode 100644
index 0000000..89fd65f
--- /dev/null
+++ b/Notes-master/app/build/intermediates/merged_res_blame_folder/release/out/multi-v2/values-zh-rCN.json
@@ -0,0 +1,47 @@
+{
+ "logs": [
+ {
+ "outputFile": "net.micode.notes.app-mergeReleaseResources-3:/values-zh-rCN/values-zh-rCN.xml",
+ "map": [
+ {
+ "source": "E:\\Notes-master\\app\\src\\main\\res\\values-zh-rCN\\strings.xml",
+ "from": {
+ "startLines": "121,71,70,69,68,19,20,21,112,113,120,119,26,77,78,76,75,74,90,89,88,80,60,29,30,81,72,114,67,63,38,44,49,39,59,58,57,53,52,50,51,54,55,45,66,56,64,43,48,47,46,62,42,61,40,41,65,28,34,36,33,35,32,31,25,24,97,96,99,111,104,103,105,106,108,107,98,102,100,101,95,109,110,118,116,115,117,27,79,87,92,91,93,86,85,84,83,22,23",
+ "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
+ "startOffsets": "6532,3495,3429,3356,3306,827,867,915,6083,6128,6478,6428,1199,3861,3929,3802,3737,3674,4592,4532,4469,4061,2877,1369,1422,4115,3568,6185,3247,3034,1798,2079,2325,1851,2817,2764,2713,2518,2470,2376,2424,2564,2611,2122,3188,2661,3077,2036,2278,2222,2167,2979,1992,2937,1901,1942,3129,1318,1623,1719,1576,1672,1529,1484,1148,1095,4967,4908,5108,6009,5419,5350,5483,5561,5744,5671,5042,5295,5165,5230,4859,5848,5931,6390,6283,6235,6328,1261,4006,4410,4705,4647,4772,4362,4317,4269,4218,963,1029",
+ "endLines": "123,71,70,69,68,19,20,21,112,113,120,119,26,77,78,76,75,74,90,89,88,80,60,29,30,81,72,114,67,63,38,44,49,39,59,58,57,53,52,50,51,54,55,45,66,56,64,43,48,47,46,62,42,61,40,41,65,28,34,36,33,35,32,31,25,24,97,96,99,111,104,103,105,106,108,107,98,102,100,101,95,109,110,118,116,115,117,27,79,87,92,91,93,86,85,84,83,22,23",
+ "endColumns": "14,72,65,72,49,39,47,47,44,56,53,49,61,67,76,58,64,62,54,59,62,53,59,52,61,84,80,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65",
+ "endOffsets": "6704,3563,3490,3424,3351,862,910,958,6123,6180,6527,6473,1256,3924,4001,3856,3797,3732,4642,4587,4527,4110,2932,1417,1479,4195,3644,6230,3301,3072,1846,2117,2371,1896,2872,2812,2759,2559,2513,2419,2465,2606,2656,2162,3242,2708,3124,2074,2320,2273,2217,3029,2031,2974,1937,1987,3183,1364,1667,1763,1618,1714,1571,1524,1194,1143,5037,4962,5160,6078,5478,5414,5556,5666,5843,5739,5103,5345,5225,5290,4903,5926,6004,6423,6323,6278,6385,1313,4056,4464,4767,4700,4829,4405,4357,4312,4264,1024,1090"
+ },
+ "to": {
+ "startLines": "6,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106",
+ "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
+ "startOffsets": "215,384,457,523,596,646,686,734,782,827,884,938,988,1050,1118,1195,1254,1319,1382,1437,1497,1560,1614,1674,1727,1789,1874,1955,2005,2064,2107,2160,2203,2254,2304,2364,2417,2468,2514,2562,2610,2656,2703,2753,2798,2857,2909,2961,3004,3051,3107,3162,3217,3261,3303,3344,3394,3453,3504,3553,3602,3649,3696,3743,3788,3839,3892,3967,4026,4083,4157,4221,4290,4368,4478,4582,4655,4721,4776,4841,4906,4955,5038,5116,5154,5199,5247,5309,5366,5421,5480,5547,5605,5667,5715,5760,5808,5859,5925",
+ "endLines": "8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106",
+ "endColumns": "14,72,65,72,49,39,47,47,44,56,53,49,61,67,76,58,64,62,54,59,62,53,59,52,61,84,80,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65",
+ "endOffsets": "379,452,518,591,641,681,729,777,822,879,933,983,1045,1113,1190,1249,1314,1377,1432,1492,1555,1609,1669,1722,1784,1869,1950,2000,2059,2102,2155,2198,2249,2299,2359,2412,2463,2509,2557,2605,2651,2698,2748,2793,2852,2904,2956,2999,3046,3102,3157,3212,3256,3298,3339,3389,3448,3499,3548,3597,3644,3691,3738,3783,3834,3887,3962,4021,4078,4152,4216,4285,4363,4473,4577,4650,4716,4771,4836,4901,4950,5033,5111,5149,5194,5242,5304,5361,5416,5475,5542,5600,5662,5710,5755,5803,5854,5920,5986"
+ }
+ },
+ {
+ "source": "E:\\Notes-master\\app\\src\\main\\res\\values-zh-rCN\\arrays.xml",
+ "from": {
+ "startLines": "18",
+ "startColumns": "4",
+ "startOffsets": "712",
+ "endLines": "21",
+ "endColumns": "19",
+ "endOffsets": "817"
+ },
+ "to": {
+ "startLines": "2",
+ "startColumns": "4",
+ "startOffsets": "105",
+ "endLines": "5",
+ "endColumns": "19",
+ "endOffsets": "210"
+ }
+ }
+ ]
+ }
+ ]
+}
\ No newline at end of file
diff --git a/Notes-master/app/build/intermediates/merged_res_blame_folder/release/out/multi-v2/values-zh-rTW.json b/Notes-master/app/build/intermediates/merged_res_blame_folder/release/out/multi-v2/values-zh-rTW.json
new file mode 100644
index 0000000..ba3e5e7
--- /dev/null
+++ b/Notes-master/app/build/intermediates/merged_res_blame_folder/release/out/multi-v2/values-zh-rTW.json
@@ -0,0 +1,47 @@
+{
+ "logs": [
+ {
+ "outputFile": "net.micode.notes.app-mergeReleaseResources-3:/values-zh-rTW/values-zh-rTW.xml",
+ "map": [
+ {
+ "source": "E:\\Notes-master\\app\\src\\main\\res\\values-zh-rTW\\arrays.xml",
+ "from": {
+ "startLines": "18",
+ "startColumns": "4",
+ "startOffsets": "712",
+ "endLines": "21",
+ "endColumns": "19",
+ "endOffsets": "817"
+ },
+ "to": {
+ "startLines": "2",
+ "startColumns": "4",
+ "startOffsets": "105",
+ "endLines": "5",
+ "endColumns": "19",
+ "endOffsets": "210"
+ }
+ },
+ {
+ "source": "E:\\Notes-master\\app\\src\\main\\res\\values-zh-rTW\\strings.xml",
+ "from": {
+ "startLines": "122,72,71,70,69,19,20,21,112,113,121,120,26,76,77,75,74,73,89,88,87,79,61,29,30,80,37,114,68,64,39,45,50,40,60,59,58,54,53,51,52,55,56,46,67,57,65,44,49,48,47,63,43,62,41,42,66,28,34,36,33,35,32,31,25,24,96,95,98,110,103,102,104,105,107,106,97,101,99,100,94,108,109,119,117,116,118,27,78,86,91,90,92,85,84,83,82,22,23",
+ "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
+ "startOffsets": "6507,3575,3509,3436,3386,827,867,915,6057,6102,6453,6403,1199,3835,3903,3776,3710,3647,4565,4505,4442,4035,2957,1369,1422,4089,1768,6159,3327,3114,1878,2159,2405,1931,2897,2844,2793,2598,2550,2456,2504,2644,2691,2202,3268,2741,3157,2116,2358,2302,2247,3059,2072,3017,1981,2022,3209,1318,1623,1719,1576,1672,1529,1484,1148,1095,4940,4881,5081,5982,5392,5323,5456,5534,5717,5644,5015,5268,5138,5203,4832,5821,5904,6365,6258,6210,6303,1261,3980,4383,4678,4620,4745,4335,4290,4242,4191,963,1029",
+ "endLines": "124,72,71,70,69,19,20,21,112,113,121,120,26,76,77,75,74,73,89,88,87,79,61,29,30,80,37,114,68,64,39,45,50,40,60,59,58,54,53,51,52,55,56,46,67,57,65,44,49,48,47,63,43,62,41,42,66,28,34,36,33,35,32,31,25,24,96,95,98,110,103,102,104,105,107,106,97,101,99,100,94,108,109,119,117,116,118,27,78,86,91,90,92,85,84,83,82,22,23",
+ "endColumns": "14,71,65,72,49,39,47,47,44,56,53,49,61,67,76,58,65,62,54,59,62,53,59,52,61,83,79,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65",
+ "endOffsets": "6679,3642,3570,3504,3431,862,910,958,6097,6154,6502,6448,1256,3898,3975,3830,3771,3705,4615,4560,4500,4084,3012,1417,1479,4168,1843,6204,3381,3152,1926,2197,2451,1976,2952,2892,2839,2639,2593,2499,2545,2686,2736,2242,3322,2788,3204,2154,2400,2353,2297,3109,2111,3054,2017,2067,3263,1364,1667,1763,1618,1714,1571,1524,1194,1143,5010,4935,5133,6051,5451,5387,5529,5639,5816,5712,5076,5318,5198,5263,4876,5899,5977,6398,6298,6253,6360,1313,4030,4437,4740,4673,4802,4378,4330,4285,4237,1024,1090"
+ },
+ "to": {
+ "startLines": "6,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106",
+ "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
+ "startOffsets": "215,384,456,522,595,645,685,733,781,826,883,937,987,1049,1117,1194,1253,1319,1382,1437,1497,1560,1614,1674,1727,1789,1873,1953,2003,2062,2105,2158,2201,2252,2302,2362,2415,2466,2512,2560,2608,2654,2701,2751,2796,2855,2907,2959,3002,3049,3105,3160,3215,3259,3301,3342,3392,3451,3502,3551,3600,3647,3694,3741,3786,3837,3890,3965,4024,4081,4155,4219,4288,4366,4476,4580,4653,4719,4774,4839,4904,4953,5036,5114,5152,5197,5245,5307,5364,5419,5478,5545,5603,5665,5713,5758,5806,5857,5923",
+ "endLines": "8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106",
+ "endColumns": "14,71,65,72,49,39,47,47,44,56,53,49,61,67,76,58,65,62,54,59,62,53,59,52,61,83,79,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65",
+ "endOffsets": "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,2153,2196,2247,2297,2357,2410,2461,2507,2555,2603,2649,2696,2746,2791,2850,2902,2954,2997,3044,3100,3155,3210,3254,3296,3337,3387,3446,3497,3546,3595,3642,3689,3736,3781,3832,3885,3960,4019,4076,4150,4214,4283,4361,4471,4575,4648,4714,4769,4834,4899,4948,5031,5109,5147,5192,5240,5302,5359,5414,5473,5540,5598,5660,5708,5753,5801,5852,5918,5984"
+ }
+ }
+ ]
+ }
+ ]
+}
\ No newline at end of file
diff --git a/Notes-master/app/build/intermediates/merged_res_blame_folder/release/out/multi-v2/values.json b/Notes-master/app/build/intermediates/merged_res_blame_folder/release/out/multi-v2/values.json
new file mode 100644
index 0000000..94faa8b
--- /dev/null
+++ b/Notes-master/app/build/intermediates/merged_res_blame_folder/release/out/multi-v2/values.json
@@ -0,0 +1,100 @@
+{
+ "logs": [
+ {
+ "outputFile": "net.micode.notes.app-mergeReleaseResources-3:/values/values.xml",
+ "map": [
+ {
+ "source": "E:\\Notes-master\\app\\src\\main\\res\\values\\styles.xml",
+ "from": {
+ "startLines": "50,55,64,60,22,26,30,35,40,18,45",
+ "startColumns": "4,4,4,4,4,4,4,4,4,4,4",
+ "startOffsets": "2062,2267,2640,2479,895,1078,1263,1449,1653,712,1860",
+ "endLines": "53,58,67,62,25,29,33,38,43,21,48",
+ "endColumns": "12,12,12,12,12,12,12,12,12,12,12",
+ "endOffsets": "2261,2473,2843,2634,1073,1258,1443,1647,1854,890,2056"
+ },
+ "to": {
+ "startLines": "125,129,133,137,140,144,148,152,156,160,164",
+ "startColumns": "4,4,4,4,4,4,4,4,4,4,4",
+ "startOffsets": "8124,8328,8539,8746,8906,9089,9274,9459,9662,9868,10051",
+ "endLines": "128,132,136,139,143,147,151,155,159,163,167",
+ "endColumns": "12,12,12,12,12,12,12,12,12,12,12",
+ "endOffsets": "8323,8534,8741,8901,9084,9269,9454,9657,9863,10046,10247"
+ }
+ },
+ {
+ "source": "E:\\Notes-master\\app\\src\\main\\res\\values\\colors.xml",
+ "from": {
+ "startLines": "18",
+ "startColumns": "4",
+ "startOffsets": "712",
+ "endColumns": "56",
+ "endOffsets": "764"
+ },
+ "to": {
+ "startLines": "12",
+ "startColumns": "4",
+ "startOffsets": "420",
+ "endColumns": "56",
+ "endOffsets": "472"
+ }
+ },
+ {
+ "source": "E:\\Notes-master\\app\\src\\main\\res\\values\\arrays.xml",
+ "from": {
+ "startLines": "19,26",
+ "startColumns": "4,4",
+ "startOffsets": "739,1047",
+ "endLines": "24,29",
+ "endColumns": "19,19",
+ "endOffsets": "1041,1162"
+ },
+ "to": {
+ "startLines": "2,8",
+ "startColumns": "4,4",
+ "startOffsets": "105,300",
+ "endLines": "7,11",
+ "endColumns": "19,19",
+ "endOffsets": "295,415"
+ }
+ },
+ {
+ "source": "E:\\Notes-master\\app\\src\\main\\res\\values\\strings.xml",
+ "from": {
+ "startLines": "128,72,75,74,73,19,20,21,118,119,127,126,26,81,82,80,79,78,94,93,92,84,39,38,64,29,30,85,41,76,120,71,67,42,48,53,43,63,62,61,57,56,54,55,58,59,49,70,60,68,47,52,51,50,66,46,65,44,45,69,28,34,36,33,35,32,31,25,24,101,100,104,116,109,108,110,111,113,112,102,103,107,105,106,99,114,115,125,123,122,124,27,83,91,96,95,97,90,89,88,87,22,23",
+ "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
+ "startOffsets": "8008,3898,4159,4063,3994,827,870,922,7506,7555,7950,7899,1282,4613,4707,4542,4458,4375,5574,5491,5389,4883,2004,1953,3397,1486,1539,4944,2097,4242,7618,3827,3582,2156,2471,2772,2214,3326,3265,3208,2986,2934,2831,2884,3036,3086,2518,3761,3146,3631,2424,2717,2629,2571,3520,2374,3475,2271,2314,3694,1431,1750,1858,1703,1805,1647,1599,1227,1174,6030,5963,6271,7409,6635,6554,6709,6798,7040,6961,6114,6189,6495,6335,6415,5908,7184,7306,7858,7731,7674,7784,1366,4815,5303,5709,5640,5789,5244,5189,5127,5067,974,1084",
+ "endLines": "132,72,75,74,73,19,20,21,118,119,127,126,26,81,82,80,79,78,94,93,92,84,39,38,64,29,30,85,41,76,120,71,67,42,48,53,43,63,62,61,57,56,54,55,58,59,49,70,60,68,47,52,51,50,66,46,65,44,45,69,28,34,36,33,35,32,31,25,24,101,100,104,116,109,108,110,111,113,112,102,103,107,105,106,99,114,115,125,123,122,124,27,83,91,96,95,97,90,89,88,87,22,23",
+ "endColumns": "14,95,82,95,68,42,51,51,48,62,57,50,83,93,107,70,83,82,65,82,101,60,61,50,77,52,59,104,58,101,54,70,48,57,46,58,56,70,60,56,49,51,52,49,49,59,52,65,61,62,46,54,87,57,61,49,44,42,59,66,54,54,52,46,52,55,47,54,52,83,66,63,95,73,80,88,162,143,78,74,81,58,79,79,54,121,102,40,52,56,73,64,67,85,79,68,93,58,54,61,59,109,89",
+ "endOffsets": "8412,3989,4237,4154,4058,865,917,969,7550,7613,8003,7945,1361,4702,4810,4608,4537,4453,5635,5569,5486,4939,2061,1999,3470,1534,1594,5044,2151,4339,7668,3893,3626,2209,2513,2826,2266,3392,3321,3260,3031,2981,2879,2929,3081,3141,2566,3822,3203,3689,2466,2767,2712,2624,3577,2419,3515,2309,2369,3756,1481,1800,1906,1745,1853,1698,1642,1277,1222,6109,6025,6330,7500,6704,6630,6793,6956,7179,7035,6184,6266,6549,6410,6490,5958,7301,7404,7894,7779,7726,7853,1426,4878,5384,5784,5704,5878,5298,5239,5184,5122,1079,1169"
+ },
+ "to": {
+ "startLines": "18,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124",
+ "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
+ "startOffsets": "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,2884,2944,3049,3108,3210,3265,3336,3385,3443,3490,3549,3606,3677,3738,3795,3845,3897,3950,4000,4050,4110,4163,4229,4291,4354,4401,4456,4544,4602,4664,4714,4759,4802,4862,4929,4984,5039,5092,5139,5192,5248,5296,5351,5404,5488,5555,5619,5715,5789,5870,5959,6122,6266,6345,6420,6502,6561,6641,6721,6776,6898,7001,7042,7095,7152,7226,7291,7359,7445,7525,7594,7688,7747,7802,7864,7924,8034",
+ "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",
+ "endColumns": "14,95,82,95,68,42,51,51,48,62,57,50,83,93,107,70,83,82,65,82,101,60,61,50,77,52,59,104,58,101,54,70,48,57,46,58,56,70,60,56,49,51,52,49,49,59,52,65,61,62,46,54,87,57,61,49,44,42,59,66,54,54,52,46,52,55,47,54,52,83,66,63,95,73,80,88,162,143,78,74,81,58,79,79,54,121,102,40,52,56,73,64,67,85,79,68,93,58,54,61,59,109,89",
+ "endOffsets": "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,2879,2939,3044,3103,3205,3260,3331,3380,3438,3485,3544,3601,3672,3733,3790,3840,3892,3945,3995,4045,4105,4158,4224,4286,4349,4396,4451,4539,4597,4659,4709,4754,4797,4857,4924,4979,5034,5087,5134,5187,5243,5291,5346,5399,5483,5550,5614,5710,5784,5865,5954,6117,6261,6340,6415,6497,6556,6636,6716,6771,6893,6996,7037,7090,7147,7221,7286,7354,7440,7520,7589,7683,7742,7797,7859,7919,8029,8119"
+ }
+ },
+ {
+ "source": "E:\\Notes-master\\app\\src\\main\\res\\values\\dimens.xml",
+ "from": {
+ "startLines": "19,20,21,22,18",
+ "startColumns": "4,4,4,4,4",
+ "startOffsets": "764,816,869,922,712",
+ "endColumns": "51,52,52,51,51",
+ "endOffsets": "811,864,917,969,759"
+ },
+ "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"
+ }
+ }
+ ]
+ }
+ ]
+}
\ No newline at end of file
diff --git a/Notes-master/app/build/intermediates/merged_res_blame_folder/release/out/single/release.json b/Notes-master/app/build/intermediates/merged_res_blame_folder/release/out/single/release.json
new file mode 100644
index 0000000..9cc6955
--- /dev/null
+++ b/Notes-master/app/build/intermediates/merged_res_blame_folder/release/out/single/release.json
@@ -0,0 +1,382 @@
+[
+ {
+ "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_red_middle.9.png.flat",
+ "source": "net.micode.notes.app-main-6:/drawable-hdpi/list_red_middle.9.png"
+ },
+ {
+ "merged": "net.micode.notes.app-merged_res-5:/layout_note_list_dropdown_menu.xml.flat",
+ "source": "net.micode.notes.app-main-6:/layout/note_list_dropdown_menu.xml"
+ },
+ {
+ "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_title_bar_bg.9.png.flat",
+ "source": "net.micode.notes.app-main-6:/drawable-hdpi/title_bar_bg.9.png"
+ },
+ {
+ "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_folder.9.png.flat",
+ "source": "net.micode.notes.app-main-6:/drawable-hdpi/list_folder.9.png"
+ },
+ {
+ "merged": "net.micode.notes.app-merged_res-5:/layout_folder_list_item.xml.flat",
+ "source": "net.micode.notes.app-main-6:/layout/folder_list_item.xml"
+ },
+ {
+ "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_red_single.9.png.flat",
+ "source": "net.micode.notes.app-main-6:/drawable-hdpi/list_red_single.9.png"
+ },
+ {
+ "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_selected.png.flat",
+ "source": "net.micode.notes.app-main-6:/drawable-hdpi/selected.png"
+ },
+ {
+ "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_edit_title_yellow.9.png.flat",
+ "source": "net.micode.notes.app-main-6:/drawable-hdpi/edit_title_yellow.9.png"
+ },
+ {
+ "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_notification.png.flat",
+ "source": "net.micode.notes.app-main-6:/drawable-hdpi/notification.png"
+ },
+ {
+ "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_red_down.9.png.flat",
+ "source": "net.micode.notes.app-main-6:/drawable-hdpi/list_red_down.9.png"
+ },
+ {
+ "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_new_note_pressed.png.flat",
+ "source": "net.micode.notes.app-main-6:/drawable-hdpi/new_note_pressed.png"
+ },
+ {
+ "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_edit_white.9.png.flat",
+ "source": "net.micode.notes.app-main-6:/drawable-hdpi/edit_white.9.png"
+ },
+ {
+ "merged": "net.micode.notes.app-merged_res-5:/layout_note_item.xml.flat",
+ "source": "net.micode.notes.app-main-6:/layout/note_item.xml"
+ },
+ {
+ "merged": "net.micode.notes.app-merged_res-5:/menu_sub_folder.xml.flat",
+ "source": "net.micode.notes.app-main-6:/menu/sub_folder.xml"
+ },
+ {
+ "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_footer_bg.9.png.flat",
+ "source": "net.micode.notes.app-main-6:/drawable-hdpi/list_footer_bg.9.png"
+ },
+ {
+ "merged": "net.micode.notes.app-merged_res-5:/layout_settings_header.xml.flat",
+ "source": "net.micode.notes.app-main-6:/layout/settings_header.xml"
+ },
+ {
+ "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_note_edit_color_selector_panel.png.flat",
+ "source": "net.micode.notes.app-main-6:/drawable-hdpi/note_edit_color_selector_panel.png"
+ },
+ {
+ "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_title_alert.png.flat",
+ "source": "net.micode.notes.app-main-6:/drawable-hdpi/title_alert.png"
+ },
+ {
+ "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_widget_4x_red.png.flat",
+ "source": "net.micode.notes.app-main-6:/drawable-hdpi/widget_4x_red.png"
+ },
+ {
+ "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_clock.png.flat",
+ "source": "net.micode.notes.app-main-6:/drawable-hdpi/clock.png"
+ },
+ {
+ "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_widget_4x_yellow.png.flat",
+ "source": "net.micode.notes.app-main-6:/drawable-hdpi/widget_4x_yellow.png"
+ },
+ {
+ "merged": "net.micode.notes.app-merged_res-5:/raw_introduction.flat",
+ "source": "net.micode.notes.app-main-6:/raw/introduction"
+ },
+ {
+ "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_font_large.png.flat",
+ "source": "net.micode.notes.app-main-6:/drawable-hdpi/font_large.png"
+ },
+ {
+ "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_blue_middle.9.png.flat",
+ "source": "net.micode.notes.app-main-6:/drawable-hdpi/list_blue_middle.9.png"
+ },
+ {
+ "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_widget_2x_blue.png.flat",
+ "source": "net.micode.notes.app-main-6:/drawable-hdpi/widget_2x_blue.png"
+ },
+ {
+ "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_white_up.9.png.flat",
+ "source": "net.micode.notes.app-main-6:/drawable-hdpi/list_white_up.9.png"
+ },
+ {
+ "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_red_up.9.png.flat",
+ "source": "net.micode.notes.app-main-6:/drawable-hdpi/list_red_up.9.png"
+ },
+ {
+ "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_widget_4x_blue.png.flat",
+ "source": "net.micode.notes.app-main-6:/drawable-hdpi/widget_4x_blue.png"
+ },
+ {
+ "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_widget_4x_white.png.flat",
+ "source": "net.micode.notes.app-main-6:/drawable-hdpi/widget_4x_white.png"
+ },
+ {
+ "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_widget_2x_green.png.flat",
+ "source": "net.micode.notes.app-main-6:/drawable-hdpi/widget_2x_green.png"
+ },
+ {
+ "merged": "net.micode.notes.app-merged_res-5:/drawable_new_note.xml.flat",
+ "source": "net.micode.notes.app-main-6:/drawable/new_note.xml"
+ },
+ {
+ "merged": "net.micode.notes.app-merged_res-5:/layout_widget_2x.xml.flat",
+ "source": "net.micode.notes.app-main-6:/layout/widget_2x.xml"
+ },
+ {
+ "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_yellow_up.9.png.flat",
+ "source": "net.micode.notes.app-main-6:/drawable-hdpi/list_yellow_up.9.png"
+ },
+ {
+ "merged": "net.micode.notes.app-merged_res-5:/xml_widget_2x_info.xml.flat",
+ "source": "net.micode.notes.app-main-6:/xml/widget_2x_info.xml"
+ },
+ {
+ "merged": "net.micode.notes.app-merged_res-5:/menu_call_record_folder.xml.flat",
+ "source": "net.micode.notes.app-main-6:/menu/call_record_folder.xml"
+ },
+ {
+ "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_widget_2x_white.png.flat",
+ "source": "net.micode.notes.app-main-6:/drawable-hdpi/widget_2x_white.png"
+ },
+ {
+ "merged": "net.micode.notes.app-merged_res-5:/xml_preferences.xml.flat",
+ "source": "net.micode.notes.app-main-6:/xml/preferences.xml"
+ },
+ {
+ "merged": "net.micode.notes.app-merged_res-5:/layout_dialog_edit_text.xml.flat",
+ "source": "net.micode.notes.app-main-6:/layout/dialog_edit_text.xml"
+ },
+ {
+ "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_edit_title_white.9.png.flat",
+ "source": "net.micode.notes.app-main-6:/drawable-hdpi/edit_title_white.9.png"
+ },
+ {
+ "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_edit_title_blue.9.png.flat",
+ "source": "net.micode.notes.app-main-6:/drawable-hdpi/edit_title_blue.9.png"
+ },
+ {
+ "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_yellow_down.9.png.flat",
+ "source": "net.micode.notes.app-main-6:/drawable-hdpi/list_yellow_down.9.png"
+ },
+ {
+ "merged": "net.micode.notes.app-merged_res-5:/raw-zh-rCN_introduction.flat",
+ "source": "net.micode.notes.app-main-6:/raw-zh-rCN/introduction"
+ },
+ {
+ "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_yellow_single.9.png.flat",
+ "source": "net.micode.notes.app-main-6:/drawable-hdpi/list_yellow_single.9.png"
+ },
+ {
+ "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_background.png.flat",
+ "source": "net.micode.notes.app-main-6:/drawable-hdpi/list_background.png"
+ },
+ {
+ "merged": "net.micode.notes.app-merged_res-5:/color_secondary_text_dark.xml.flat",
+ "source": "net.micode.notes.app-main-6:/color/secondary_text_dark.xml"
+ },
+ {
+ "merged": "net.micode.notes.app-merged_res-5:/xml_widget_4x_info.xml.flat",
+ "source": "net.micode.notes.app-main-6:/xml/widget_4x_info.xml"
+ },
+ {
+ "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_blue_up.9.png.flat",
+ "source": "net.micode.notes.app-main-6:/drawable-hdpi/list_blue_up.9.png"
+ },
+ {
+ "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_white_middle.9.png.flat",
+ "source": "net.micode.notes.app-main-6:/drawable-hdpi/list_white_middle.9.png"
+ },
+ {
+ "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_white_single.9.png.flat",
+ "source": "net.micode.notes.app-main-6:/drawable-hdpi/list_white_single.9.png"
+ },
+ {
+ "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_edit_yellow.9.png.flat",
+ "source": "net.micode.notes.app-main-6:/drawable-hdpi/edit_yellow.9.png"
+ },
+ {
+ "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_search_result.png.flat",
+ "source": "net.micode.notes.app-main-6:/drawable-hdpi/search_result.png"
+ },
+ {
+ "merged": "net.micode.notes.app-merged_res-5:/layout_note_edit.xml.flat",
+ "source": "net.micode.notes.app-main-6:/layout/note_edit.xml"
+ },
+ {
+ "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_widget_4x_green.png.flat",
+ "source": "net.micode.notes.app-main-6:/drawable-hdpi/widget_4x_green.png"
+ },
+ {
+ "merged": "net.micode.notes.app-merged_res-5:/layout_widget_4x.xml.flat",
+ "source": "net.micode.notes.app-main-6:/layout/widget_4x.xml"
+ },
+ {
+ "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_edit_title_green.9.png.flat",
+ "source": "net.micode.notes.app-main-6:/drawable-hdpi/edit_title_green.9.png"
+ },
+ {
+ "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_edit_red.9.png.flat",
+ "source": "net.micode.notes.app-main-6:/drawable-hdpi/edit_red.9.png"
+ },
+ {
+ "merged": "net.micode.notes.app-merged_res-5:/xml_searchable.xml.flat",
+ "source": "net.micode.notes.app-main-6:/xml/searchable.xml"
+ },
+ {
+ "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_green_middle.9.png.flat",
+ "source": "net.micode.notes.app-main-6:/drawable-hdpi/list_green_middle.9.png"
+ },
+ {
+ "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_menu_delete.png.flat",
+ "source": "net.micode.notes.app-main-6:/drawable-hdpi/menu_delete.png"
+ },
+ {
+ "merged": "net.micode.notes.app-merged_res-5:/layout_note_list.xml.flat",
+ "source": "net.micode.notes.app-main-6:/layout/note_list.xml"
+ },
+ {
+ "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_green_down.9.png.flat",
+ "source": "net.micode.notes.app-main-6:/drawable-hdpi/list_green_down.9.png"
+ },
+ {
+ "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_font_normal.png.flat",
+ "source": "net.micode.notes.app-main-6:/drawable-hdpi/font_normal.png"
+ },
+ {
+ "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_yellow_middle.9.png.flat",
+ "source": "net.micode.notes.app-main-6:/drawable-hdpi/list_yellow_middle.9.png"
+ },
+ {
+ "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_icon_app.png.flat",
+ "source": "net.micode.notes.app-main-6:/drawable-hdpi/icon_app.png"
+ },
+ {
+ "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_dropdown_icon.9.png.flat",
+ "source": "net.micode.notes.app-main-6:/drawable-hdpi/dropdown_icon.9.png"
+ },
+ {
+ "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_bg_btn_set_color.png.flat",
+ "source": "net.micode.notes.app-main-6:/drawable-hdpi/bg_btn_set_color.png"
+ },
+ {
+ "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_new_note_normal.png.flat",
+ "source": "net.micode.notes.app-main-6:/drawable-hdpi/new_note_normal.png"
+ },
+ {
+ "merged": "net.micode.notes.app-merged_res-5:/menu_note_list_dropdown.xml.flat",
+ "source": "net.micode.notes.app-main-6:/menu/note_list_dropdown.xml"
+ },
+ {
+ "merged": "net.micode.notes.app-merged_res-5:/menu_note_list.xml.flat",
+ "source": "net.micode.notes.app-main-6:/menu/note_list.xml"
+ },
+ {
+ "merged": "net.micode.notes.app-merged_res-5:/layout_note_edit_list_item.xml.flat",
+ "source": "net.micode.notes.app-main-6:/layout/note_edit_list_item.xml"
+ },
+ {
+ "merged": "net.micode.notes.app-merged_res-5:/layout_note_list_footer.xml.flat",
+ "source": "net.micode.notes.app-main-6:/layout/note_list_footer.xml"
+ },
+ {
+ "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_menu_move.png.flat",
+ "source": "net.micode.notes.app-main-6:/drawable-hdpi/menu_move.png"
+ },
+ {
+ "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_bg_color_btn_mask.png.flat",
+ "source": "net.micode.notes.app-main-6:/drawable-hdpi/bg_color_btn_mask.png"
+ },
+ {
+ "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_blue_down.9.png.flat",
+ "source": "net.micode.notes.app-main-6:/drawable-hdpi/list_blue_down.9.png"
+ },
+ {
+ "merged": "net.micode.notes.app-merged_res-5:/layout_add_account_text.xml.flat",
+ "source": "net.micode.notes.app-main-6:/layout/add_account_text.xml"
+ },
+ {
+ "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_font_size_selector_bg.9.png.flat",
+ "source": "net.micode.notes.app-main-6:/drawable-hdpi/font_size_selector_bg.9.png"
+ },
+ {
+ "merged": "net.micode.notes.app-merged_res-5:/layout_datetime_picker.xml.flat",
+ "source": "net.micode.notes.app-main-6:/layout/datetime_picker.xml"
+ },
+ {
+ "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_font_super.png.flat",
+ "source": "net.micode.notes.app-main-6:/drawable-hdpi/font_super.png"
+ },
+ {
+ "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_edit_title_red.9.png.flat",
+ "source": "net.micode.notes.app-main-6:/drawable-hdpi/edit_title_red.9.png"
+ },
+ {
+ "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_edit_blue.9.png.flat",
+ "source": "net.micode.notes.app-main-6:/drawable-hdpi/edit_blue.9.png"
+ },
+ {
+ "merged": "net.micode.notes.app-merged_res-5:/menu_note_list_options.xml.flat",
+ "source": "net.micode.notes.app-main-6:/menu/note_list_options.xml"
+ },
+ {
+ "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_blue_single.9.png.flat",
+ "source": "net.micode.notes.app-main-6:/drawable-hdpi/list_blue_single.9.png"
+ },
+ {
+ "merged": "net.micode.notes.app-merged_res-5:/menu_call_note_edit.xml.flat",
+ "source": "net.micode.notes.app-main-6:/menu/call_note_edit.xml"
+ },
+ {
+ "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_green_single.9.png.flat",
+ "source": "net.micode.notes.app-main-6:/drawable-hdpi/list_green_single.9.png"
+ },
+ {
+ "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_widget_2x_yellow.png.flat",
+ "source": "net.micode.notes.app-main-6:/drawable-hdpi/widget_2x_yellow.png"
+ },
+ {
+ "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_widget_2x_red.png.flat",
+ "source": "net.micode.notes.app-main-6:/drawable-hdpi/widget_2x_red.png"
+ },
+ {
+ "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_delete.png.flat",
+ "source": "net.micode.notes.app-main-6:/drawable-hdpi/delete.png"
+ },
+ {
+ "merged": "net.micode.notes.app-merged_res-5:/color_primary_text_dark.xml.flat",
+ "source": "net.micode.notes.app-main-6:/color/primary_text_dark.xml"
+ },
+ {
+ "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_edit_green.9.png.flat",
+ "source": "net.micode.notes.app-main-6:/drawable-hdpi/edit_green.9.png"
+ },
+ {
+ "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_white_down.9.png.flat",
+ "source": "net.micode.notes.app-main-6:/drawable-hdpi/list_white_down.9.png"
+ },
+ {
+ "merged": "net.micode.notes.app-merged_res-5:/menu_note_edit.xml.flat",
+ "source": "net.micode.notes.app-main-6:/menu/note_edit.xml"
+ },
+ {
+ "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_font_small.png.flat",
+ "source": "net.micode.notes.app-main-6:/drawable-hdpi/font_small.png"
+ },
+ {
+ "merged": "net.micode.notes.app-merged_res-5:/layout_account_dialog_title.xml.flat",
+ "source": "net.micode.notes.app-main-6:/layout/account_dialog_title.xml"
+ },
+ {
+ "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_call_record.png.flat",
+ "source": "net.micode.notes.app-main-6:/drawable-hdpi/call_record.png"
+ },
+ {
+ "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_green_up.9.png.flat",
+ "source": "net.micode.notes.app-main-6:/drawable-hdpi/list_green_up.9.png"
+ }
+]
\ No newline at end of file
diff --git a/Notes-master/app/build/intermediates/metadata_library_dependencies_report/release/dependencies.pb b/Notes-master/app/build/intermediates/metadata_library_dependencies_report/release/dependencies.pb
new file mode 100644
index 0000000..ebef3cd
--- /dev/null
+++ b/Notes-master/app/build/intermediates/metadata_library_dependencies_report/release/dependencies.pb
@@ -0,0 +1,6 @@
+
+base",
+*
+(https://dl.google.com/dl/android/maven2/"
+
+https://jcenter.bintray.com/
\ No newline at end of file
diff --git a/xiaomi/app/build/intermediates/navigation_json/debug/navigation.json b/Notes-master/app/build/intermediates/navigation_json/debug/navigation.json
similarity index 100%
rename from xiaomi/app/build/intermediates/navigation_json/debug/navigation.json
rename to Notes-master/app/build/intermediates/navigation_json/debug/navigation.json
diff --git a/Notes-master/app/build/intermediates/navigation_json/release/navigation.json b/Notes-master/app/build/intermediates/navigation_json/release/navigation.json
new file mode 100644
index 0000000..0637a08
--- /dev/null
+++ b/Notes-master/app/build/intermediates/navigation_json/release/navigation.json
@@ -0,0 +1 @@
+[]
\ No newline at end of file
diff --git a/Notes-master/app/build/intermediates/optimized_processed_res/release/output-metadata.json b/Notes-master/app/build/intermediates/optimized_processed_res/release/output-metadata.json
new file mode 100644
index 0000000..9277522
--- /dev/null
+++ b/Notes-master/app/build/intermediates/optimized_processed_res/release/output-metadata.json
@@ -0,0 +1,20 @@
+{
+ "version": 3,
+ "artifactType": {
+ "type": "OPTIMIZED_PROCESSED_RES",
+ "kind": "Directory"
+ },
+ "applicationId": "net.micode.notes",
+ "variantName": "release",
+ "elements": [
+ {
+ "type": "SINGLE",
+ "filters": [],
+ "attributes": [],
+ "versionCode": 1,
+ "versionName": "0.1",
+ "outputFile": "resources-release-optimize.ap_"
+ }
+ ],
+ "elementType": "File"
+}
\ No newline at end of file
diff --git a/Notes-master/app/build/intermediates/optimized_processed_res/release/resources-release-optimize.ap_ b/Notes-master/app/build/intermediates/optimized_processed_res/release/resources-release-optimize.ap_
new file mode 100644
index 0000000..29d56c4
Binary files /dev/null and b/Notes-master/app/build/intermediates/optimized_processed_res/release/resources-release-optimize.ap_ differ
diff --git a/Notes-master/app/build/intermediates/packaged_manifests/debug/AndroidManifest.xml b/Notes-master/app/build/intermediates/packaged_manifests/debug/AndroidManifest.xml
new file mode 100644
index 0000000..1f5b31c
--- /dev/null
+++ b/Notes-master/app/build/intermediates/packaged_manifests/debug/AndroidManifest.xml
@@ -0,0 +1,160 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/Notes-master/app/build/intermediates/packaged_manifests/debug/output-metadata.json b/Notes-master/app/build/intermediates/packaged_manifests/debug/output-metadata.json
new file mode 100644
index 0000000..c7bf802
--- /dev/null
+++ b/Notes-master/app/build/intermediates/packaged_manifests/debug/output-metadata.json
@@ -0,0 +1,18 @@
+{
+ "version": 2,
+ "artifactType": {
+ "type": "PACKAGED_MANIFESTS",
+ "kind": "Directory"
+ },
+ "applicationId": "net.micode.notes",
+ "variantName": "debug",
+ "elements": [
+ {
+ "type": "SINGLE",
+ "filters": [],
+ "versionCode": 1,
+ "versionName": "0.1",
+ "outputFile": "AndroidManifest.xml"
+ }
+ ]
+}
\ No newline at end of file
diff --git a/Notes-master/app/build/intermediates/packaged_manifests/release/AndroidManifest.xml b/Notes-master/app/build/intermediates/packaged_manifests/release/AndroidManifest.xml
new file mode 100644
index 0000000..b3424d2
--- /dev/null
+++ b/Notes-master/app/build/intermediates/packaged_manifests/release/AndroidManifest.xml
@@ -0,0 +1,149 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/Notes-master/app/build/intermediates/packaged_manifests/release/output-metadata.json b/Notes-master/app/build/intermediates/packaged_manifests/release/output-metadata.json
new file mode 100644
index 0000000..a6b664d
--- /dev/null
+++ b/Notes-master/app/build/intermediates/packaged_manifests/release/output-metadata.json
@@ -0,0 +1,20 @@
+{
+ "version": 3,
+ "artifactType": {
+ "type": "PACKAGED_MANIFESTS",
+ "kind": "Directory"
+ },
+ "applicationId": "net.micode.notes",
+ "variantName": "release",
+ "elements": [
+ {
+ "type": "SINGLE",
+ "filters": [],
+ "attributes": [],
+ "versionCode": 1,
+ "versionName": "0.1",
+ "outputFile": "AndroidManifest.xml"
+ }
+ ],
+ "elementType": "File"
+}
\ No newline at end of file
diff --git a/Notes-master/app/build/intermediates/processed_res/debug/out/output-metadata.json b/Notes-master/app/build/intermediates/processed_res/debug/out/output-metadata.json
new file mode 100644
index 0000000..7d60de5
--- /dev/null
+++ b/Notes-master/app/build/intermediates/processed_res/debug/out/output-metadata.json
@@ -0,0 +1,18 @@
+{
+ "version": 2,
+ "artifactType": {
+ "type": "PROCESSED_RES",
+ "kind": "Directory"
+ },
+ "applicationId": "net.micode.notes",
+ "variantName": "debug",
+ "elements": [
+ {
+ "type": "SINGLE",
+ "filters": [],
+ "versionCode": 1,
+ "versionName": "0.1",
+ "outputFile": "resources-debug.ap_"
+ }
+ ]
+}
\ No newline at end of file
diff --git a/Notes-master/app/build/intermediates/processed_res/debug/out/resources-debug.ap_ b/Notes-master/app/build/intermediates/processed_res/debug/out/resources-debug.ap_
new file mode 100644
index 0000000..bb07af8
Binary files /dev/null and b/Notes-master/app/build/intermediates/processed_res/debug/out/resources-debug.ap_ differ
diff --git a/Notes-master/app/build/intermediates/processed_res/release/out/output-metadata.json b/Notes-master/app/build/intermediates/processed_res/release/out/output-metadata.json
new file mode 100644
index 0000000..813214a
--- /dev/null
+++ b/Notes-master/app/build/intermediates/processed_res/release/out/output-metadata.json
@@ -0,0 +1,20 @@
+{
+ "version": 3,
+ "artifactType": {
+ "type": "PROCESSED_RES",
+ "kind": "Directory"
+ },
+ "applicationId": "net.micode.notes",
+ "variantName": "release",
+ "elements": [
+ {
+ "type": "SINGLE",
+ "filters": [],
+ "attributes": [],
+ "versionCode": 1,
+ "versionName": "0.1",
+ "outputFile": "resources-release.ap_"
+ }
+ ],
+ "elementType": "File"
+}
\ No newline at end of file
diff --git a/Notes-master/app/build/intermediates/processed_res/release/out/resources-release.ap_ b/Notes-master/app/build/intermediates/processed_res/release/out/resources-release.ap_
new file mode 100644
index 0000000..8e7449f
Binary files /dev/null and b/Notes-master/app/build/intermediates/processed_res/release/out/resources-release.ap_ differ
diff --git a/Notes-master/app/build/intermediates/project_dex_archive/debug/out/6be87a94442d2b8afadf938b2d2a05d2859a1208729216b9bf0c454c5fca49e1_5.jar b/Notes-master/app/build/intermediates/project_dex_archive/debug/out/6be87a94442d2b8afadf938b2d2a05d2859a1208729216b9bf0c454c5fca49e1_5.jar
new file mode 100644
index 0000000..2791e5e
Binary files /dev/null and b/Notes-master/app/build/intermediates/project_dex_archive/debug/out/6be87a94442d2b8afadf938b2d2a05d2859a1208729216b9bf0c454c5fca49e1_5.jar differ
diff --git a/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/BuildConfig.dex b/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/BuildConfig.dex
new file mode 100644
index 0000000..8406c6b
Binary files /dev/null and b/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/BuildConfig.dex differ
diff --git a/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Contact.dex b/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Contact.dex
new file mode 100644
index 0000000..02744f8
Binary files /dev/null and b/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Contact.dex differ
diff --git a/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$CallNote.dex b/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$CallNote.dex
new file mode 100644
index 0000000..383e920
Binary files /dev/null and b/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$CallNote.dex differ
diff --git a/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$DataColumns.dex b/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$DataColumns.dex
new file mode 100644
index 0000000..b27d0df
Binary files /dev/null and b/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$DataColumns.dex differ
diff --git a/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$DataConstants.dex b/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$DataConstants.dex
new file mode 100644
index 0000000..73f1c6e
Binary files /dev/null and b/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$DataConstants.dex differ
diff --git a/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$NoteColumns.dex b/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$NoteColumns.dex
new file mode 100644
index 0000000..df62b8a
Binary files /dev/null and b/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$NoteColumns.dex differ
diff --git a/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$TextNote.dex b/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$TextNote.dex
new file mode 100644
index 0000000..775bcb8
Binary files /dev/null and b/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$TextNote.dex differ
diff --git a/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes.dex b/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes.dex
new file mode 100644
index 0000000..b465e24
Binary files /dev/null and b/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes.dex differ
diff --git a/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/NotesDatabaseHelper$TABLE.dex b/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/NotesDatabaseHelper$TABLE.dex
new file mode 100644
index 0000000..bc4d41f
Binary files /dev/null and b/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/NotesDatabaseHelper$TABLE.dex differ
diff --git a/xiaomi/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/NotesDatabaseHelper.dex b/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/NotesDatabaseHelper.dex
similarity index 89%
rename from xiaomi/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/NotesDatabaseHelper.dex
rename to Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/NotesDatabaseHelper.dex
index 41cfede..9d95616 100644
Binary files a/xiaomi/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/NotesDatabaseHelper.dex and b/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/NotesDatabaseHelper.dex differ
diff --git a/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/NotesProvider.dex b/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/NotesProvider.dex
new file mode 100644
index 0000000..f64ee07
Binary files /dev/null and b/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/NotesProvider.dex differ
diff --git a/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/MetaData.dex b/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/MetaData.dex
new file mode 100644
index 0000000..4f4195b
Binary files /dev/null and b/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/MetaData.dex differ
diff --git a/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/Node.dex b/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/Node.dex
new file mode 100644
index 0000000..b820dd1
Binary files /dev/null and b/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/Node.dex differ
diff --git a/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/SqlData.dex b/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/SqlData.dex
new file mode 100644
index 0000000..156e8a4
Binary files /dev/null and b/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/SqlData.dex differ
diff --git a/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/SqlNote.dex b/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/SqlNote.dex
new file mode 100644
index 0000000..957751d
Binary files /dev/null and b/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/SqlNote.dex differ
diff --git a/xiaomi/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/Task.dex b/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/Task.dex
similarity index 88%
rename from xiaomi/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/Task.dex
rename to Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/Task.dex
index 8413884..1c8c0a3 100644
Binary files a/xiaomi/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/Task.dex and b/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/Task.dex differ
diff --git a/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/TaskList.dex b/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/TaskList.dex
new file mode 100644
index 0000000..0820b08
Binary files /dev/null and b/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/TaskList.dex differ
diff --git a/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/exception/ActionFailureException.dex b/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/exception/ActionFailureException.dex
new file mode 100644
index 0000000..9a7e336
Binary files /dev/null and b/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/exception/ActionFailureException.dex differ
diff --git a/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/exception/NetworkFailureException.dex b/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/exception/NetworkFailureException.dex
new file mode 100644
index 0000000..b72490f
Binary files /dev/null and b/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/exception/NetworkFailureException.dex differ
diff --git a/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskASyncTask$1.dex b/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskASyncTask$1.dex
new file mode 100644
index 0000000..22e46f2
Binary files /dev/null and b/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskASyncTask$1.dex differ
diff --git a/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskASyncTask$OnCompleteListener.dex b/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskASyncTask$OnCompleteListener.dex
new file mode 100644
index 0000000..b3b9bd1
Binary files /dev/null and b/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskASyncTask$OnCompleteListener.dex differ
diff --git a/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskASyncTask.dex b/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskASyncTask.dex
new file mode 100644
index 0000000..1df5862
Binary files /dev/null and b/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskASyncTask.dex differ
diff --git a/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskClient.dex b/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskClient.dex
new file mode 100644
index 0000000..c67eb1c
Binary files /dev/null and b/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskClient.dex differ
diff --git a/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskManager.dex b/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskManager.dex
new file mode 100644
index 0000000..8ae0178
Binary files /dev/null and b/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskManager.dex differ
diff --git a/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskSyncService$1.dex b/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskSyncService$1.dex
new file mode 100644
index 0000000..7c1e0a6
Binary files /dev/null and b/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskSyncService$1.dex differ
diff --git a/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskSyncService.dex b/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskSyncService.dex
new file mode 100644
index 0000000..6e47c66
Binary files /dev/null and b/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskSyncService.dex differ
diff --git a/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/Note$NoteData.dex b/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/Note$NoteData.dex
new file mode 100644
index 0000000..f2309af
Binary files /dev/null and b/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/Note$NoteData.dex differ
diff --git a/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/Note.dex b/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/Note.dex
new file mode 100644
index 0000000..b33a50f
Binary files /dev/null and b/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/Note.dex differ
diff --git a/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/WorkingNote$NoteSettingChangedListener.dex b/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/WorkingNote$NoteSettingChangedListener.dex
new file mode 100644
index 0000000..0ed5f90
Binary files /dev/null and b/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/WorkingNote$NoteSettingChangedListener.dex differ
diff --git a/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/WorkingNote.dex b/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/WorkingNote.dex
new file mode 100644
index 0000000..2053394
Binary files /dev/null and b/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/WorkingNote.dex differ
diff --git a/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/BackupUtils$TextExport.dex b/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/BackupUtils$TextExport.dex
new file mode 100644
index 0000000..e7b50c1
Binary files /dev/null and b/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/BackupUtils$TextExport.dex differ
diff --git a/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/BackupUtils.dex b/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/BackupUtils.dex
new file mode 100644
index 0000000..1c30b3b
Binary files /dev/null and b/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/BackupUtils.dex differ
diff --git a/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/DataUtils.dex b/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/DataUtils.dex
new file mode 100644
index 0000000..121e005
Binary files /dev/null and b/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/DataUtils.dex differ
diff --git a/xiaomi/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/GTaskStringUtils.dex b/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/GTaskStringUtils.dex
similarity index 81%
rename from xiaomi/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/GTaskStringUtils.dex
rename to Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/GTaskStringUtils.dex
index 4aa26e3..23c4fb2 100644
Binary files a/xiaomi/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/GTaskStringUtils.dex and b/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/GTaskStringUtils.dex differ
diff --git a/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser$NoteBgResources.dex b/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser$NoteBgResources.dex
new file mode 100644
index 0000000..999a582
Binary files /dev/null and b/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser$NoteBgResources.dex differ
diff --git a/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser$NoteItemBgResources.dex b/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser$NoteItemBgResources.dex
new file mode 100644
index 0000000..67a20b4
Binary files /dev/null and b/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser$NoteItemBgResources.dex differ
diff --git a/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser$TextAppearanceResources.dex b/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser$TextAppearanceResources.dex
new file mode 100644
index 0000000..f039e92
Binary files /dev/null and b/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser$TextAppearanceResources.dex differ
diff --git a/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser$WidgetBgResources.dex b/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser$WidgetBgResources.dex
new file mode 100644
index 0000000..b64c8f6
Binary files /dev/null and b/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser$WidgetBgResources.dex differ
diff --git a/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser.dex b/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser.dex
new file mode 100644
index 0000000..ed9bf48
Binary files /dev/null and b/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser.dex differ
diff --git a/xiaomi/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/AlarmAlertActivity.dex b/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/AlarmAlertActivity.dex
similarity index 86%
rename from xiaomi/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/AlarmAlertActivity.dex
rename to Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/AlarmAlertActivity.dex
index 155dd53..a5b7cd0 100644
Binary files a/xiaomi/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/AlarmAlertActivity.dex and b/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/AlarmAlertActivity.dex differ
diff --git a/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/AlarmInitReceiver.dex b/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/AlarmInitReceiver.dex
new file mode 100644
index 0000000..7468e7b
Binary files /dev/null and b/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/AlarmInitReceiver.dex differ
diff --git a/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/AlarmReceiver.dex b/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/AlarmReceiver.dex
new file mode 100644
index 0000000..e97fe5e
Binary files /dev/null and b/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/AlarmReceiver.dex differ
diff --git a/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$1.dex b/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$1.dex
new file mode 100644
index 0000000..a2f67eb
Binary files /dev/null and b/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$1.dex differ
diff --git a/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$2.dex b/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$2.dex
new file mode 100644
index 0000000..03dccc3
Binary files /dev/null and b/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$2.dex differ
diff --git a/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$3.dex b/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$3.dex
new file mode 100644
index 0000000..1a1ebb9
Binary files /dev/null and b/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$3.dex differ
diff --git a/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$4.dex b/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$4.dex
new file mode 100644
index 0000000..5bb032a
Binary files /dev/null and b/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$4.dex differ
diff --git a/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$OnDateTimeChangedListener.dex b/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$OnDateTimeChangedListener.dex
new file mode 100644
index 0000000..fa635ea
Binary files /dev/null and b/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$OnDateTimeChangedListener.dex differ
diff --git a/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker.dex b/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker.dex
new file mode 100644
index 0000000..b786f10
Binary files /dev/null and b/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker.dex differ
diff --git a/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePickerDialog$1.dex b/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePickerDialog$1.dex
new file mode 100644
index 0000000..1655d53
Binary files /dev/null and b/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePickerDialog$1.dex differ
diff --git a/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePickerDialog$OnDateTimeSetListener.dex b/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePickerDialog$OnDateTimeSetListener.dex
new file mode 100644
index 0000000..ca27fef
Binary files /dev/null and b/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePickerDialog$OnDateTimeSetListener.dex differ
diff --git a/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePickerDialog.dex b/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePickerDialog.dex
new file mode 100644
index 0000000..d1de587
Binary files /dev/null and b/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePickerDialog.dex differ
diff --git a/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DropdownMenu$1.dex b/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DropdownMenu$1.dex
new file mode 100644
index 0000000..dfb9291
Binary files /dev/null and b/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DropdownMenu$1.dex differ
diff --git a/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DropdownMenu.dex b/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DropdownMenu.dex
new file mode 100644
index 0000000..e11fede
Binary files /dev/null and b/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DropdownMenu.dex differ
diff --git a/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/FoldersListAdapter$FolderListItem.dex b/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/FoldersListAdapter$FolderListItem.dex
new file mode 100644
index 0000000..eccfc20
Binary files /dev/null and b/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/FoldersListAdapter$FolderListItem.dex differ
diff --git a/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/FoldersListAdapter.dex b/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/FoldersListAdapter.dex
new file mode 100644
index 0000000..9ad6ac3
Binary files /dev/null and b/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/FoldersListAdapter.dex differ
diff --git a/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$1.dex b/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$1.dex
new file mode 100644
index 0000000..ea41bca
Binary files /dev/null and b/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$1.dex differ
diff --git a/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$2.dex b/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$2.dex
new file mode 100644
index 0000000..a654140
Binary files /dev/null and b/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$2.dex differ
diff --git a/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$3.dex b/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$3.dex
new file mode 100644
index 0000000..50939f5
Binary files /dev/null and b/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$3.dex differ
diff --git a/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$HeadViewHolder.dex b/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$HeadViewHolder.dex
new file mode 100644
index 0000000..533e1d3
Binary files /dev/null and b/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$HeadViewHolder.dex differ
diff --git a/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity.dex b/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity.dex
new file mode 100644
index 0000000..1809c71
Binary files /dev/null and b/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity.dex differ
diff --git a/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditText$1.dex b/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditText$1.dex
new file mode 100644
index 0000000..80e0dc5
Binary files /dev/null and b/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditText$1.dex differ
diff --git a/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditText$OnTextViewChangeListener.dex b/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditText$OnTextViewChangeListener.dex
new file mode 100644
index 0000000..f612f53
Binary files /dev/null and b/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditText$OnTextViewChangeListener.dex differ
diff --git a/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditText.dex b/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditText.dex
new file mode 100644
index 0000000..5bf3630
Binary files /dev/null and b/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditText.dex differ
diff --git a/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteItemData.dex b/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteItemData.dex
new file mode 100644
index 0000000..ef628c6
Binary files /dev/null and b/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteItemData.dex differ
diff --git a/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$1.dex b/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$1.dex
new file mode 100644
index 0000000..efd12dc
Binary files /dev/null and b/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$1.dex differ
diff --git a/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$2.dex b/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$2.dex
new file mode 100644
index 0000000..5252428
Binary files /dev/null and b/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$2.dex differ
diff --git a/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$3.dex b/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$3.dex
new file mode 100644
index 0000000..2ae7979
Binary files /dev/null and b/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$3.dex differ
diff --git a/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$4.dex b/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$4.dex
new file mode 100644
index 0000000..6a84970
Binary files /dev/null and b/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$4.dex differ
diff --git a/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$5.dex b/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$5.dex
new file mode 100644
index 0000000..c1b03b9
Binary files /dev/null and b/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$5.dex differ
diff --git a/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$6.dex b/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$6.dex
new file mode 100644
index 0000000..5e5b4ac
Binary files /dev/null and b/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$6.dex differ
diff --git a/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$7.dex b/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$7.dex
new file mode 100644
index 0000000..26d72c5
Binary files /dev/null and b/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$7.dex differ
diff --git a/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$8.dex b/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$8.dex
new file mode 100644
index 0000000..aff4c9f
Binary files /dev/null and b/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$8.dex differ
diff --git a/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$9.dex b/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$9.dex
new file mode 100644
index 0000000..1cfd3ea
Binary files /dev/null and b/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$9.dex differ
diff --git a/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$BackgroundQueryHandler.dex b/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$BackgroundQueryHandler.dex
new file mode 100644
index 0000000..bad9d98
Binary files /dev/null and b/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$BackgroundQueryHandler.dex differ
diff --git a/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ListEditState.dex b/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ListEditState.dex
new file mode 100644
index 0000000..119fe3c
Binary files /dev/null and b/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ListEditState.dex differ
diff --git a/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback$1.dex b/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback$1.dex
new file mode 100644
index 0000000..1fd242d
Binary files /dev/null and b/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback$1.dex differ
diff --git a/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback$2.dex b/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback$2.dex
new file mode 100644
index 0000000..8912b51
Binary files /dev/null and b/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback$2.dex differ
diff --git a/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback.dex b/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback.dex
new file mode 100644
index 0000000..533986d
Binary files /dev/null and b/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback.dex differ
diff --git a/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$NewNoteOnTouchListener.dex b/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$NewNoteOnTouchListener.dex
new file mode 100644
index 0000000..ebef90d
Binary files /dev/null and b/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$NewNoteOnTouchListener.dex differ
diff --git a/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.dex b/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.dex
new file mode 100644
index 0000000..a384072
Binary files /dev/null and b/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.dex differ
diff --git a/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity.dex b/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity.dex
new file mode 100644
index 0000000..a82d363
Binary files /dev/null and b/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity.dex differ
diff --git a/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListAdapter$AppWidgetAttribute.dex b/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListAdapter$AppWidgetAttribute.dex
new file mode 100644
index 0000000..3251de1
Binary files /dev/null and b/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListAdapter$AppWidgetAttribute.dex differ
diff --git a/xiaomi/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListAdapter.dex b/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListAdapter.dex
similarity index 86%
rename from xiaomi/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListAdapter.dex
rename to Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListAdapter.dex
index 3f67ab6..c93c7eb 100644
Binary files a/xiaomi/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListAdapter.dex and b/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListAdapter.dex differ
diff --git a/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListItem.dex b/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListItem.dex
new file mode 100644
index 0000000..63d7681
Binary files /dev/null and b/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListItem.dex differ
diff --git a/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$1.dex b/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$1.dex
new file mode 100644
index 0000000..a6be123
Binary files /dev/null and b/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$1.dex differ
diff --git a/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$2.dex b/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$2.dex
new file mode 100644
index 0000000..3122db1
Binary files /dev/null and b/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$2.dex differ
diff --git a/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$3.dex b/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$3.dex
new file mode 100644
index 0000000..d304211
Binary files /dev/null and b/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$3.dex differ
diff --git a/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$4.dex b/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$4.dex
new file mode 100644
index 0000000..90d4acd
Binary files /dev/null and b/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$4.dex differ
diff --git a/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$5.dex b/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$5.dex
new file mode 100644
index 0000000..ab271b4
Binary files /dev/null and b/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$5.dex differ
diff --git a/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$6.dex b/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$6.dex
new file mode 100644
index 0000000..97ab92c
Binary files /dev/null and b/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$6.dex differ
diff --git a/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$7.dex b/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$7.dex
new file mode 100644
index 0000000..d9e1e8f
Binary files /dev/null and b/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$7.dex differ
diff --git a/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$8.dex b/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$8.dex
new file mode 100644
index 0000000..19f2822
Binary files /dev/null and b/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$8.dex differ
diff --git a/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$GTaskReceiver.dex b/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$GTaskReceiver.dex
new file mode 100644
index 0000000..e1361a3
Binary files /dev/null and b/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$GTaskReceiver.dex differ
diff --git a/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity.dex b/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity.dex
new file mode 100644
index 0000000..eb26308
Binary files /dev/null and b/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity.dex differ
diff --git a/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/widget/NoteWidgetProvider.dex b/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/widget/NoteWidgetProvider.dex
new file mode 100644
index 0000000..3ab9546
Binary files /dev/null and b/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/widget/NoteWidgetProvider.dex differ
diff --git a/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/widget/NoteWidgetProvider_2x.dex b/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/widget/NoteWidgetProvider_2x.dex
new file mode 100644
index 0000000..b56d2a7
Binary files /dev/null and b/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/widget/NoteWidgetProvider_2x.dex differ
diff --git a/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/widget/NoteWidgetProvider_4x.dex b/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/widget/NoteWidgetProvider_4x.dex
new file mode 100644
index 0000000..8ee03ed
Binary files /dev/null and b/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/widget/NoteWidgetProvider_4x.dex differ
diff --git a/Notes-master/app/build/intermediates/res/merged/debug/color_primary_text_dark.xml.flat b/Notes-master/app/build/intermediates/res/merged/debug/color_primary_text_dark.xml.flat
new file mode 100644
index 0000000..c13b85b
Binary files /dev/null and b/Notes-master/app/build/intermediates/res/merged/debug/color_primary_text_dark.xml.flat differ
diff --git a/Notes-master/app/build/intermediates/res/merged/debug/color_secondary_text_dark.xml.flat b/Notes-master/app/build/intermediates/res/merged/debug/color_secondary_text_dark.xml.flat
new file mode 100644
index 0000000..5edb4ce
Binary files /dev/null and b/Notes-master/app/build/intermediates/res/merged/debug/color_secondary_text_dark.xml.flat differ
diff --git a/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_bg_btn_set_color.png.flat b/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_bg_btn_set_color.png.flat
new file mode 100644
index 0000000..f1c1ef0
Binary files /dev/null and b/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_bg_btn_set_color.png.flat differ
diff --git a/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_bg_color_btn_mask.png.flat b/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_bg_color_btn_mask.png.flat
new file mode 100644
index 0000000..d78fbd5
Binary files /dev/null and b/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_bg_color_btn_mask.png.flat differ
diff --git a/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_call_record.png.flat b/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_call_record.png.flat
new file mode 100644
index 0000000..b1d6820
Binary files /dev/null and b/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_call_record.png.flat differ
diff --git a/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_clock.png.flat b/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_clock.png.flat
new file mode 100644
index 0000000..8ade731
Binary files /dev/null and b/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_clock.png.flat differ
diff --git a/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_delete.png.flat b/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_delete.png.flat
new file mode 100644
index 0000000..e02b3dc
Binary files /dev/null and b/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_delete.png.flat differ
diff --git a/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_dropdown_icon.9.png.flat b/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_dropdown_icon.9.png.flat
new file mode 100644
index 0000000..ebb2e95
Binary files /dev/null and b/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_dropdown_icon.9.png.flat differ
diff --git a/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_edit_blue.9.png.flat b/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_edit_blue.9.png.flat
new file mode 100644
index 0000000..47801ee
Binary files /dev/null and b/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_edit_blue.9.png.flat differ
diff --git a/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_edit_green.9.png.flat b/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_edit_green.9.png.flat
new file mode 100644
index 0000000..3e185e2
Binary files /dev/null and b/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_edit_green.9.png.flat differ
diff --git a/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_edit_red.9.png.flat b/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_edit_red.9.png.flat
new file mode 100644
index 0000000..5108084
Binary files /dev/null and b/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_edit_red.9.png.flat differ
diff --git a/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_edit_title_blue.9.png.flat b/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_edit_title_blue.9.png.flat
new file mode 100644
index 0000000..e70f9bf
Binary files /dev/null and b/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_edit_title_blue.9.png.flat differ
diff --git a/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_edit_title_green.9.png.flat b/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_edit_title_green.9.png.flat
new file mode 100644
index 0000000..04c4a43
Binary files /dev/null and b/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_edit_title_green.9.png.flat differ
diff --git a/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_edit_title_red.9.png.flat b/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_edit_title_red.9.png.flat
new file mode 100644
index 0000000..cd69b27
Binary files /dev/null and b/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_edit_title_red.9.png.flat differ
diff --git a/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_edit_title_white.9.png.flat b/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_edit_title_white.9.png.flat
new file mode 100644
index 0000000..38f7456
Binary files /dev/null and b/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_edit_title_white.9.png.flat differ
diff --git a/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_edit_title_yellow.9.png.flat b/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_edit_title_yellow.9.png.flat
new file mode 100644
index 0000000..7cc9508
Binary files /dev/null and b/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_edit_title_yellow.9.png.flat differ
diff --git a/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_edit_white.9.png.flat b/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_edit_white.9.png.flat
new file mode 100644
index 0000000..29e2015
Binary files /dev/null and b/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_edit_white.9.png.flat differ
diff --git a/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_edit_yellow.9.png.flat b/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_edit_yellow.9.png.flat
new file mode 100644
index 0000000..c339da5
Binary files /dev/null and b/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_edit_yellow.9.png.flat differ
diff --git a/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_font_large.png.flat b/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_font_large.png.flat
new file mode 100644
index 0000000..df898a9
Binary files /dev/null and b/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_font_large.png.flat differ
diff --git a/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_font_normal.png.flat b/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_font_normal.png.flat
new file mode 100644
index 0000000..e4c43f3
Binary files /dev/null and b/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_font_normal.png.flat differ
diff --git a/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_font_size_selector_bg.9.png.flat b/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_font_size_selector_bg.9.png.flat
new file mode 100644
index 0000000..7a1850d
Binary files /dev/null and b/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_font_size_selector_bg.9.png.flat differ
diff --git a/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_font_small.png.flat b/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_font_small.png.flat
new file mode 100644
index 0000000..edabddb
Binary files /dev/null and b/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_font_small.png.flat differ
diff --git a/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_font_super.png.flat b/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_font_super.png.flat
new file mode 100644
index 0000000..7ab37b7
Binary files /dev/null and b/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_font_super.png.flat differ
diff --git a/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_icon_app.png.flat b/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_icon_app.png.flat
new file mode 100644
index 0000000..4c204cb
Binary files /dev/null and b/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_icon_app.png.flat differ
diff --git a/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_list_background.png.flat b/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_list_background.png.flat
new file mode 100644
index 0000000..3b7020d
Binary files /dev/null and b/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_list_background.png.flat differ
diff --git a/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_list_blue_down.9.png.flat b/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_list_blue_down.9.png.flat
new file mode 100644
index 0000000..fabc96f
Binary files /dev/null and b/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_list_blue_down.9.png.flat differ
diff --git a/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_list_blue_middle.9.png.flat b/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_list_blue_middle.9.png.flat
new file mode 100644
index 0000000..9c8cde1
Binary files /dev/null and b/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_list_blue_middle.9.png.flat differ
diff --git a/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_list_blue_single.9.png.flat b/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_list_blue_single.9.png.flat
new file mode 100644
index 0000000..ea075b7
Binary files /dev/null and b/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_list_blue_single.9.png.flat differ
diff --git a/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_list_blue_up.9.png.flat b/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_list_blue_up.9.png.flat
new file mode 100644
index 0000000..4cd39ca
Binary files /dev/null and b/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_list_blue_up.9.png.flat differ
diff --git a/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_list_folder.9.png.flat b/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_list_folder.9.png.flat
new file mode 100644
index 0000000..51928be
Binary files /dev/null and b/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_list_folder.9.png.flat differ
diff --git a/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_list_footer_bg.9.png.flat b/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_list_footer_bg.9.png.flat
new file mode 100644
index 0000000..ae8b2a4
Binary files /dev/null and b/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_list_footer_bg.9.png.flat differ
diff --git a/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_list_green_down.9.png.flat b/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_list_green_down.9.png.flat
new file mode 100644
index 0000000..c3ace77
Binary files /dev/null and b/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_list_green_down.9.png.flat differ
diff --git a/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_list_green_middle.9.png.flat b/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_list_green_middle.9.png.flat
new file mode 100644
index 0000000..2ebdd9a
Binary files /dev/null and b/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_list_green_middle.9.png.flat differ
diff --git a/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_list_green_single.9.png.flat b/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_list_green_single.9.png.flat
new file mode 100644
index 0000000..7bdc6bd
Binary files /dev/null and b/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_list_green_single.9.png.flat differ
diff --git a/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_list_green_up.9.png.flat b/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_list_green_up.9.png.flat
new file mode 100644
index 0000000..b37ee1b
Binary files /dev/null and b/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_list_green_up.9.png.flat differ
diff --git a/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_list_red_down.9.png.flat b/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_list_red_down.9.png.flat
new file mode 100644
index 0000000..604cfe8
Binary files /dev/null and b/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_list_red_down.9.png.flat differ
diff --git a/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_list_red_middle.9.png.flat b/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_list_red_middle.9.png.flat
new file mode 100644
index 0000000..566c7cc
Binary files /dev/null and b/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_list_red_middle.9.png.flat differ
diff --git a/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_list_red_single.9.png.flat b/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_list_red_single.9.png.flat
new file mode 100644
index 0000000..74d28bb
Binary files /dev/null and b/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_list_red_single.9.png.flat differ
diff --git a/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_list_red_up.9.png.flat b/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_list_red_up.9.png.flat
new file mode 100644
index 0000000..fccf321
Binary files /dev/null and b/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_list_red_up.9.png.flat differ
diff --git a/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_list_white_down.9.png.flat b/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_list_white_down.9.png.flat
new file mode 100644
index 0000000..84dd852
Binary files /dev/null and b/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_list_white_down.9.png.flat differ
diff --git a/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_list_white_middle.9.png.flat b/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_list_white_middle.9.png.flat
new file mode 100644
index 0000000..595d517
Binary files /dev/null and b/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_list_white_middle.9.png.flat differ
diff --git a/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_list_white_single.9.png.flat b/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_list_white_single.9.png.flat
new file mode 100644
index 0000000..0762af7
Binary files /dev/null and b/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_list_white_single.9.png.flat differ
diff --git a/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_list_white_up.9.png.flat b/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_list_white_up.9.png.flat
new file mode 100644
index 0000000..e5e5104
Binary files /dev/null and b/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_list_white_up.9.png.flat differ
diff --git a/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_list_yellow_down.9.png.flat b/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_list_yellow_down.9.png.flat
new file mode 100644
index 0000000..8ec52bf
Binary files /dev/null and b/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_list_yellow_down.9.png.flat differ
diff --git a/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_list_yellow_middle.9.png.flat b/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_list_yellow_middle.9.png.flat
new file mode 100644
index 0000000..fb62a50
Binary files /dev/null and b/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_list_yellow_middle.9.png.flat differ
diff --git a/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_list_yellow_single.9.png.flat b/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_list_yellow_single.9.png.flat
new file mode 100644
index 0000000..91d9d24
Binary files /dev/null and b/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_list_yellow_single.9.png.flat differ
diff --git a/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_list_yellow_up.9.png.flat b/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_list_yellow_up.9.png.flat
new file mode 100644
index 0000000..5981366
Binary files /dev/null and b/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_list_yellow_up.9.png.flat differ
diff --git a/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_menu_delete.png.flat b/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_menu_delete.png.flat
new file mode 100644
index 0000000..42547af
Binary files /dev/null and b/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_menu_delete.png.flat differ
diff --git a/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_menu_move.png.flat b/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_menu_move.png.flat
new file mode 100644
index 0000000..1229517
Binary files /dev/null and b/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_menu_move.png.flat differ
diff --git a/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_new_note_normal.png.flat b/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_new_note_normal.png.flat
new file mode 100644
index 0000000..e9ffd3c
Binary files /dev/null and b/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_new_note_normal.png.flat differ
diff --git a/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_new_note_pressed.png.flat b/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_new_note_pressed.png.flat
new file mode 100644
index 0000000..bfa6f7c
Binary files /dev/null and b/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_new_note_pressed.png.flat differ
diff --git a/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_note_edit_color_selector_panel.png.flat b/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_note_edit_color_selector_panel.png.flat
new file mode 100644
index 0000000..d7b644f
Binary files /dev/null and b/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_note_edit_color_selector_panel.png.flat differ
diff --git a/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_notification.png.flat b/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_notification.png.flat
new file mode 100644
index 0000000..a64cb9d
Binary files /dev/null and b/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_notification.png.flat differ
diff --git a/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_search_result.png.flat b/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_search_result.png.flat
new file mode 100644
index 0000000..dfe0f4a
Binary files /dev/null and b/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_search_result.png.flat differ
diff --git a/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_selected.png.flat b/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_selected.png.flat
new file mode 100644
index 0000000..eedbaf9
Binary files /dev/null and b/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_selected.png.flat differ
diff --git a/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_title_alert.png.flat b/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_title_alert.png.flat
new file mode 100644
index 0000000..6b2b175
Binary files /dev/null and b/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_title_alert.png.flat differ
diff --git a/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_title_bar_bg.9.png.flat b/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_title_bar_bg.9.png.flat
new file mode 100644
index 0000000..3e8994f
Binary files /dev/null and b/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_title_bar_bg.9.png.flat differ
diff --git a/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_widget_2x_blue.png.flat b/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_widget_2x_blue.png.flat
new file mode 100644
index 0000000..a949cca
Binary files /dev/null and b/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_widget_2x_blue.png.flat differ
diff --git a/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_widget_2x_green.png.flat b/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_widget_2x_green.png.flat
new file mode 100644
index 0000000..6232200
Binary files /dev/null and b/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_widget_2x_green.png.flat differ
diff --git a/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_widget_2x_red.png.flat b/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_widget_2x_red.png.flat
new file mode 100644
index 0000000..642cb78
Binary files /dev/null and b/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_widget_2x_red.png.flat differ
diff --git a/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_widget_2x_white.png.flat b/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_widget_2x_white.png.flat
new file mode 100644
index 0000000..ff56b7a
Binary files /dev/null and b/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_widget_2x_white.png.flat differ
diff --git a/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_widget_2x_yellow.png.flat b/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_widget_2x_yellow.png.flat
new file mode 100644
index 0000000..a6c9ecd
Binary files /dev/null and b/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_widget_2x_yellow.png.flat differ
diff --git a/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_widget_4x_blue.png.flat b/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_widget_4x_blue.png.flat
new file mode 100644
index 0000000..cc308cc
Binary files /dev/null and b/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_widget_4x_blue.png.flat differ
diff --git a/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_widget_4x_green.png.flat b/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_widget_4x_green.png.flat
new file mode 100644
index 0000000..4566912
Binary files /dev/null and b/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_widget_4x_green.png.flat differ
diff --git a/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_widget_4x_red.png.flat b/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_widget_4x_red.png.flat
new file mode 100644
index 0000000..8b8d92c
Binary files /dev/null and b/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_widget_4x_red.png.flat differ
diff --git a/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_widget_4x_white.png.flat b/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_widget_4x_white.png.flat
new file mode 100644
index 0000000..d8de221
Binary files /dev/null and b/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_widget_4x_white.png.flat differ
diff --git a/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_widget_4x_yellow.png.flat b/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_widget_4x_yellow.png.flat
new file mode 100644
index 0000000..911692f
Binary files /dev/null and b/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_widget_4x_yellow.png.flat differ
diff --git a/Notes-master/app/build/intermediates/res/merged/debug/drawable_new_note.xml.flat b/Notes-master/app/build/intermediates/res/merged/debug/drawable_new_note.xml.flat
new file mode 100644
index 0000000..a31a025
Binary files /dev/null and b/Notes-master/app/build/intermediates/res/merged/debug/drawable_new_note.xml.flat differ
diff --git a/Notes-master/app/build/intermediates/res/merged/debug/layout_account_dialog_title.xml.flat b/Notes-master/app/build/intermediates/res/merged/debug/layout_account_dialog_title.xml.flat
new file mode 100644
index 0000000..65e9c37
Binary files /dev/null and b/Notes-master/app/build/intermediates/res/merged/debug/layout_account_dialog_title.xml.flat differ
diff --git a/Notes-master/app/build/intermediates/res/merged/debug/layout_add_account_text.xml.flat b/Notes-master/app/build/intermediates/res/merged/debug/layout_add_account_text.xml.flat
new file mode 100644
index 0000000..46e4dd1
Binary files /dev/null and b/Notes-master/app/build/intermediates/res/merged/debug/layout_add_account_text.xml.flat differ
diff --git a/Notes-master/app/build/intermediates/res/merged/debug/layout_datetime_picker.xml.flat b/Notes-master/app/build/intermediates/res/merged/debug/layout_datetime_picker.xml.flat
new file mode 100644
index 0000000..4696b26
Binary files /dev/null and b/Notes-master/app/build/intermediates/res/merged/debug/layout_datetime_picker.xml.flat differ
diff --git a/Notes-master/app/build/intermediates/res/merged/debug/layout_dialog_edit_text.xml.flat b/Notes-master/app/build/intermediates/res/merged/debug/layout_dialog_edit_text.xml.flat
new file mode 100644
index 0000000..d554e11
Binary files /dev/null and b/Notes-master/app/build/intermediates/res/merged/debug/layout_dialog_edit_text.xml.flat differ
diff --git a/Notes-master/app/build/intermediates/res/merged/debug/layout_folder_list_item.xml.flat b/Notes-master/app/build/intermediates/res/merged/debug/layout_folder_list_item.xml.flat
new file mode 100644
index 0000000..3f5c7a8
Binary files /dev/null and b/Notes-master/app/build/intermediates/res/merged/debug/layout_folder_list_item.xml.flat differ
diff --git a/Notes-master/app/build/intermediates/res/merged/debug/layout_note_edit.xml.flat b/Notes-master/app/build/intermediates/res/merged/debug/layout_note_edit.xml.flat
new file mode 100644
index 0000000..b380fc1
Binary files /dev/null and b/Notes-master/app/build/intermediates/res/merged/debug/layout_note_edit.xml.flat differ
diff --git a/Notes-master/app/build/intermediates/res/merged/debug/layout_note_edit_list_item.xml.flat b/Notes-master/app/build/intermediates/res/merged/debug/layout_note_edit_list_item.xml.flat
new file mode 100644
index 0000000..3a70679
Binary files /dev/null and b/Notes-master/app/build/intermediates/res/merged/debug/layout_note_edit_list_item.xml.flat differ
diff --git a/Notes-master/app/build/intermediates/res/merged/debug/layout_note_item.xml.flat b/Notes-master/app/build/intermediates/res/merged/debug/layout_note_item.xml.flat
new file mode 100644
index 0000000..4e35886
Binary files /dev/null and b/Notes-master/app/build/intermediates/res/merged/debug/layout_note_item.xml.flat differ
diff --git a/Notes-master/app/build/intermediates/res/merged/debug/layout_note_list.xml.flat b/Notes-master/app/build/intermediates/res/merged/debug/layout_note_list.xml.flat
new file mode 100644
index 0000000..961c7db
Binary files /dev/null and b/Notes-master/app/build/intermediates/res/merged/debug/layout_note_list.xml.flat differ
diff --git a/Notes-master/app/build/intermediates/res/merged/debug/layout_note_list_dropdown_menu.xml.flat b/Notes-master/app/build/intermediates/res/merged/debug/layout_note_list_dropdown_menu.xml.flat
new file mode 100644
index 0000000..b89018d
Binary files /dev/null and b/Notes-master/app/build/intermediates/res/merged/debug/layout_note_list_dropdown_menu.xml.flat differ
diff --git a/Notes-master/app/build/intermediates/res/merged/debug/layout_note_list_footer.xml.flat b/Notes-master/app/build/intermediates/res/merged/debug/layout_note_list_footer.xml.flat
new file mode 100644
index 0000000..c6beead
Binary files /dev/null and b/Notes-master/app/build/intermediates/res/merged/debug/layout_note_list_footer.xml.flat differ
diff --git a/Notes-master/app/build/intermediates/res/merged/debug/layout_settings_header.xml.flat b/Notes-master/app/build/intermediates/res/merged/debug/layout_settings_header.xml.flat
new file mode 100644
index 0000000..91d3a57
Binary files /dev/null and b/Notes-master/app/build/intermediates/res/merged/debug/layout_settings_header.xml.flat differ
diff --git a/Notes-master/app/build/intermediates/res/merged/debug/layout_widget_2x.xml.flat b/Notes-master/app/build/intermediates/res/merged/debug/layout_widget_2x.xml.flat
new file mode 100644
index 0000000..f358434
Binary files /dev/null and b/Notes-master/app/build/intermediates/res/merged/debug/layout_widget_2x.xml.flat differ
diff --git a/Notes-master/app/build/intermediates/res/merged/debug/layout_widget_4x.xml.flat b/Notes-master/app/build/intermediates/res/merged/debug/layout_widget_4x.xml.flat
new file mode 100644
index 0000000..4c3c301
Binary files /dev/null and b/Notes-master/app/build/intermediates/res/merged/debug/layout_widget_4x.xml.flat differ
diff --git a/Notes-master/app/build/intermediates/res/merged/debug/menu_call_note_edit.xml.flat b/Notes-master/app/build/intermediates/res/merged/debug/menu_call_note_edit.xml.flat
new file mode 100644
index 0000000..c6c3aad
Binary files /dev/null and b/Notes-master/app/build/intermediates/res/merged/debug/menu_call_note_edit.xml.flat differ
diff --git a/Notes-master/app/build/intermediates/res/merged/debug/menu_call_record_folder.xml.flat b/Notes-master/app/build/intermediates/res/merged/debug/menu_call_record_folder.xml.flat
new file mode 100644
index 0000000..44b7e4e
Binary files /dev/null and b/Notes-master/app/build/intermediates/res/merged/debug/menu_call_record_folder.xml.flat differ
diff --git a/Notes-master/app/build/intermediates/res/merged/debug/menu_note_edit.xml.flat b/Notes-master/app/build/intermediates/res/merged/debug/menu_note_edit.xml.flat
new file mode 100644
index 0000000..bab130b
Binary files /dev/null and b/Notes-master/app/build/intermediates/res/merged/debug/menu_note_edit.xml.flat differ
diff --git a/Notes-master/app/build/intermediates/res/merged/debug/menu_note_list.xml.flat b/Notes-master/app/build/intermediates/res/merged/debug/menu_note_list.xml.flat
new file mode 100644
index 0000000..3b2fe31
Binary files /dev/null and b/Notes-master/app/build/intermediates/res/merged/debug/menu_note_list.xml.flat differ
diff --git a/Notes-master/app/build/intermediates/res/merged/debug/menu_note_list_dropdown.xml.flat b/Notes-master/app/build/intermediates/res/merged/debug/menu_note_list_dropdown.xml.flat
new file mode 100644
index 0000000..9e9b603
Binary files /dev/null and b/Notes-master/app/build/intermediates/res/merged/debug/menu_note_list_dropdown.xml.flat differ
diff --git a/Notes-master/app/build/intermediates/res/merged/debug/menu_note_list_options.xml.flat b/Notes-master/app/build/intermediates/res/merged/debug/menu_note_list_options.xml.flat
new file mode 100644
index 0000000..96229c8
Binary files /dev/null and b/Notes-master/app/build/intermediates/res/merged/debug/menu_note_list_options.xml.flat differ
diff --git a/Notes-master/app/build/intermediates/res/merged/debug/menu_sub_folder.xml.flat b/Notes-master/app/build/intermediates/res/merged/debug/menu_sub_folder.xml.flat
new file mode 100644
index 0000000..bfe2c3f
Binary files /dev/null and b/Notes-master/app/build/intermediates/res/merged/debug/menu_sub_folder.xml.flat differ
diff --git a/Notes-master/app/build/intermediates/res/merged/debug/raw-zh-rCN_introduction.flat b/Notes-master/app/build/intermediates/res/merged/debug/raw-zh-rCN_introduction.flat
new file mode 100644
index 0000000..514e6b8
Binary files /dev/null and b/Notes-master/app/build/intermediates/res/merged/debug/raw-zh-rCN_introduction.flat differ
diff --git a/Notes-master/app/build/intermediates/res/merged/debug/raw_introduction.flat b/Notes-master/app/build/intermediates/res/merged/debug/raw_introduction.flat
new file mode 100644
index 0000000..e9ef1d0
Binary files /dev/null and b/Notes-master/app/build/intermediates/res/merged/debug/raw_introduction.flat differ
diff --git a/Notes-master/app/build/intermediates/res/merged/debug/values-zh-rCN_values-zh-rCN.arsc.flat b/Notes-master/app/build/intermediates/res/merged/debug/values-zh-rCN_values-zh-rCN.arsc.flat
new file mode 100644
index 0000000..1e95254
Binary files /dev/null and b/Notes-master/app/build/intermediates/res/merged/debug/values-zh-rCN_values-zh-rCN.arsc.flat differ
diff --git a/Notes-master/app/build/intermediates/res/merged/debug/values-zh-rTW_values-zh-rTW.arsc.flat b/Notes-master/app/build/intermediates/res/merged/debug/values-zh-rTW_values-zh-rTW.arsc.flat
new file mode 100644
index 0000000..2ecd24a
Binary files /dev/null and b/Notes-master/app/build/intermediates/res/merged/debug/values-zh-rTW_values-zh-rTW.arsc.flat differ
diff --git a/Notes-master/app/build/intermediates/res/merged/debug/values_values.arsc.flat b/Notes-master/app/build/intermediates/res/merged/debug/values_values.arsc.flat
new file mode 100644
index 0000000..fc8c874
Binary files /dev/null and b/Notes-master/app/build/intermediates/res/merged/debug/values_values.arsc.flat differ
diff --git a/Notes-master/app/build/intermediates/res/merged/debug/xml_preferences.xml.flat b/Notes-master/app/build/intermediates/res/merged/debug/xml_preferences.xml.flat
new file mode 100644
index 0000000..6b95ce1
Binary files /dev/null and b/Notes-master/app/build/intermediates/res/merged/debug/xml_preferences.xml.flat differ
diff --git a/Notes-master/app/build/intermediates/res/merged/debug/xml_searchable.xml.flat b/Notes-master/app/build/intermediates/res/merged/debug/xml_searchable.xml.flat
new file mode 100644
index 0000000..d50758b
Binary files /dev/null and b/Notes-master/app/build/intermediates/res/merged/debug/xml_searchable.xml.flat differ
diff --git a/Notes-master/app/build/intermediates/res/merged/debug/xml_widget_2x_info.xml.flat b/Notes-master/app/build/intermediates/res/merged/debug/xml_widget_2x_info.xml.flat
new file mode 100644
index 0000000..bc04655
Binary files /dev/null and b/Notes-master/app/build/intermediates/res/merged/debug/xml_widget_2x_info.xml.flat differ
diff --git a/Notes-master/app/build/intermediates/res/merged/debug/xml_widget_4x_info.xml.flat b/Notes-master/app/build/intermediates/res/merged/debug/xml_widget_4x_info.xml.flat
new file mode 100644
index 0000000..b8dd146
Binary files /dev/null and b/Notes-master/app/build/intermediates/res/merged/debug/xml_widget_4x_info.xml.flat differ
diff --git a/Notes-master/app/build/intermediates/runtime_symbol_list/debug/R.txt b/Notes-master/app/build/intermediates/runtime_symbol_list/debug/R.txt
new file mode 100644
index 0000000..00d6e91
--- /dev/null
+++ b/Notes-master/app/build/intermediates/runtime_symbol_list/debug/R.txt
@@ -0,0 +1,283 @@
+int array format_for_exported_note 0x7f010000
+int array menu_share_ways 0x7f010001
+int color primary_text_dark 0x7f020000
+int color secondary_text_dark 0x7f020001
+int color user_query_highlight 0x7f020002
+int dimen text_font_size_large 0x7f030000
+int dimen text_font_size_medium 0x7f030001
+int dimen text_font_size_normal 0x7f030002
+int dimen text_font_size_small 0x7f030003
+int dimen text_font_size_super 0x7f030004
+int drawable bg_btn_set_color 0x7f040000
+int drawable bg_color_btn_mask 0x7f040001
+int drawable call_record 0x7f040002
+int drawable clock 0x7f040003
+int drawable delete 0x7f040004
+int drawable dropdown_icon 0x7f040005
+int drawable edit_blue 0x7f040006
+int drawable edit_green 0x7f040007
+int drawable edit_red 0x7f040008
+int drawable edit_title_blue 0x7f040009
+int drawable edit_title_green 0x7f04000a
+int drawable edit_title_red 0x7f04000b
+int drawable edit_title_white 0x7f04000c
+int drawable edit_title_yellow 0x7f04000d
+int drawable edit_white 0x7f04000e
+int drawable edit_yellow 0x7f04000f
+int drawable font_large 0x7f040010
+int drawable font_normal 0x7f040011
+int drawable font_size_selector_bg 0x7f040012
+int drawable font_small 0x7f040013
+int drawable font_super 0x7f040014
+int drawable icon_app 0x7f040015
+int drawable list_background 0x7f040016
+int drawable list_blue_down 0x7f040017
+int drawable list_blue_middle 0x7f040018
+int drawable list_blue_single 0x7f040019
+int drawable list_blue_up 0x7f04001a
+int drawable list_folder 0x7f04001b
+int drawable list_footer_bg 0x7f04001c
+int drawable list_green_down 0x7f04001d
+int drawable list_green_middle 0x7f04001e
+int drawable list_green_single 0x7f04001f
+int drawable list_green_up 0x7f040020
+int drawable list_red_down 0x7f040021
+int drawable list_red_middle 0x7f040022
+int drawable list_red_single 0x7f040023
+int drawable list_red_up 0x7f040024
+int drawable list_white_down 0x7f040025
+int drawable list_white_middle 0x7f040026
+int drawable list_white_single 0x7f040027
+int drawable list_white_up 0x7f040028
+int drawable list_yellow_down 0x7f040029
+int drawable list_yellow_middle 0x7f04002a
+int drawable list_yellow_single 0x7f04002b
+int drawable list_yellow_up 0x7f04002c
+int drawable menu_delete 0x7f04002d
+int drawable menu_move 0x7f04002e
+int drawable new_note 0x7f04002f
+int drawable new_note_normal 0x7f040030
+int drawable new_note_pressed 0x7f040031
+int drawable note_edit_color_selector_panel 0x7f040032
+int drawable notification 0x7f040033
+int drawable search_result 0x7f040034
+int drawable selected 0x7f040035
+int drawable title_alert 0x7f040036
+int drawable title_bar_bg 0x7f040037
+int drawable widget_2x_blue 0x7f040038
+int drawable widget_2x_green 0x7f040039
+int drawable widget_2x_red 0x7f04003a
+int drawable widget_2x_white 0x7f04003b
+int drawable widget_2x_yellow 0x7f04003c
+int drawable widget_4x_blue 0x7f04003d
+int drawable widget_4x_green 0x7f04003e
+int drawable widget_4x_red 0x7f04003f
+int drawable widget_4x_white 0x7f040040
+int drawable widget_4x_yellow 0x7f040041
+int id account_dialog_subtitle 0x7f050000
+int id account_dialog_title 0x7f050001
+int id action_select_all 0x7f050002
+int id amPm 0x7f050003
+int id btn_new_note 0x7f050004
+int id btn_set_bg_color 0x7f050005
+int id cb_edit_item 0x7f050006
+int id date 0x7f050007
+int id delete 0x7f050008
+int id et_edit_text 0x7f050009
+int id et_foler_name 0x7f05000a
+int id font_size_selector 0x7f05000b
+int id hour 0x7f05000c
+int id iv_alert_icon 0x7f05000d
+int id iv_bg_blue 0x7f05000e
+int id iv_bg_blue_select 0x7f05000f
+int id iv_bg_green 0x7f050010
+int id iv_bg_green_select 0x7f050011
+int id iv_bg_red 0x7f050012
+int id iv_bg_red_select 0x7f050013
+int id iv_bg_white 0x7f050014
+int id iv_bg_white_select 0x7f050015
+int id iv_bg_yellow 0x7f050016
+int id iv_bg_yellow_select 0x7f050017
+int id iv_large_select 0x7f050018
+int id iv_medium_select 0x7f050019
+int id iv_small_select 0x7f05001a
+int id iv_super_select 0x7f05001b
+int id ll_font_large 0x7f05001c
+int id ll_font_normal 0x7f05001d
+int id ll_font_small 0x7f05001e
+int id ll_font_super 0x7f05001f
+int id menu_alert 0x7f050020
+int id menu_delete 0x7f050021
+int id menu_delete_remind 0x7f050022
+int id menu_export_text 0x7f050023
+int id menu_font_size 0x7f050024
+int id menu_list_mode 0x7f050025
+int id menu_new_folder 0x7f050026
+int id menu_new_note 0x7f050027
+int id menu_search 0x7f050028
+int id menu_send_to_desktop 0x7f050029
+int id menu_setting 0x7f05002a
+int id menu_share 0x7f05002b
+int id menu_sync 0x7f05002c
+int id minute 0x7f05002d
+int id move 0x7f05002e
+int id navigation_bar 0x7f05002f
+int id note_bg_color_selector 0x7f050030
+int id note_edit_list 0x7f050031
+int id note_edit_view 0x7f050032
+int id note_item 0x7f050033
+int id note_title 0x7f050034
+int id notes_list 0x7f050035
+int id prefenerece_sync_status_textview 0x7f050036
+int id preference_sync_button 0x7f050037
+int id selection_menu 0x7f050038
+int id sv_note_edit 0x7f050039
+int id tv_alert_date 0x7f05003a
+int id tv_folder_name 0x7f05003b
+int id tv_modified_date 0x7f05003c
+int id tv_name 0x7f05003d
+int id tv_time 0x7f05003e
+int id tv_title 0x7f05003f
+int id tv_title_bar 0x7f050040
+int id widget_bg_image 0x7f050041
+int id widget_text 0x7f050042
+int layout account_dialog_title 0x7f060000
+int layout add_account_text 0x7f060001
+int layout datetime_picker 0x7f060002
+int layout dialog_edit_text 0x7f060003
+int layout folder_list_item 0x7f060004
+int layout note_edit 0x7f060005
+int layout note_edit_list_item 0x7f060006
+int layout note_item 0x7f060007
+int layout note_list 0x7f060008
+int layout note_list_dropdown_menu 0x7f060009
+int layout note_list_footer 0x7f06000a
+int layout settings_header 0x7f06000b
+int layout widget_2x 0x7f06000c
+int layout widget_4x 0x7f06000d
+int menu call_note_edit 0x7f070000
+int menu call_record_folder 0x7f070001
+int menu note_edit 0x7f070002
+int menu note_list 0x7f070003
+int menu note_list_dropdown 0x7f070004
+int menu note_list_options 0x7f070005
+int menu sub_folder 0x7f070006
+int plurals search_results_title 0x7f080000
+int raw introduction 0x7f090000
+int string alert_message_delete_folder 0x7f0a0000
+int string alert_message_delete_note 0x7f0a0001
+int string alert_message_delete_notes 0x7f0a0002
+int string alert_title_delete 0x7f0a0003
+int string app_name 0x7f0a0004
+int string app_widget2x2 0x7f0a0005
+int string app_widget4x4 0x7f0a0006
+int string button_delete 0x7f0a0007
+int string call_record_folder_name 0x7f0a0008
+int string datetime_dialog_cancel 0x7f0a0009
+int string datetime_dialog_ok 0x7f0a000a
+int string delete_remind_time_message 0x7f0a000b
+int string error_note_empty_for_clock 0x7f0a000c
+int string error_note_empty_for_send_to_desktop 0x7f0a000d
+int string error_note_not_exist 0x7f0a000e
+int string error_sdcard_export 0x7f0a000f
+int string error_sdcard_unmounted 0x7f0a0010
+int string error_sync_cancelled 0x7f0a0011
+int string error_sync_internal 0x7f0a0012
+int string error_sync_network 0x7f0a0013
+int string failed_sdcard_export 0x7f0a0014
+int string file_name_txt_format 0x7f0a0015
+int string file_path 0x7f0a0016
+int string folder_exist 0x7f0a0017
+int string format_date_ymd 0x7f0a0018
+int string format_datetime_mdhm 0x7f0a0019
+int string format_exported_file_location 0x7f0a001a
+int string format_folder_files_count 0x7f0a001b
+int string format_move_notes_to_folder 0x7f0a001c
+int string hint_foler_name 0x7f0a001d
+int string info_note_enter_desktop 0x7f0a001e
+int string menu_alert 0x7f0a001f
+int string menu_create_folder 0x7f0a0020
+int string menu_delete 0x7f0a0021
+int string menu_deselect_all 0x7f0a0022
+int string menu_export_text 0x7f0a0023
+int string menu_folder_change_name 0x7f0a0024
+int string menu_folder_delete 0x7f0a0025
+int string menu_folder_view 0x7f0a0026
+int string menu_font_large 0x7f0a0027
+int string menu_font_normal 0x7f0a0028
+int string menu_font_size 0x7f0a0029
+int string menu_font_small 0x7f0a002a
+int string menu_font_super 0x7f0a002b
+int string menu_list_mode 0x7f0a002c
+int string menu_move 0x7f0a002d
+int string menu_move_parent_folder 0x7f0a002e
+int string menu_normal_mode 0x7f0a002f
+int string menu_remove_remind 0x7f0a0030
+int string menu_search 0x7f0a0031
+int string menu_select_all 0x7f0a0032
+int string menu_select_none 0x7f0a0033
+int string menu_select_title 0x7f0a0034
+int string menu_send_to_desktop 0x7f0a0035
+int string menu_setting 0x7f0a0036
+int string menu_share 0x7f0a0037
+int string menu_sync 0x7f0a0038
+int string menu_sync_cancel 0x7f0a0039
+int string menu_title_select_folder 0x7f0a003a
+int string note_alert_expired 0x7f0a003b
+int string note_link_email 0x7f0a003c
+int string note_link_other 0x7f0a003d
+int string note_link_tel 0x7f0a003e
+int string note_link_web 0x7f0a003f
+int string notealert_enter 0x7f0a0040
+int string notealert_ok 0x7f0a0041
+int string notelist_menu_new 0x7f0a0042
+int string notelist_string_info 0x7f0a0043
+int string preferences_account_summary 0x7f0a0044
+int string preferences_account_title 0x7f0a0045
+int string preferences_add_account 0x7f0a0046
+int string preferences_bg_random_appear_title 0x7f0a0047
+int string preferences_button_sync_cancel 0x7f0a0048
+int string preferences_button_sync_immediately 0x7f0a0049
+int string preferences_dialog_change_account_title 0x7f0a004a
+int string preferences_dialog_change_account_warn_msg 0x7f0a004b
+int string preferences_dialog_select_account_tips 0x7f0a004c
+int string preferences_dialog_select_account_title 0x7f0a004d
+int string preferences_last_sync_time 0x7f0a004e
+int string preferences_last_sync_time_format 0x7f0a004f
+int string preferences_menu_cancel 0x7f0a0050
+int string preferences_menu_change_account 0x7f0a0051
+int string preferences_menu_remove_account 0x7f0a0052
+int string preferences_title 0x7f0a0053
+int string preferences_toast_cannot_change_account 0x7f0a0054
+int string preferences_toast_success_set_accout 0x7f0a0055
+int string search 0x7f0a0056
+int string search_hint 0x7f0a0057
+int string search_label 0x7f0a0058
+int string search_setting_description 0x7f0a0059
+int string set_remind_time_message 0x7f0a005a
+int string success_sdcard_export 0x7f0a005b
+int string success_sync_account 0x7f0a005c
+int string sync_progress_init_list 0x7f0a005d
+int string sync_progress_login 0x7f0a005e
+int string sync_progress_syncing 0x7f0a005f
+int string ticker_cancel 0x7f0a0060
+int string ticker_fail 0x7f0a0061
+int string ticker_success 0x7f0a0062
+int string ticker_syncing 0x7f0a0063
+int string widget_havenot_content 0x7f0a0064
+int string widget_under_visit_mode 0x7f0a0065
+int style HighlightTextAppearancePrimary 0x7f0b0000
+int style HighlightTextAppearanceSecondary 0x7f0b0001
+int style NoteActionBarStyle 0x7f0b0002
+int style NoteTheme 0x7f0b0003
+int style TextAppearanceLarge 0x7f0b0004
+int style TextAppearanceMedium 0x7f0b0005
+int style TextAppearanceNormal 0x7f0b0006
+int style TextAppearancePrimaryItem 0x7f0b0007
+int style TextAppearanceSecondaryItem 0x7f0b0008
+int style TextAppearanceSuper 0x7f0b0009
+int style TextAppearanceUnderMenuIcon 0x7f0b000a
+int xml preferences 0x7f0c0000
+int xml searchable 0x7f0c0001
+int xml widget_2x_info 0x7f0c0002
+int xml widget_4x_info 0x7f0c0003
diff --git a/Notes-master/app/build/intermediates/runtime_symbol_list/release/R.txt b/Notes-master/app/build/intermediates/runtime_symbol_list/release/R.txt
new file mode 100644
index 0000000..00d6e91
--- /dev/null
+++ b/Notes-master/app/build/intermediates/runtime_symbol_list/release/R.txt
@@ -0,0 +1,283 @@
+int array format_for_exported_note 0x7f010000
+int array menu_share_ways 0x7f010001
+int color primary_text_dark 0x7f020000
+int color secondary_text_dark 0x7f020001
+int color user_query_highlight 0x7f020002
+int dimen text_font_size_large 0x7f030000
+int dimen text_font_size_medium 0x7f030001
+int dimen text_font_size_normal 0x7f030002
+int dimen text_font_size_small 0x7f030003
+int dimen text_font_size_super 0x7f030004
+int drawable bg_btn_set_color 0x7f040000
+int drawable bg_color_btn_mask 0x7f040001
+int drawable call_record 0x7f040002
+int drawable clock 0x7f040003
+int drawable delete 0x7f040004
+int drawable dropdown_icon 0x7f040005
+int drawable edit_blue 0x7f040006
+int drawable edit_green 0x7f040007
+int drawable edit_red 0x7f040008
+int drawable edit_title_blue 0x7f040009
+int drawable edit_title_green 0x7f04000a
+int drawable edit_title_red 0x7f04000b
+int drawable edit_title_white 0x7f04000c
+int drawable edit_title_yellow 0x7f04000d
+int drawable edit_white 0x7f04000e
+int drawable edit_yellow 0x7f04000f
+int drawable font_large 0x7f040010
+int drawable font_normal 0x7f040011
+int drawable font_size_selector_bg 0x7f040012
+int drawable font_small 0x7f040013
+int drawable font_super 0x7f040014
+int drawable icon_app 0x7f040015
+int drawable list_background 0x7f040016
+int drawable list_blue_down 0x7f040017
+int drawable list_blue_middle 0x7f040018
+int drawable list_blue_single 0x7f040019
+int drawable list_blue_up 0x7f04001a
+int drawable list_folder 0x7f04001b
+int drawable list_footer_bg 0x7f04001c
+int drawable list_green_down 0x7f04001d
+int drawable list_green_middle 0x7f04001e
+int drawable list_green_single 0x7f04001f
+int drawable list_green_up 0x7f040020
+int drawable list_red_down 0x7f040021
+int drawable list_red_middle 0x7f040022
+int drawable list_red_single 0x7f040023
+int drawable list_red_up 0x7f040024
+int drawable list_white_down 0x7f040025
+int drawable list_white_middle 0x7f040026
+int drawable list_white_single 0x7f040027
+int drawable list_white_up 0x7f040028
+int drawable list_yellow_down 0x7f040029
+int drawable list_yellow_middle 0x7f04002a
+int drawable list_yellow_single 0x7f04002b
+int drawable list_yellow_up 0x7f04002c
+int drawable menu_delete 0x7f04002d
+int drawable menu_move 0x7f04002e
+int drawable new_note 0x7f04002f
+int drawable new_note_normal 0x7f040030
+int drawable new_note_pressed 0x7f040031
+int drawable note_edit_color_selector_panel 0x7f040032
+int drawable notification 0x7f040033
+int drawable search_result 0x7f040034
+int drawable selected 0x7f040035
+int drawable title_alert 0x7f040036
+int drawable title_bar_bg 0x7f040037
+int drawable widget_2x_blue 0x7f040038
+int drawable widget_2x_green 0x7f040039
+int drawable widget_2x_red 0x7f04003a
+int drawable widget_2x_white 0x7f04003b
+int drawable widget_2x_yellow 0x7f04003c
+int drawable widget_4x_blue 0x7f04003d
+int drawable widget_4x_green 0x7f04003e
+int drawable widget_4x_red 0x7f04003f
+int drawable widget_4x_white 0x7f040040
+int drawable widget_4x_yellow 0x7f040041
+int id account_dialog_subtitle 0x7f050000
+int id account_dialog_title 0x7f050001
+int id action_select_all 0x7f050002
+int id amPm 0x7f050003
+int id btn_new_note 0x7f050004
+int id btn_set_bg_color 0x7f050005
+int id cb_edit_item 0x7f050006
+int id date 0x7f050007
+int id delete 0x7f050008
+int id et_edit_text 0x7f050009
+int id et_foler_name 0x7f05000a
+int id font_size_selector 0x7f05000b
+int id hour 0x7f05000c
+int id iv_alert_icon 0x7f05000d
+int id iv_bg_blue 0x7f05000e
+int id iv_bg_blue_select 0x7f05000f
+int id iv_bg_green 0x7f050010
+int id iv_bg_green_select 0x7f050011
+int id iv_bg_red 0x7f050012
+int id iv_bg_red_select 0x7f050013
+int id iv_bg_white 0x7f050014
+int id iv_bg_white_select 0x7f050015
+int id iv_bg_yellow 0x7f050016
+int id iv_bg_yellow_select 0x7f050017
+int id iv_large_select 0x7f050018
+int id iv_medium_select 0x7f050019
+int id iv_small_select 0x7f05001a
+int id iv_super_select 0x7f05001b
+int id ll_font_large 0x7f05001c
+int id ll_font_normal 0x7f05001d
+int id ll_font_small 0x7f05001e
+int id ll_font_super 0x7f05001f
+int id menu_alert 0x7f050020
+int id menu_delete 0x7f050021
+int id menu_delete_remind 0x7f050022
+int id menu_export_text 0x7f050023
+int id menu_font_size 0x7f050024
+int id menu_list_mode 0x7f050025
+int id menu_new_folder 0x7f050026
+int id menu_new_note 0x7f050027
+int id menu_search 0x7f050028
+int id menu_send_to_desktop 0x7f050029
+int id menu_setting 0x7f05002a
+int id menu_share 0x7f05002b
+int id menu_sync 0x7f05002c
+int id minute 0x7f05002d
+int id move 0x7f05002e
+int id navigation_bar 0x7f05002f
+int id note_bg_color_selector 0x7f050030
+int id note_edit_list 0x7f050031
+int id note_edit_view 0x7f050032
+int id note_item 0x7f050033
+int id note_title 0x7f050034
+int id notes_list 0x7f050035
+int id prefenerece_sync_status_textview 0x7f050036
+int id preference_sync_button 0x7f050037
+int id selection_menu 0x7f050038
+int id sv_note_edit 0x7f050039
+int id tv_alert_date 0x7f05003a
+int id tv_folder_name 0x7f05003b
+int id tv_modified_date 0x7f05003c
+int id tv_name 0x7f05003d
+int id tv_time 0x7f05003e
+int id tv_title 0x7f05003f
+int id tv_title_bar 0x7f050040
+int id widget_bg_image 0x7f050041
+int id widget_text 0x7f050042
+int layout account_dialog_title 0x7f060000
+int layout add_account_text 0x7f060001
+int layout datetime_picker 0x7f060002
+int layout dialog_edit_text 0x7f060003
+int layout folder_list_item 0x7f060004
+int layout note_edit 0x7f060005
+int layout note_edit_list_item 0x7f060006
+int layout note_item 0x7f060007
+int layout note_list 0x7f060008
+int layout note_list_dropdown_menu 0x7f060009
+int layout note_list_footer 0x7f06000a
+int layout settings_header 0x7f06000b
+int layout widget_2x 0x7f06000c
+int layout widget_4x 0x7f06000d
+int menu call_note_edit 0x7f070000
+int menu call_record_folder 0x7f070001
+int menu note_edit 0x7f070002
+int menu note_list 0x7f070003
+int menu note_list_dropdown 0x7f070004
+int menu note_list_options 0x7f070005
+int menu sub_folder 0x7f070006
+int plurals search_results_title 0x7f080000
+int raw introduction 0x7f090000
+int string alert_message_delete_folder 0x7f0a0000
+int string alert_message_delete_note 0x7f0a0001
+int string alert_message_delete_notes 0x7f0a0002
+int string alert_title_delete 0x7f0a0003
+int string app_name 0x7f0a0004
+int string app_widget2x2 0x7f0a0005
+int string app_widget4x4 0x7f0a0006
+int string button_delete 0x7f0a0007
+int string call_record_folder_name 0x7f0a0008
+int string datetime_dialog_cancel 0x7f0a0009
+int string datetime_dialog_ok 0x7f0a000a
+int string delete_remind_time_message 0x7f0a000b
+int string error_note_empty_for_clock 0x7f0a000c
+int string error_note_empty_for_send_to_desktop 0x7f0a000d
+int string error_note_not_exist 0x7f0a000e
+int string error_sdcard_export 0x7f0a000f
+int string error_sdcard_unmounted 0x7f0a0010
+int string error_sync_cancelled 0x7f0a0011
+int string error_sync_internal 0x7f0a0012
+int string error_sync_network 0x7f0a0013
+int string failed_sdcard_export 0x7f0a0014
+int string file_name_txt_format 0x7f0a0015
+int string file_path 0x7f0a0016
+int string folder_exist 0x7f0a0017
+int string format_date_ymd 0x7f0a0018
+int string format_datetime_mdhm 0x7f0a0019
+int string format_exported_file_location 0x7f0a001a
+int string format_folder_files_count 0x7f0a001b
+int string format_move_notes_to_folder 0x7f0a001c
+int string hint_foler_name 0x7f0a001d
+int string info_note_enter_desktop 0x7f0a001e
+int string menu_alert 0x7f0a001f
+int string menu_create_folder 0x7f0a0020
+int string menu_delete 0x7f0a0021
+int string menu_deselect_all 0x7f0a0022
+int string menu_export_text 0x7f0a0023
+int string menu_folder_change_name 0x7f0a0024
+int string menu_folder_delete 0x7f0a0025
+int string menu_folder_view 0x7f0a0026
+int string menu_font_large 0x7f0a0027
+int string menu_font_normal 0x7f0a0028
+int string menu_font_size 0x7f0a0029
+int string menu_font_small 0x7f0a002a
+int string menu_font_super 0x7f0a002b
+int string menu_list_mode 0x7f0a002c
+int string menu_move 0x7f0a002d
+int string menu_move_parent_folder 0x7f0a002e
+int string menu_normal_mode 0x7f0a002f
+int string menu_remove_remind 0x7f0a0030
+int string menu_search 0x7f0a0031
+int string menu_select_all 0x7f0a0032
+int string menu_select_none 0x7f0a0033
+int string menu_select_title 0x7f0a0034
+int string menu_send_to_desktop 0x7f0a0035
+int string menu_setting 0x7f0a0036
+int string menu_share 0x7f0a0037
+int string menu_sync 0x7f0a0038
+int string menu_sync_cancel 0x7f0a0039
+int string menu_title_select_folder 0x7f0a003a
+int string note_alert_expired 0x7f0a003b
+int string note_link_email 0x7f0a003c
+int string note_link_other 0x7f0a003d
+int string note_link_tel 0x7f0a003e
+int string note_link_web 0x7f0a003f
+int string notealert_enter 0x7f0a0040
+int string notealert_ok 0x7f0a0041
+int string notelist_menu_new 0x7f0a0042
+int string notelist_string_info 0x7f0a0043
+int string preferences_account_summary 0x7f0a0044
+int string preferences_account_title 0x7f0a0045
+int string preferences_add_account 0x7f0a0046
+int string preferences_bg_random_appear_title 0x7f0a0047
+int string preferences_button_sync_cancel 0x7f0a0048
+int string preferences_button_sync_immediately 0x7f0a0049
+int string preferences_dialog_change_account_title 0x7f0a004a
+int string preferences_dialog_change_account_warn_msg 0x7f0a004b
+int string preferences_dialog_select_account_tips 0x7f0a004c
+int string preferences_dialog_select_account_title 0x7f0a004d
+int string preferences_last_sync_time 0x7f0a004e
+int string preferences_last_sync_time_format 0x7f0a004f
+int string preferences_menu_cancel 0x7f0a0050
+int string preferences_menu_change_account 0x7f0a0051
+int string preferences_menu_remove_account 0x7f0a0052
+int string preferences_title 0x7f0a0053
+int string preferences_toast_cannot_change_account 0x7f0a0054
+int string preferences_toast_success_set_accout 0x7f0a0055
+int string search 0x7f0a0056
+int string search_hint 0x7f0a0057
+int string search_label 0x7f0a0058
+int string search_setting_description 0x7f0a0059
+int string set_remind_time_message 0x7f0a005a
+int string success_sdcard_export 0x7f0a005b
+int string success_sync_account 0x7f0a005c
+int string sync_progress_init_list 0x7f0a005d
+int string sync_progress_login 0x7f0a005e
+int string sync_progress_syncing 0x7f0a005f
+int string ticker_cancel 0x7f0a0060
+int string ticker_fail 0x7f0a0061
+int string ticker_success 0x7f0a0062
+int string ticker_syncing 0x7f0a0063
+int string widget_havenot_content 0x7f0a0064
+int string widget_under_visit_mode 0x7f0a0065
+int style HighlightTextAppearancePrimary 0x7f0b0000
+int style HighlightTextAppearanceSecondary 0x7f0b0001
+int style NoteActionBarStyle 0x7f0b0002
+int style NoteTheme 0x7f0b0003
+int style TextAppearanceLarge 0x7f0b0004
+int style TextAppearanceMedium 0x7f0b0005
+int style TextAppearanceNormal 0x7f0b0006
+int style TextAppearancePrimaryItem 0x7f0b0007
+int style TextAppearanceSecondaryItem 0x7f0b0008
+int style TextAppearanceSuper 0x7f0b0009
+int style TextAppearanceUnderMenuIcon 0x7f0b000a
+int xml preferences 0x7f0c0000
+int xml searchable 0x7f0c0001
+int xml widget_2x_info 0x7f0c0002
+int xml widget_4x_info 0x7f0c0003
diff --git a/Notes-master/app/build/intermediates/sdk_dependency_data/release/sdkDependencyData.pb b/Notes-master/app/build/intermediates/sdk_dependency_data/release/sdkDependencyData.pb
new file mode 100644
index 0000000..7d8a7f4
Binary files /dev/null and b/Notes-master/app/build/intermediates/sdk_dependency_data/release/sdkDependencyData.pb differ
diff --git a/xiaomi/app/build/intermediates/signing_config_versions/debug/signing-config-versions.json b/Notes-master/app/build/intermediates/signing_config_versions/debug/signing-config-versions.json
similarity index 100%
rename from xiaomi/app/build/intermediates/signing_config_versions/debug/signing-config-versions.json
rename to Notes-master/app/build/intermediates/signing_config_versions/debug/signing-config-versions.json
diff --git a/Notes-master/app/build/intermediates/signing_config_versions/release/signing-config-versions.json b/Notes-master/app/build/intermediates/signing_config_versions/release/signing-config-versions.json
new file mode 100644
index 0000000..bb4deaa
--- /dev/null
+++ b/Notes-master/app/build/intermediates/signing_config_versions/release/signing-config-versions.json
@@ -0,0 +1 @@
+{"enableV1Signing":true,"enableV2Signing":true,"enableV3Signing":false,"enableV4Signing":false}
\ No newline at end of file
diff --git a/Notes-master/app/build/intermediates/source_set_path_map/debug/file-map.txt b/Notes-master/app/build/intermediates/source_set_path_map/debug/file-map.txt
new file mode 100644
index 0000000..af270a4
--- /dev/null
+++ b/Notes-master/app/build/intermediates/source_set_path_map/debug/file-map.txt
@@ -0,0 +1,8 @@
+net.micode.notes.app-pngs-0 E:\Notes-master\app\build\generated\res\pngs\debug
+net.micode.notes.app-resValues-1 E:\Notes-master\app\build\generated\res\resValues\debug
+net.micode.notes.app-rs-2 E:\Notes-master\app\build\generated\res\rs\debug
+net.micode.notes.app-mergeDebugResources-3 E:\Notes-master\app\build\intermediates\incremental\debug\mergeDebugResources\merged.dir
+net.micode.notes.app-mergeDebugResources-4 E:\Notes-master\app\build\intermediates\incremental\debug\mergeDebugResources\stripped.dir
+net.micode.notes.app-merged_res-5 E:\Notes-master\app\build\intermediates\merged_res\debug
+net.micode.notes.app-debug-6 E:\Notes-master\app\src\debug\res
+net.micode.notes.app-main-7 E:\Notes-master\app\src\main\res
diff --git a/Notes-master/app/build/intermediates/source_set_path_map/release/file-map.txt b/Notes-master/app/build/intermediates/source_set_path_map/release/file-map.txt
new file mode 100644
index 0000000..c78c2d6
--- /dev/null
+++ b/Notes-master/app/build/intermediates/source_set_path_map/release/file-map.txt
@@ -0,0 +1,8 @@
+net.micode.notes.app-pngs-0 E:\Notes-master\app\build\generated\res\pngs\release
+net.micode.notes.app-resValues-1 E:\Notes-master\app\build\generated\res\resValues\release
+net.micode.notes.app-rs-2 E:\Notes-master\app\build\generated\res\rs\release
+net.micode.notes.app-mergeReleaseResources-3 E:\Notes-master\app\build\intermediates\incremental\release\mergeReleaseResources\merged.dir
+net.micode.notes.app-mergeReleaseResources-4 E:\Notes-master\app\build\intermediates\incremental\release\mergeReleaseResources\stripped.dir
+net.micode.notes.app-merged_res-5 E:\Notes-master\app\build\intermediates\merged_res\release
+net.micode.notes.app-main-6 E:\Notes-master\app\src\main\res
+net.micode.notes.app-release-7 E:\Notes-master\app\src\release\res
diff --git a/Notes-master/app/build/intermediates/stable_resource_ids_file/debug/stableIds.txt b/Notes-master/app/build/intermediates/stable_resource_ids_file/debug/stableIds.txt
new file mode 100644
index 0000000..86c3561
--- /dev/null
+++ b/Notes-master/app/build/intermediates/stable_resource_ids_file/debug/stableIds.txt
@@ -0,0 +1,283 @@
+net.micode.notes:xml/preferences = 0x7f0c0000
+net.micode.notes:string/success_sdcard_export = 0x7f0a005b
+net.micode.notes:string/folder_exist = 0x7f0a0017
+net.micode.notes:xml/searchable = 0x7f0c0001
+net.micode.notes:string/search_label = 0x7f0a0058
+net.micode.notes:id/iv_super_select = 0x7f05001b
+net.micode.notes:xml/widget_4x_info = 0x7f0c0003
+net.micode.notes:style/TextAppearancePrimaryItem = 0x7f0b0007
+net.micode.notes:raw/introduction = 0x7f090000
+net.micode.notes:style/TextAppearanceUnderMenuIcon = 0x7f0b000a
+net.micode.notes:string/menu_alert = 0x7f0a001f
+net.micode.notes:string/error_note_not_exist = 0x7f0a000e
+net.micode.notes:string/set_remind_time_message = 0x7f0a005a
+net.micode.notes:string/search_hint = 0x7f0a0057
+net.micode.notes:id/menu_sync = 0x7f05002c
+net.micode.notes:string/menu_send_to_desktop = 0x7f0a0035
+net.micode.notes:string/preferences_toast_cannot_change_account = 0x7f0a0054
+net.micode.notes:style/HighlightTextAppearancePrimary = 0x7f0b0000
+net.micode.notes:style/TextAppearanceSuper = 0x7f0b0009
+net.micode.notes:drawable/bg_color_btn_mask = 0x7f040001
+net.micode.notes:string/ticker_syncing = 0x7f0a0063
+net.micode.notes:id/tv_alert_date = 0x7f05003a
+net.micode.notes:string/datetime_dialog_ok = 0x7f0a000a
+net.micode.notes:string/sync_progress_syncing = 0x7f0a005f
+net.micode.notes:string/preferences_menu_cancel = 0x7f0a0050
+net.micode.notes:style/TextAppearanceSecondaryItem = 0x7f0b0008
+net.micode.notes:string/preferences_last_sync_time = 0x7f0a004e
+net.micode.notes:string/preferences_menu_remove_account = 0x7f0a0052
+net.micode.notes:string/menu_font_super = 0x7f0a002b
+net.micode.notes:string/preferences_dialog_change_account_warn_msg = 0x7f0a004b
+net.micode.notes:string/success_sync_account = 0x7f0a005c
+net.micode.notes:string/info_note_enter_desktop = 0x7f0a001e
+net.micode.notes:id/sv_note_edit = 0x7f050039
+net.micode.notes:string/menu_font_large = 0x7f0a0027
+net.micode.notes:string/preferences_account_summary = 0x7f0a0044
+net.micode.notes:string/ticker_cancel = 0x7f0a0060
+net.micode.notes:string/menu_folder_change_name = 0x7f0a0024
+net.micode.notes:string/note_alert_expired = 0x7f0a003b
+net.micode.notes:string/menu_sync = 0x7f0a0038
+net.micode.notes:string/ticker_success = 0x7f0a0062
+net.micode.notes:string/menu_normal_mode = 0x7f0a002f
+net.micode.notes:string/file_name_txt_format = 0x7f0a0015
+net.micode.notes:string/format_datetime_mdhm = 0x7f0a0019
+net.micode.notes:string/preferences_menu_change_account = 0x7f0a0051
+net.micode.notes:string/preferences_last_sync_time_format = 0x7f0a004f
+net.micode.notes:string/sync_progress_init_list = 0x7f0a005d
+net.micode.notes:string/preferences_dialog_select_account_title = 0x7f0a004d
+net.micode.notes:string/menu_delete = 0x7f0a0021
+net.micode.notes:style/HighlightTextAppearanceSecondary = 0x7f0b0001
+net.micode.notes:string/menu_font_small = 0x7f0a002a
+net.micode.notes:drawable/edit_blue = 0x7f040006
+net.micode.notes:drawable/widget_4x_red = 0x7f04003f
+net.micode.notes:string/menu_font_size = 0x7f0a0029
+net.micode.notes:id/menu_share = 0x7f05002b
+net.micode.notes:string/menu_folder_delete = 0x7f0a0025
+net.micode.notes:string/preferences_add_account = 0x7f0a0046
+net.micode.notes:drawable/widget_2x_yellow = 0x7f04003c
+net.micode.notes:string/menu_create_folder = 0x7f0a0020
+net.micode.notes:xml/widget_2x_info = 0x7f0c0002
+net.micode.notes:string/menu_deselect_all = 0x7f0a0022
+net.micode.notes:id/tv_folder_name = 0x7f05003b
+net.micode.notes:string/hint_foler_name = 0x7f0a001d
+net.micode.notes:id/menu_new_folder = 0x7f050026
+net.micode.notes:string/format_folder_files_count = 0x7f0a001b
+net.micode.notes:plurals/search_results_title = 0x7f080000
+net.micode.notes:menu/note_list_options = 0x7f070005
+net.micode.notes:drawable/widget_4x_blue = 0x7f04003d
+net.micode.notes:string/format_exported_file_location = 0x7f0a001a
+net.micode.notes:array/menu_share_ways = 0x7f010001
+net.micode.notes:string/format_date_ymd = 0x7f0a0018
+net.micode.notes:string/notealert_enter = 0x7f0a0040
+net.micode.notes:string/preferences_toast_success_set_accout = 0x7f0a0055
+net.micode.notes:string/menu_font_normal = 0x7f0a0028
+net.micode.notes:string/file_path = 0x7f0a0016
+net.micode.notes:id/menu_new_note = 0x7f050027
+net.micode.notes:string/preferences_bg_random_appear_title = 0x7f0a0047
+net.micode.notes:string/search_setting_description = 0x7f0a0059
+net.micode.notes:string/error_sdcard_unmounted = 0x7f0a0010
+net.micode.notes:string/preferences_account_title = 0x7f0a0045
+net.micode.notes:drawable/list_red_up = 0x7f040024
+net.micode.notes:string/delete_remind_time_message = 0x7f0a000b
+net.micode.notes:string/menu_folder_view = 0x7f0a0026
+net.micode.notes:id/prefenerece_sync_status_textview = 0x7f050036
+net.micode.notes:string/button_delete = 0x7f0a0007
+net.micode.notes:string/search = 0x7f0a0056
+net.micode.notes:string/alert_title_delete = 0x7f0a0003
+net.micode.notes:drawable/title_alert = 0x7f040036
+net.micode.notes:string/alert_message_delete_note = 0x7f0a0001
+net.micode.notes:string/menu_move = 0x7f0a002d
+net.micode.notes:string/preferences_button_sync_immediately = 0x7f0a0049
+net.micode.notes:string/failed_sdcard_export = 0x7f0a0014
+net.micode.notes:string/menu_remove_remind = 0x7f0a0030
+net.micode.notes:menu/note_edit = 0x7f070002
+net.micode.notes:drawable/edit_yellow = 0x7f04000f
+net.micode.notes:menu/call_record_folder = 0x7f070001
+net.micode.notes:style/TextAppearanceNormal = 0x7f0b0006
+net.micode.notes:layout/widget_4x = 0x7f06000d
+net.micode.notes:layout/settings_header = 0x7f06000b
+net.micode.notes:string/note_link_other = 0x7f0a003d
+net.micode.notes:drawable/font_super = 0x7f040014
+net.micode.notes:layout/note_list = 0x7f060008
+net.micode.notes:string/alert_message_delete_notes = 0x7f0a0002
+net.micode.notes:style/NoteTheme = 0x7f0b0003
+net.micode.notes:menu/note_list = 0x7f070003
+net.micode.notes:drawable/widget_4x_yellow = 0x7f040041
+net.micode.notes:layout/note_item = 0x7f060007
+net.micode.notes:string/format_move_notes_to_folder = 0x7f0a001c
+net.micode.notes:id/tv_name = 0x7f05003d
+net.micode.notes:string/preferences_dialog_change_account_title = 0x7f0a004a
+net.micode.notes:layout/note_edit_list_item = 0x7f060006
+net.micode.notes:dimen/text_font_size_normal = 0x7f030002
+net.micode.notes:layout/folder_list_item = 0x7f060004
+net.micode.notes:string/error_sync_cancelled = 0x7f0a0011
+net.micode.notes:layout/datetime_picker = 0x7f060002
+net.micode.notes:layout/account_dialog_title = 0x7f060000
+net.micode.notes:string/note_link_web = 0x7f0a003f
+net.micode.notes:drawable/widget_4x_white = 0x7f040040
+net.micode.notes:layout/add_account_text = 0x7f060001
+net.micode.notes:drawable/list_green_up = 0x7f040020
+net.micode.notes:id/widget_text = 0x7f050042
+net.micode.notes:string/error_note_empty_for_send_to_desktop = 0x7f0a000d
+net.micode.notes:id/menu_delete_remind = 0x7f050022
+net.micode.notes:id/font_size_selector = 0x7f05000b
+net.micode.notes:string/preferences_button_sync_cancel = 0x7f0a0048
+net.micode.notes:drawable/widget_2x_blue = 0x7f040038
+net.micode.notes:drawable/list_yellow_middle = 0x7f04002a
+net.micode.notes:id/widget_bg_image = 0x7f050041
+net.micode.notes:id/iv_bg_red = 0x7f050012
+net.micode.notes:drawable/list_blue_down = 0x7f040017
+net.micode.notes:string/error_sync_internal = 0x7f0a0012
+net.micode.notes:id/tv_title_bar = 0x7f050040
+net.micode.notes:id/iv_bg_blue_select = 0x7f05000f
+net.micode.notes:string/menu_select_none = 0x7f0a0033
+net.micode.notes:id/iv_bg_yellow_select = 0x7f050017
+net.micode.notes:id/note_edit_view = 0x7f050032
+net.micode.notes:drawable/clock = 0x7f040003
+net.micode.notes:string/app_widget4x4 = 0x7f0a0006
+net.micode.notes:id/note_bg_color_selector = 0x7f050030
+net.micode.notes:drawable/font_small = 0x7f040013
+net.micode.notes:id/action_select_all = 0x7f050002
+net.micode.notes:id/navigation_bar = 0x7f05002f
+net.micode.notes:id/move = 0x7f05002e
+net.micode.notes:drawable/edit_title_white = 0x7f04000c
+net.micode.notes:drawable/menu_delete = 0x7f04002d
+net.micode.notes:string/menu_share = 0x7f0a0037
+net.micode.notes:id/ll_font_normal = 0x7f05001d
+net.micode.notes:id/minute = 0x7f05002d
+net.micode.notes:string/notelist_menu_new = 0x7f0a0042
+net.micode.notes:string/preferences_title = 0x7f0a0053
+net.micode.notes:color/primary_text_dark = 0x7f020000
+net.micode.notes:id/menu_setting = 0x7f05002a
+net.micode.notes:string/menu_setting = 0x7f0a0036
+net.micode.notes:id/menu_search = 0x7f050028
+net.micode.notes:layout/note_list_footer = 0x7f06000a
+net.micode.notes:style/NoteActionBarStyle = 0x7f0b0002
+net.micode.notes:id/menu_alert = 0x7f050020
+net.micode.notes:id/iv_bg_green = 0x7f050010
+net.micode.notes:id/tv_time = 0x7f05003e
+net.micode.notes:id/et_foler_name = 0x7f05000a
+net.micode.notes:id/ll_font_small = 0x7f05001e
+net.micode.notes:drawable/widget_2x_white = 0x7f04003b
+net.micode.notes:id/iv_medium_select = 0x7f050019
+net.micode.notes:layout/note_list_dropdown_menu = 0x7f060009
+net.micode.notes:id/ll_font_super = 0x7f05001f
+net.micode.notes:id/iv_large_select = 0x7f050018
+net.micode.notes:string/error_note_empty_for_clock = 0x7f0a000c
+net.micode.notes:string/app_widget2x2 = 0x7f0a0005
+net.micode.notes:string/menu_select_title = 0x7f0a0034
+net.micode.notes:drawable/widget_2x_green = 0x7f040039
+net.micode.notes:string/ticker_fail = 0x7f0a0061
+net.micode.notes:drawable/list_blue_middle = 0x7f040018
+net.micode.notes:string/menu_move_parent_folder = 0x7f0a002e
+net.micode.notes:drawable/font_normal = 0x7f040011
+net.micode.notes:id/iv_bg_yellow = 0x7f050016
+net.micode.notes:id/iv_bg_red_select = 0x7f050013
+net.micode.notes:id/et_edit_text = 0x7f050009
+net.micode.notes:style/TextAppearanceMedium = 0x7f0b0005
+net.micode.notes:id/notes_list = 0x7f050035
+net.micode.notes:string/menu_list_mode = 0x7f0a002c
+net.micode.notes:id/btn_set_bg_color = 0x7f050005
+net.micode.notes:string/note_link_email = 0x7f0a003c
+net.micode.notes:drawable/list_blue_up = 0x7f04001a
+net.micode.notes:id/date = 0x7f050007
+net.micode.notes:string/notelist_string_info = 0x7f0a0043
+net.micode.notes:string/preferences_dialog_select_account_tips = 0x7f0a004c
+net.micode.notes:drawable/list_yellow_single = 0x7f04002b
+net.micode.notes:id/amPm = 0x7f050003
+net.micode.notes:drawable/new_note_pressed = 0x7f040031
+net.micode.notes:layout/dialog_edit_text = 0x7f060003
+net.micode.notes:id/ll_font_large = 0x7f05001c
+net.micode.notes:drawable/list_red_single = 0x7f040023
+net.micode.notes:drawable/widget_4x_green = 0x7f04003e
+net.micode.notes:drawable/dropdown_icon = 0x7f040005
+net.micode.notes:drawable/list_white_down = 0x7f040025
+net.micode.notes:drawable/new_note_normal = 0x7f040030
+net.micode.notes:drawable/new_note = 0x7f04002f
+net.micode.notes:string/menu_sync_cancel = 0x7f0a0039
+net.micode.notes:id/cb_edit_item = 0x7f050006
+net.micode.notes:drawable/list_yellow_up = 0x7f04002c
+net.micode.notes:drawable/widget_2x_red = 0x7f04003a
+net.micode.notes:id/note_edit_list = 0x7f050031
+net.micode.notes:drawable/list_yellow_down = 0x7f040029
+net.micode.notes:drawable/selected = 0x7f040035
+net.micode.notes:drawable/list_white_middle = 0x7f040026
+net.micode.notes:string/note_link_tel = 0x7f0a003e
+net.micode.notes:drawable/edit_title_yellow = 0x7f04000d
+net.micode.notes:layout/note_edit = 0x7f060005
+net.micode.notes:id/hour = 0x7f05000c
+net.micode.notes:id/iv_bg_white_select = 0x7f050015
+net.micode.notes:array/format_for_exported_note = 0x7f010000
+net.micode.notes:string/error_sync_network = 0x7f0a0013
+net.micode.notes:id/menu_export_text = 0x7f050023
+net.micode.notes:drawable/list_red_down = 0x7f040021
+net.micode.notes:color/secondary_text_dark = 0x7f020001
+net.micode.notes:menu/sub_folder = 0x7f070006
+net.micode.notes:id/iv_bg_green_select = 0x7f050011
+net.micode.notes:id/menu_font_size = 0x7f050024
+net.micode.notes:id/iv_bg_blue = 0x7f05000e
+net.micode.notes:drawable/list_green_middle = 0x7f04001e
+net.micode.notes:drawable/list_footer_bg = 0x7f04001c
+net.micode.notes:drawable/list_white_single = 0x7f040027
+net.micode.notes:menu/note_list_dropdown = 0x7f070004
+net.micode.notes:drawable/list_white_up = 0x7f040028
+net.micode.notes:drawable/list_green_down = 0x7f04001d
+net.micode.notes:string/menu_select_all = 0x7f0a0032
+net.micode.notes:menu/call_note_edit = 0x7f070000
+net.micode.notes:string/notealert_ok = 0x7f0a0041
+net.micode.notes:id/preference_sync_button = 0x7f050037
+net.micode.notes:id/account_dialog_title = 0x7f050001
+net.micode.notes:string/alert_message_delete_folder = 0x7f0a0000
+net.micode.notes:layout/widget_2x = 0x7f06000c
+net.micode.notes:id/note_item = 0x7f050033
+net.micode.notes:dimen/text_font_size_super = 0x7f030004
+net.micode.notes:id/menu_delete = 0x7f050021
+net.micode.notes:drawable/icon_app = 0x7f040015
+net.micode.notes:drawable/list_blue_single = 0x7f040019
+net.micode.notes:drawable/list_red_middle = 0x7f040022
+net.micode.notes:string/menu_search = 0x7f0a0031
+net.micode.notes:drawable/edit_title_blue = 0x7f040009
+net.micode.notes:string/widget_under_visit_mode = 0x7f0a0065
+net.micode.notes:drawable/list_background = 0x7f040016
+net.micode.notes:id/menu_send_to_desktop = 0x7f050029
+net.micode.notes:drawable/title_bar_bg = 0x7f040037
+net.micode.notes:id/delete = 0x7f050008
+net.micode.notes:drawable/search_result = 0x7f040034
+net.micode.notes:id/tv_modified_date = 0x7f05003c
+net.micode.notes:drawable/font_large = 0x7f040010
+net.micode.notes:id/iv_alert_icon = 0x7f05000d
+net.micode.notes:drawable/list_green_single = 0x7f04001f
+net.micode.notes:drawable/edit_white = 0x7f04000e
+net.micode.notes:drawable/menu_move = 0x7f04002e
+net.micode.notes:id/btn_new_note = 0x7f050004
+net.micode.notes:string/app_name = 0x7f0a0004
+net.micode.notes:drawable/edit_title_red = 0x7f04000b
+net.micode.notes:id/menu_list_mode = 0x7f050025
+net.micode.notes:dimen/text_font_size_medium = 0x7f030001
+net.micode.notes:drawable/note_edit_color_selector_panel = 0x7f040032
+net.micode.notes:style/TextAppearanceLarge = 0x7f0b0004
+net.micode.notes:drawable/list_folder = 0x7f04001b
+net.micode.notes:id/iv_small_select = 0x7f05001a
+net.micode.notes:string/widget_havenot_content = 0x7f0a0064
+net.micode.notes:color/user_query_highlight = 0x7f020002
+net.micode.notes:string/sync_progress_login = 0x7f0a005e
+net.micode.notes:string/menu_title_select_folder = 0x7f0a003a
+net.micode.notes:string/error_sdcard_export = 0x7f0a000f
+net.micode.notes:drawable/edit_red = 0x7f040008
+net.micode.notes:drawable/edit_green = 0x7f040007
+net.micode.notes:id/tv_title = 0x7f05003f
+net.micode.notes:drawable/delete = 0x7f040004
+net.micode.notes:drawable/font_size_selector_bg = 0x7f040012
+net.micode.notes:string/datetime_dialog_cancel = 0x7f0a0009
+net.micode.notes:drawable/edit_title_green = 0x7f04000a
+net.micode.notes:drawable/bg_btn_set_color = 0x7f040000
+net.micode.notes:dimen/text_font_size_small = 0x7f030003
+net.micode.notes:string/call_record_folder_name = 0x7f0a0008
+net.micode.notes:dimen/text_font_size_large = 0x7f030000
+net.micode.notes:string/menu_export_text = 0x7f0a0023
+net.micode.notes:id/selection_menu = 0x7f050038
+net.micode.notes:id/account_dialog_subtitle = 0x7f050000
+net.micode.notes:drawable/call_record = 0x7f040002
+net.micode.notes:drawable/notification = 0x7f040033
+net.micode.notes:id/iv_bg_white = 0x7f050014
+net.micode.notes:id/note_title = 0x7f050034
diff --git a/xiaomi/app/build/intermediates/variant_model/debug/variant_model.json b/Notes-master/app/build/intermediates/variant_model/debug/variant_model.json
similarity index 100%
rename from xiaomi/app/build/intermediates/variant_model/debug/variant_model.json
rename to Notes-master/app/build/intermediates/variant_model/debug/variant_model.json
diff --git a/Notes-master/app/build/intermediates/variant_model/release/variant_model.json b/Notes-master/app/build/intermediates/variant_model/release/variant_model.json
new file mode 100644
index 0000000..fbfb74a
Binary files /dev/null and b/Notes-master/app/build/intermediates/variant_model/release/variant_model.json differ
diff --git a/Notes-master/app/build/outputs/apk/debug/app-debug.apk b/Notes-master/app/build/outputs/apk/debug/app-debug.apk
new file mode 100644
index 0000000..d86d3e5
Binary files /dev/null and b/Notes-master/app/build/outputs/apk/debug/app-debug.apk differ
diff --git a/Notes-master/app/build/outputs/apk/debug/output-metadata.json b/Notes-master/app/build/outputs/apk/debug/output-metadata.json
new file mode 100644
index 0000000..25a6e2b
--- /dev/null
+++ b/Notes-master/app/build/outputs/apk/debug/output-metadata.json
@@ -0,0 +1,18 @@
+{
+ "version": 2,
+ "artifactType": {
+ "type": "APK",
+ "kind": "Directory"
+ },
+ "applicationId": "net.micode.notes",
+ "variantName": "debug",
+ "elements": [
+ {
+ "type": "SINGLE",
+ "filters": [],
+ "versionCode": 1,
+ "versionName": "0.1",
+ "outputFile": "app-debug.apk"
+ }
+ ]
+}
\ No newline at end of file
diff --git a/Notes-master/app/build/outputs/logs/manifest-merger-debug-report.txt b/Notes-master/app/build/outputs/logs/manifest-merger-debug-report.txt
new file mode 100644
index 0000000..c4a25bc
--- /dev/null
+++ b/Notes-master/app/build/outputs/logs/manifest-merger-debug-report.txt
@@ -0,0 +1,287 @@
+-- Merging decision tree log ---
+manifest
+ADDED from E:\Notes-master\app\src\main\AndroidManifest.xml:18:1-158:12
+INJECTED from E:\Notes-master\app\src\main\AndroidManifest.xml:18:1-158:12
+INJECTED from E:\Notes-master\app\src\main\AndroidManifest.xml:18:1-158:12
+INJECTED from E:\Notes-master\app\src\main\AndroidManifest.xml:18:1-158:12
+INJECTED from E:\Notes-master\app\src\main\AndroidManifest.xml:18:1-158:12
+INJECTED from E:\Notes-master\app\src\main\AndroidManifest.xml:18:1-158:12
+INJECTED from E:\Notes-master\app\src\main\AndroidManifest.xml:18:1-158:12
+ package
+ INJECTED from E:\Notes-master\app\src\main\AndroidManifest.xml
+ ADDED from E:\Notes-master\app\src\main\AndroidManifest.xml:18:1-158:12
+ INJECTED from E:\Notes-master\app\src\main\AndroidManifest.xml
+ android:versionName
+ ADDED from E:\Notes-master\app\src\main\AndroidManifest.xml:20:5-30
+ INJECTED from E:\Notes-master\app\src\main\AndroidManifest.xml
+ INJECTED from E:\Notes-master\app\src\main\AndroidManifest.xml
+ xmlns:android
+ ADDED from E:\Notes-master\app\src\main\AndroidManifest.xml:18:11-69
+ android:versionCode
+ ADDED from E:\Notes-master\app\src\main\AndroidManifest.xml:19:5-28
+ INJECTED from E:\Notes-master\app\src\main\AndroidManifest.xml
+ INJECTED from E:\Notes-master\app\src\main\AndroidManifest.xml
+uses-sdk
+ADDED from E:\Notes-master\app\src\main\AndroidManifest.xml:22:5-44
+INJECTED from E:\Notes-master\app\src\main\AndroidManifest.xml:22:5-44
+INJECTED from E:\Notes-master\app\src\main\AndroidManifest.xml:22:5-44
+INJECTED from E:\Notes-master\app\src\main\AndroidManifest.xml:22:5-44
+INJECTED from E:\Notes-master\app\src\main\AndroidManifest.xml:22:5-44
+ android:targetSdkVersion
+ INJECTED from E:\Notes-master\app\src\main\AndroidManifest.xml
+ ADDED from E:\Notes-master\app\src\main\AndroidManifest.xml:22:5-44
+ INJECTED from E:\Notes-master\app\src\main\AndroidManifest.xml
+ android:minSdkVersion
+ ADDED from E:\Notes-master\app\src\main\AndroidManifest.xml:22:15-41
+ INJECTED from E:\Notes-master\app\src\main\AndroidManifest.xml
+ INJECTED from E:\Notes-master\app\src\main\AndroidManifest.xml
+uses-permission#android.permission.WRITE_EXTERNAL_STORAGE
+ADDED from E:\Notes-master\app\src\main\AndroidManifest.xml:25:5-81
+ android:name
+ ADDED from E:\Notes-master\app\src\main\AndroidManifest.xml:25:22-78
+uses-permission#com.android.launcher.permission.INSTALL_SHORTCUT
+ADDED from E:\Notes-master\app\src\main\AndroidManifest.xml:27:5-88
+ android:name
+ ADDED from E:\Notes-master\app\src\main\AndroidManifest.xml:27:22-85
+uses-permission#android.permission.INTERNET
+ADDED from E:\Notes-master\app\src\main\AndroidManifest.xml:29:5-67
+ android:name
+ ADDED from E:\Notes-master\app\src\main\AndroidManifest.xml:29:22-64
+uses-permission#android.permission.READ_CONTACTS
+ADDED from E:\Notes-master\app\src\main\AndroidManifest.xml:31:5-72
+ android:name
+ ADDED from E:\Notes-master\app\src\main\AndroidManifest.xml:31:22-69
+uses-permission#android.permission.MANAGE_ACCOUNTS
+ADDED from E:\Notes-master\app\src\main\AndroidManifest.xml:33:5-74
+ android:name
+ ADDED from E:\Notes-master\app\src\main\AndroidManifest.xml:33:22-71
+uses-permission#android.permission.AUTHENTICATE_ACCOUNTS
+ADDED from E:\Notes-master\app\src\main\AndroidManifest.xml:35:5-80
+ android:name
+ ADDED from E:\Notes-master\app\src\main\AndroidManifest.xml:35:22-77
+uses-permission#android.permission.GET_ACCOUNTS
+ADDED from E:\Notes-master\app\src\main\AndroidManifest.xml:37:5-71
+ android:name
+ ADDED from E:\Notes-master\app\src\main\AndroidManifest.xml:37:22-68
+uses-permission#android.permission.USE_CREDENTIALS
+ADDED from E:\Notes-master\app\src\main\AndroidManifest.xml:39:5-74
+ android:name
+ ADDED from E:\Notes-master\app\src\main\AndroidManifest.xml:39:22-71
+uses-permission#android.permission.RECEIVE_BOOT_COMPLETED
+ADDED from E:\Notes-master\app\src\main\AndroidManifest.xml:41:5-81
+ android:name
+ ADDED from E:\Notes-master\app\src\main\AndroidManifest.xml:41:22-78
+application
+ADDED from E:\Notes-master\app\src\main\AndroidManifest.xml:43:5-157:19
+ android:label
+ ADDED from E:\Notes-master\app\src\main\AndroidManifest.xml:45:9-41
+ android:icon
+ ADDED from E:\Notes-master\app\src\main\AndroidManifest.xml:44:9-42
+activity#.ui.NotesListActivity
+ADDED from E:\Notes-master\app\src\main\AndroidManifest.xml:46:9-59:20
+ android:label
+ ADDED from E:\Notes-master\app\src\main\AndroidManifest.xml:49:13-45
+ android:launchMode
+ ADDED from E:\Notes-master\app\src\main\AndroidManifest.xml:50:13-43
+ android:windowSoftInputMode
+ ADDED from E:\Notes-master\app\src\main\AndroidManifest.xml:53:13-52
+ android:uiOptions
+ ADDED from E:\Notes-master\app\src\main\AndroidManifest.xml:52:13-57
+ android:configChanges
+ ADDED from E:\Notes-master\app\src\main\AndroidManifest.xml:48:13-74
+ android:theme
+ ADDED from E:\Notes-master\app\src\main\AndroidManifest.xml:51:13-45
+ android:name
+ ADDED from E:\Notes-master\app\src\main\AndroidManifest.xml:47:13-49
+intent-filter#action:name:android.intent.action.MAIN+category:name:android.intent.category.LAUNCHER
+ADDED from E:\Notes-master\app\src\main\AndroidManifest.xml:55:13-58:29
+action#android.intent.action.MAIN
+ADDED from E:\Notes-master\app\src\main\AndroidManifest.xml:56:17-69
+ android:name
+ ADDED from E:\Notes-master\app\src\main\AndroidManifest.xml:56:25-66
+category#android.intent.category.LAUNCHER
+ADDED from E:\Notes-master\app\src\main\AndroidManifest.xml:57:17-77
+ android:name
+ ADDED from E:\Notes-master\app\src\main\AndroidManifest.xml:57:27-74
+activity#.ui.NoteEditActivity
+ADDED from E:\Notes-master\app\src\main\AndroidManifest.xml:61:9-89:20
+ android:launchMode
+ ADDED from E:\Notes-master\app\src\main\AndroidManifest.xml:64:13-43
+ android:configChanges
+ ADDED from E:\Notes-master\app\src\main\AndroidManifest.xml:63:13-74
+ android:theme
+ ADDED from E:\Notes-master\app\src\main\AndroidManifest.xml:65:13-45
+ android:name
+ ADDED from E:\Notes-master\app\src\main\AndroidManifest.xml:62: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:\Notes-master\app\src\main\AndroidManifest.xml:67:13-72:29
+action#android.intent.action.VIEW
+ADDED from E:\Notes-master\app\src\main\AndroidManifest.xml:68:17-69
+ android:name
+ ADDED from E:\Notes-master\app\src\main\AndroidManifest.xml:68:25-66
+category#android.intent.category.DEFAULT
+ADDED from E:\Notes-master\app\src\main\AndroidManifest.xml:69:17-76
+ android:name
+ ADDED from E:\Notes-master\app\src\main\AndroidManifest.xml:69:27-73
+data
+ADDED from E:\Notes-master\app\src\main\AndroidManifest.xml:70:17-78
+ android:mimeType
+ ADDED from E:\Notes-master\app\src\main\AndroidManifest.xml:70: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:\Notes-master\app\src\main\AndroidManifest.xml:74:13-79:29
+action#android.intent.action.INSERT_OR_EDIT
+ADDED from E:\Notes-master\app\src\main\AndroidManifest.xml:75:17-79
+ android:name
+ ADDED from E:\Notes-master\app\src\main\AndroidManifest.xml:75:25-76
+intent-filter#action:name:android.intent.action.SEARCH+category:name:android.intent.category.DEFAULT
+ADDED from E:\Notes-master\app\src\main\AndroidManifest.xml:81:13-84:29
+action#android.intent.action.SEARCH
+ADDED from E:\Notes-master\app\src\main\AndroidManifest.xml:82:17-71
+ android:name
+ ADDED from E:\Notes-master\app\src\main\AndroidManifest.xml:82:25-68
+meta-data#android.app.searchable
+ADDED from E:\Notes-master\app\src\main\AndroidManifest.xml:86:13-88:54
+ android:resource
+ ADDED from E:\Notes-master\app\src\main\AndroidManifest.xml:88:17-51
+ android:name
+ ADDED from E:\Notes-master\app\src\main\AndroidManifest.xml:87:17-54
+provider#net.micode.notes.data.NotesProvider
+ADDED from E:\Notes-master\app\src\main\AndroidManifest.xml:91:9-94:43
+ android:authorities
+ ADDED from E:\Notes-master\app\src\main\AndroidManifest.xml:93:13-47
+ android:multiprocess
+ ADDED from E:\Notes-master\app\src\main\AndroidManifest.xml:94:13-40
+ android:name
+ ADDED from E:\Notes-master\app\src\main\AndroidManifest.xml:92:13-63
+receiver#.widget.NoteWidgetProvider_2x
+ADDED from E:\Notes-master\app\src\main\AndroidManifest.xml:96:9-108:20
+ android:label
+ ADDED from E:\Notes-master\app\src\main\AndroidManifest.xml:98:13-50
+ android:name
+ ADDED from E:\Notes-master\app\src\main\AndroidManifest.xml:97: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:\Notes-master\app\src\main\AndroidManifest.xml:99:13-103:29
+action#android.appwidget.action.APPWIDGET_UPDATE
+ADDED from E:\Notes-master\app\src\main\AndroidManifest.xml:100:17-84
+ android:name
+ ADDED from E:\Notes-master\app\src\main\AndroidManifest.xml:100:25-81
+action#android.appwidget.action.APPWIDGET_DELETED
+ADDED from E:\Notes-master\app\src\main\AndroidManifest.xml:101:17-85
+ android:name
+ ADDED from E:\Notes-master\app\src\main\AndroidManifest.xml:101:25-82
+action#android.intent.action.PRIVACY_MODE_CHANGED
+ADDED from E:\Notes-master\app\src\main\AndroidManifest.xml:102:17-85
+ android:name
+ ADDED from E:\Notes-master\app\src\main\AndroidManifest.xml:102:25-82
+meta-data#android.appwidget.provider
+ADDED from E:\Notes-master\app\src\main\AndroidManifest.xml:105:13-107:58
+ android:resource
+ ADDED from E:\Notes-master\app\src\main\AndroidManifest.xml:107:17-55
+ android:name
+ ADDED from E:\Notes-master\app\src\main\AndroidManifest.xml:106:17-58
+receiver#.widget.NoteWidgetProvider_4x
+ADDED from E:\Notes-master\app\src\main\AndroidManifest.xml:109:9-122:20
+ android:label
+ ADDED from E:\Notes-master\app\src\main\AndroidManifest.xml:111:13-50
+ android:name
+ ADDED from E:\Notes-master\app\src\main\AndroidManifest.xml:110:13-57
+receiver#.ui.AlarmInitReceiver
+ADDED from E:\Notes-master\app\src\main\AndroidManifest.xml:124:9-128:20
+ android:name
+ ADDED from E:\Notes-master\app\src\main\AndroidManifest.xml:124:19-55
+intent-filter#action:name:android.intent.action.BOOT_COMPLETED
+ADDED from E:\Notes-master\app\src\main\AndroidManifest.xml:125:13-127:29
+action#android.intent.action.BOOT_COMPLETED
+ADDED from E:\Notes-master\app\src\main\AndroidManifest.xml:126:17-79
+ android:name
+ ADDED from E:\Notes-master\app\src\main\AndroidManifest.xml:126:25-76
+receiver#net.micode.notes.ui.AlarmReceiver
+ADDED from E:\Notes-master\app\src\main\AndroidManifest.xml:130:9-133:20
+ android:process
+ ADDED from E:\Notes-master\app\src\main\AndroidManifest.xml:132:13-38
+ android:name
+ ADDED from E:\Notes-master\app\src\main\AndroidManifest.xml:131:13-61
+activity#.ui.AlarmAlertActivity
+ADDED from E:\Notes-master\app\src\main\AndroidManifest.xml:135:9-140:20
+ android:label
+ ADDED from E:\Notes-master\app\src\main\AndroidManifest.xml:137:13-45
+ android:launchMode
+ ADDED from E:\Notes-master\app\src\main\AndroidManifest.xml:138:13-48
+ android:theme
+ ADDED from E:\Notes-master\app\src\main\AndroidManifest.xml:139:13-75
+ android:name
+ ADDED from E:\Notes-master\app\src\main\AndroidManifest.xml:136:13-50
+activity#net.micode.notes.ui.NotesPreferenceActivity
+ADDED from E:\Notes-master\app\src\main\AndroidManifest.xml:142:9-147:20
+ android:label
+ ADDED from E:\Notes-master\app\src\main\AndroidManifest.xml:144:13-54
+ android:launchMode
+ ADDED from E:\Notes-master\app\src\main\AndroidManifest.xml:145:13-43
+ android:theme
+ ADDED from E:\Notes-master\app\src\main\AndroidManifest.xml:146:13-60
+ android:name
+ ADDED from E:\Notes-master\app\src\main\AndroidManifest.xml:143:13-71
+service#net.micode.notes.gtask.remote.GTaskSyncService
+ADDED from E:\Notes-master\app\src\main\AndroidManifest.xml:149:9-152:19
+ android:exported
+ ADDED from E:\Notes-master\app\src\main\AndroidManifest.xml:151:13-37
+ android:name
+ ADDED from E:\Notes-master\app\src\main\AndroidManifest.xml:150:13-74
+meta-data#android.app.default_searchable
+ADDED from E:\Notes-master\app\src\main\AndroidManifest.xml:154:9-156:52
+ android:value
+ ADDED from E:\Notes-master\app\src\main\AndroidManifest.xml:156:13-49
+ android:name
+ ADDED from E:\Notes-master\app\src\main\AndroidManifest.xml:155:13-58
+activity#net.micode.notes.ui.NotesListActivity
+ADDED from E:\Notes-master\app\src\main\AndroidManifest.xml:46:9-59:20
+ android:label
+ ADDED from E:\Notes-master\app\src\main\AndroidManifest.xml:49:13-45
+ android:launchMode
+ ADDED from E:\Notes-master\app\src\main\AndroidManifest.xml:50:13-43
+ android:windowSoftInputMode
+ ADDED from E:\Notes-master\app\src\main\AndroidManifest.xml:53:13-52
+ android:uiOptions
+ ADDED from E:\Notes-master\app\src\main\AndroidManifest.xml:52:13-57
+ android:configChanges
+ ADDED from E:\Notes-master\app\src\main\AndroidManifest.xml:48:13-74
+ android:theme
+ ADDED from E:\Notes-master\app\src\main\AndroidManifest.xml:51:13-45
+ android:name
+ ADDED from E:\Notes-master\app\src\main\AndroidManifest.xml:47:13-49
+activity#net.micode.notes.ui.NoteEditActivity
+ADDED from E:\Notes-master\app\src\main\AndroidManifest.xml:61:9-89:20
+ android:launchMode
+ ADDED from E:\Notes-master\app\src\main\AndroidManifest.xml:64:13-43
+ android:configChanges
+ ADDED from E:\Notes-master\app\src\main\AndroidManifest.xml:63:13-74
+ android:theme
+ ADDED from E:\Notes-master\app\src\main\AndroidManifest.xml:65:13-45
+ android:name
+ ADDED from E:\Notes-master\app\src\main\AndroidManifest.xml:62:13-48
+receiver#net.micode.notes.widget.NoteWidgetProvider_2x
+ADDED from E:\Notes-master\app\src\main\AndroidManifest.xml:96:9-108:20
+ android:label
+ ADDED from E:\Notes-master\app\src\main\AndroidManifest.xml:98:13-50
+ android:name
+ ADDED from E:\Notes-master\app\src\main\AndroidManifest.xml:97:13-57
+receiver#net.micode.notes.widget.NoteWidgetProvider_4x
+ADDED from E:\Notes-master\app\src\main\AndroidManifest.xml:109:9-122:20
+ android:label
+ ADDED from E:\Notes-master\app\src\main\AndroidManifest.xml:111:13-50
+ android:name
+ ADDED from E:\Notes-master\app\src\main\AndroidManifest.xml:110:13-57
+receiver#net.micode.notes.ui.AlarmInitReceiver
+ADDED from E:\Notes-master\app\src\main\AndroidManifest.xml:124:9-128:20
+ android:name
+ ADDED from E:\Notes-master\app\src\main\AndroidManifest.xml:124:19-55
+activity#net.micode.notes.ui.AlarmAlertActivity
+ADDED from E:\Notes-master\app\src\main\AndroidManifest.xml:135:9-140:20
+ android:label
+ ADDED from E:\Notes-master\app\src\main\AndroidManifest.xml:137:13-45
+ android:launchMode
+ ADDED from E:\Notes-master\app\src\main\AndroidManifest.xml:138:13-48
+ android:theme
+ ADDED from E:\Notes-master\app\src\main\AndroidManifest.xml:139:13-75
+ android:name
+ ADDED from E:\Notes-master\app\src\main\AndroidManifest.xml:136:13-50
diff --git a/Notes-master/app/build/outputs/logs/manifest-merger-release-report.txt b/Notes-master/app/build/outputs/logs/manifest-merger-release-report.txt
new file mode 100644
index 0000000..155fcf1
--- /dev/null
+++ b/Notes-master/app/build/outputs/logs/manifest-merger-release-report.txt
@@ -0,0 +1,235 @@
+-- Merging decision tree log ---
+manifest
+ADDED from E:\Notes-master\app\src\main\AndroidManifest.xml:18:1-150:12
+INJECTED from E:\Notes-master\app\src\main\AndroidManifest.xml:18:1-150:12
+INJECTED from E:\Notes-master\app\src\main\AndroidManifest.xml:18:1-150:12
+INJECTED from E:\Notes-master\app\src\main\AndroidManifest.xml:18:1-150:12
+INJECTED from E:\Notes-master\app\src\main\AndroidManifest.xml:18:1-150:12
+INJECTED from E:\Notes-master\app\src\main\AndroidManifest.xml:18:1-150:12
+INJECTED from E:\Notes-master\app\src\main\AndroidManifest.xml:18:1-150:12
+ package
+ ADDED from E:\Notes-master\app\src\main\AndroidManifest.xml:19:5-31
+ INJECTED from E:\Notes-master\app\src\main\AndroidManifest.xml
+ INJECTED from E:\Notes-master\app\src\main\AndroidManifest.xml
+ android:versionName
+ ADDED from E:\Notes-master\app\src\main\AndroidManifest.xml:21:5-30
+ INJECTED from E:\Notes-master\app\src\main\AndroidManifest.xml
+ INJECTED from E:\Notes-master\app\src\main\AndroidManifest.xml
+ xmlns:android
+ ADDED from E:\Notes-master\app\src\main\AndroidManifest.xml:18:11-69
+ android:versionCode
+ ADDED from E:\Notes-master\app\src\main\AndroidManifest.xml:20:5-28
+ INJECTED from E:\Notes-master\app\src\main\AndroidManifest.xml
+ INJECTED from E:\Notes-master\app\src\main\AndroidManifest.xml
+uses-sdk
+ADDED from E:\Notes-master\app\src\main\AndroidManifest.xml:23:5-44
+INJECTED from E:\Notes-master\app\src\main\AndroidManifest.xml:23:5-44
+INJECTED from E:\Notes-master\app\src\main\AndroidManifest.xml:23:5-44
+INJECTED from E:\Notes-master\app\src\main\AndroidManifest.xml:23:5-44
+INJECTED from E:\Notes-master\app\src\main\AndroidManifest.xml:23:5-44
+ android:targetSdkVersion
+ INJECTED from E:\Notes-master\app\src\main\AndroidManifest.xml
+ ADDED from E:\Notes-master\app\src\main\AndroidManifest.xml:23:5-44
+ INJECTED from E:\Notes-master\app\src\main\AndroidManifest.xml
+ android:minSdkVersion
+ ADDED from E:\Notes-master\app\src\main\AndroidManifest.xml:23:15-41
+ INJECTED from E:\Notes-master\app\src\main\AndroidManifest.xml
+ INJECTED from E:\Notes-master\app\src\main\AndroidManifest.xml
+uses-permission#android.permission.WRITE_EXTERNAL_STORAGE
+ADDED from E:\Notes-master\app\src\main\AndroidManifest.xml:25:5-81
+ android:name
+ ADDED from E:\Notes-master\app\src\main\AndroidManifest.xml:25:22-78
+uses-permission#com.android.launcher.permission.INSTALL_SHORTCUT
+ADDED from E:\Notes-master\app\src\main\AndroidManifest.xml:26:5-88
+ android:name
+ ADDED from E:\Notes-master\app\src\main\AndroidManifest.xml:26:22-85
+uses-permission#android.permission.INTERNET
+ADDED from E:\Notes-master\app\src\main\AndroidManifest.xml:27:5-67
+ android:name
+ ADDED from E:\Notes-master\app\src\main\AndroidManifest.xml:27:22-64
+uses-permission#android.permission.READ_CONTACTS
+ADDED from E:\Notes-master\app\src\main\AndroidManifest.xml:28:5-72
+ android:name
+ ADDED from E:\Notes-master\app\src\main\AndroidManifest.xml:28:22-69
+uses-permission#android.permission.MANAGE_ACCOUNTS
+ADDED from E:\Notes-master\app\src\main\AndroidManifest.xml:29:5-74
+ android:name
+ ADDED from E:\Notes-master\app\src\main\AndroidManifest.xml:29:22-71
+uses-permission#android.permission.AUTHENTICATE_ACCOUNTS
+ADDED from E:\Notes-master\app\src\main\AndroidManifest.xml:30:5-80
+ android:name
+ ADDED from E:\Notes-master\app\src\main\AndroidManifest.xml:30:22-77
+uses-permission#android.permission.GET_ACCOUNTS
+ADDED from E:\Notes-master\app\src\main\AndroidManifest.xml:31:5-71
+ android:name
+ ADDED from E:\Notes-master\app\src\main\AndroidManifest.xml:31:22-68
+uses-permission#android.permission.USE_CREDENTIALS
+ADDED from E:\Notes-master\app\src\main\AndroidManifest.xml:32:5-74
+ android:name
+ ADDED from E:\Notes-master\app\src\main\AndroidManifest.xml:32:22-71
+uses-permission#android.permission.RECEIVE_BOOT_COMPLETED
+ADDED from E:\Notes-master\app\src\main\AndroidManifest.xml:33:5-81
+ android:name
+ ADDED from E:\Notes-master\app\src\main\AndroidManifest.xml:33:22-78
+application
+ADDED from E:\Notes-master\app\src\main\AndroidManifest.xml:35:5-149:19
+ android:label
+ ADDED from E:\Notes-master\app\src\main\AndroidManifest.xml:37:9-41
+ android:icon
+ ADDED from E:\Notes-master\app\src\main\AndroidManifest.xml:36:9-42
+activity#net.micode.notes.ui.NotesListActivity
+ADDED from E:\Notes-master\app\src\main\AndroidManifest.xml:38:9-51:20
+ android:label
+ ADDED from E:\Notes-master\app\src\main\AndroidManifest.xml:41:13-45
+ android:launchMode
+ ADDED from E:\Notes-master\app\src\main\AndroidManifest.xml:42:13-43
+ android:windowSoftInputMode
+ ADDED from E:\Notes-master\app\src\main\AndroidManifest.xml:45:13-52
+ android:uiOptions
+ ADDED from E:\Notes-master\app\src\main\AndroidManifest.xml:44:13-57
+ android:configChanges
+ ADDED from E:\Notes-master\app\src\main\AndroidManifest.xml:40:13-74
+ android:theme
+ ADDED from E:\Notes-master\app\src\main\AndroidManifest.xml:43:13-45
+ android:name
+ ADDED from E:\Notes-master\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:\Notes-master\app\src\main\AndroidManifest.xml:47:13-50:29
+action#android.intent.action.MAIN
+ADDED from E:\Notes-master\app\src\main\AndroidManifest.xml:48:17-69
+ android:name
+ ADDED from E:\Notes-master\app\src\main\AndroidManifest.xml:48:25-66
+category#android.intent.category.LAUNCHER
+ADDED from E:\Notes-master\app\src\main\AndroidManifest.xml:49:17-77
+ android:name
+ ADDED from E:\Notes-master\app\src\main\AndroidManifest.xml:49:27-74
+activity#net.micode.notes.ui.NoteEditActivity
+ADDED from E:\Notes-master\app\src\main\AndroidManifest.xml:53:9-81:20
+ android:launchMode
+ ADDED from E:\Notes-master\app\src\main\AndroidManifest.xml:56:13-43
+ android:configChanges
+ ADDED from E:\Notes-master\app\src\main\AndroidManifest.xml:55:13-74
+ android:theme
+ ADDED from E:\Notes-master\app\src\main\AndroidManifest.xml:57:13-45
+ android:name
+ ADDED from E:\Notes-master\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:\Notes-master\app\src\main\AndroidManifest.xml:59:13-64:29
+action#android.intent.action.VIEW
+ADDED from E:\Notes-master\app\src\main\AndroidManifest.xml:60:17-69
+ android:name
+ ADDED from E:\Notes-master\app\src\main\AndroidManifest.xml:60:25-66
+category#android.intent.category.DEFAULT
+ADDED from E:\Notes-master\app\src\main\AndroidManifest.xml:61:17-76
+ android:name
+ ADDED from E:\Notes-master\app\src\main\AndroidManifest.xml:61:27-73
+data
+ADDED from E:\Notes-master\app\src\main\AndroidManifest.xml:62:17-78
+ android:mimeType
+ ADDED from E:\Notes-master\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:\Notes-master\app\src\main\AndroidManifest.xml:66:13-71:29
+action#android.intent.action.INSERT_OR_EDIT
+ADDED from E:\Notes-master\app\src\main\AndroidManifest.xml:67:17-79
+ android:name
+ ADDED from E:\Notes-master\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:\Notes-master\app\src\main\AndroidManifest.xml:73:13-76:29
+action#android.intent.action.SEARCH
+ADDED from E:\Notes-master\app\src\main\AndroidManifest.xml:74:17-71
+ android:name
+ ADDED from E:\Notes-master\app\src\main\AndroidManifest.xml:74:25-68
+meta-data#android.app.searchable
+ADDED from E:\Notes-master\app\src\main\AndroidManifest.xml:78:13-80:54
+ android:resource
+ ADDED from E:\Notes-master\app\src\main\AndroidManifest.xml:80:17-51
+ android:name
+ ADDED from E:\Notes-master\app\src\main\AndroidManifest.xml:79:17-54
+provider#net.micode.notes.data.NotesProvider
+ADDED from E:\Notes-master\app\src\main\AndroidManifest.xml:83:9-86:43
+ android:authorities
+ ADDED from E:\Notes-master\app\src\main\AndroidManifest.xml:85:13-47
+ android:multiprocess
+ ADDED from E:\Notes-master\app\src\main\AndroidManifest.xml:86:13-40
+ android:name
+ ADDED from E:\Notes-master\app\src\main\AndroidManifest.xml:84:13-63
+receiver#net.micode.notes.widget.NoteWidgetProvider_2x
+ADDED from E:\Notes-master\app\src\main\AndroidManifest.xml:88:9-100:20
+ android:label
+ ADDED from E:\Notes-master\app\src\main\AndroidManifest.xml:90:13-50
+ android:name
+ ADDED from E:\Notes-master\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:\Notes-master\app\src\main\AndroidManifest.xml:91:13-95:29
+action#android.appwidget.action.APPWIDGET_UPDATE
+ADDED from E:\Notes-master\app\src\main\AndroidManifest.xml:92:17-84
+ android:name
+ ADDED from E:\Notes-master\app\src\main\AndroidManifest.xml:92:25-81
+action#android.appwidget.action.APPWIDGET_DELETED
+ADDED from E:\Notes-master\app\src\main\AndroidManifest.xml:93:17-85
+ android:name
+ ADDED from E:\Notes-master\app\src\main\AndroidManifest.xml:93:25-82
+action#android.intent.action.PRIVACY_MODE_CHANGED
+ADDED from E:\Notes-master\app\src\main\AndroidManifest.xml:94:17-85
+ android:name
+ ADDED from E:\Notes-master\app\src\main\AndroidManifest.xml:94:25-82
+meta-data#android.appwidget.provider
+ADDED from E:\Notes-master\app\src\main\AndroidManifest.xml:97:13-99:58
+ android:resource
+ ADDED from E:\Notes-master\app\src\main\AndroidManifest.xml:99:17-55
+ android:name
+ ADDED from E:\Notes-master\app\src\main\AndroidManifest.xml:98:17-58
+receiver#net.micode.notes.widget.NoteWidgetProvider_4x
+ADDED from E:\Notes-master\app\src\main\AndroidManifest.xml:101:9-114:20
+ android:label
+ ADDED from E:\Notes-master\app\src\main\AndroidManifest.xml:103:13-50
+ android:name
+ ADDED from E:\Notes-master\app\src\main\AndroidManifest.xml:102:13-57
+receiver#net.micode.notes.ui.AlarmInitReceiver
+ADDED from E:\Notes-master\app\src\main\AndroidManifest.xml:116:9-120:20
+ android:name
+ ADDED from E:\Notes-master\app\src\main\AndroidManifest.xml:116:19-55
+intent-filter#action:name:android.intent.action.BOOT_COMPLETED
+ADDED from E:\Notes-master\app\src\main\AndroidManifest.xml:117:13-119:29
+action#android.intent.action.BOOT_COMPLETED
+ADDED from E:\Notes-master\app\src\main\AndroidManifest.xml:118:17-79
+ android:name
+ ADDED from E:\Notes-master\app\src\main\AndroidManifest.xml:118:25-76
+receiver#net.micode.notes.ui.AlarmReceiver
+ADDED from E:\Notes-master\app\src\main\AndroidManifest.xml:122:9-125:20
+ android:process
+ ADDED from E:\Notes-master\app\src\main\AndroidManifest.xml:124:13-38
+ android:name
+ ADDED from E:\Notes-master\app\src\main\AndroidManifest.xml:123:13-61
+activity#net.micode.notes.ui.AlarmAlertActivity
+ADDED from E:\Notes-master\app\src\main\AndroidManifest.xml:127:9-132:20
+ android:label
+ ADDED from E:\Notes-master\app\src\main\AndroidManifest.xml:129:13-45
+ android:launchMode
+ ADDED from E:\Notes-master\app\src\main\AndroidManifest.xml:130:13-48
+ android:theme
+ ADDED from E:\Notes-master\app\src\main\AndroidManifest.xml:131:13-75
+ android:name
+ ADDED from E:\Notes-master\app\src\main\AndroidManifest.xml:128:13-50
+activity#net.micode.notes.ui.NotesPreferenceActivity
+ADDED from E:\Notes-master\app\src\main\AndroidManifest.xml:134:9-139:20
+ android:label
+ ADDED from E:\Notes-master\app\src\main\AndroidManifest.xml:136:13-54
+ android:launchMode
+ ADDED from E:\Notes-master\app\src\main\AndroidManifest.xml:137:13-43
+ android:theme
+ ADDED from E:\Notes-master\app\src\main\AndroidManifest.xml:138:13-60
+ android:name
+ ADDED from E:\Notes-master\app\src\main\AndroidManifest.xml:135:13-71
+service#net.micode.notes.gtask.remote.GTaskSyncService
+ADDED from E:\Notes-master\app\src\main\AndroidManifest.xml:141:9-144:19
+ android:exported
+ ADDED from E:\Notes-master\app\src\main\AndroidManifest.xml:143:13-37
+ android:name
+ ADDED from E:\Notes-master\app\src\main\AndroidManifest.xml:142:13-74
+meta-data#android.app.default_searchable
+ADDED from E:\Notes-master\app\src\main\AndroidManifest.xml:146:9-148:52
+ android:value
+ ADDED from E:\Notes-master\app\src\main\AndroidManifest.xml:148:13-49
+ android:name
+ ADDED from E:\Notes-master\app\src\main\AndroidManifest.xml:147:13-58
diff --git a/Notes-master/app/build/outputs/sdk-dependencies/release/sdkDependencies.txt b/Notes-master/app/build/outputs/sdk-dependencies/release/sdkDependencies.txt
new file mode 100644
index 0000000..3d6fd33
--- /dev/null
+++ b/Notes-master/app/build/outputs/sdk-dependencies/release/sdkDependencies.txt
@@ -0,0 +1,16 @@
+# List of SDK dependencies of this app, this information is also included in an encrypted form in the APK.
+# For more information visit: https://d.android.com/r/tools/dependency-metadata
+
+module_dependencies {
+ module_name: "base"
+}
+repositories {
+ maven_repo {
+ url: "https://dl.google.com/dl/android/maven2/"
+ }
+}
+repositories {
+ maven_repo {
+ url: "https://jcenter.bintray.com/"
+ }
+}
diff --git a/Notes-master/app/build/tmp/compileDebugJavaWithJavac/previous-compilation-data.bin b/Notes-master/app/build/tmp/compileDebugJavaWithJavac/previous-compilation-data.bin
new file mode 100644
index 0000000..5996e18
Binary files /dev/null and b/Notes-master/app/build/tmp/compileDebugJavaWithJavac/previous-compilation-data.bin differ
diff --git a/Notes-master/app/build/tmp/compileDebugJavaWithJavac/source-classes-mapping.txt b/Notes-master/app/build/tmp/compileDebugJavaWithJavac/source-classes-mapping.txt
new file mode 100644
index 0000000..71423fe
--- /dev/null
+++ b/Notes-master/app/build/tmp/compileDebugJavaWithJavac/source-classes-mapping.txt
@@ -0,0 +1,137 @@
+net/micode/notes/gtask/remote/GTaskManager.java
+ net.micode.notes.gtask.remote.GTaskManager
+net/micode/notes/gtask/remote/GTaskClient.java
+ net.micode.notes.gtask.remote.GTaskClient
+net/micode/notes/gtask/data/Task.java
+ net.micode.notes.gtask.data.Task
+net/micode/notes/model/WorkingNote.java
+ net.micode.notes.model.WorkingNote
+ net.micode.notes.model.WorkingNote$NoteSettingChangedListener
+net/micode/notes/ui/AlarmAlertActivity.java
+ net.micode.notes.ui.AlarmAlertActivity
+net/micode/notes/tool/BackupUtils.java
+ net.micode.notes.tool.BackupUtils
+ net.micode.notes.tool.BackupUtils$TextExport
+net/micode/notes/gtask/data/MetaData.java
+ net.micode.notes.gtask.data.MetaData
+net/micode/notes/gtask/remote/GTaskASyncTask.java
+ net.micode.notes.gtask.remote.GTaskASyncTask
+ net.micode.notes.gtask.remote.GTaskASyncTask$1
+ net.micode.notes.gtask.remote.GTaskASyncTask$OnCompleteListener
+net/micode/notes/ui/DateTimePickerDialog.java
+ net.micode.notes.ui.DateTimePickerDialog
+ net.micode.notes.ui.DateTimePickerDialog$1
+ net.micode.notes.ui.DateTimePickerDialog$OnDateTimeSetListener
+net/micode/notes/widget/NoteWidgetProvider.java
+ net.micode.notes.widget.NoteWidgetProvider
+net/micode/notes/data/Notes.java
+ net.micode.notes.data.Notes
+ net.micode.notes.data.Notes$CallNote
+ net.micode.notes.data.Notes$DataColumns
+ net.micode.notes.data.Notes$DataConstants
+ net.micode.notes.data.Notes$NoteColumns
+ net.micode.notes.data.Notes$TextNote
+net/micode/notes/gtask/data/TaskList.java
+ net.micode.notes.gtask.data.TaskList
+net/micode/notes/model/Note.java
+ net.micode.notes.model.Note
+ net.micode.notes.model.Note$NoteData
+net/micode/notes/ui/AlarmReceiver.java
+ net.micode.notes.ui.AlarmReceiver
+net/micode/notes/tool/ResourceParser.java
+ net.micode.notes.tool.ResourceParser
+ net.micode.notes.tool.ResourceParser$NoteBgResources
+ net.micode.notes.tool.ResourceParser$NoteItemBgResources
+ net.micode.notes.tool.ResourceParser$TextAppearanceResources
+ net.micode.notes.tool.ResourceParser$WidgetBgResources
+net/micode/notes/widget/NoteWidgetProvider_4x.java
+ net.micode.notes.widget.NoteWidgetProvider_4x
+net/micode/notes/ui/NotesPreferenceActivity.java
+ net.micode.notes.ui.NotesPreferenceActivity
+ net.micode.notes.ui.NotesPreferenceActivity$1
+ net.micode.notes.ui.NotesPreferenceActivity$2
+ net.micode.notes.ui.NotesPreferenceActivity$3
+ net.micode.notes.ui.NotesPreferenceActivity$4
+ net.micode.notes.ui.NotesPreferenceActivity$5
+ net.micode.notes.ui.NotesPreferenceActivity$6
+ net.micode.notes.ui.NotesPreferenceActivity$7
+ net.micode.notes.ui.NotesPreferenceActivity$8
+ net.micode.notes.ui.NotesPreferenceActivity$GTaskReceiver
+net/micode/notes/gtask/exception/NetworkFailureException.java
+ net.micode.notes.gtask.exception.NetworkFailureException
+net/micode/notes/ui/AlarmInitReceiver.java
+ net.micode.notes.ui.AlarmInitReceiver
+net/micode/notes/ui/FoldersListAdapter.java
+ net.micode.notes.ui.FoldersListAdapter
+ net.micode.notes.ui.FoldersListAdapter$FolderListItem
+net/micode/notes/data/NotesDatabaseHelper.java
+ net.micode.notes.data.NotesDatabaseHelper
+ net.micode.notes.data.NotesDatabaseHelper$TABLE
+net/micode/notes/ui/NoteEditText.java
+ net.micode.notes.ui.NoteEditText
+ net.micode.notes.ui.NoteEditText$1
+ net.micode.notes.ui.NoteEditText$OnTextViewChangeListener
+net/micode/notes/ui/NotesListItem.java
+ net.micode.notes.ui.NotesListItem
+net/micode/notes/gtask/data/SqlNote.java
+ net.micode.notes.gtask.data.SqlNote
+net/micode/notes/tool/DataUtils.java
+ net.micode.notes.tool.DataUtils
+net/micode/notes/widget/NoteWidgetProvider_2x.java
+ net.micode.notes.widget.NoteWidgetProvider_2x
+net/micode/notes/BuildConfig.java
+ net.micode.notes.BuildConfig
+net/micode/notes/gtask/remote/GTaskSyncService.java
+ net.micode.notes.gtask.remote.GTaskSyncService
+ net.micode.notes.gtask.remote.GTaskSyncService$1
+net/micode/notes/ui/DropdownMenu.java
+ net.micode.notes.ui.DropdownMenu
+ net.micode.notes.ui.DropdownMenu$1
+net/micode/notes/ui/NotesListAdapter.java
+ net.micode.notes.ui.NotesListAdapter
+ net.micode.notes.ui.NotesListAdapter$AppWidgetAttribute
+net/micode/notes/gtask/data/Node.java
+ net.micode.notes.gtask.data.Node
+net/micode/notes/ui/NotesListActivity.java
+ net.micode.notes.ui.NotesListActivity
+ net.micode.notes.ui.NotesListActivity$1
+ net.micode.notes.ui.NotesListActivity$2
+ net.micode.notes.ui.NotesListActivity$3
+ net.micode.notes.ui.NotesListActivity$4
+ net.micode.notes.ui.NotesListActivity$5
+ net.micode.notes.ui.NotesListActivity$6
+ net.micode.notes.ui.NotesListActivity$7
+ net.micode.notes.ui.NotesListActivity$8
+ net.micode.notes.ui.NotesListActivity$9
+ net.micode.notes.ui.NotesListActivity$BackgroundQueryHandler
+ net.micode.notes.ui.NotesListActivity$ListEditState
+ net.micode.notes.ui.NotesListActivity$ModeCallback
+ net.micode.notes.ui.NotesListActivity$ModeCallback$1
+ net.micode.notes.ui.NotesListActivity$ModeCallback$2
+ net.micode.notes.ui.NotesListActivity$NewNoteOnTouchListener
+ net.micode.notes.ui.NotesListActivity$OnListItemClickListener
+net/micode/notes/gtask/exception/ActionFailureException.java
+ net.micode.notes.gtask.exception.ActionFailureException
+net/micode/notes/ui/NoteItemData.java
+ net.micode.notes.ui.NoteItemData
+net/micode/notes/data/Contact.java
+ net.micode.notes.data.Contact
+net/micode/notes/gtask/data/SqlData.java
+ net.micode.notes.gtask.data.SqlData
+net/micode/notes/ui/NoteEditActivity.java
+ net.micode.notes.ui.NoteEditActivity
+ net.micode.notes.ui.NoteEditActivity$1
+ net.micode.notes.ui.NoteEditActivity$2
+ net.micode.notes.ui.NoteEditActivity$3
+ net.micode.notes.ui.NoteEditActivity$HeadViewHolder
+net/micode/notes/data/NotesProvider.java
+ net.micode.notes.data.NotesProvider
+net/micode/notes/ui/DateTimePicker.java
+ net.micode.notes.ui.DateTimePicker
+ net.micode.notes.ui.DateTimePicker$1
+ net.micode.notes.ui.DateTimePicker$2
+ net.micode.notes.ui.DateTimePicker$3
+ net.micode.notes.ui.DateTimePicker$4
+ net.micode.notes.ui.DateTimePicker$OnDateTimeChangedListener
+net/micode/notes/tool/GTaskStringUtils.java
+ net.micode.notes.tool.GTaskStringUtils
diff --git a/Notes-master/app/src/main/AndroidManifest.xml b/Notes-master/app/src/main/AndroidManifest.xml
new file mode 100644
index 0000000..4515a44
--- /dev/null
+++ b/Notes-master/app/src/main/AndroidManifest.xml
@@ -0,0 +1,158 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/Notes-master/app/src/main/java/net/micode/notes/data/Contact.java b/Notes-master/app/src/main/java/net/micode/notes/data/Contact.java
new file mode 100644
index 0000000..d97ac5d
--- /dev/null
+++ b/Notes-master/app/src/main/java/net/micode/notes/data/Contact.java
@@ -0,0 +1,73 @@
+/*
+ * 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.data;
+
+import android.content.Context;
+import android.database.Cursor;
+import android.provider.ContactsContract.CommonDataKinds.Phone;
+import android.provider.ContactsContract.Data;
+import android.telephony.PhoneNumberUtils;
+import android.util.Log;
+
+import java.util.HashMap;
+
+public class Contact {
+ private static HashMap sContactCache;
+ private static final String TAG = "Contact";
+
+ private static final String CALLER_ID_SELECTION = "PHONE_NUMBERS_EQUAL(" + Phone.NUMBER
+ + ",?) AND " + Data.MIMETYPE + "='" + Phone.CONTENT_ITEM_TYPE + "'"
+ + " AND " + Data.RAW_CONTACT_ID + " IN "
+ + "(SELECT raw_contact_id "
+ + " FROM phone_lookup"
+ + " WHERE min_match = '+')";
+
+ public static String getContact(Context context, String phoneNumber) {
+ if(sContactCache == null) {
+ sContactCache = new HashMap();
+ }
+
+ if(sContactCache.containsKey(phoneNumber)) {
+ return sContactCache.get(phoneNumber);
+ }
+
+ String selection = CALLER_ID_SELECTION.replace("+",
+ PhoneNumberUtils.toCallerIDMinMatch(phoneNumber));
+ Cursor cursor = context.getContentResolver().query(
+ Data.CONTENT_URI,
+ new String [] { Phone.DISPLAY_NAME },
+ selection,
+ new String[] { phoneNumber },
+ null);
+
+ if (cursor != null && cursor.moveToFirst()) {
+ try {
+ String name = cursor.getString(0);
+ sContactCache.put(phoneNumber, name);
+ return name;
+ } catch (IndexOutOfBoundsException e) {
+ Log.e(TAG, " Cursor get string error " + e.toString());
+ return null;
+ } finally {
+ cursor.close();
+ }
+ } else {
+ Log.d(TAG, "No contact matched with number:" + phoneNumber);
+ return null;
+ }
+ }
+}
diff --git a/Notes-master/app/src/main/java/net/micode/notes/data/Notes.java b/Notes-master/app/src/main/java/net/micode/notes/data/Notes.java
new file mode 100644
index 0000000..f240604
--- /dev/null
+++ b/Notes-master/app/src/main/java/net/micode/notes/data/Notes.java
@@ -0,0 +1,279 @@
+/*
+ * 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.data;
+
+import android.net.Uri;
+public class Notes {
+ public static final String AUTHORITY = "micode_notes";
+ public static final String TAG = "Notes";
+ public static final int TYPE_NOTE = 0;
+ public static final int TYPE_FOLDER = 1;
+ public static final int TYPE_SYSTEM = 2;
+
+ /**
+ * Following IDs are system folders' identifiers
+ * {@link Notes#ID_ROOT_FOLDER } is default folder
+ * {@link Notes#ID_TEMPARAY_FOLDER } is for notes belonging no folder
+ * {@link Notes#ID_CALL_RECORD_FOLDER} is to store call records
+ */
+ public static final int ID_ROOT_FOLDER = 0;
+ public static final int ID_TEMPARAY_FOLDER = -1;
+ public static final int ID_CALL_RECORD_FOLDER = -2;
+ public static final int ID_TRASH_FOLER = -3;
+
+ public static final String INTENT_EXTRA_ALERT_DATE = "net.micode.notes.alert_date";
+ public static final String INTENT_EXTRA_BACKGROUND_ID = "net.micode.notes.background_color_id";
+ public static final String INTENT_EXTRA_WIDGET_ID = "net.micode.notes.widget_id";
+ public static final String INTENT_EXTRA_WIDGET_TYPE = "net.micode.notes.widget_type";
+ public static final String INTENT_EXTRA_FOLDER_ID = "net.micode.notes.folder_id";
+ public static final String INTENT_EXTRA_CALL_DATE = "net.micode.notes.call_date";
+
+ public static final int TYPE_WIDGET_INVALIDE = -1;
+ public static final int TYPE_WIDGET_2X = 0;
+ public static final int TYPE_WIDGET_4X = 1;
+
+ public static class DataConstants {
+ public static final String NOTE = TextNote.CONTENT_ITEM_TYPE;
+ public static final String CALL_NOTE = CallNote.CONTENT_ITEM_TYPE;
+ }
+
+ /**
+ * Uri to query all notes and folders
+ */
+ public static final Uri CONTENT_NOTE_URI = Uri.parse("content://" + AUTHORITY + "/note");
+
+ /**
+ * Uri to query data
+ */
+ public static final Uri CONTENT_DATA_URI = Uri.parse("content://" + AUTHORITY + "/data");
+
+ public interface NoteColumns {
+ /**
+ * The unique ID for a row
+ *
Type: INTEGER (long)
+ */
+ public static final String ID = "_id";
+
+ /**
+ * The parent's id for note or folder
+ *
Type: INTEGER (long)
+ */
+ public static final String PARENT_ID = "parent_id";
+
+ /**
+ * Created data for note or folder
+ *
Type: INTEGER (long)
+ */
+ public static final String CREATED_DATE = "created_date";
+
+ /**
+ * Latest modified date
+ *
Type: INTEGER (long)
+ */
+ public static final String MODIFIED_DATE = "modified_date";
+
+
+ /**
+ * Alert date
+ *
Type: INTEGER (long)
+ */
+ public static final String ALERTED_DATE = "alert_date";
+
+ /**
+ * Folder's name or text content of note
+ *
Type: TEXT
+ */
+ public static final String SNIPPET = "snippet";
+
+ /**
+ * Note's widget id
+ *
Type: INTEGER (long)
+ */
+ public static final String WIDGET_ID = "widget_id";
+
+ /**
+ * Note's widget type
+ *
Type: INTEGER (long)
+ */
+ public static final String WIDGET_TYPE = "widget_type";
+
+ /**
+ * Note's background color's id
+ *
Type: INTEGER (long)
+ */
+ public static final String BG_COLOR_ID = "bg_color_id";
+
+ /**
+ * For text note, it doesn't has attachment, for multi-media
+ * note, it has at least one attachment
+ *
Type: INTEGER
+ */
+ public static final String HAS_ATTACHMENT = "has_attachment";
+
+ /**
+ * Folder's count of notes
+ *
Type: INTEGER (long)
+ */
+ public static final String NOTES_COUNT = "notes_count";
+
+ /**
+ * The file type: folder or note
+ *
Type: INTEGER
+ */
+ public static final String TYPE = "type";
+
+ /**
+ * The last sync id
+ *
Type: INTEGER (long)
+ */
+ public static final String SYNC_ID = "sync_id";
+
+ /**
+ * Sign to indicate local modified or not
+ *
Type: INTEGER
+ */
+ public static final String LOCAL_MODIFIED = "local_modified";
+
+ /**
+ * Original parent id before moving into temporary folder
+ *
Type : INTEGER
+ */
+ public static final String ORIGIN_PARENT_ID = "origin_parent_id";
+
+ /**
+ * The gtask id
+ *
Type : TEXT
+ */
+ public static final String GTASK_ID = "gtask_id";
+
+ /**
+ * The version code
+ *
Type : INTEGER (long)
+ */
+ public static final String VERSION = "version";
+ }
+
+ public interface DataColumns {
+ /**
+ * The unique ID for a row
+ *
Type: INTEGER (long)
+ */
+ public static final String ID = "_id";
+
+ /**
+ * The MIME type of the item represented by this row.
+ *
Type: Text
+ */
+ public static final String MIME_TYPE = "mime_type";
+
+ /**
+ * The reference id to note that this data belongs to
+ *
Type: INTEGER (long)
+ */
+ public static final String NOTE_ID = "note_id";
+
+ /**
+ * Created data for note or folder
+ *
Type: INTEGER (long)
+ */
+ public static final String CREATED_DATE = "created_date";
+
+ /**
+ * Latest modified date
+ *
Type: INTEGER (long)
+ */
+ public static final String MODIFIED_DATE = "modified_date";
+
+ /**
+ * Data's content
+ *
Type: TEXT
+ */
+ public static final String CONTENT = "content";
+
+
+ /**
+ * Generic data column, the meaning is {@link #MIMETYPE} specific, used for
+ * integer data type
+ *
Type: INTEGER
+ */
+ public static final String DATA1 = "data1";
+
+ /**
+ * Generic data column, the meaning is {@link #MIMETYPE} specific, used for
+ * integer data type
+ *
Type: INTEGER
+ */
+ public static final String DATA2 = "data2";
+
+ /**
+ * Generic data column, the meaning is {@link #MIMETYPE} specific, used for
+ * TEXT data type
+ *
Type: TEXT
+ */
+ public static final String DATA3 = "data3";
+
+ /**
+ * Generic data column, the meaning is {@link #MIMETYPE} specific, used for
+ * TEXT data type
+ *
Type: TEXT
+ */
+ public static final String DATA4 = "data4";
+
+ /**
+ * Generic data column, the meaning is {@link #MIMETYPE} specific, used for
+ * TEXT data type
+ *
Type: TEXT
+ */
+ public static final String DATA5 = "data5";
+ }
+
+ public static final class TextNote implements DataColumns {
+ /**
+ * Mode to indicate the text in check list mode or not
+ *
Type: Integer 1:check list mode 0: normal mode
+ */
+ public static final String MODE = DATA1;
+
+ public static final int MODE_CHECK_LIST = 1;
+
+ public static final String CONTENT_TYPE = "vnd.android.cursor.dir/text_note";
+
+ public static final String CONTENT_ITEM_TYPE = "vnd.android.cursor.item/text_note";
+
+ public static final Uri CONTENT_URI = Uri.parse("content://" + AUTHORITY + "/text_note");
+ }
+
+ public static final class CallNote implements DataColumns {
+ /**
+ * Call date for this record
+ *
Type: INTEGER (long)
+ */
+ public static final String CALL_DATE = DATA1;
+
+ /**
+ * Phone number for this record
+ *
Type: TEXT
+ */
+ public static final String PHONE_NUMBER = DATA3;
+
+ public static final String CONTENT_TYPE = "vnd.android.cursor.dir/call_note";
+
+ public static final String CONTENT_ITEM_TYPE = "vnd.android.cursor.item/call_note";
+
+ public static final Uri CONTENT_URI = Uri.parse("content://" + AUTHORITY + "/call_note");
+ }
+}
diff --git a/Notes-master/app/src/main/java/net/micode/notes/data/NotesDatabaseHelper.java b/Notes-master/app/src/main/java/net/micode/notes/data/NotesDatabaseHelper.java
new file mode 100644
index 0000000..ffe5d57
--- /dev/null
+++ b/Notes-master/app/src/main/java/net/micode/notes/data/NotesDatabaseHelper.java
@@ -0,0 +1,362 @@
+/*
+ * 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.data;
+
+import android.content.ContentValues;
+import android.content.Context;
+import android.database.sqlite.SQLiteDatabase;
+import android.database.sqlite.SQLiteOpenHelper;
+import android.util.Log;
+
+import net.micode.notes.data.Notes.DataColumns;
+import net.micode.notes.data.Notes.DataConstants;
+import net.micode.notes.data.Notes.NoteColumns;
+
+
+public class NotesDatabaseHelper extends SQLiteOpenHelper {
+ private static final String DB_NAME = "note.db";
+
+ private static final int DB_VERSION = 4;
+
+ public interface TABLE {
+ public static final String NOTE = "note";
+
+ public static final String DATA = "data";
+ }
+
+ private static final String TAG = "NotesDatabaseHelper";
+
+ private static NotesDatabaseHelper mInstance;
+
+ private static final String CREATE_NOTE_TABLE_SQL =
+ "CREATE TABLE " + TABLE.NOTE + "(" +
+ NoteColumns.ID + " INTEGER PRIMARY KEY," +
+ NoteColumns.PARENT_ID + " INTEGER NOT NULL DEFAULT 0," +
+ NoteColumns.ALERTED_DATE + " INTEGER NOT NULL DEFAULT 0," +
+ NoteColumns.BG_COLOR_ID + " INTEGER NOT NULL DEFAULT 0," +
+ NoteColumns.CREATED_DATE + " INTEGER NOT NULL DEFAULT (strftime('%s','now') * 1000)," +
+ NoteColumns.HAS_ATTACHMENT + " INTEGER NOT NULL DEFAULT 0," +
+ NoteColumns.MODIFIED_DATE + " INTEGER NOT NULL DEFAULT (strftime('%s','now') * 1000)," +
+ NoteColumns.NOTES_COUNT + " INTEGER NOT NULL DEFAULT 0," +
+ NoteColumns.SNIPPET + " TEXT NOT NULL DEFAULT ''," +
+ NoteColumns.TYPE + " INTEGER NOT NULL DEFAULT 0," +
+ NoteColumns.WIDGET_ID + " INTEGER NOT NULL DEFAULT 0," +
+ NoteColumns.WIDGET_TYPE + " INTEGER NOT NULL DEFAULT -1," +
+ NoteColumns.SYNC_ID + " INTEGER NOT NULL DEFAULT 0," +
+ NoteColumns.LOCAL_MODIFIED + " INTEGER NOT NULL DEFAULT 0," +
+ NoteColumns.ORIGIN_PARENT_ID + " INTEGER NOT NULL DEFAULT 0," +
+ NoteColumns.GTASK_ID + " TEXT NOT NULL DEFAULT ''," +
+ NoteColumns.VERSION + " INTEGER NOT NULL DEFAULT 0" +
+ ")";
+
+ private static final String CREATE_DATA_TABLE_SQL =
+ "CREATE TABLE " + TABLE.DATA + "(" +
+ DataColumns.ID + " INTEGER PRIMARY KEY," +
+ DataColumns.MIME_TYPE + " TEXT NOT NULL," +
+ DataColumns.NOTE_ID + " INTEGER NOT NULL DEFAULT 0," +
+ NoteColumns.CREATED_DATE + " INTEGER NOT NULL DEFAULT (strftime('%s','now') * 1000)," +
+ NoteColumns.MODIFIED_DATE + " INTEGER NOT NULL DEFAULT (strftime('%s','now') * 1000)," +
+ DataColumns.CONTENT + " TEXT NOT NULL DEFAULT ''," +
+ DataColumns.DATA1 + " INTEGER," +
+ DataColumns.DATA2 + " INTEGER," +
+ DataColumns.DATA3 + " TEXT NOT NULL DEFAULT ''," +
+ DataColumns.DATA4 + " TEXT NOT NULL DEFAULT ''," +
+ DataColumns.DATA5 + " TEXT NOT NULL DEFAULT ''" +
+ ")";
+
+ private static final String CREATE_DATA_NOTE_ID_INDEX_SQL =
+ "CREATE INDEX IF NOT EXISTS note_id_index ON " +
+ TABLE.DATA + "(" + DataColumns.NOTE_ID + ");";
+
+ /**
+ * Increase folder's note count when move note to the folder
+ */
+ private static final String NOTE_INCREASE_FOLDER_COUNT_ON_UPDATE_TRIGGER =
+ "CREATE TRIGGER increase_folder_count_on_update "+
+ " AFTER UPDATE OF " + NoteColumns.PARENT_ID + " ON " + TABLE.NOTE +
+ " BEGIN " +
+ " UPDATE " + TABLE.NOTE +
+ " SET " + NoteColumns.NOTES_COUNT + "=" + NoteColumns.NOTES_COUNT + " + 1" +
+ " WHERE " + NoteColumns.ID + "=new." + NoteColumns.PARENT_ID + ";" +
+ " END";
+
+ /**
+ * Decrease folder's note count when move note from folder
+ */
+ private static final String NOTE_DECREASE_FOLDER_COUNT_ON_UPDATE_TRIGGER =
+ "CREATE TRIGGER decrease_folder_count_on_update " +
+ " AFTER UPDATE OF " + NoteColumns.PARENT_ID + " ON " + TABLE.NOTE +
+ " BEGIN " +
+ " UPDATE " + TABLE.NOTE +
+ " SET " + NoteColumns.NOTES_COUNT + "=" + NoteColumns.NOTES_COUNT + "-1" +
+ " WHERE " + NoteColumns.ID + "=old." + NoteColumns.PARENT_ID +
+ " AND " + NoteColumns.NOTES_COUNT + ">0" + ";" +
+ " END";
+
+ /**
+ * Increase folder's note count when insert new note to the folder
+ */
+ private static final String NOTE_INCREASE_FOLDER_COUNT_ON_INSERT_TRIGGER =
+ "CREATE TRIGGER increase_folder_count_on_insert " +
+ " AFTER INSERT ON " + TABLE.NOTE +
+ " BEGIN " +
+ " UPDATE " + TABLE.NOTE +
+ " SET " + NoteColumns.NOTES_COUNT + "=" + NoteColumns.NOTES_COUNT + " + 1" +
+ " WHERE " + NoteColumns.ID + "=new." + NoteColumns.PARENT_ID + ";" +
+ " END";
+
+ /**
+ * Decrease folder's note count when delete note from the folder
+ */
+ private static final String NOTE_DECREASE_FOLDER_COUNT_ON_DELETE_TRIGGER =
+ "CREATE TRIGGER decrease_folder_count_on_delete " +
+ " AFTER DELETE ON " + TABLE.NOTE +
+ " BEGIN " +
+ " UPDATE " + TABLE.NOTE +
+ " SET " + NoteColumns.NOTES_COUNT + "=" + NoteColumns.NOTES_COUNT + "-1" +
+ " WHERE " + NoteColumns.ID + "=old." + NoteColumns.PARENT_ID +
+ " AND " + NoteColumns.NOTES_COUNT + ">0;" +
+ " END";
+
+ /**
+ * Update note's content when insert data with type {@link DataConstants#NOTE}
+ */
+ private static final String DATA_UPDATE_NOTE_CONTENT_ON_INSERT_TRIGGER =
+ "CREATE TRIGGER update_note_content_on_insert " +
+ " AFTER INSERT ON " + TABLE.DATA +
+ " WHEN new." + DataColumns.MIME_TYPE + "='" + DataConstants.NOTE + "'" +
+ " BEGIN" +
+ " UPDATE " + TABLE.NOTE +
+ " SET " + NoteColumns.SNIPPET + "=new." + DataColumns.CONTENT +
+ " WHERE " + NoteColumns.ID + "=new." + DataColumns.NOTE_ID + ";" +
+ " END";
+
+ /**
+ * Update note's content when data with {@link DataConstants#NOTE} type has changed
+ */
+ private static final String DATA_UPDATE_NOTE_CONTENT_ON_UPDATE_TRIGGER =
+ "CREATE TRIGGER update_note_content_on_update " +
+ " AFTER UPDATE ON " + TABLE.DATA +
+ " WHEN old." + DataColumns.MIME_TYPE + "='" + DataConstants.NOTE + "'" +
+ " BEGIN" +
+ " UPDATE " + TABLE.NOTE +
+ " SET " + NoteColumns.SNIPPET + "=new." + DataColumns.CONTENT +
+ " WHERE " + NoteColumns.ID + "=new." + DataColumns.NOTE_ID + ";" +
+ " END";
+
+ /**
+ * Update note's content when data with {@link DataConstants#NOTE} type has deleted
+ */
+ private static final String DATA_UPDATE_NOTE_CONTENT_ON_DELETE_TRIGGER =
+ "CREATE TRIGGER update_note_content_on_delete " +
+ " AFTER delete ON " + TABLE.DATA +
+ " WHEN old." + DataColumns.MIME_TYPE + "='" + DataConstants.NOTE + "'" +
+ " BEGIN" +
+ " UPDATE " + TABLE.NOTE +
+ " SET " + NoteColumns.SNIPPET + "=''" +
+ " WHERE " + NoteColumns.ID + "=old." + DataColumns.NOTE_ID + ";" +
+ " END";
+
+ /**
+ * Delete datas belong to note which has been deleted
+ */
+ private static final String NOTE_DELETE_DATA_ON_DELETE_TRIGGER =
+ "CREATE TRIGGER delete_data_on_delete " +
+ " AFTER DELETE ON " + TABLE.NOTE +
+ " BEGIN" +
+ " DELETE FROM " + TABLE.DATA +
+ " WHERE " + DataColumns.NOTE_ID + "=old." + NoteColumns.ID + ";" +
+ " END";
+
+ /**
+ * Delete notes belong to folder which has been deleted
+ */
+ private static final String FOLDER_DELETE_NOTES_ON_DELETE_TRIGGER =
+ "CREATE TRIGGER folder_delete_notes_on_delete " +
+ " AFTER DELETE ON " + TABLE.NOTE +
+ " BEGIN" +
+ " DELETE FROM " + TABLE.NOTE +
+ " WHERE " + NoteColumns.PARENT_ID + "=old." + NoteColumns.ID + ";" +
+ " END";
+
+ /**
+ * Move notes belong to folder which has been moved to trash folder
+ */
+ private static final String FOLDER_MOVE_NOTES_ON_TRASH_TRIGGER =
+ "CREATE TRIGGER folder_move_notes_on_trash " +
+ " AFTER UPDATE ON " + TABLE.NOTE +
+ " WHEN new." + NoteColumns.PARENT_ID + "=" + Notes.ID_TRASH_FOLER +
+ " BEGIN" +
+ " UPDATE " + TABLE.NOTE +
+ " SET " + NoteColumns.PARENT_ID + "=" + Notes.ID_TRASH_FOLER +
+ " WHERE " + NoteColumns.PARENT_ID + "=old." + NoteColumns.ID + ";" +
+ " END";
+
+ public NotesDatabaseHelper(Context context) {
+ super(context, DB_NAME, null, DB_VERSION);
+ }
+
+ public void createNoteTable(SQLiteDatabase db) {
+ db.execSQL(CREATE_NOTE_TABLE_SQL);
+ reCreateNoteTableTriggers(db);
+ createSystemFolder(db);
+ Log.d(TAG, "note table has been created");
+ }
+
+ private void reCreateNoteTableTriggers(SQLiteDatabase db) {
+ db.execSQL("DROP TRIGGER IF EXISTS increase_folder_count_on_update");
+ db.execSQL("DROP TRIGGER IF EXISTS decrease_folder_count_on_update");
+ db.execSQL("DROP TRIGGER IF EXISTS decrease_folder_count_on_delete");
+ db.execSQL("DROP TRIGGER IF EXISTS delete_data_on_delete");
+ db.execSQL("DROP TRIGGER IF EXISTS increase_folder_count_on_insert");
+ db.execSQL("DROP TRIGGER IF EXISTS folder_delete_notes_on_delete");
+ db.execSQL("DROP TRIGGER IF EXISTS folder_move_notes_on_trash");
+
+ db.execSQL(NOTE_INCREASE_FOLDER_COUNT_ON_UPDATE_TRIGGER);
+ db.execSQL(NOTE_DECREASE_FOLDER_COUNT_ON_UPDATE_TRIGGER);
+ db.execSQL(NOTE_DECREASE_FOLDER_COUNT_ON_DELETE_TRIGGER);
+ db.execSQL(NOTE_DELETE_DATA_ON_DELETE_TRIGGER);
+ db.execSQL(NOTE_INCREASE_FOLDER_COUNT_ON_INSERT_TRIGGER);
+ db.execSQL(FOLDER_DELETE_NOTES_ON_DELETE_TRIGGER);
+ db.execSQL(FOLDER_MOVE_NOTES_ON_TRASH_TRIGGER);
+ }
+
+ private void createSystemFolder(SQLiteDatabase db) {
+ ContentValues values = new ContentValues();
+
+ /**
+ * call record foler for call notes
+ */
+ values.put(NoteColumns.ID, Notes.ID_CALL_RECORD_FOLDER);
+ values.put(NoteColumns.TYPE, Notes.TYPE_SYSTEM);
+ db.insert(TABLE.NOTE, null, values);
+
+ /**
+ * root folder which is default folder
+ */
+ values.clear();
+ values.put(NoteColumns.ID, Notes.ID_ROOT_FOLDER);
+ values.put(NoteColumns.TYPE, Notes.TYPE_SYSTEM);
+ db.insert(TABLE.NOTE, null, values);
+
+ /**
+ * temporary folder which is used for moving note
+ */
+ values.clear();
+ values.put(NoteColumns.ID, Notes.ID_TEMPARAY_FOLDER);
+ values.put(NoteColumns.TYPE, Notes.TYPE_SYSTEM);
+ db.insert(TABLE.NOTE, null, values);
+
+ /**
+ * create trash folder
+ */
+ values.clear();
+ values.put(NoteColumns.ID, Notes.ID_TRASH_FOLER);
+ values.put(NoteColumns.TYPE, Notes.TYPE_SYSTEM);
+ db.insert(TABLE.NOTE, null, values);
+ }
+
+ public void createDataTable(SQLiteDatabase db) {
+ db.execSQL(CREATE_DATA_TABLE_SQL);
+ reCreateDataTableTriggers(db);
+ db.execSQL(CREATE_DATA_NOTE_ID_INDEX_SQL);
+ Log.d(TAG, "data table has been created");
+ }
+
+ private void reCreateDataTableTriggers(SQLiteDatabase db) {
+ db.execSQL("DROP TRIGGER IF EXISTS update_note_content_on_insert");
+ db.execSQL("DROP TRIGGER IF EXISTS update_note_content_on_update");
+ db.execSQL("DROP TRIGGER IF EXISTS update_note_content_on_delete");
+
+ db.execSQL(DATA_UPDATE_NOTE_CONTENT_ON_INSERT_TRIGGER);
+ db.execSQL(DATA_UPDATE_NOTE_CONTENT_ON_UPDATE_TRIGGER);
+ db.execSQL(DATA_UPDATE_NOTE_CONTENT_ON_DELETE_TRIGGER);
+ }
+
+ static synchronized NotesDatabaseHelper getInstance(Context context) {
+ if (mInstance == null) {
+ mInstance = new NotesDatabaseHelper(context);
+ }
+ return mInstance;
+ }
+
+ @Override
+ public void onCreate(SQLiteDatabase db) {
+ createNoteTable(db);
+ createDataTable(db);
+ }
+
+ @Override
+ public void onUpgrade(SQLiteDatabase db, int oldVersion, int newVersion) {
+ boolean reCreateTriggers = false;
+ boolean skipV2 = false;
+
+ if (oldVersion == 1) {
+ upgradeToV2(db);
+ skipV2 = true; // this upgrade including the upgrade from v2 to v3
+ oldVersion++;
+ }
+
+ if (oldVersion == 2 && !skipV2) {
+ upgradeToV3(db);
+ reCreateTriggers = true;
+ oldVersion++;
+ }
+
+ if (oldVersion == 3) {
+ upgradeToV4(db);
+ oldVersion++;
+ }
+
+ if (reCreateTriggers) {
+ reCreateNoteTableTriggers(db);
+ reCreateDataTableTriggers(db);
+ }
+
+ if (oldVersion != newVersion) {
+ throw new IllegalStateException("Upgrade notes database to version " + newVersion
+ + "fails");
+ }
+ }
+
+ private void upgradeToV2(SQLiteDatabase db) {
+ db.execSQL("DROP TABLE IF EXISTS " + TABLE.NOTE);
+ db.execSQL("DROP TABLE IF EXISTS " + TABLE.DATA);
+ createNoteTable(db);
+ createDataTable(db);
+ }
+
+ private void upgradeToV3(SQLiteDatabase db) {
+ // drop unused triggers
+ db.execSQL("DROP TRIGGER IF EXISTS update_note_modified_date_on_insert");
+ db.execSQL("DROP TRIGGER IF EXISTS update_note_modified_date_on_delete");
+ db.execSQL("DROP TRIGGER IF EXISTS update_note_modified_date_on_update");
+ // add a column for gtask id
+ db.execSQL("ALTER TABLE " + TABLE.NOTE + " ADD COLUMN " + NoteColumns.GTASK_ID
+ + " TEXT NOT NULL DEFAULT ''");
+ // add a trash system folder
+ ContentValues values = new ContentValues();
+ values.put(NoteColumns.ID, Notes.ID_TRASH_FOLER);
+ values.put(NoteColumns.TYPE, Notes.TYPE_SYSTEM);
+ db.insert(TABLE.NOTE, null, values);
+ }
+
+ private void upgradeToV4(SQLiteDatabase db) {
+ db.execSQL("ALTER TABLE " + TABLE.NOTE + " ADD COLUMN " + NoteColumns.VERSION
+ + " INTEGER NOT NULL DEFAULT 0");
+ }
+}
diff --git a/xiaomi/app/src/main/java/net/micode/notes/data/NotesProvider.java b/Notes-master/app/src/main/java/net/micode/notes/data/NotesProvider.java
similarity index 89%
rename from xiaomi/app/src/main/java/net/micode/notes/data/NotesProvider.java
rename to Notes-master/app/src/main/java/net/micode/notes/data/NotesProvider.java
index 5cd4d4a..edb0a60 100644
--- a/xiaomi/app/src/main/java/net/micode/notes/data/NotesProvider.java
+++ b/Notes-master/app/src/main/java/net/micode/notes/data/NotesProvider.java
@@ -50,7 +50,6 @@ public class NotesProvider extends ContentProvider {
private static final int URI_SEARCH = 5;
private static final int URI_SEARCH_SUGGEST = 6;
- // UriMatcher用于匹配URI和对应的操作类型
static {
mMatcher = new UriMatcher(UriMatcher.NO_MATCH);
mMatcher.addURI(Notes.AUTHORITY, "note", URI_NOTE);
@@ -62,21 +61,23 @@ public class NotesProvider extends ContentProvider {
mMatcher.addURI(Notes.AUTHORITY, SearchManager.SUGGEST_URI_PATH_QUERY + "/*", URI_SEARCH_SUGGEST);
}
- // 搜索结果的投影列,用于显示搜索结果的标题和内容
+ /**
+ * x'0A' represents the '\n' character in sqlite. For title and content in the search result,
+ * we will trim '\n' and white space in order to show more information.
+ */
private static final String NOTES_SEARCH_PROJECTION = NoteColumns.ID + ","
- + NoteColumns.ID + " AS " + SearchManager.SUGGEST_COLUMN_INTENT_EXTRA_DATA + ","
- + "TRIM(REPLACE(" + NoteColumns.SNIPPET + ", x'0A','')) AS " + SearchManager.SUGGEST_COLUMN_TEXT_1 + ","
- + "TRIM(REPLACE(" + NoteColumns.SNIPPET + ", x'0A','')) AS " + SearchManager.SUGGEST_COLUMN_TEXT_2 + ","
- + R.drawable.search_result + " AS " + SearchManager.SUGGEST_COLUMN_ICON_1 + ","
- + "'" + Intent.ACTION_VIEW + "' AS " + SearchManager.SUGGEST_COLUMN_INTENT_ACTION + ","
- + "'" + Notes.TextNote.CONTENT_TYPE + "' AS " + SearchManager.SUGGEST_COLUMN_INTENT_DATA;
+ + NoteColumns.ID + " AS " + SearchManager.SUGGEST_COLUMN_INTENT_EXTRA_DATA + ","
+ + "TRIM(REPLACE(" + NoteColumns.SNIPPET + ", x'0A','')) AS " + SearchManager.SUGGEST_COLUMN_TEXT_1 + ","
+ + "TRIM(REPLACE(" + NoteColumns.SNIPPET + ", x'0A','')) AS " + SearchManager.SUGGEST_COLUMN_TEXT_2 + ","
+ + R.drawable.search_result + " AS " + SearchManager.SUGGEST_COLUMN_ICON_1 + ","
+ + "'" + Intent.ACTION_VIEW + "' AS " + SearchManager.SUGGEST_COLUMN_INTENT_ACTION + ","
+ + "'" + Notes.TextNote.CONTENT_TYPE + "' AS " + SearchManager.SUGGEST_COLUMN_INTENT_DATA;
- // 搜索笔记的SQL查询语句
private static String NOTES_SNIPPET_SEARCH_QUERY = "SELECT " + NOTES_SEARCH_PROJECTION
- + " FROM " + TABLE.NOTE
- + " WHERE " + NoteColumns.SNIPPET + " LIKE ?"
- + " AND " + NoteColumns.PARENT_ID + "<>" + Notes.ID_TRASH_FOLER
- + " AND " + NoteColumns.TYPE + "=" + Notes.TYPE_NOTE;
+ + " FROM " + TABLE.NOTE
+ + " WHERE " + NoteColumns.SNIPPET + " LIKE ?"
+ + " AND " + NoteColumns.PARENT_ID + "<>" + Notes.ID_TRASH_FOLER
+ + " AND " + NoteColumns.TYPE + "=" + Notes.TYPE_NOTE;
@Override
public boolean onCreate() {
@@ -86,7 +87,7 @@ public class NotesProvider extends ContentProvider {
@Override
public Cursor query(Uri uri, String[] projection, String selection, String[] selectionArgs,
- String sortOrder) {
+ String sortOrder) {
Cursor c = null;
SQLiteDatabase db = mHelper.getReadableDatabase();
String id = null;
@@ -146,7 +147,6 @@ public class NotesProvider extends ContentProvider {
return c;
}
- // 插入数据
@Override
public Uri insert(Uri uri, ContentValues values) {
SQLiteDatabase db = mHelper.getWritableDatabase();
@@ -166,13 +166,13 @@ public class NotesProvider extends ContentProvider {
default:
throw new IllegalArgumentException("Unknown URI " + uri);
}
- // 通知对应的note uri发生了变化
+ // Notify the note uri
if (noteId > 0) {
getContext().getContentResolver().notifyChange(
ContentUris.withAppendedId(Notes.CONTENT_NOTE_URI, noteId), null);
}
- // 通知对应的data uri发生了变化
+ // Notify the data uri
if (dataId > 0) {
getContext().getContentResolver().notifyChange(
ContentUris.withAppendedId(Notes.CONTENT_DATA_URI, dataId), null);
@@ -181,7 +181,6 @@ public class NotesProvider extends ContentProvider {
return ContentUris.withAppendedId(uri, insertedId);
}
- // 删除数据
@Override
public int delete(Uri uri, String selection, String[] selectionArgs) {
int count = 0;
@@ -228,7 +227,6 @@ public class NotesProvider extends ContentProvider {
return count;
}
- // 更新数据
@Override
public int update(Uri uri, ContentValues values, String selection, String[] selectionArgs) {
int count = 0;
@@ -269,12 +267,10 @@ public class NotesProvider extends ContentProvider {
return count;
}
- // 解析selection参数
private String parseSelection(String selection) {
return (!TextUtils.isEmpty(selection) ? " AND (" + selection + ')' : "");
}
- // 增加Note的版本号
private void increaseNoteVersion(long id, String selection, String[] selectionArgs) {
StringBuilder sql = new StringBuilder(120);
sql.append("UPDATE ");
@@ -306,4 +302,4 @@ public class NotesProvider extends ContentProvider {
return null;
}
-}
\ No newline at end of file
+}
diff --git a/Notes-master/app/src/main/java/net/micode/notes/gtask/data/MetaData.java b/Notes-master/app/src/main/java/net/micode/notes/gtask/data/MetaData.java
new file mode 100644
index 0000000..3a2050b
--- /dev/null
+++ b/Notes-master/app/src/main/java/net/micode/notes/gtask/data/MetaData.java
@@ -0,0 +1,82 @@
+/*
+ * 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.gtask.data;
+
+import android.database.Cursor;
+import android.util.Log;
+
+import net.micode.notes.tool.GTaskStringUtils;
+
+import org.json.JSONException;
+import org.json.JSONObject;
+
+
+public class MetaData extends Task {
+ private final static String TAG = MetaData.class.getSimpleName();
+
+ private String mRelatedGid = null;
+
+ public void setMeta(String gid, JSONObject metaInfo) {
+ try {
+ metaInfo.put(GTaskStringUtils.META_HEAD_GTASK_ID, gid);
+ } catch (JSONException e) {
+ Log.e(TAG, "failed to put related gid");
+ }
+ setNotes(metaInfo.toString());
+ setName(GTaskStringUtils.META_NOTE_NAME);
+ }
+
+ public String getRelatedGid() {
+ return mRelatedGid;
+ }
+
+ @Override
+ public boolean isWorthSaving() {
+ return getNotes() != null;
+ }
+
+ @Override
+ public void setContentByRemoteJSON(JSONObject js) {
+ super.setContentByRemoteJSON(js);
+ if (getNotes() != null) {
+ try {
+ JSONObject metaInfo = new JSONObject(getNotes().trim());
+ mRelatedGid = metaInfo.getString(GTaskStringUtils.META_HEAD_GTASK_ID);
+ } catch (JSONException e) {
+ Log.w(TAG, "failed to get related gid");
+ mRelatedGid = null;
+ }
+ }
+ }
+
+ @Override
+ public void setContentByLocalJSON(JSONObject js) {
+ // this function should not be called
+ throw new IllegalAccessError("MetaData:setContentByLocalJSON should not be called");
+ }
+
+ @Override
+ public JSONObject getLocalJSONFromContent() {
+ throw new IllegalAccessError("MetaData:getLocalJSONFromContent should not be called");
+ }
+
+ @Override
+ public int getSyncAction(Cursor c) {
+ throw new IllegalAccessError("MetaData:getSyncAction should not be called");
+ }
+
+}
diff --git a/Notes-master/app/src/main/java/net/micode/notes/gtask/data/Node.java b/Notes-master/app/src/main/java/net/micode/notes/gtask/data/Node.java
new file mode 100644
index 0000000..63950e0
--- /dev/null
+++ b/Notes-master/app/src/main/java/net/micode/notes/gtask/data/Node.java
@@ -0,0 +1,101 @@
+/*
+ * 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.gtask.data;
+
+import android.database.Cursor;
+
+import org.json.JSONObject;
+
+public abstract class Node {
+ public static final int SYNC_ACTION_NONE = 0;
+
+ public static final int SYNC_ACTION_ADD_REMOTE = 1;
+
+ public static final int SYNC_ACTION_ADD_LOCAL = 2;
+
+ public static final int SYNC_ACTION_DEL_REMOTE = 3;
+
+ public static final int SYNC_ACTION_DEL_LOCAL = 4;
+
+ public static final int SYNC_ACTION_UPDATE_REMOTE = 5;
+
+ public static final int SYNC_ACTION_UPDATE_LOCAL = 6;
+
+ public static final int SYNC_ACTION_UPDATE_CONFLICT = 7;
+
+ public static final int SYNC_ACTION_ERROR = 8;
+
+ private String mGid;
+
+ private String mName;
+
+ private long mLastModified;
+
+ private boolean mDeleted;
+
+ public Node() {
+ mGid = null;
+ mName = "";
+ mLastModified = 0;
+ mDeleted = false;
+ }
+
+ public abstract JSONObject getCreateAction(int actionId);
+
+ public abstract JSONObject getUpdateAction(int actionId);
+
+ public abstract void setContentByRemoteJSON(JSONObject js);
+
+ public abstract void setContentByLocalJSON(JSONObject js);
+
+ public abstract JSONObject getLocalJSONFromContent();
+
+ public abstract int getSyncAction(Cursor c);
+
+ public void setGid(String gid) {
+ this.mGid = gid;
+ }
+
+ public void setName(String name) {
+ this.mName = name;
+ }
+
+ public void setLastModified(long lastModified) {
+ this.mLastModified = lastModified;
+ }
+
+ public void setDeleted(boolean deleted) {
+ this.mDeleted = deleted;
+ }
+
+ public String getGid() {
+ return this.mGid;
+ }
+
+ public String getName() {
+ return this.mName;
+ }
+
+ public long getLastModified() {
+ return this.mLastModified;
+ }
+
+ public boolean getDeleted() {
+ return this.mDeleted;
+ }
+
+}
diff --git a/Notes-master/app/src/main/java/net/micode/notes/gtask/data/SqlData.java b/Notes-master/app/src/main/java/net/micode/notes/gtask/data/SqlData.java
new file mode 100644
index 0000000..d3ec3be
--- /dev/null
+++ b/Notes-master/app/src/main/java/net/micode/notes/gtask/data/SqlData.java
@@ -0,0 +1,189 @@
+/*
+ * 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.gtask.data;
+
+import android.content.ContentResolver;
+import android.content.ContentUris;
+import android.content.ContentValues;
+import android.content.Context;
+import android.database.Cursor;
+import android.net.Uri;
+import android.util.Log;
+
+import net.micode.notes.data.Notes;
+import net.micode.notes.data.Notes.DataColumns;
+import net.micode.notes.data.Notes.DataConstants;
+import net.micode.notes.data.Notes.NoteColumns;
+import net.micode.notes.data.NotesDatabaseHelper.TABLE;
+import net.micode.notes.gtask.exception.ActionFailureException;
+
+import org.json.JSONException;
+import org.json.JSONObject;
+
+
+public class SqlData {
+ private static final String TAG = SqlData.class.getSimpleName();
+
+ private static final int INVALID_ID = -99999;
+
+ public static final String[] PROJECTION_DATA = new String[] {
+ DataColumns.ID, DataColumns.MIME_TYPE, DataColumns.CONTENT, DataColumns.DATA1,
+ DataColumns.DATA3
+ };
+
+ public static final int DATA_ID_COLUMN = 0;
+
+ public static final int DATA_MIME_TYPE_COLUMN = 1;
+
+ public static final int DATA_CONTENT_COLUMN = 2;
+
+ public static final int DATA_CONTENT_DATA_1_COLUMN = 3;
+
+ public static final int DATA_CONTENT_DATA_3_COLUMN = 4;
+
+ private ContentResolver mContentResolver;
+
+ private boolean mIsCreate;
+
+ private long mDataId;
+
+ private String mDataMimeType;
+
+ private String mDataContent;
+
+ private long mDataContentData1;
+
+ private String mDataContentData3;
+
+ private ContentValues mDiffDataValues;
+
+ public SqlData(Context context) {
+ mContentResolver = context.getContentResolver();
+ mIsCreate = true;
+ mDataId = INVALID_ID;
+ mDataMimeType = DataConstants.NOTE;
+ mDataContent = "";
+ mDataContentData1 = 0;
+ mDataContentData3 = "";
+ mDiffDataValues = new ContentValues();
+ }
+
+ public SqlData(Context context, Cursor c) {
+ mContentResolver = context.getContentResolver();
+ mIsCreate = false;
+ loadFromCursor(c);
+ mDiffDataValues = new ContentValues();
+ }
+
+ private void loadFromCursor(Cursor c) {
+ mDataId = c.getLong(DATA_ID_COLUMN);
+ mDataMimeType = c.getString(DATA_MIME_TYPE_COLUMN);
+ mDataContent = c.getString(DATA_CONTENT_COLUMN);
+ mDataContentData1 = c.getLong(DATA_CONTENT_DATA_1_COLUMN);
+ mDataContentData3 = c.getString(DATA_CONTENT_DATA_3_COLUMN);
+ }
+
+ public void setContent(JSONObject js) throws JSONException {
+ long dataId = js.has(DataColumns.ID) ? js.getLong(DataColumns.ID) : INVALID_ID;
+ if (mIsCreate || mDataId != dataId) {
+ mDiffDataValues.put(DataColumns.ID, dataId);
+ }
+ mDataId = dataId;
+
+ String dataMimeType = js.has(DataColumns.MIME_TYPE) ? js.getString(DataColumns.MIME_TYPE)
+ : DataConstants.NOTE;
+ if (mIsCreate || !mDataMimeType.equals(dataMimeType)) {
+ mDiffDataValues.put(DataColumns.MIME_TYPE, dataMimeType);
+ }
+ mDataMimeType = dataMimeType;
+
+ String dataContent = js.has(DataColumns.CONTENT) ? js.getString(DataColumns.CONTENT) : "";
+ if (mIsCreate || !mDataContent.equals(dataContent)) {
+ mDiffDataValues.put(DataColumns.CONTENT, dataContent);
+ }
+ mDataContent = dataContent;
+
+ long dataContentData1 = js.has(DataColumns.DATA1) ? js.getLong(DataColumns.DATA1) : 0;
+ if (mIsCreate || mDataContentData1 != dataContentData1) {
+ mDiffDataValues.put(DataColumns.DATA1, dataContentData1);
+ }
+ mDataContentData1 = dataContentData1;
+
+ String dataContentData3 = js.has(DataColumns.DATA3) ? js.getString(DataColumns.DATA3) : "";
+ if (mIsCreate || !mDataContentData3.equals(dataContentData3)) {
+ mDiffDataValues.put(DataColumns.DATA3, dataContentData3);
+ }
+ mDataContentData3 = dataContentData3;
+ }
+
+ public JSONObject getContent() throws JSONException {
+ if (mIsCreate) {
+ Log.e(TAG, "it seems that we haven't created this in database yet");
+ return null;
+ }
+ JSONObject js = new JSONObject();
+ js.put(DataColumns.ID, mDataId);
+ js.put(DataColumns.MIME_TYPE, mDataMimeType);
+ js.put(DataColumns.CONTENT, mDataContent);
+ js.put(DataColumns.DATA1, mDataContentData1);
+ js.put(DataColumns.DATA3, mDataContentData3);
+ return js;
+ }
+
+ public void commit(long noteId, boolean validateVersion, long version) {
+
+ if (mIsCreate) {
+ if (mDataId == INVALID_ID && mDiffDataValues.containsKey(DataColumns.ID)) {
+ mDiffDataValues.remove(DataColumns.ID);
+ }
+
+ mDiffDataValues.put(DataColumns.NOTE_ID, noteId);
+ Uri uri = mContentResolver.insert(Notes.CONTENT_DATA_URI, mDiffDataValues);
+ try {
+ mDataId = Long.valueOf(uri.getPathSegments().get(1));
+ } catch (NumberFormatException e) {
+ Log.e(TAG, "Get note id error :" + e.toString());
+ throw new ActionFailureException("create note failed");
+ }
+ } else {
+ if (mDiffDataValues.size() > 0) {
+ int result = 0;
+ if (!validateVersion) {
+ result = mContentResolver.update(ContentUris.withAppendedId(
+ Notes.CONTENT_DATA_URI, mDataId), mDiffDataValues, null, null);
+ } else {
+ result = mContentResolver.update(ContentUris.withAppendedId(
+ Notes.CONTENT_DATA_URI, mDataId), mDiffDataValues,
+ " ? in (SELECT " + NoteColumns.ID + " FROM " + TABLE.NOTE
+ + " WHERE " + NoteColumns.VERSION + "=?)", new String[] {
+ String.valueOf(noteId), String.valueOf(version)
+ });
+ }
+ if (result == 0) {
+ Log.w(TAG, "there is no update. maybe user updates note when syncing");
+ }
+ }
+ }
+
+ mDiffDataValues.clear();
+ mIsCreate = false;
+ }
+
+ public long getId() {
+ return mDataId;
+ }
+}
diff --git a/Notes-master/app/src/main/java/net/micode/notes/gtask/data/SqlNote.java b/Notes-master/app/src/main/java/net/micode/notes/gtask/data/SqlNote.java
new file mode 100644
index 0000000..79a4095
--- /dev/null
+++ b/Notes-master/app/src/main/java/net/micode/notes/gtask/data/SqlNote.java
@@ -0,0 +1,505 @@
+/*
+ * 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.gtask.data;
+
+import android.appwidget.AppWidgetManager;
+import android.content.ContentResolver;
+import android.content.ContentValues;
+import android.content.Context;
+import android.database.Cursor;
+import android.net.Uri;
+import android.util.Log;
+
+import net.micode.notes.data.Notes;
+import net.micode.notes.data.Notes.DataColumns;
+import net.micode.notes.data.Notes.NoteColumns;
+import net.micode.notes.gtask.exception.ActionFailureException;
+import net.micode.notes.tool.GTaskStringUtils;
+import net.micode.notes.tool.ResourceParser;
+
+import org.json.JSONArray;
+import org.json.JSONException;
+import org.json.JSONObject;
+
+import java.util.ArrayList;
+
+
+public class SqlNote {
+ private static final String TAG = SqlNote.class.getSimpleName();
+
+ private static final int INVALID_ID = -99999;
+
+ public static final String[] PROJECTION_NOTE = 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.SYNC_ID,
+ NoteColumns.LOCAL_MODIFIED, NoteColumns.ORIGIN_PARENT_ID, NoteColumns.GTASK_ID,
+ NoteColumns.VERSION
+ };
+
+ public static final int ID_COLUMN = 0;
+
+ public static final int ALERTED_DATE_COLUMN = 1;
+
+ public static final int BG_COLOR_ID_COLUMN = 2;
+
+ public static final int CREATED_DATE_COLUMN = 3;
+
+ public static final int HAS_ATTACHMENT_COLUMN = 4;
+
+ public static final int MODIFIED_DATE_COLUMN = 5;
+
+ public static final int NOTES_COUNT_COLUMN = 6;
+
+ public static final int PARENT_ID_COLUMN = 7;
+
+ public static final int SNIPPET_COLUMN = 8;
+
+ public static final int TYPE_COLUMN = 9;
+
+ public static final int WIDGET_ID_COLUMN = 10;
+
+ public static final int WIDGET_TYPE_COLUMN = 11;
+
+ public static final int SYNC_ID_COLUMN = 12;
+
+ public static final int LOCAL_MODIFIED_COLUMN = 13;
+
+ public static final int ORIGIN_PARENT_ID_COLUMN = 14;
+
+ public static final int GTASK_ID_COLUMN = 15;
+
+ public static final int VERSION_COLUMN = 16;
+
+ private Context mContext;
+
+ private ContentResolver mContentResolver;
+
+ private boolean mIsCreate;
+
+ private long mId;
+
+ private long mAlertDate;
+
+ private int mBgColorId;
+
+ private long mCreatedDate;
+
+ private int mHasAttachment;
+
+ private long mModifiedDate;
+
+ private long mParentId;
+
+ private String mSnippet;
+
+ private int mType;
+
+ private int mWidgetId;
+
+ private int mWidgetType;
+
+ private long mOriginParent;
+
+ private long mVersion;
+
+ private ContentValues mDiffNoteValues;
+
+ private ArrayList mDataList;
+
+ public SqlNote(Context context) {
+ mContext = context;
+ mContentResolver = context.getContentResolver();
+ mIsCreate = true;
+ mId = INVALID_ID;
+ mAlertDate = 0;
+ mBgColorId = ResourceParser.getDefaultBgId(context);
+ mCreatedDate = System.currentTimeMillis();
+ mHasAttachment = 0;
+ mModifiedDate = System.currentTimeMillis();
+ mParentId = 0;
+ mSnippet = "";
+ mType = Notes.TYPE_NOTE;
+ mWidgetId = AppWidgetManager.INVALID_APPWIDGET_ID;
+ mWidgetType = Notes.TYPE_WIDGET_INVALIDE;
+ mOriginParent = 0;
+ mVersion = 0;
+ mDiffNoteValues = new ContentValues();
+ mDataList = new ArrayList();
+ }
+
+ public SqlNote(Context context, Cursor c) {
+ mContext = context;
+ mContentResolver = context.getContentResolver();
+ mIsCreate = false;
+ loadFromCursor(c);
+ mDataList = new ArrayList();
+ if (mType == Notes.TYPE_NOTE)
+ loadDataContent();
+ mDiffNoteValues = new ContentValues();
+ }
+
+ public SqlNote(Context context, long id) {
+ mContext = context;
+ mContentResolver = context.getContentResolver();
+ mIsCreate = false;
+ loadFromCursor(id);
+ mDataList = new ArrayList();
+ if (mType == Notes.TYPE_NOTE)
+ loadDataContent();
+ mDiffNoteValues = new ContentValues();
+
+ }
+
+ private void loadFromCursor(long id) {
+ Cursor c = null;
+ try {
+ c = mContentResolver.query(Notes.CONTENT_NOTE_URI, PROJECTION_NOTE, "(_id=?)",
+ new String[] {
+ String.valueOf(id)
+ }, null);
+ if (c != null) {
+ c.moveToNext();
+ loadFromCursor(c);
+ } else {
+ Log.w(TAG, "loadFromCursor: cursor = null");
+ }
+ } finally {
+ if (c != null)
+ c.close();
+ }
+ }
+
+ private void loadFromCursor(Cursor c) {
+ mId = c.getLong(ID_COLUMN);
+ mAlertDate = c.getLong(ALERTED_DATE_COLUMN);
+ mBgColorId = c.getInt(BG_COLOR_ID_COLUMN);
+ mCreatedDate = c.getLong(CREATED_DATE_COLUMN);
+ mHasAttachment = c.getInt(HAS_ATTACHMENT_COLUMN);
+ mModifiedDate = c.getLong(MODIFIED_DATE_COLUMN);
+ mParentId = c.getLong(PARENT_ID_COLUMN);
+ mSnippet = c.getString(SNIPPET_COLUMN);
+ mType = c.getInt(TYPE_COLUMN);
+ mWidgetId = c.getInt(WIDGET_ID_COLUMN);
+ mWidgetType = c.getInt(WIDGET_TYPE_COLUMN);
+ mVersion = c.getLong(VERSION_COLUMN);
+ }
+
+ private void loadDataContent() {
+ Cursor c = null;
+ mDataList.clear();
+ try {
+ c = mContentResolver.query(Notes.CONTENT_DATA_URI, SqlData.PROJECTION_DATA,
+ "(note_id=?)", new String[] {
+ String.valueOf(mId)
+ }, null);
+ if (c != null) {
+ if (c.getCount() == 0) {
+ Log.w(TAG, "it seems that the note has not data");
+ return;
+ }
+ while (c.moveToNext()) {
+ SqlData data = new SqlData(mContext, c);
+ mDataList.add(data);
+ }
+ } else {
+ Log.w(TAG, "loadDataContent: cursor = null");
+ }
+ } finally {
+ if (c != null)
+ c.close();
+ }
+ }
+
+ public boolean setContent(JSONObject js) {
+ try {
+ JSONObject note = js.getJSONObject(GTaskStringUtils.META_HEAD_NOTE);
+ if (note.getInt(NoteColumns.TYPE) == Notes.TYPE_SYSTEM) {
+ Log.w(TAG, "cannot set system folder");
+ } else if (note.getInt(NoteColumns.TYPE) == Notes.TYPE_FOLDER) {
+ // for folder we can only update the snnipet and type
+ String snippet = note.has(NoteColumns.SNIPPET) ? note
+ .getString(NoteColumns.SNIPPET) : "";
+ if (mIsCreate || !mSnippet.equals(snippet)) {
+ mDiffNoteValues.put(NoteColumns.SNIPPET, snippet);
+ }
+ mSnippet = snippet;
+
+ int type = note.has(NoteColumns.TYPE) ? note.getInt(NoteColumns.TYPE)
+ : Notes.TYPE_NOTE;
+ if (mIsCreate || mType != type) {
+ mDiffNoteValues.put(NoteColumns.TYPE, type);
+ }
+ mType = type;
+ } else if (note.getInt(NoteColumns.TYPE) == Notes.TYPE_NOTE) {
+ JSONArray dataArray = js.getJSONArray(GTaskStringUtils.META_HEAD_DATA);
+ long id = note.has(NoteColumns.ID) ? note.getLong(NoteColumns.ID) : INVALID_ID;
+ if (mIsCreate || mId != id) {
+ mDiffNoteValues.put(NoteColumns.ID, id);
+ }
+ mId = id;
+
+ long alertDate = note.has(NoteColumns.ALERTED_DATE) ? note
+ .getLong(NoteColumns.ALERTED_DATE) : 0;
+ if (mIsCreate || mAlertDate != alertDate) {
+ mDiffNoteValues.put(NoteColumns.ALERTED_DATE, alertDate);
+ }
+ mAlertDate = alertDate;
+
+ int bgColorId = note.has(NoteColumns.BG_COLOR_ID) ? note
+ .getInt(NoteColumns.BG_COLOR_ID) : ResourceParser.getDefaultBgId(mContext);
+ if (mIsCreate || mBgColorId != bgColorId) {
+ mDiffNoteValues.put(NoteColumns.BG_COLOR_ID, bgColorId);
+ }
+ mBgColorId = bgColorId;
+
+ long createDate = note.has(NoteColumns.CREATED_DATE) ? note
+ .getLong(NoteColumns.CREATED_DATE) : System.currentTimeMillis();
+ if (mIsCreate || mCreatedDate != createDate) {
+ mDiffNoteValues.put(NoteColumns.CREATED_DATE, createDate);
+ }
+ mCreatedDate = createDate;
+
+ int hasAttachment = note.has(NoteColumns.HAS_ATTACHMENT) ? note
+ .getInt(NoteColumns.HAS_ATTACHMENT) : 0;
+ if (mIsCreate || mHasAttachment != hasAttachment) {
+ mDiffNoteValues.put(NoteColumns.HAS_ATTACHMENT, hasAttachment);
+ }
+ mHasAttachment = hasAttachment;
+
+ long modifiedDate = note.has(NoteColumns.MODIFIED_DATE) ? note
+ .getLong(NoteColumns.MODIFIED_DATE) : System.currentTimeMillis();
+ if (mIsCreate || mModifiedDate != modifiedDate) {
+ mDiffNoteValues.put(NoteColumns.MODIFIED_DATE, modifiedDate);
+ }
+ mModifiedDate = modifiedDate;
+
+ long parentId = note.has(NoteColumns.PARENT_ID) ? note
+ .getLong(NoteColumns.PARENT_ID) : 0;
+ if (mIsCreate || mParentId != parentId) {
+ mDiffNoteValues.put(NoteColumns.PARENT_ID, parentId);
+ }
+ mParentId = parentId;
+
+ String snippet = note.has(NoteColumns.SNIPPET) ? note
+ .getString(NoteColumns.SNIPPET) : "";
+ if (mIsCreate || !mSnippet.equals(snippet)) {
+ mDiffNoteValues.put(NoteColumns.SNIPPET, snippet);
+ }
+ mSnippet = snippet;
+
+ int type = note.has(NoteColumns.TYPE) ? note.getInt(NoteColumns.TYPE)
+ : Notes.TYPE_NOTE;
+ if (mIsCreate || mType != type) {
+ mDiffNoteValues.put(NoteColumns.TYPE, type);
+ }
+ mType = type;
+
+ int widgetId = note.has(NoteColumns.WIDGET_ID) ? note.getInt(NoteColumns.WIDGET_ID)
+ : AppWidgetManager.INVALID_APPWIDGET_ID;
+ if (mIsCreate || mWidgetId != widgetId) {
+ mDiffNoteValues.put(NoteColumns.WIDGET_ID, widgetId);
+ }
+ mWidgetId = widgetId;
+
+ int widgetType = note.has(NoteColumns.WIDGET_TYPE) ? note
+ .getInt(NoteColumns.WIDGET_TYPE) : Notes.TYPE_WIDGET_INVALIDE;
+ if (mIsCreate || mWidgetType != widgetType) {
+ mDiffNoteValues.put(NoteColumns.WIDGET_TYPE, widgetType);
+ }
+ mWidgetType = widgetType;
+
+ long originParent = note.has(NoteColumns.ORIGIN_PARENT_ID) ? note
+ .getLong(NoteColumns.ORIGIN_PARENT_ID) : 0;
+ if (mIsCreate || mOriginParent != originParent) {
+ mDiffNoteValues.put(NoteColumns.ORIGIN_PARENT_ID, originParent);
+ }
+ mOriginParent = originParent;
+
+ for (int i = 0; i < dataArray.length(); i++) {
+ JSONObject data = dataArray.getJSONObject(i);
+ SqlData sqlData = null;
+ if (data.has(DataColumns.ID)) {
+ long dataId = data.getLong(DataColumns.ID);
+ for (SqlData temp : mDataList) {
+ if (dataId == temp.getId()) {
+ sqlData = temp;
+ }
+ }
+ }
+
+ if (sqlData == null) {
+ sqlData = new SqlData(mContext);
+ mDataList.add(sqlData);
+ }
+
+ sqlData.setContent(data);
+ }
+ }
+ } catch (JSONException e) {
+ Log.e(TAG, e.toString());
+ e.printStackTrace();
+ return false;
+ }
+ return true;
+ }
+
+ public JSONObject getContent() {
+ try {
+ JSONObject js = new JSONObject();
+
+ if (mIsCreate) {
+ Log.e(TAG, "it seems that we haven't created this in database yet");
+ return null;
+ }
+
+ JSONObject note = new JSONObject();
+ if (mType == Notes.TYPE_NOTE) {
+ note.put(NoteColumns.ID, mId);
+ note.put(NoteColumns.ALERTED_DATE, mAlertDate);
+ note.put(NoteColumns.BG_COLOR_ID, mBgColorId);
+ note.put(NoteColumns.CREATED_DATE, mCreatedDate);
+ note.put(NoteColumns.HAS_ATTACHMENT, mHasAttachment);
+ note.put(NoteColumns.MODIFIED_DATE, mModifiedDate);
+ note.put(NoteColumns.PARENT_ID, mParentId);
+ note.put(NoteColumns.SNIPPET, mSnippet);
+ note.put(NoteColumns.TYPE, mType);
+ note.put(NoteColumns.WIDGET_ID, mWidgetId);
+ note.put(NoteColumns.WIDGET_TYPE, mWidgetType);
+ note.put(NoteColumns.ORIGIN_PARENT_ID, mOriginParent);
+ js.put(GTaskStringUtils.META_HEAD_NOTE, note);
+
+ JSONArray dataArray = new JSONArray();
+ for (SqlData sqlData : mDataList) {
+ JSONObject data = sqlData.getContent();
+ if (data != null) {
+ dataArray.put(data);
+ }
+ }
+ js.put(GTaskStringUtils.META_HEAD_DATA, dataArray);
+ } else if (mType == Notes.TYPE_FOLDER || mType == Notes.TYPE_SYSTEM) {
+ note.put(NoteColumns.ID, mId);
+ note.put(NoteColumns.TYPE, mType);
+ note.put(NoteColumns.SNIPPET, mSnippet);
+ js.put(GTaskStringUtils.META_HEAD_NOTE, note);
+ }
+
+ return js;
+ } catch (JSONException e) {
+ Log.e(TAG, e.toString());
+ e.printStackTrace();
+ }
+ return null;
+ }
+
+ public void setParentId(long id) {
+ mParentId = id;
+ mDiffNoteValues.put(NoteColumns.PARENT_ID, id);
+ }
+
+ public void setGtaskId(String gid) {
+ mDiffNoteValues.put(NoteColumns.GTASK_ID, gid);
+ }
+
+ public void setSyncId(long syncId) {
+ mDiffNoteValues.put(NoteColumns.SYNC_ID, syncId);
+ }
+
+ public void resetLocalModified() {
+ mDiffNoteValues.put(NoteColumns.LOCAL_MODIFIED, 0);
+ }
+
+ public long getId() {
+ return mId;
+ }
+
+ public long getParentId() {
+ return mParentId;
+ }
+
+ public String getSnippet() {
+ return mSnippet;
+ }
+
+ public boolean isNoteType() {
+ return mType == Notes.TYPE_NOTE;
+ }
+
+ public void commit(boolean validateVersion) {
+ if (mIsCreate) {
+ if (mId == INVALID_ID && mDiffNoteValues.containsKey(NoteColumns.ID)) {
+ mDiffNoteValues.remove(NoteColumns.ID);
+ }
+
+ Uri uri = mContentResolver.insert(Notes.CONTENT_NOTE_URI, mDiffNoteValues);
+ try {
+ mId = Long.valueOf(uri.getPathSegments().get(1));
+ } catch (NumberFormatException e) {
+ Log.e(TAG, "Get note id error :" + e.toString());
+ throw new ActionFailureException("create note failed");
+ }
+ if (mId == 0) {
+ throw new IllegalStateException("Create thread id failed");
+ }
+
+ if (mType == Notes.TYPE_NOTE) {
+ for (SqlData sqlData : mDataList) {
+ sqlData.commit(mId, false, -1);
+ }
+ }
+ } else {
+ if (mId <= 0 && mId != Notes.ID_ROOT_FOLDER && mId != Notes.ID_CALL_RECORD_FOLDER) {
+ Log.e(TAG, "No such note");
+ throw new IllegalStateException("Try to update note with invalid id");
+ }
+ if (mDiffNoteValues.size() > 0) {
+ mVersion ++;
+ int result = 0;
+ if (!validateVersion) {
+ result = mContentResolver.update(Notes.CONTENT_NOTE_URI, mDiffNoteValues, "("
+ + NoteColumns.ID + "=?)", new String[] {
+ String.valueOf(mId)
+ });
+ } else {
+ result = mContentResolver.update(Notes.CONTENT_NOTE_URI, mDiffNoteValues, "("
+ + NoteColumns.ID + "=?) AND (" + NoteColumns.VERSION + "<=?)",
+ new String[] {
+ String.valueOf(mId), String.valueOf(mVersion)
+ });
+ }
+ if (result == 0) {
+ Log.w(TAG, "there is no update. maybe user updates note when syncing");
+ }
+ }
+
+ if (mType == Notes.TYPE_NOTE) {
+ for (SqlData sqlData : mDataList) {
+ sqlData.commit(mId, validateVersion, mVersion);
+ }
+ }
+ }
+
+ // refresh local info
+ loadFromCursor(mId);
+ if (mType == Notes.TYPE_NOTE)
+ loadDataContent();
+
+ mDiffNoteValues.clear();
+ mIsCreate = false;
+ }
+}
diff --git a/xiaomi/app/src/main/java/net/micode/notes/gtask/data/Task.java b/Notes-master/app/src/main/java/net/micode/notes/gtask/data/Task.java
similarity index 78%
rename from xiaomi/app/src/main/java/net/micode/notes/gtask/data/Task.java
rename to Notes-master/app/src/main/java/net/micode/notes/gtask/data/Task.java
index 120c43d..6a19454 100644
--- a/xiaomi/app/src/main/java/net/micode/notes/gtask/data/Task.java
+++ b/Notes-master/app/src/main/java/net/micode/notes/gtask/data/Task.java
@@ -35,15 +35,15 @@ import org.json.JSONObject;
public class Task extends Node {
private static final String TAG = Task.class.getSimpleName();
- private boolean mCompleted; // 任务完成状态
+ private boolean mCompleted;
- private String mNotes; // 任务备注
+ private String mNotes;
- private JSONObject mMetaInfo; // 任务元信息
+ private JSONObject mMetaInfo;
- private Task mPriorSibling; // 任务的前一个兄弟节点
+ private Task mPriorSibling;
- private TaskList mParent; // 任务所属的任务列表
+ private TaskList mParent;
public Task() {
super();
@@ -58,38 +58,38 @@ public class Task extends Node {
JSONObject js = new JSONObject();
try {
- // action_type // 动作类型为创建任务
+ // action_type
js.put(GTaskStringUtils.GTASK_JSON_ACTION_TYPE,
GTaskStringUtils.GTASK_JSON_ACTION_TYPE_CREATE);
- // action_id // 动作的唯一标识符
+ // action_id
js.put(GTaskStringUtils.GTASK_JSON_ACTION_ID, actionId);
- // index // 任务在父节点中的索引位置
+ // index
js.put(GTaskStringUtils.GTASK_JSON_INDEX, mParent.getChildTaskIndex(this));
- // entity_delta // 实体的变化信息
+ // entity_delta
JSONObject entity = new JSONObject();
- entity.put(GTaskStringUtils.GTASK_JSON_NAME, getName()); // 任务名称
- entity.put(GTaskStringUtils.GTASK_JSON_CREATOR_ID, "null"); // 创建者ID
+ entity.put(GTaskStringUtils.GTASK_JSON_NAME, getName());
+ entity.put(GTaskStringUtils.GTASK_JSON_CREATOR_ID, "null");
entity.put(GTaskStringUtils.GTASK_JSON_ENTITY_TYPE,
- GTaskStringUtils.GTASK_JSON_TYPE_TASK); // 实体类型为任务
+ GTaskStringUtils.GTASK_JSON_TYPE_TASK);
if (getNotes() != null) {
- entity.put(GTaskStringUtils.GTASK_JSON_NOTES, getNotes()); // 任务备注
+ entity.put(GTaskStringUtils.GTASK_JSON_NOTES, getNotes());
}
js.put(GTaskStringUtils.GTASK_JSON_ENTITY_DELTA, entity);
- // parent_id // 父节点的ID
+ // parent_id
js.put(GTaskStringUtils.GTASK_JSON_PARENT_ID, mParent.getGid());
- // dest_parent_type // 目标父节点类型为分组
+ // dest_parent_type
js.put(GTaskStringUtils.GTASK_JSON_DEST_PARENT_TYPE,
GTaskStringUtils.GTASK_JSON_TYPE_GROUP);
- // list_id // 任务列表的ID
+ // list_id
js.put(GTaskStringUtils.GTASK_JSON_LIST_ID, mParent.getGid());
- // prior_sibling_id // 前一个兄弟节点的ID
+ // prior_sibling_id
if (mPriorSibling != null) {
js.put(GTaskStringUtils.GTASK_JSON_PRIOR_SIBLING_ID, mPriorSibling.getGid());
}
@@ -97,7 +97,7 @@ public class Task extends Node {
} catch (JSONException e) {
Log.e(TAG, e.toString());
e.printStackTrace();
- throw new ActionFailureException("fail to generate task-create jsonobject"); // 生成任务创建JSON对象失败
+ throw new ActionFailureException("fail to generate task-create jsonobject");
}
return js;
@@ -107,29 +107,29 @@ public class Task extends Node {
JSONObject js = new JSONObject();
try {
- // action_type // 动作类型为更新任务
+ // action_type
js.put(GTaskStringUtils.GTASK_JSON_ACTION_TYPE,
GTaskStringUtils.GTASK_JSON_ACTION_TYPE_UPDATE);
- // action_id // 动作的唯一标识符
+ // action_id
js.put(GTaskStringUtils.GTASK_JSON_ACTION_ID, actionId);
- // id // 任务的ID
+ // id
js.put(GTaskStringUtils.GTASK_JSON_ID, getGid());
- // entity_delta // 实体的变化信息
+ // entity_delta
JSONObject entity = new JSONObject();
- entity.put(GTaskStringUtils.GTASK_JSON_NAME, getName()); // 任务名称
+ entity.put(GTaskStringUtils.GTASK_JSON_NAME, getName());
if (getNotes() != null) {
- entity.put(GTaskStringUtils.GTASK_JSON_NOTES, getNotes()); // 任务备注
+ entity.put(GTaskStringUtils.GTASK_JSON_NOTES, getNotes());
}
- entity.put(GTaskStringUtils.GTASK_JSON_DELETED, getDeleted()); // 任务删除状态
+ entity.put(GTaskStringUtils.GTASK_JSON_DELETED, getDeleted());
js.put(GTaskStringUtils.GTASK_JSON_ENTITY_DELTA, entity);
} catch (JSONException e) {
Log.e(TAG, e.toString());
e.printStackTrace();
- throw new ActionFailureException("fail to generate task-update jsonobject"); // 生成任务更新JSON对象失败
+ throw new ActionFailureException("fail to generate task-update jsonobject");
}
return js;
@@ -138,39 +138,39 @@ public class Task extends Node {
public void setContentByRemoteJSON(JSONObject js) {
if (js != null) {
try {
- // id // 任务的ID
+ // id
if (js.has(GTaskStringUtils.GTASK_JSON_ID)) {
setGid(js.getString(GTaskStringUtils.GTASK_JSON_ID));
}
- // last_modified // 最后修改时间
+ // last_modified
if (js.has(GTaskStringUtils.GTASK_JSON_LAST_MODIFIED)) {
setLastModified(js.getLong(GTaskStringUtils.GTASK_JSON_LAST_MODIFIED));
}
- // name // 任务名称
+ // name
if (js.has(GTaskStringUtils.GTASK_JSON_NAME)) {
setName(js.getString(GTaskStringUtils.GTASK_JSON_NAME));
}
- // notes // 任务备注
+ // notes
if (js.has(GTaskStringUtils.GTASK_JSON_NOTES)) {
setNotes(js.getString(GTaskStringUtils.GTASK_JSON_NOTES));
}
- // deleted // 任务删除状态
+ // deleted
if (js.has(GTaskStringUtils.GTASK_JSON_DELETED)) {
setDeleted(js.getBoolean(GTaskStringUtils.GTASK_JSON_DELETED));
}
- // completed // 任务完成状态
+ // completed
if (js.has(GTaskStringUtils.GTASK_JSON_COMPLETED)) {
setCompleted(js.getBoolean(GTaskStringUtils.GTASK_JSON_COMPLETED));
}
} catch (JSONException e) {
Log.e(TAG, e.toString());
e.printStackTrace();
- throw new ActionFailureException("fail to get task content from jsonobject"); // 从JSON对象获取任务内容失败
+ throw new ActionFailureException("fail to get task content from jsonobject");
}
}
}
@@ -178,7 +178,7 @@ public class Task extends Node {
public void setContentByLocalJSON(JSONObject js) {
if (js == null || !js.has(GTaskStringUtils.META_HEAD_NOTE)
|| !js.has(GTaskStringUtils.META_HEAD_DATA)) {
- Log.w(TAG, "setContentByLocalJSON: nothing is avaiable"); // 本地JSON对象为空或缺少必要字段时,记录警告日志
+ Log.w(TAG, "setContentByLocalJSON: nothing is avaiable");
}
try {
@@ -186,14 +186,14 @@ public class Task extends Node {
JSONArray dataArray = js.getJSONArray(GTaskStringUtils.META_HEAD_DATA);
if (note.getInt(NoteColumns.TYPE) != Notes.TYPE_NOTE) {
- Log.e(TAG, "invalid type"); // 无效的类型,记录错误日志
+ Log.e(TAG, "invalid type");
return;
}
for (int i = 0; i < dataArray.length(); i++) {
JSONObject data = dataArray.getJSONObject(i);
if (TextUtils.equals(data.getString(DataColumns.MIME_TYPE), DataConstants.NOTE)) {
- setName(data.getString(DataColumns.CONTENT)); // 从本地JSON对象中获取任务名称
+ setName(data.getString(DataColumns.CONTENT));
break;
}
}
@@ -204,14 +204,13 @@ public class Task extends Node {
}
}
-
public JSONObject getLocalJSONFromContent() {
String name = getName();
try {
if (mMetaInfo == null) {
- // 从网络创建的新任务
+ // new task created from web
if (name == null) {
- Log.w(TAG, "the note seems to be an empty one"); // 备注为空时,记录警告日志
+ Log.w(TAG, "the note seems to be an empty one");
return null;
}
@@ -219,21 +218,21 @@ public class Task extends Node {
JSONObject note = new JSONObject();
JSONArray dataArray = new JSONArray();
JSONObject data = new JSONObject();
- data.put(DataColumns.CONTENT, name); // 设置数据内容为任务名称
+ data.put(DataColumns.CONTENT, name);
dataArray.put(data);
js.put(GTaskStringUtils.META_HEAD_DATA, dataArray);
note.put(NoteColumns.TYPE, Notes.TYPE_NOTE);
js.put(GTaskStringUtils.META_HEAD_NOTE, note);
return js;
} else {
- // 同步的任务
+ // synced task
JSONObject note = mMetaInfo.getJSONObject(GTaskStringUtils.META_HEAD_NOTE);
JSONArray dataArray = mMetaInfo.getJSONArray(GTaskStringUtils.META_HEAD_DATA);
for (int i = 0; i < dataArray.length(); i++) {
JSONObject data = dataArray.getJSONObject(i);
if (TextUtils.equals(data.getString(DataColumns.MIME_TYPE), DataConstants.NOTE)) {
- data.put(DataColumns.CONTENT, getName()); // 更新数据内容为任务名称
+ data.put(DataColumns.CONTENT, getName());
break;
}
}
@@ -251,7 +250,7 @@ public class Task extends Node {
public void setMetaInfo(MetaData metaData) {
if (metaData != null && metaData.getNotes() != null) {
try {
- mMetaInfo = new JSONObject(metaData.getNotes()); // 从元数据中获取备注信息并设置为元信息
+ mMetaInfo = new JSONObject(metaData.getNotes());
} catch (JSONException e) {
Log.w(TAG, e.toString());
mMetaInfo = null;
@@ -267,41 +266,41 @@ public class Task extends Node {
}
if (noteInfo == null) {
- Log.w(TAG, "it seems that note meta has been deleted"); // 备注元信息不存在时,记录警告日志
+ Log.w(TAG, "it seems that note meta has been deleted");
return SYNC_ACTION_UPDATE_REMOTE;
}
if (!noteInfo.has(NoteColumns.ID)) {
- Log.w(TAG, "remote note id seems to be deleted"); // 远程备注ID不存在时,记录警告日志
+ Log.w(TAG, "remote note id seems to be deleted");
return SYNC_ACTION_UPDATE_LOCAL;
}
- // 验证备注ID
+ // validate the note id now
if (c.getLong(SqlNote.ID_COLUMN) != noteInfo.getLong(NoteColumns.ID)) {
- Log.w(TAG, "note id doesn't match"); // 备注ID不匹配时,记录警告日志
+ Log.w(TAG, "note id doesn't match");
return SYNC_ACTION_UPDATE_LOCAL;
}
if (c.getInt(SqlNote.LOCAL_MODIFIED_COLUMN) == 0) {
- // 无本地更新
+ // there is no local update
if (c.getLong(SqlNote.SYNC_ID_COLUMN) == getLastModified()) {
- // 无更新(双方都没有更新)
+ // no update both side
return SYNC_ACTION_NONE;
} else {
- // 应用远程更新到本地
+ // apply remote to local
return SYNC_ACTION_UPDATE_LOCAL;
}
} else {
- // 验证GTask ID
+ // validate gtask id
if (!c.getString(SqlNote.GTASK_ID_COLUMN).equals(getGid())) {
- Log.e(TAG, "gtask id doesn't match"); // GTask ID不匹配时,记录错误日志
+ Log.e(TAG, "gtask id doesn't match");
return SYNC_ACTION_ERROR;
}
if (c.getLong(SqlNote.SYNC_ID_COLUMN) == getLastModified()) {
- // 仅有本地修改
+ // local modification only
return SYNC_ACTION_UPDATE_REMOTE;
} else {
- return SYNC_ACTION_UPDATE_CONFLICT; // 发生冲突,需要更新双方
+ return SYNC_ACTION_UPDATE_CONFLICT;
}
}
} catch (Exception e) {
@@ -348,4 +347,5 @@ public class Task extends Node {
public TaskList getParent() {
return this.mParent;
}
-}
\ No newline at end of file
+
+}
diff --git a/xiaomi/app/src/main/java/net/micode/notes/gtask/data/TaskList.java b/Notes-master/app/src/main/java/net/micode/notes/gtask/data/TaskList.java
similarity index 79%
rename from xiaomi/app/src/main/java/net/micode/notes/gtask/data/TaskList.java
rename to Notes-master/app/src/main/java/net/micode/notes/gtask/data/TaskList.java
index ee12ab4..4ea21c5 100644
--- a/xiaomi/app/src/main/java/net/micode/notes/gtask/data/TaskList.java
+++ b/Notes-master/app/src/main/java/net/micode/notes/gtask/data/TaskList.java
@@ -33,9 +33,9 @@ import java.util.ArrayList;
public class TaskList extends Node {
private static final String TAG = TaskList.class.getSimpleName();
- private int mIndex; // 任务列表索引
+ private int mIndex;
- private ArrayList mChildren; // 子任务列表
+ private ArrayList mChildren;
public TaskList() {
super();
@@ -47,22 +47,22 @@ public class TaskList extends Node {
JSONObject js = new JSONObject();
try {
- // action_type 动作类型为创建
+ // action_type
js.put(GTaskStringUtils.GTASK_JSON_ACTION_TYPE,
GTaskStringUtils.GTASK_JSON_ACTION_TYPE_CREATE);
- // action_id 动作ID
+ // action_id
js.put(GTaskStringUtils.GTASK_JSON_ACTION_ID, actionId);
- // index 索引
+ // index
js.put(GTaskStringUtils.GTASK_JSON_INDEX, mIndex);
- // entity_delta 实体数据
+ // entity_delta
JSONObject entity = new JSONObject();
- entity.put(GTaskStringUtils.GTASK_JSON_NAME, getName()); // 任务列表名称
- entity.put(GTaskStringUtils.GTASK_JSON_CREATOR_ID, "null"); // 创建者ID
+ entity.put(GTaskStringUtils.GTASK_JSON_NAME, getName());
+ entity.put(GTaskStringUtils.GTASK_JSON_CREATOR_ID, "null");
entity.put(GTaskStringUtils.GTASK_JSON_ENTITY_TYPE,
- GTaskStringUtils.GTASK_JSON_TYPE_GROUP); // 实体类型为组
+ GTaskStringUtils.GTASK_JSON_TYPE_GROUP);
js.put(GTaskStringUtils.GTASK_JSON_ENTITY_DELTA, entity);
} catch (JSONException e) {
@@ -78,20 +78,20 @@ public class TaskList extends Node {
JSONObject js = new JSONObject();
try {
- // action_type 动作类型为更新
+ // action_type
js.put(GTaskStringUtils.GTASK_JSON_ACTION_TYPE,
GTaskStringUtils.GTASK_JSON_ACTION_TYPE_UPDATE);
- // action_id 动作ID
+ // action_id
js.put(GTaskStringUtils.GTASK_JSON_ACTION_ID, actionId);
- // id 任务列表ID
+ // id
js.put(GTaskStringUtils.GTASK_JSON_ID, getGid());
- // entity_delta 实体数据
+ // entity_delta
JSONObject entity = new JSONObject();
- entity.put(GTaskStringUtils.GTASK_JSON_NAME, getName()); // 任务列表名称
- entity.put(GTaskStringUtils.GTASK_JSON_DELETED, getDeleted()); // 是否已删除
+ entity.put(GTaskStringUtils.GTASK_JSON_NAME, getName());
+ entity.put(GTaskStringUtils.GTASK_JSON_DELETED, getDeleted());
js.put(GTaskStringUtils.GTASK_JSON_ENTITY_DELTA, entity);
} catch (JSONException e) {
@@ -106,17 +106,17 @@ public class TaskList extends Node {
public void setContentByRemoteJSON(JSONObject js) {
if (js != null) {
try {
- // id 任务列表ID
+ // id
if (js.has(GTaskStringUtils.GTASK_JSON_ID)) {
setGid(js.getString(GTaskStringUtils.GTASK_JSON_ID));
}
- // last_modified 最后修改时间
+ // last_modified
if (js.has(GTaskStringUtils.GTASK_JSON_LAST_MODIFIED)) {
setLastModified(js.getLong(GTaskStringUtils.GTASK_JSON_LAST_MODIFIED));
}
- // name 任务列表名称
+ // name
if (js.has(GTaskStringUtils.GTASK_JSON_NAME)) {
setName(js.getString(GTaskStringUtils.GTASK_JSON_NAME));
}
@@ -139,17 +139,17 @@ public class TaskList extends Node {
if (folder.getInt(NoteColumns.TYPE) == Notes.TYPE_FOLDER) {
String name = folder.getString(NoteColumns.SNIPPET);
- setName(GTaskStringUtils.MIUI_FOLDER_PREFFIX + name); // 设置任务列表名称(MIUI特定前缀 + 名称)
+ setName(GTaskStringUtils.MIUI_FOLDER_PREFFIX + name);
} else if (folder.getInt(NoteColumns.TYPE) == Notes.TYPE_SYSTEM) {
if (folder.getLong(NoteColumns.ID) == Notes.ID_ROOT_FOLDER)
- setName(GTaskStringUtils.MIUI_FOLDER_PREFFIX + GTaskStringUtils.FOLDER_DEFAULT); // 设置任务列表名称(MIUI特定前缀 + 默认文件夹)
+ setName(GTaskStringUtils.MIUI_FOLDER_PREFFIX + GTaskStringUtils.FOLDER_DEFAULT);
else if (folder.getLong(NoteColumns.ID) == Notes.ID_CALL_RECORD_FOLDER)
setName(GTaskStringUtils.MIUI_FOLDER_PREFFIX
- + GTaskStringUtils.FOLDER_CALL_NOTE); // 设置任务列表名称(MIUI特定前缀 + 通话记录文件夹)
+ + GTaskStringUtils.FOLDER_CALL_NOTE);
else
- Log.e(TAG, "invalid system folder"); // 无效的系统文件夹
+ Log.e(TAG, "invalid system folder");
} else {
- Log.e(TAG, "error type"); // 错误的类型
+ Log.e(TAG, "error type");
}
} catch (JSONException e) {
Log.e(TAG, e.toString());
@@ -166,12 +166,12 @@ public class TaskList extends Node {
if (getName().startsWith(GTaskStringUtils.MIUI_FOLDER_PREFFIX))
folderName = folderName.substring(GTaskStringUtils.MIUI_FOLDER_PREFFIX.length(),
folderName.length());
- folder.put(NoteColumns.SNIPPET, folderName); // 设置文件夹名称
+ folder.put(NoteColumns.SNIPPET, folderName);
if (folderName.equals(GTaskStringUtils.FOLDER_DEFAULT)
|| folderName.equals(GTaskStringUtils.FOLDER_CALL_NOTE))
- folder.put(NoteColumns.TYPE, Notes.TYPE_SYSTEM); // 设置文件夹类型为系统文件夹
+ folder.put(NoteColumns.TYPE, Notes.TYPE_SYSTEM);
else
- folder.put(NoteColumns.TYPE, Notes.TYPE_FOLDER); // 设置文件夹类型为普通文件夹
+ folder.put(NoteColumns.TYPE, Notes.TYPE_FOLDER);
js.put(GTaskStringUtils.META_HEAD_NOTE, folder);
@@ -186,25 +186,25 @@ public class TaskList extends Node {
public int getSyncAction(Cursor c) {
try {
if (c.getInt(SqlNote.LOCAL_MODIFIED_COLUMN) == 0) {
- // there is no local update 本地没有更新
+ // there is no local update
if (c.getLong(SqlNote.SYNC_ID_COLUMN) == getLastModified()) {
- // no update both side 两边都没有更新
+ // no update both side
return SYNC_ACTION_NONE;
} else {
- // apply remote to local 将远程更新应用到本地
+ // apply remote to local
return SYNC_ACTION_UPDATE_LOCAL;
}
} else {
- // validate gtask id 验证gtask id
+ // validate gtask id
if (!c.getString(SqlNote.GTASK_ID_COLUMN).equals(getGid())) {
- Log.e(TAG, "gtask id doesn't match"); // GTask ID不匹配
+ Log.e(TAG, "gtask id doesn't match");
return SYNC_ACTION_ERROR;
}
if (c.getLong(SqlNote.SYNC_ID_COLUMN) == getLastModified()) {
- // local modification only 仅本地修改
+ // local modification only
return SYNC_ACTION_UPDATE_REMOTE;
} else {
- // for folder conflicts, just apply local modification 对于文件夹冲突,只应用本地修改
+ // for folder conflicts, just apply local modification
return SYNC_ACTION_UPDATE_REMOTE;
}
}
@@ -219,21 +219,20 @@ public class TaskList extends Node {
public int getChildTaskCount() {
return mChildren.size();
}
-// 返回子任务数量
public boolean addChildTask(Task task) {
boolean ret = false;
if (task != null && !mChildren.contains(task)) {
ret = mChildren.add(task);
if (ret) {
- // 需要设置前一个兄弟和父任务
- task.setPriorSibling(mChildren.isEmpty() ? null : mChildren.get(mChildren.size() - 1));
+ // need to set prior sibling and parent
+ task.setPriorSibling(mChildren.isEmpty() ? null : mChildren
+ .get(mChildren.size() - 1));
task.setParent(this);
}
}
return ret;
}
-// 添加子任务,如果成功添加,则设置前一个兄弟和父任务
public boolean addChildTask(Task task, int index) {
if (index < 0 || index > mChildren.size()) {
@@ -245,7 +244,7 @@ public class TaskList extends Node {
if (task != null && pos == -1) {
mChildren.add(index, task);
- // 更新任务列表
+ // update the task list
Task preTask = null;
Task afterTask = null;
if (index != 0)
@@ -260,7 +259,6 @@ public class TaskList extends Node {
return true;
}
-// 在指定索引位置添加子任务,并更新任务列表和前一个兄弟的关系
public boolean removeChildTask(Task task) {
boolean ret = false;
@@ -269,19 +267,19 @@ public class TaskList extends Node {
ret = mChildren.remove(task);
if (ret) {
- // 重置前一个兄弟和父任务
+ // reset prior sibling and parent
task.setPriorSibling(null);
task.setParent(null);
- // 更新任务列表
+ // update the task list
if (index != mChildren.size()) {
- mChildren.get(index).setPriorSibling(index == 0 ? null : mChildren.get(index - 1));
+ mChildren.get(index).setPriorSibling(
+ index == 0 ? null : mChildren.get(index - 1));
}
}
}
return ret;
}
-// 移除子任务,并重置前一个兄弟和父任务,更新任务列表
public boolean moveChildTask(Task task, int index) {
@@ -300,7 +298,6 @@ public class TaskList extends Node {
return true;
return (removeChildTask(task) && addChildTask(task, index));
}
-// 移动子任务到指定的索引位置
public Task findChildTaskByGid(String gid) {
for (int i = 0; i < mChildren.size(); i++) {
@@ -311,12 +308,10 @@ public class TaskList extends Node {
}
return null;
}
-// 根据GID查找子任务
public int getChildTaskIndex(Task task) {
return mChildren.indexOf(task);
}
-// 获取子任务的索引
public Task getChildTaskByIndex(int index) {
if (index < 0 || index >= mChildren.size()) {
@@ -325,7 +320,6 @@ public class TaskList extends Node {
}
return mChildren.get(index);
}
-// 根据索引获取子任务
public Task getChilTaskByGid(String gid) {
for (Task task : mChildren) {
@@ -334,20 +328,16 @@ public class TaskList extends Node {
}
return null;
}
-// 根据GID获取子任务
public ArrayList getChildTaskList() {
return this.mChildren;
}
-// 获取子任务列表
public void setIndex(int index) {
this.mIndex = index;
}
-// 设置索引
public int getIndex() {
return this.mIndex;
}
-// 获取索引
}
diff --git a/xiaomi/app/src/main/java/net/micode/notes/gtask/exception/ActionFailureException.java b/Notes-master/app/src/main/java/net/micode/notes/gtask/exception/ActionFailureException.java
similarity index 76%
rename from xiaomi/app/src/main/java/net/micode/notes/gtask/exception/ActionFailureException.java
rename to Notes-master/app/src/main/java/net/micode/notes/gtask/exception/ActionFailureException.java
index 4ed5e6a..15504be 100644
--- a/xiaomi/app/src/main/java/net/micode/notes/gtask/exception/ActionFailureException.java
+++ b/Notes-master/app/src/main/java/net/micode/notes/gtask/exception/ActionFailureException.java
@@ -18,20 +18,16 @@ package net.micode.notes.gtask.exception;
public class ActionFailureException extends RuntimeException {
private static final long serialVersionUID = 4425249765923293627L;
- // 序列化版本ID,用于在对象序列化和反序列化过程中的版本匹配
public ActionFailureException() {
super();
- // 调用父类RuntimeException的无参构造方法
}
public ActionFailureException(String paramString) {
super(paramString);
- // 调用父类RuntimeException的带有一个字符串参数的构造方法
}
public ActionFailureException(String paramString, Throwable paramThrowable) {
super(paramString, paramThrowable);
- // 调用父类RuntimeException的带有一个字符串参数和一个Throwable参数的构造方法
}
}
diff --git a/xiaomi/app/src/main/java/net/micode/notes/gtask/exception/NetworkFailureException.java b/Notes-master/app/src/main/java/net/micode/notes/gtask/exception/NetworkFailureException.java
similarity index 77%
rename from xiaomi/app/src/main/java/net/micode/notes/gtask/exception/NetworkFailureException.java
rename to Notes-master/app/src/main/java/net/micode/notes/gtask/exception/NetworkFailureException.java
index 5a670ff..b08cfb1 100644
--- a/xiaomi/app/src/main/java/net/micode/notes/gtask/exception/NetworkFailureException.java
+++ b/Notes-master/app/src/main/java/net/micode/notes/gtask/exception/NetworkFailureException.java
@@ -18,21 +18,16 @@ package net.micode.notes.gtask.exception;
public class NetworkFailureException extends Exception {
private static final long serialVersionUID = 2107610287180234136L;
- // 序列化版本ID,用于在对象序列化和反序列化过程中的版本匹配
public NetworkFailureException() {
super();
- // 调用父类Exception的无参构造方法
}
public NetworkFailureException(String paramString) {
super(paramString);
- // 调用父类Exception的带有一个字符串参数的构造方法
}
public NetworkFailureException(String paramString, Throwable paramThrowable) {
super(paramString, paramThrowable);
- // 调用父类Exception的带有一个字符串参数和一个Throwable参数的构造方法
}
}
-
diff --git a/Notes-master/app/src/main/java/net/micode/notes/gtask/remote/GTaskASyncTask.java b/Notes-master/app/src/main/java/net/micode/notes/gtask/remote/GTaskASyncTask.java
new file mode 100644
index 0000000..b3b61e7
--- /dev/null
+++ b/Notes-master/app/src/main/java/net/micode/notes/gtask/remote/GTaskASyncTask.java
@@ -0,0 +1,123 @@
+
+/*
+ * 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.gtask.remote;
+
+import android.app.Notification;
+import android.app.NotificationManager;
+import android.app.PendingIntent;
+import android.content.Context;
+import android.content.Intent;
+import android.os.AsyncTask;
+
+import net.micode.notes.R;
+import net.micode.notes.ui.NotesListActivity;
+import net.micode.notes.ui.NotesPreferenceActivity;
+
+
+public class GTaskASyncTask extends AsyncTask {
+
+ private static int GTASK_SYNC_NOTIFICATION_ID = 5234235;
+
+ public interface OnCompleteListener {
+ void onComplete();
+ }
+
+ private Context mContext;
+
+ private NotificationManager mNotifiManager;
+
+ private GTaskManager mTaskManager;
+
+ private OnCompleteListener mOnCompleteListener;
+
+ public GTaskASyncTask(Context context, OnCompleteListener listener) {
+ mContext = context;
+ mOnCompleteListener = listener;
+ mNotifiManager = (NotificationManager) mContext
+ .getSystemService(Context.NOTIFICATION_SERVICE);
+ mTaskManager = GTaskManager.getInstance();
+ }
+
+ public void cancelSync() {
+ mTaskManager.cancelSync();
+ }
+
+ public void publishProgess(String message) {
+ publishProgress(new String[] {
+ message
+ });
+ }
+
+ private void showNotification(int tickerId, String content) {
+ Notification notification = new Notification(R.drawable.notification, mContext
+ .getString(tickerId), System.currentTimeMillis());
+ notification.defaults = Notification.DEFAULT_LIGHTS;
+ notification.flags = Notification.FLAG_AUTO_CANCEL;
+ PendingIntent pendingIntent;
+ if (tickerId != R.string.ticker_success) {
+ pendingIntent = PendingIntent.getActivity(mContext, 0, new Intent(mContext,
+ NotesPreferenceActivity.class), 0);
+
+ } else {
+ pendingIntent = PendingIntent.getActivity(mContext, 0, new Intent(mContext,
+ NotesListActivity.class), 0);
+ }
+ notification.setLatestEventInfo(mContext, mContext.getString(R.string.app_name), content,
+ pendingIntent);
+ mNotifiManager.notify(GTASK_SYNC_NOTIFICATION_ID, notification);
+ }
+
+ @Override
+ protected Integer doInBackground(Void... unused) {
+ publishProgess(mContext.getString(R.string.sync_progress_login, NotesPreferenceActivity
+ .getSyncAccountName(mContext)));
+ return mTaskManager.sync(mContext, this);
+ }
+
+ @Override
+ protected void onProgressUpdate(String... progress) {
+ showNotification(R.string.ticker_syncing, progress[0]);
+ if (mContext instanceof GTaskSyncService) {
+ ((GTaskSyncService) mContext).sendBroadcast(progress[0]);
+ }
+ }
+
+ @Override
+ protected void onPostExecute(Integer result) {
+ if (result == GTaskManager.STATE_SUCCESS) {
+ showNotification(R.string.ticker_success, mContext.getString(
+ R.string.success_sync_account, mTaskManager.getSyncAccount()));
+ NotesPreferenceActivity.setLastSyncTime(mContext, System.currentTimeMillis());
+ } else if (result == GTaskManager.STATE_NETWORK_ERROR) {
+ showNotification(R.string.ticker_fail, mContext.getString(R.string.error_sync_network));
+ } else if (result == GTaskManager.STATE_INTERNAL_ERROR) {
+ showNotification(R.string.ticker_fail, mContext.getString(R.string.error_sync_internal));
+ } else if (result == GTaskManager.STATE_SYNC_CANCELLED) {
+ showNotification(R.string.ticker_cancel, mContext
+ .getString(R.string.error_sync_cancelled));
+ }
+ if (mOnCompleteListener != null) {
+ new Thread(new Runnable() {
+
+ public void run() {
+ mOnCompleteListener.onComplete();
+ }
+ }).start();
+ }
+ }
+}
diff --git a/xiaomi/app/src/main/java/net/micode/notes/gtask/remote/GTaskClient.java b/Notes-master/app/src/main/java/net/micode/notes/gtask/remote/GTaskClient.java
similarity index 88%
rename from xiaomi/app/src/main/java/net/micode/notes/gtask/remote/GTaskClient.java
rename to Notes-master/app/src/main/java/net/micode/notes/gtask/remote/GTaskClient.java
index ceda040..c67dfdf 100644
--- a/xiaomi/app/src/main/java/net/micode/notes/gtask/remote/GTaskClient.java
+++ b/Notes-master/app/src/main/java/net/micode/notes/gtask/remote/GTaskClient.java
@@ -64,31 +64,31 @@ import java.util.zip.InflaterInputStream;
public class GTaskClient {
private static final String TAG = GTaskClient.class.getSimpleName();
- private static final String GTASK_URL = "https://mail.google.com/tasks/"; // Google Tasks的URL
+ private static final String GTASK_URL = "https://mail.google.com/tasks/";
- private static final String GTASK_GET_URL = "https://mail.google.com/tasks/ig"; // 获取任务的URL
+ private static final String GTASK_GET_URL = "https://mail.google.com/tasks/ig";
- private static final String GTASK_POST_URL = "https://mail.google.com/tasks/r/ig"; // 提交任务的URL
+ private static final String GTASK_POST_URL = "https://mail.google.com/tasks/r/ig";
private static GTaskClient mInstance = null;
- private DefaultHttpClient mHttpClient; // HTTP客户端
+ private DefaultHttpClient mHttpClient;
- private String mGetUrl; // 获取任务的URL
+ private String mGetUrl;
- private String mPostUrl; // 提交任务的URL
+ private String mPostUrl;
- private long mClientVersion; // 客户端版本号
+ private long mClientVersion;
- private boolean mLoggedin; // 是否已登录
+ private boolean mLoggedin;
- private long mLastLoginTime; // 上次登录时间
+ private long mLastLoginTime;
- private int mActionId; // 动作ID
+ private int mActionId;
- private Account mAccount; // 账户
+ private Account mAccount;
- private JSONArray mUpdateArray; // 更新数组
+ private JSONArray mUpdateArray;
private GTaskClient() {
mHttpClient = null;
@@ -110,16 +110,17 @@ public class GTaskClient {
}
public boolean login(Activity activity) {
- // 假设Cookie在5分钟后过期,需要重新登录
+ // we suppose that the cookie would expire after 5 minutes
+ // then we need to re-login
final long interval = 1000 * 60 * 5;
if (mLastLoginTime + interval < System.currentTimeMillis()) {
mLoggedin = false;
}
- // 在切换账户后需要重新登录
+ // need to re-login after account switch
if (mLoggedin
&& !TextUtils.equals(getSyncAccount().name, NotesPreferenceActivity
- .getSyncAccountName(activity))) {
+ .getSyncAccountName(activity))) {
mLoggedin = false;
}
@@ -135,7 +136,7 @@ public class GTaskClient {
return false;
}
- // 如果需要,使用自定义域名进行登录
+ // login with custom domain if necessary
if (!(mAccount.name.toLowerCase().endsWith("gmail.com") || mAccount.name.toLowerCase()
.endsWith("googlemail.com"))) {
StringBuilder url = new StringBuilder(GTASK_URL).append("a/");
@@ -150,7 +151,7 @@ public class GTaskClient {
}
}
- // 尝试使用Google官方URL登录
+ // try to login with google official url
if (!mLoggedin) {
mGetUrl = GTASK_GET_URL;
mPostUrl = GTASK_POST_URL;
@@ -169,7 +170,7 @@ public class GTaskClient {
Account[] accounts = accountManager.getAccountsByType("com.google");
if (accounts.length == 0) {
- Log.e(TAG, "there is no available google account"); // 没有可用的Google账户
+ Log.e(TAG, "there is no available google account");
return null;
}
@@ -184,11 +185,11 @@ public class GTaskClient {
if (account != null) {
mAccount = account;
} else {
- Log.e(TAG, "unable to get an account with the same name in the settings"); // 无法获取与设置中相同名称的账户
+ Log.e(TAG, "unable to get an account with the same name in the settings");
return null;
}
- // 获取令牌
+ // get the token now
AccountManagerFuture accountManagerFuture = accountManager.getAuthToken(account,
"goanna_mobile", null, activity, null, null);
try {
@@ -199,17 +200,17 @@ public class GTaskClient {
loginGoogleAccount(activity, false);
}
} catch (Exception e) {
- Log.e(TAG, "get auth token failed"); // 获取授权令牌失败
+ Log.e(TAG, "get auth token failed");
authToken = null;
}
return authToken;
}
- // 尝试登录GTask,如果登录失败则尝试刷新令牌并再次登录
private boolean tryToLoginGtask(Activity activity, String authToken) {
if (!loginGtask(authToken)) {
- // 可能是令牌过期了,现在让我们使令牌失效并再次尝试登录
+ // maybe the auth token is out of date, now let's invalidate the
+ // token and try again
authToken = loginGoogleAccount(activity, true);
if (authToken == null) {
Log.e(TAG, "login google account failed");
@@ -224,7 +225,6 @@ public class GTaskClient {
return true;
}
- // 登录GTask
private boolean loginGtask(String authToken) {
int timeoutConnection = 10000;
int timeoutSocket = 15000;
@@ -236,14 +236,14 @@ public class GTaskClient {
mHttpClient.setCookieStore(localBasicCookieStore);
HttpProtocolParams.setUseExpectContinue(mHttpClient.getParams(), false);
- // 登录GTask
+ // login gtask
try {
String loginUrl = mGetUrl + "?auth=" + authToken;
HttpGet httpGet = new HttpGet(loginUrl);
HttpResponse response = null;
response = mHttpClient.execute(httpGet);
- // 获取Cookie
+ // get the cookie now
List cookies = mHttpClient.getCookieStore().getCookies();
boolean hasAuthCookie = false;
for (Cookie cookie : cookies) {
@@ -255,7 +255,7 @@ public class GTaskClient {
Log.w(TAG, "it seems that there is no auth cookie");
}
- // 获取客户端版本
+ // get the client version
String resString = getResponseContent(response.getEntity());
String jsBegin = "_setup(";
String jsEnd = ")}";
@@ -272,7 +272,7 @@ public class GTaskClient {
e.printStackTrace();
return false;
} catch (Exception e) {
- // 捕获所有异常
+ // simply catch all exceptions
Log.e(TAG, "httpget gtask_url failed");
return false;
}
@@ -280,12 +280,10 @@ public class GTaskClient {
return true;
}
- // 获取动作ID
private int getActionId() {
return mActionId++;
}
- // 创建HttpPost请求
private HttpPost createHttpPost() {
HttpPost httpPost = new HttpPost(mPostUrl);
httpPost.setHeader("Content-Type", "application/x-www-form-urlencoded;charset=utf-8");
@@ -293,7 +291,6 @@ public class GTaskClient {
return httpPost;
}
- // 获取响应内容
private String getResponseContent(HttpEntity entity) throws IOException {
String contentEncoding = null;
if (entity.getContentEncoding() != null) {
@@ -326,7 +323,6 @@ public class GTaskClient {
}
}
- // 发送HttpPost请求并返回JSON响应
private JSONObject postRequest(JSONObject js) throws NetworkFailureException {
if (!mLoggedin) {
Log.e(TAG, "please login first");
@@ -340,7 +336,7 @@ public class GTaskClient {
UrlEncodedFormEntity entity = new UrlEncodedFormEntity(list, "UTF-8");
httpPost.setEntity(entity);
- // 执行HttpPost请求
+ // execute the post
HttpResponse response = mHttpClient.execute(httpPost);
String jsString = getResponseContent(response.getEntity());
return new JSONObject(jsString);
@@ -364,7 +360,6 @@ public class GTaskClient {
}
}
- // 创建任务
public void createTask(Task task) throws NetworkFailureException {
commitUpdate();
try {
@@ -378,7 +373,7 @@ public class GTaskClient {
// client_version
jsPost.put(GTaskStringUtils.GTASK_JSON_CLIENT_VERSION, mClientVersion);
- // 发送请求
+ // post
JSONObject jsResponse = postRequest(jsPost);
JSONObject jsResult = (JSONObject) jsResponse.getJSONArray(
GTaskStringUtils.GTASK_JSON_RESULTS).get(0);
@@ -391,7 +386,6 @@ public class GTaskClient {
}
}
- // 创建任务列表
public void createTaskList(TaskList tasklist) throws NetworkFailureException {
commitUpdate();
try {
@@ -405,7 +399,7 @@ public class GTaskClient {
// client version
jsPost.put(GTaskStringUtils.GTASK_JSON_CLIENT_VERSION, mClientVersion);
- // 发送请求
+ // post
JSONObject jsResponse = postRequest(jsPost);
JSONObject jsResult = (JSONObject) jsResponse.getJSONArray(
GTaskStringUtils.GTASK_JSON_RESULTS).get(0);
@@ -418,19 +412,15 @@ public class GTaskClient {
}
}
-
public void commitUpdate() throws NetworkFailureException {
- // 提交更新操作
if (mUpdateArray != null) {
try {
JSONObject jsPost = new JSONObject();
// action_list
- // 更新操作数组
jsPost.put(GTaskStringUtils.GTASK_JSON_ACTION_LIST, mUpdateArray);
// client_version
- // 客户端版本
jsPost.put(GTaskStringUtils.GTASK_JSON_CLIENT_VERSION, mClientVersion);
postRequest(jsPost);
@@ -438,23 +428,21 @@ public class GTaskClient {
} catch (JSONException e) {
Log.e(TAG, e.toString());
e.printStackTrace();
- throw new ActionFailureException("commit update: handling jsonobject failed");
+ throw new ActionFailureException("commit update: handing jsonobject failed");
}
}
}
public void addUpdateNode(Node node) throws NetworkFailureException {
- // 添加更新节点
if (node != null) {
- // 太多的更新项可能导致错误
- // 将最大限制设置为10个项
+ // too many update items may result in an error
+ // set max to 10 items
if (mUpdateArray != null && mUpdateArray.length() > 10) {
commitUpdate();
}
if (mUpdateArray == null)
mUpdateArray = new JSONArray();
- // 将节点的更新操作添加到更新操作数组中
mUpdateArray.put(node.getUpdateAction(getActionId()));
}
}
@@ -468,26 +456,25 @@ public class GTaskClient {
JSONObject action = new JSONObject();
// action_list
- // 更新操作数组
action.put(GTaskStringUtils.GTASK_JSON_ACTION_TYPE,
GTaskStringUtils.GTASK_JSON_ACTION_TYPE_MOVE);
action.put(GTaskStringUtils.GTASK_JSON_ACTION_ID, getActionId());
action.put(GTaskStringUtils.GTASK_JSON_ID, task.getGid());
if (preParent == curParent && task.getPriorSibling() != null) {
- // 仅当在任务列表内移动且不是第一个时,设置prior_sibling_id
+ // put prioring_sibing_id only if moving within the tasklist and
+ // it is not the first one
action.put(GTaskStringUtils.GTASK_JSON_PRIOR_SIBLING_ID, task.getPriorSibling());
}
action.put(GTaskStringUtils.GTASK_JSON_SOURCE_LIST, preParent.getGid());
action.put(GTaskStringUtils.GTASK_JSON_DEST_PARENT, curParent.getGid());
if (preParent != curParent) {
- // 仅在任务列表之间移动时设置dest_list
+ // put the dest_list only if moving between tasklists
action.put(GTaskStringUtils.GTASK_JSON_DEST_LIST, curParent.getGid());
}
actionList.put(action);
jsPost.put(GTaskStringUtils.GTASK_JSON_ACTION_LIST, actionList);
// client_version
- // 客户端版本
jsPost.put(GTaskStringUtils.GTASK_JSON_CLIENT_VERSION, mClientVersion);
postRequest(jsPost);
@@ -495,7 +482,7 @@ public class GTaskClient {
} catch (JSONException e) {
Log.e(TAG, e.toString());
e.printStackTrace();
- throw new ActionFailureException("move task: handling jsonobject failed");
+ throw new ActionFailureException("move task: handing jsonobject failed");
}
}
@@ -511,7 +498,6 @@ public class GTaskClient {
jsPost.put(GTaskStringUtils.GTASK_JSON_ACTION_LIST, actionList);
// client_version
- // 客户端版本
jsPost.put(GTaskStringUtils.GTASK_JSON_CLIENT_VERSION, mClientVersion);
postRequest(jsPost);
@@ -519,7 +505,7 @@ public class GTaskClient {
} catch (JSONException e) {
Log.e(TAG, e.toString());
e.printStackTrace();
- throw new ActionFailureException("delete node: handling jsonobject failed");
+ throw new ActionFailureException("delete node: handing jsonobject failed");
}
}
@@ -534,7 +520,7 @@ public class GTaskClient {
HttpResponse response = null;
response = mHttpClient.execute(httpGet);
- // 获取任务列表
+ // get the task list
String resString = getResponseContent(response.getEntity());
String jsBegin = "_setup(";
String jsEnd = ")}";
@@ -557,7 +543,7 @@ public class GTaskClient {
} catch (JSONException e) {
Log.e(TAG, e.toString());
e.printStackTrace();
- throw new ActionFailureException("get task lists: handling jsonobject failed");
+ throw new ActionFailureException("get task lists: handing jasonobject failed");
}
}
@@ -578,7 +564,6 @@ public class GTaskClient {
jsPost.put(GTaskStringUtils.GTASK_JSON_ACTION_LIST, actionList);
// client_version
- // 客户端版本
jsPost.put(GTaskStringUtils.GTASK_JSON_CLIENT_VERSION, mClientVersion);
JSONObject jsResponse = postRequest(jsPost);
@@ -586,7 +571,7 @@ public class GTaskClient {
} catch (JSONException e) {
Log.e(TAG, e.toString());
e.printStackTrace();
- throw new ActionFailureException("get task list: handling jsonobject failed");
+ throw new ActionFailureException("get task list: handing jsonobject failed");
}
}
@@ -597,4 +582,4 @@ public class GTaskClient {
public void resetUpdateArray() {
mUpdateArray = null;
}
-}
\ No newline at end of file
+}
diff --git a/xiaomi/app/src/main/java/net/micode/notes/gtask/remote/GTaskManager.java b/Notes-master/app/src/main/java/net/micode/notes/gtask/remote/GTaskManager.java
similarity index 86%
rename from xiaomi/app/src/main/java/net/micode/notes/gtask/remote/GTaskManager.java
rename to Notes-master/app/src/main/java/net/micode/notes/gtask/remote/GTaskManager.java
index e65580b..d2b4082 100644
--- a/xiaomi/app/src/main/java/net/micode/notes/gtask/remote/GTaskManager.java
+++ b/Notes-master/app/src/main/java/net/micode/notes/gtask/remote/GTaskManager.java
@@ -51,29 +51,41 @@ import java.util.Map;
public class GTaskManager {
private static final String TAG = GTaskManager.class.getSimpleName();
- // 同步状态常量
- public static final int STATE_SUCCESS = 0; // 同步成功
- public static final int STATE_NETWORK_ERROR = 1; // 网络错误
- public static final int STATE_INTERNAL_ERROR = 2; // 内部错误
- public static final int STATE_SYNC_IN_PROGRESS = 3; // 同步正在进行中
- public static final int STATE_SYNC_CANCELLED = 4; // 同步被取消
+ public static final int STATE_SUCCESS = 0;
+
+ public static final int STATE_NETWORK_ERROR = 1;
+
+ public static final int STATE_INTERNAL_ERROR = 2;
+
+ public static final int STATE_SYNC_IN_PROGRESS = 3;
+
+ public static final int STATE_SYNC_CANCELLED = 4;
private static GTaskManager mInstance = null;
- private Activity mActivity; // Activity上下文
- private Context mContext; // 应用程序上下文
- private ContentResolver mContentResolver; // ContentResolver,用于访问应用数据
+ private Activity mActivity;
+
+ private Context mContext;
+
+ private ContentResolver mContentResolver;
+
+ private boolean mSyncing;
+
+ private boolean mCancelled;
+
+ private HashMap mGTaskListHashMap;
+
+ private HashMap mGTaskHashMap;
- private boolean mSyncing; // 是否正在同步中
- private boolean mCancelled; // 同步是否被取消
+ private HashMap mMetaHashMap;
- private HashMap mGTaskListHashMap; // Google任务列表的HashMap,用于存储从Google获取的任务列表
- private HashMap mGTaskHashMap; // Google任务的HashMap,用于存储从Google获取的任务
- private HashMap mMetaHashMap; // 元数据的HashMap,用于存储从Google获取的元数据
- private TaskList mMetaList; // 元数据列表
- private HashSet mLocalDeleteIdMap; // 本地已删除任务的ID集合
- private HashMap mGidToNid; // Google任务ID到本地任务ID的映射
- private HashMap mNidToGid; // 本地任务ID到Google任务ID的映射
+ private TaskList mMetaList;
+
+ private HashSet mLocalDeleteIdMap;
+
+ private HashMap mGidToNid;
+
+ private HashMap mNidToGid;
private GTaskManager() {
mSyncing = false;
@@ -87,7 +99,6 @@ public class GTaskManager {
mNidToGid = new HashMap();
}
- // 获取GTaskManager的单例实例
public static synchronized GTaskManager getInstance() {
if (mInstance == null) {
mInstance = new GTaskManager();
@@ -95,19 +106,16 @@ public class GTaskManager {
return mInstance;
}
- // 设置Activity上下文
public synchronized void setActivityContext(Activity activity) {
- // 用于获取认证令牌
+ // used for getting authtoken
mActivity = activity;
}
- // 执行同步操作
public int sync(Context context, GTaskASyncTask asyncTask) {
if (mSyncing) {
Log.d(TAG, "Sync is in progress");
return STATE_SYNC_IN_PROGRESS;
}
-
mContext = context;
mContentResolver = mContext.getContentResolver();
mSyncing = true;
@@ -123,18 +131,18 @@ public class GTaskManager {
GTaskClient client = GTaskClient.getInstance();
client.resetUpdateArray();
- // 登录Google任务
+ // login google task
if (!mCancelled) {
if (!client.login(mActivity)) {
throw new NetworkFailureException("login google task failed");
}
}
- // 从Google获取任务列表
+ // get the task list from google
asyncTask.publishProgess(mContext.getString(R.string.sync_progress_init_list));
initGTaskList();
- // 同步应用数据
+ // do content sync work
asyncTask.publishProgess(mContext.getString(R.string.sync_progress_syncing));
syncContent();
} catch (NetworkFailureException e) {
@@ -160,7 +168,6 @@ public class GTaskManager {
return mCancelled ? STATE_SYNC_CANCELLED : STATE_SUCCESS;
}
- // 初始化Google任务列表
private void initGTaskList() throws NetworkFailureException {
if (mCancelled)
return;
@@ -168,7 +175,7 @@ public class GTaskManager {
try {
JSONArray jsTaskLists = client.getTaskLists();
- // 首先初始化元数据列表
+ // init meta list first
mMetaList = null;
for (int i = 0; i < jsTaskLists.length(); i++) {
JSONObject object = jsTaskLists.getJSONObject(i);
@@ -180,7 +187,7 @@ public class GTaskManager {
mMetaList = new TaskList();
mMetaList.setContentByRemoteJSON(object);
- // 加载元数据
+ // load meta data
JSONArray jsMetas = client.getTaskList(gid);
for (int j = 0; j < jsMetas.length(); j++) {
object = (JSONObject) jsMetas.getJSONObject(j);
@@ -196,7 +203,7 @@ public class GTaskManager {
}
}
- // 如果元数据列表不存在,则创建一个
+ // create meta list if not existed
if (mMetaList == null) {
mMetaList = new TaskList();
mMetaList.setName(GTaskStringUtils.MIUI_FOLDER_PREFFIX
@@ -204,7 +211,7 @@ public class GTaskManager {
GTaskClient.getInstance().createTaskList(mMetaList);
}
- // 初始化任务列表
+ // init task list
for (int i = 0; i < jsTaskLists.length(); i++) {
JSONObject object = jsTaskLists.getJSONObject(i);
String gid = object.getString(GTaskStringUtils.GTASK_JSON_ID);
@@ -212,13 +219,13 @@ public class GTaskManager {
if (name.startsWith(GTaskStringUtils.MIUI_FOLDER_PREFFIX)
&& !name.equals(GTaskStringUtils.MIUI_FOLDER_PREFFIX
- + GTaskStringUtils.FOLDER_META)) {
+ + GTaskStringUtils.FOLDER_META)) {
TaskList tasklist = new TaskList();
tasklist.setContentByRemoteJSON(object);
mGTaskListHashMap.put(gid, tasklist);
mGTaskHashMap.put(gid, tasklist);
- // 加载任务
+ // load tasks
JSONArray jsTasks = client.getTaskList(gid);
for (int j = 0; j < jsTasks.length(); j++) {
object = (JSONObject) jsTasks.getJSONObject(j);
@@ -239,19 +246,20 @@ public class GTaskManager {
throw new ActionFailureException("initGTaskList: handing JSONObject failed");
}
}
+
private void syncContent() throws NetworkFailureException {
int syncType;
Cursor c = null;
String gid;
Node node;
- mLocalDeleteIdMap.clear(); // 清空本地删除ID映射表
+ mLocalDeleteIdMap.clear();
if (mCancelled) {
return;
}
- // 同步本地已删除的笔记
+ // for local deleted note
try {
c = mContentResolver.query(Notes.CONTENT_NOTE_URI, SqlNote.PROJECTION_NOTE,
"(type<>? AND parent_id=?)", new String[] {
@@ -263,13 +271,13 @@ public class GTaskManager {
node = mGTaskHashMap.get(gid);
if (node != null) {
mGTaskHashMap.remove(gid);
- doContentSync(Node.SYNC_ACTION_DEL_REMOTE, node, c); // 执行删除远程同步操作
+ doContentSync(Node.SYNC_ACTION_DEL_REMOTE, node, c);
}
- mLocalDeleteIdMap.add(c.getLong(SqlNote.ID_COLUMN)); // 添加到本地删除ID映射表
+ mLocalDeleteIdMap.add(c.getLong(SqlNote.ID_COLUMN));
}
} else {
- Log.w(TAG, "failed to query trash folder"); // 查询垃圾箱文件夹失败
+ Log.w(TAG, "failed to query trash folder");
}
} finally {
if (c != null) {
@@ -278,10 +286,10 @@ public class GTaskManager {
}
}
- // 先同步文件夹
- syncFolder(); // 同步文件夹的方法
+ // sync folder first
+ syncFolder();
- // 同步数据库中已存在的笔记
+ // for note existing in database
try {
c = mContentResolver.query(Notes.CONTENT_NOTE_URI, SqlNote.PROJECTION_NOTE,
"(type=? AND parent_id<>?)", new String[] {
@@ -295,20 +303,20 @@ public class GTaskManager {
mGTaskHashMap.remove(gid);
mGidToNid.put(gid, c.getLong(SqlNote.ID_COLUMN));
mNidToGid.put(c.getLong(SqlNote.ID_COLUMN), gid);
- syncType = node.getSyncAction(c); // 获取同步操作类型
+ syncType = node.getSyncAction(c);
} else {
if (c.getString(SqlNote.GTASK_ID_COLUMN).trim().length() == 0) {
- // 本地新增
+ // local add
syncType = Node.SYNC_ACTION_ADD_REMOTE;
} else {
- // 远程删除
+ // remote delete
syncType = Node.SYNC_ACTION_DEL_LOCAL;
}
}
- doContentSync(syncType, node, c); // 执行同步操作
+ doContentSync(syncType, node, c);
}
} else {
- Log.w(TAG, "failed to query existing note in database"); // 查询数据库中已存在的笔记失败
+ Log.w(TAG, "failed to query existing note in database");
}
} finally {
@@ -318,29 +326,31 @@ public class GTaskManager {
}
}
- // 处理剩余的项
+ // go through remaining items
Iterator> iter = mGTaskHashMap.entrySet().iterator();
while (iter.hasNext()) {
Map.Entry entry = iter.next();
node = entry.getValue();
- doContentSync(Node.SYNC_ACTION_ADD_LOCAL, node, null); // 执行本地新增同步操作
+ doContentSync(Node.SYNC_ACTION_ADD_LOCAL, node, null);
}
- // 逐个检查以确保mCancelled没有被其他线程设置
- // 清空本地删除表
+ // mCancelled can be set by another thread, so we neet to check one by
+ // one
+ // clear local delete table
if (!mCancelled) {
if (!DataUtils.batchDeleteNotes(mContentResolver, mLocalDeleteIdMap)) {
- throw new ActionFailureException("failed to batch-delete local deleted notes"); // 批量删除本地已删除的笔记失败
+ throw new ActionFailureException("failed to batch-delete local deleted notes");
}
}
- // 刷新本地同步ID
+ // refresh local sync id
if (!mCancelled) {
GTaskClient.getInstance().commitUpdate();
refreshLocalSyncId();
}
}
+
private void syncFolder() throws NetworkFailureException {
Cursor c = null;
String gid;
@@ -351,7 +361,7 @@ public class GTaskManager {
return;
}
- // 同步根文件夹
+ // for root folder
try {
c = mContentResolver.query(ContentUris.withAppendedId(Notes.CONTENT_NOTE_URI,
Notes.ID_ROOT_FOLDER), SqlNote.PROJECTION_NOTE, null, null, null);
@@ -363,15 +373,15 @@ public class GTaskManager {
mGTaskHashMap.remove(gid);
mGidToNid.put(gid, (long) Notes.ID_ROOT_FOLDER);
mNidToGid.put((long) Notes.ID_ROOT_FOLDER, gid);
- // 对于系统文件夹,仅在必要时更新远程名称
+ // for system folder, only update remote name if necessary
if (!node.getName().equals(
GTaskStringUtils.MIUI_FOLDER_PREFFIX + GTaskStringUtils.FOLDER_DEFAULT))
- doContentSync(Node.SYNC_ACTION_UPDATE_REMOTE, node, c); // 执行更新远程同步操作
+ doContentSync(Node.SYNC_ACTION_UPDATE_REMOTE, node, c);
} else {
- doContentSync(Node.SYNC_ACTION_ADD_REMOTE, node, c); // 执行新增远程同步操作
+ doContentSync(Node.SYNC_ACTION_ADD_REMOTE, node, c);
}
} else {
- Log.w(TAG, "failed to query root folder"); // 查询根文件夹失败
+ Log.w(TAG, "failed to query root folder");
}
} finally {
if (c != null) {
@@ -380,11 +390,11 @@ public class GTaskManager {
}
}
- // 同步通话记录文件夹
+ // for call-note folder
try {
c = mContentResolver.query(Notes.CONTENT_NOTE_URI, SqlNote.PROJECTION_NOTE, "(_id=?)",
new String[] {
- String.valueOf(Notes.ID_CALL_RECORD_FOLDER)
+ String.valueOf(Notes.ID_CALL_RECORD_FOLDER)
}, null);
if (c != null) {
if (c.moveToNext()) {
@@ -394,17 +404,18 @@ public class GTaskManager {
mGTaskHashMap.remove(gid);
mGidToNid.put(gid, (long) Notes.ID_CALL_RECORD_FOLDER);
mNidToGid.put((long) Notes.ID_CALL_RECORD_FOLDER, gid);
- // 对于系统文件夹,仅在必要时更新远程名称
+ // for system folder, only update remote name if
+ // necessary
if (!node.getName().equals(
GTaskStringUtils.MIUI_FOLDER_PREFFIX
+ GTaskStringUtils.FOLDER_CALL_NOTE))
- doContentSync(Node.SYNC_ACTION_UPDATE_REMOTE, node, c); // 执行更新远程同步操作
+ doContentSync(Node.SYNC_ACTION_UPDATE_REMOTE, node, c);
} else {
- doContentSync(Node.SYNC_ACTION_ADD_REMOTE, node, c); // 执行新增远程同步操作
+ doContentSync(Node.SYNC_ACTION_ADD_REMOTE, node, c);
}
}
} else {
- Log.w(TAG, "failed to query call note folder"); // 查询通话记录文件夹失败
+ Log.w(TAG, "failed to query call note folder");
}
} finally {
if (c != null) {
@@ -413,7 +424,7 @@ public class GTaskManager {
}
}
- // 同步本地已存在的文件夹
+ // for local existing folders
try {
c = mContentResolver.query(Notes.CONTENT_NOTE_URI, SqlNote.PROJECTION_NOTE,
"(type=? AND parent_id<>?)", new String[] {
@@ -430,17 +441,17 @@ public class GTaskManager {
syncType = node.getSyncAction(c);
} else {
if (c.getString(SqlNote.GTASK_ID_COLUMN).trim().length() == 0) {
- // 本地新增
+ // local add
syncType = Node.SYNC_ACTION_ADD_REMOTE;
} else {
- // 远程删除
+ // remote delete
syncType = Node.SYNC_ACTION_DEL_LOCAL;
}
}
- doContentSync(syncType, node, c); // 执行同步操作
+ doContentSync(syncType, node, c);
}
} else {
- Log.w(TAG, "failed to query existing folder"); // 查询已存在文件夹失败
+ Log.w(TAG, "failed to query existing folder");
}
} finally {
if (c != null) {
@@ -449,7 +460,7 @@ public class GTaskManager {
}
}
- // 处理远程新增的文件夹
+ // for remote add folders
Iterator> iter = mGTaskListHashMap.entrySet().iterator();
while (iter.hasNext()) {
Map.Entry entry = iter.next();
@@ -457,7 +468,7 @@ public class GTaskManager {
node = entry.getValue();
if (mGTaskHashMap.containsKey(gid)) {
mGTaskHashMap.remove(gid);
- doContentSync(Node.SYNC_ACTION_ADD_LOCAL, node, null); // 执行本地新增同步操作
+ doContentSync(Node.SYNC_ACTION_ADD_LOCAL, node, null);
}
}
@@ -465,7 +476,6 @@ public class GTaskManager {
GTaskClient.getInstance().commitUpdate();
}
-
private void doContentSync(int syncType, Node node, Cursor c) throws NetworkFailureException {
if (mCancelled) {
return;
diff --git a/xiaomi/app/src/main/java/net/micode/notes/gtask/remote/GTaskSyncService.java b/Notes-master/app/src/main/java/net/micode/notes/gtask/remote/GTaskSyncService.java
similarity index 85%
rename from xiaomi/app/src/main/java/net/micode/notes/gtask/remote/GTaskSyncService.java
rename to Notes-master/app/src/main/java/net/micode/notes/gtask/remote/GTaskSyncService.java
index 5e170af..cca36f7 100644
--- a/xiaomi/app/src/main/java/net/micode/notes/gtask/remote/GTaskSyncService.java
+++ b/Notes-master/app/src/main/java/net/micode/notes/gtask/remote/GTaskSyncService.java
@@ -25,31 +25,22 @@ import android.os.IBinder;
public class GTaskSyncService extends Service {
public final static String ACTION_STRING_NAME = "sync_action_type";
- // 同步操作的动作类型
public final static int ACTION_START_SYNC = 0;
- // 启动同步操作
public final static int ACTION_CANCEL_SYNC = 1;
- // 取消同步操作
public final static int ACTION_INVALID = 2;
- // 无效的操作
public final static String GTASK_SERVICE_BROADCAST_NAME = "net.micode.notes.gtask.remote.gtask_sync_service";
- // 广播名称,用于发送同步服务的广播
public final static String GTASK_SERVICE_BROADCAST_IS_SYNCING = "isSyncing";
- // 广播中用于指示是否正在同步的键名
public final static String GTASK_SERVICE_BROADCAST_PROGRESS_MSG = "progressMsg";
- // 广播中用于同步进度消息的键名
private static GTaskASyncTask mSyncTask = null;
- // 同步任务实例
private static String mSyncProgress = "";
- // 同步进度消息
private void startSync() {
if (mSyncTask == null) {
@@ -114,10 +105,6 @@ public class GTaskSyncService extends Service {
sendBroadcast(intent);
}
- /**
- * 启动同步操作
- * @param activity 调用此方法的Activity
- */
public static void startSync(Activity activity) {
GTaskManager.getInstance().setActivityContext(activity);
Intent intent = new Intent(activity, GTaskSyncService.class);
@@ -125,28 +112,16 @@ public class GTaskSyncService extends Service {
activity.startService(intent);
}
- /**
- * 取消同步操作
- * @param context 上下文对象
- */
public static void cancelSync(Context context) {
Intent intent = new Intent(context, GTaskSyncService.class);
intent.putExtra(GTaskSyncService.ACTION_STRING_NAME, GTaskSyncService.ACTION_CANCEL_SYNC);
context.startService(intent);
}
- /**
- * 判断是否正在同步
- * @return 正在同步返回true,否则返回false
- */
public static boolean isSyncing() {
return mSyncTask != null;
}
- /**
- * 获取同步进度消息
- * @return 同步进度消息
- */
public static String getProgressString() {
return mSyncProgress;
}
diff --git a/Notes-master/app/src/main/java/net/micode/notes/model/Note.java b/Notes-master/app/src/main/java/net/micode/notes/model/Note.java
new file mode 100644
index 0000000..6706cf6
--- /dev/null
+++ b/Notes-master/app/src/main/java/net/micode/notes/model/Note.java
@@ -0,0 +1,253 @@
+/*
+ * 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.model;
+import android.content.ContentProviderOperation;
+import android.content.ContentProviderResult;
+import android.content.ContentUris;
+import android.content.ContentValues;
+import android.content.Context;
+import android.content.OperationApplicationException;
+import android.net.Uri;
+import android.os.RemoteException;
+import android.util.Log;
+
+import net.micode.notes.data.Notes;
+import net.micode.notes.data.Notes.CallNote;
+import net.micode.notes.data.Notes.DataColumns;
+import net.micode.notes.data.Notes.NoteColumns;
+import net.micode.notes.data.Notes.TextNote;
+
+import java.util.ArrayList;
+
+
+public class Note {
+ private ContentValues mNoteDiffValues;
+ private NoteData mNoteData;
+ private static final String TAG = "Note";
+ /**
+ * Create a new note id for adding a new note to databases
+ */
+ public static synchronized long getNewNoteId(Context context, long folderId) {
+ // Create a new note in the database
+ ContentValues values = new ContentValues();
+ long createdTime = System.currentTimeMillis();
+ values.put(NoteColumns.CREATED_DATE, createdTime);
+ values.put(NoteColumns.MODIFIED_DATE, createdTime);
+ values.put(NoteColumns.TYPE, Notes.TYPE_NOTE);
+ values.put(NoteColumns.LOCAL_MODIFIED, 1);
+ values.put(NoteColumns.PARENT_ID, folderId);
+ Uri uri = context.getContentResolver().insert(Notes.CONTENT_NOTE_URI, values);
+
+ long noteId = 0;
+ try {
+ noteId = Long.valueOf(uri.getPathSegments().get(1));
+ } catch (NumberFormatException e) {
+ Log.e(TAG, "Get note id error :" + e.toString());
+ noteId = 0;
+ }
+ if (noteId == -1) {
+ throw new IllegalStateException("Wrong note id:" + noteId);
+ }
+ return noteId;
+ }
+
+ public Note() {
+ mNoteDiffValues = new ContentValues();
+ mNoteData = new NoteData();
+ }
+
+ public void setNoteValue(String key, String value) {
+ mNoteDiffValues.put(key, value);
+ mNoteDiffValues.put(NoteColumns.LOCAL_MODIFIED, 1);
+ mNoteDiffValues.put(NoteColumns.MODIFIED_DATE, System.currentTimeMillis());
+ }
+
+ public void setTextData(String key, String value) {
+ mNoteData.setTextData(key, value);
+ }
+
+ public void setTextDataId(long id) {
+ mNoteData.setTextDataId(id);
+ }
+
+ public long getTextDataId() {
+ return mNoteData.mTextDataId;
+ }
+
+ public void setCallDataId(long id) {
+ mNoteData.setCallDataId(id);
+ }
+
+ public void setCallData(String key, String value) {
+ mNoteData.setCallData(key, value);
+ }
+
+ public boolean isLocalModified() {
+ return mNoteDiffValues.size() > 0 || mNoteData.isLocalModified();
+ }
+
+ public boolean syncNote(Context context, long noteId) {
+ if (noteId <= 0) {
+ throw new IllegalArgumentException("Wrong note id:" + noteId);
+ }
+
+ if (!isLocalModified()) {
+ return true;
+ }
+
+ /**
+ * In theory, once data changed, the note should be updated on {@link NoteColumns#LOCAL_MODIFIED} and
+ * {@link NoteColumns#MODIFIED_DATE}. For data safety, though update note fails, we also update the
+ * note data info
+ */
+ if (context.getContentResolver().update(
+ ContentUris.withAppendedId(Notes.CONTENT_NOTE_URI, noteId), mNoteDiffValues, null,
+ null) == 0) {
+ Log.e(TAG, "Update note error, should not happen");
+ // Do not return, fall through
+ }
+ mNoteDiffValues.clear();
+
+ if (mNoteData.isLocalModified()
+ && (mNoteData.pushIntoContentResolver(context, noteId) == null)) {
+ return false;
+ }
+
+ return true;
+ }
+
+ private class NoteData {
+ private long mTextDataId;
+
+ private ContentValues mTextDataValues;
+
+ private long mCallDataId;
+
+ private ContentValues mCallDataValues;
+
+ private static final String TAG = "NoteData";
+
+ public NoteData() {
+ mTextDataValues = new ContentValues();
+ mCallDataValues = new ContentValues();
+ mTextDataId = 0;
+ mCallDataId = 0;
+ }
+
+ boolean isLocalModified() {
+ return mTextDataValues.size() > 0 || mCallDataValues.size() > 0;
+ }
+
+ void setTextDataId(long id) {
+ if(id <= 0) {
+ throw new IllegalArgumentException("Text data id should larger than 0");
+ }
+ mTextDataId = id;
+ }
+
+ void setCallDataId(long id) {
+ if (id <= 0) {
+ throw new IllegalArgumentException("Call data id should larger than 0");
+ }
+ mCallDataId = id;
+ }
+
+ void setCallData(String key, String value) {
+ mCallDataValues.put(key, value);
+ mNoteDiffValues.put(NoteColumns.LOCAL_MODIFIED, 1);
+ mNoteDiffValues.put(NoteColumns.MODIFIED_DATE, System.currentTimeMillis());
+ }
+
+ void setTextData(String key, String value) {
+ mTextDataValues.put(key, value);
+ mNoteDiffValues.put(NoteColumns.LOCAL_MODIFIED, 1);
+ mNoteDiffValues.put(NoteColumns.MODIFIED_DATE, System.currentTimeMillis());
+ }
+
+ Uri pushIntoContentResolver(Context context, long noteId) {
+ /**
+ * Check for safety
+ */
+ if (noteId <= 0) {
+ throw new IllegalArgumentException("Wrong note id:" + noteId);
+ }
+
+ ArrayList operationList = new ArrayList();
+ ContentProviderOperation.Builder builder = null;
+
+ if(mTextDataValues.size() > 0) {
+ mTextDataValues.put(DataColumns.NOTE_ID, noteId);
+ if (mTextDataId == 0) {
+ mTextDataValues.put(DataColumns.MIME_TYPE, TextNote.CONTENT_ITEM_TYPE);
+ Uri uri = context.getContentResolver().insert(Notes.CONTENT_DATA_URI,
+ mTextDataValues);
+ try {
+ setTextDataId(Long.valueOf(uri.getPathSegments().get(1)));
+ } catch (NumberFormatException e) {
+ Log.e(TAG, "Insert new text data fail with noteId" + noteId);
+ mTextDataValues.clear();
+ return null;
+ }
+ } else {
+ builder = ContentProviderOperation.newUpdate(ContentUris.withAppendedId(
+ Notes.CONTENT_DATA_URI, mTextDataId));
+ builder.withValues(mTextDataValues);
+ operationList.add(builder.build());
+ }
+ mTextDataValues.clear();
+ }
+
+ if(mCallDataValues.size() > 0) {
+ mCallDataValues.put(DataColumns.NOTE_ID, noteId);
+ if (mCallDataId == 0) {
+ mCallDataValues.put(DataColumns.MIME_TYPE, CallNote.CONTENT_ITEM_TYPE);
+ Uri uri = context.getContentResolver().insert(Notes.CONTENT_DATA_URI,
+ mCallDataValues);
+ try {
+ setCallDataId(Long.valueOf(uri.getPathSegments().get(1)));
+ } catch (NumberFormatException e) {
+ Log.e(TAG, "Insert new call data fail with noteId" + noteId);
+ mCallDataValues.clear();
+ return null;
+ }
+ } else {
+ builder = ContentProviderOperation.newUpdate(ContentUris.withAppendedId(
+ Notes.CONTENT_DATA_URI, mCallDataId));
+ builder.withValues(mCallDataValues);
+ operationList.add(builder.build());
+ }
+ mCallDataValues.clear();
+ }
+
+ if (operationList.size() > 0) {
+ try {
+ ContentProviderResult[] results = context.getContentResolver().applyBatch(
+ Notes.AUTHORITY, operationList);
+ return (results == null || results.length == 0 || results[0] == null) ? null
+ : ContentUris.withAppendedId(Notes.CONTENT_NOTE_URI, noteId);
+ } catch (RemoteException e) {
+ Log.e(TAG, String.format("%s: %s", e.toString(), e.getMessage()));
+ return null;
+ } catch (OperationApplicationException e) {
+ Log.e(TAG, String.format("%s: %s", e.toString(), e.getMessage()));
+ return null;
+ }
+ }
+ return null;
+ }
+ }
+}
diff --git a/Notes-master/app/src/main/java/net/micode/notes/model/WorkingNote.java b/Notes-master/app/src/main/java/net/micode/notes/model/WorkingNote.java
new file mode 100644
index 0000000..be081e4
--- /dev/null
+++ b/Notes-master/app/src/main/java/net/micode/notes/model/WorkingNote.java
@@ -0,0 +1,368 @@
+/*
+ * 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.model;
+
+import android.appwidget.AppWidgetManager;
+import android.content.ContentUris;
+import android.content.Context;
+import android.database.Cursor;
+import android.text.TextUtils;
+import android.util.Log;
+
+import net.micode.notes.data.Notes;
+import net.micode.notes.data.Notes.CallNote;
+import net.micode.notes.data.Notes.DataColumns;
+import net.micode.notes.data.Notes.DataConstants;
+import net.micode.notes.data.Notes.NoteColumns;
+import net.micode.notes.data.Notes.TextNote;
+import net.micode.notes.tool.ResourceParser.NoteBgResources;
+
+
+public class WorkingNote {
+ // Note for the working note
+ private Note mNote;
+ // Note Id
+ private long mNoteId;
+ // Note content
+ private String mContent;
+ // Note mode
+ private int mMode;
+
+ private long mAlertDate;
+
+ private long mModifiedDate;
+
+ private int mBgColorId;
+
+ private int mWidgetId;
+
+ private int mWidgetType;
+
+ private long mFolderId;
+
+ private Context mContext;
+
+ private static final String TAG = "WorkingNote";
+
+ private boolean mIsDeleted;
+
+ private NoteSettingChangedListener mNoteSettingStatusListener;
+
+ public static final String[] DATA_PROJECTION = new String[] {
+ DataColumns.ID,
+ DataColumns.CONTENT,
+ DataColumns.MIME_TYPE,
+ DataColumns.DATA1,
+ DataColumns.DATA2,
+ DataColumns.DATA3,
+ DataColumns.DATA4,
+ };
+
+ public static final String[] NOTE_PROJECTION = new String[] {
+ NoteColumns.PARENT_ID,
+ NoteColumns.ALERTED_DATE,
+ NoteColumns.BG_COLOR_ID,
+ NoteColumns.WIDGET_ID,
+ NoteColumns.WIDGET_TYPE,
+ NoteColumns.MODIFIED_DATE
+ };
+
+ private static final int DATA_ID_COLUMN = 0;
+
+ private static final int DATA_CONTENT_COLUMN = 1;
+
+ private static final int DATA_MIME_TYPE_COLUMN = 2;
+
+ private static final int DATA_MODE_COLUMN = 3;
+
+ private static final int NOTE_PARENT_ID_COLUMN = 0;
+
+ private static final int NOTE_ALERTED_DATE_COLUMN = 1;
+
+ private static final int NOTE_BG_COLOR_ID_COLUMN = 2;
+
+ private static final int NOTE_WIDGET_ID_COLUMN = 3;
+
+ private static final int NOTE_WIDGET_TYPE_COLUMN = 4;
+
+ private static final int NOTE_MODIFIED_DATE_COLUMN = 5;
+
+ // New note construct
+ private WorkingNote(Context context, long folderId) {
+ mContext = context;
+ mAlertDate = 0;
+ mModifiedDate = System.currentTimeMillis();
+ mFolderId = folderId;
+ mNote = new Note();
+ mNoteId = 0;
+ mIsDeleted = false;
+ mMode = 0;
+ mWidgetType = Notes.TYPE_WIDGET_INVALIDE;
+ }
+
+ // Existing note construct
+ private WorkingNote(Context context, long noteId, long folderId) {
+ mContext = context;
+ mNoteId = noteId;
+ mFolderId = folderId;
+ mIsDeleted = false;
+ mNote = new Note();
+ loadNote();
+ }
+
+ private void loadNote() {
+ Cursor cursor = mContext.getContentResolver().query(
+ ContentUris.withAppendedId(Notes.CONTENT_NOTE_URI, mNoteId), NOTE_PROJECTION, null,
+ null, null);
+
+ if (cursor != null) {
+ if (cursor.moveToFirst()) {
+ mFolderId = cursor.getLong(NOTE_PARENT_ID_COLUMN);
+ mBgColorId = cursor.getInt(NOTE_BG_COLOR_ID_COLUMN);
+ mWidgetId = cursor.getInt(NOTE_WIDGET_ID_COLUMN);
+ mWidgetType = cursor.getInt(NOTE_WIDGET_TYPE_COLUMN);
+ mAlertDate = cursor.getLong(NOTE_ALERTED_DATE_COLUMN);
+ mModifiedDate = cursor.getLong(NOTE_MODIFIED_DATE_COLUMN);
+ }
+ cursor.close();
+ } else {
+ Log.e(TAG, "No note with id:" + mNoteId);
+ throw new IllegalArgumentException("Unable to find note with id " + mNoteId);
+ }
+ loadNoteData();
+ }
+
+ private void loadNoteData() {
+ Cursor cursor = mContext.getContentResolver().query(Notes.CONTENT_DATA_URI, DATA_PROJECTION,
+ DataColumns.NOTE_ID + "=?", new String[] {
+ String.valueOf(mNoteId)
+ }, null);
+
+ if (cursor != null) {
+ if (cursor.moveToFirst()) {
+ do {
+ String type = cursor.getString(DATA_MIME_TYPE_COLUMN);
+ if (DataConstants.NOTE.equals(type)) {
+ mContent = cursor.getString(DATA_CONTENT_COLUMN);
+ mMode = cursor.getInt(DATA_MODE_COLUMN);
+ mNote.setTextDataId(cursor.getLong(DATA_ID_COLUMN));
+ } else if (DataConstants.CALL_NOTE.equals(type)) {
+ mNote.setCallDataId(cursor.getLong(DATA_ID_COLUMN));
+ } else {
+ Log.d(TAG, "Wrong note type with type:" + type);
+ }
+ } while (cursor.moveToNext());
+ }
+ cursor.close();
+ } else {
+ Log.e(TAG, "No data with id:" + mNoteId);
+ throw new IllegalArgumentException("Unable to find note's data with id " + mNoteId);
+ }
+ }
+
+ public static WorkingNote createEmptyNote(Context context, long folderId, int widgetId,
+ int widgetType, int defaultBgColorId) {
+ WorkingNote note = new WorkingNote(context, folderId);
+ note.setBgColorId(defaultBgColorId);
+ note.setWidgetId(widgetId);
+ note.setWidgetType(widgetType);
+ return note;
+ }
+
+ public static WorkingNote load(Context context, long id) {
+ return new WorkingNote(context, id, 0);
+ }
+
+ public synchronized boolean saveNote() {
+ if (isWorthSaving()) {
+ if (!existInDatabase()) {
+ if ((mNoteId = Note.getNewNoteId(mContext, mFolderId)) == 0) {
+ Log.e(TAG, "Create new note fail with id:" + mNoteId);
+ return false;
+ }
+ }
+
+ mNote.syncNote(mContext, mNoteId);
+
+ /**
+ * Update widget content if there exist any widget of this note
+ */
+ if (mWidgetId != AppWidgetManager.INVALID_APPWIDGET_ID
+ && mWidgetType != Notes.TYPE_WIDGET_INVALIDE
+ && mNoteSettingStatusListener != null) {
+ mNoteSettingStatusListener.onWidgetChanged();
+ }
+ return true;
+ } else {
+ return false;
+ }
+ }
+
+ public boolean existInDatabase() {
+ return mNoteId > 0;
+ }
+
+ private boolean isWorthSaving() {
+ if (mIsDeleted || (!existInDatabase() && TextUtils.isEmpty(mContent))
+ || (existInDatabase() && !mNote.isLocalModified())) {
+ return false;
+ } else {
+ return true;
+ }
+ }
+
+ public void setOnSettingStatusChangedListener(NoteSettingChangedListener l) {
+ mNoteSettingStatusListener = l;
+ }
+
+ public void setAlertDate(long date, boolean set) {
+ if (date != mAlertDate) {
+ mAlertDate = date;
+ mNote.setNoteValue(NoteColumns.ALERTED_DATE, String.valueOf(mAlertDate));
+ }
+ if (mNoteSettingStatusListener != null) {
+ mNoteSettingStatusListener.onClockAlertChanged(date, set);
+ }
+ }
+
+ public void markDeleted(boolean mark) {
+ mIsDeleted = mark;
+ if (mWidgetId != AppWidgetManager.INVALID_APPWIDGET_ID
+ && mWidgetType != Notes.TYPE_WIDGET_INVALIDE && mNoteSettingStatusListener != null) {
+ mNoteSettingStatusListener.onWidgetChanged();
+ }
+ }
+
+ public void setBgColorId(int id) {
+ if (id != mBgColorId) {
+ mBgColorId = id;
+ if (mNoteSettingStatusListener != null) {
+ mNoteSettingStatusListener.onBackgroundColorChanged();
+ }
+ mNote.setNoteValue(NoteColumns.BG_COLOR_ID, String.valueOf(id));
+ }
+ }
+
+ public void setCheckListMode(int mode) {
+ if (mMode != mode) {
+ if (mNoteSettingStatusListener != null) {
+ mNoteSettingStatusListener.onCheckListModeChanged(mMode, mode);
+ }
+ mMode = mode;
+ mNote.setTextData(TextNote.MODE, String.valueOf(mMode));
+ }
+ }
+
+ public void setWidgetType(int type) {
+ if (type != mWidgetType) {
+ mWidgetType = type;
+ mNote.setNoteValue(NoteColumns.WIDGET_TYPE, String.valueOf(mWidgetType));
+ }
+ }
+
+ public void setWidgetId(int id) {
+ if (id != mWidgetId) {
+ mWidgetId = id;
+ mNote.setNoteValue(NoteColumns.WIDGET_ID, String.valueOf(mWidgetId));
+ }
+ }
+
+ public void setWorkingText(String text) {
+ if (!TextUtils.equals(mContent, text)) {
+ mContent = text;
+ mNote.setTextData(DataColumns.CONTENT, mContent);
+ }
+ }
+
+ public void convertToCallNote(String phoneNumber, long callDate) {
+ mNote.setCallData(CallNote.CALL_DATE, String.valueOf(callDate));
+ mNote.setCallData(CallNote.PHONE_NUMBER, phoneNumber);
+ mNote.setNoteValue(NoteColumns.PARENT_ID, String.valueOf(Notes.ID_CALL_RECORD_FOLDER));
+ }
+
+ public boolean hasClockAlert() {
+ return (mAlertDate > 0 ? true : false);
+ }
+
+ public String getContent() {
+ return mContent;
+ }
+
+ public long getAlertDate() {
+ return mAlertDate;
+ }
+
+ public long getModifiedDate() {
+ return mModifiedDate;
+ }
+
+ public int getBgColorResId() {
+ return NoteBgResources.getNoteBgResource(mBgColorId);
+ }
+
+ public int getBgColorId() {
+ return mBgColorId;
+ }
+
+ public int getTitleBgResId() {
+ return NoteBgResources.getNoteTitleBgResource(mBgColorId);
+ }
+
+ public int getCheckListMode() {
+ return mMode;
+ }
+
+ public long getNoteId() {
+ return mNoteId;
+ }
+
+ public long getFolderId() {
+ return mFolderId;
+ }
+
+ public int getWidgetId() {
+ return mWidgetId;
+ }
+
+ public int getWidgetType() {
+ return mWidgetType;
+ }
+
+ public interface NoteSettingChangedListener {
+ /**
+ * Called when the background color of current note has just changed
+ */
+ void onBackgroundColorChanged();
+
+ /**
+ * Called when user set clock
+ */
+ void onClockAlertChanged(long date, boolean set);
+
+ /**
+ * Call when user create note from widget
+ */
+ void onWidgetChanged();
+
+ /**
+ * Call when switch between check list mode and normal mode
+ * @param oldMode is previous mode before change
+ * @param newMode is new mode
+ */
+ void onCheckListModeChanged(int oldMode, int newMode);
+ }
+}
diff --git a/xiaomi/app/src/main/java/net/micode/notes/tool/BackupUtils.java b/Notes-master/app/src/main/java/net/micode/notes/tool/BackupUtils.java
similarity index 100%
rename from xiaomi/app/src/main/java/net/micode/notes/tool/BackupUtils.java
rename to Notes-master/app/src/main/java/net/micode/notes/tool/BackupUtils.java
diff --git a/xiaomi/app/src/main/java/net/micode/notes/tool/DataUtils.java b/Notes-master/app/src/main/java/net/micode/notes/tool/DataUtils.java
similarity index 100%
rename from xiaomi/app/src/main/java/net/micode/notes/tool/DataUtils.java
rename to Notes-master/app/src/main/java/net/micode/notes/tool/DataUtils.java
diff --git a/xiaomi/app/src/main/java/net/micode/notes/tool/GTaskStringUtils.java b/Notes-master/app/src/main/java/net/micode/notes/tool/GTaskStringUtils.java
similarity index 100%
rename from xiaomi/app/src/main/java/net/micode/notes/tool/GTaskStringUtils.java
rename to Notes-master/app/src/main/java/net/micode/notes/tool/GTaskStringUtils.java
diff --git a/xiaomi/app/src/main/java/net/micode/notes/tool/ResourceParser.java b/Notes-master/app/src/main/java/net/micode/notes/tool/ResourceParser.java
similarity index 100%
rename from xiaomi/app/src/main/java/net/micode/notes/tool/ResourceParser.java
rename to Notes-master/app/src/main/java/net/micode/notes/tool/ResourceParser.java
diff --git a/xiaomi/app/src/main/java/net/micode/notes/ui/AlarmAlertActivity.java b/Notes-master/app/src/main/java/net/micode/notes/ui/AlarmAlertActivity.java
similarity index 100%
rename from xiaomi/app/src/main/java/net/micode/notes/ui/AlarmAlertActivity.java
rename to Notes-master/app/src/main/java/net/micode/notes/ui/AlarmAlertActivity.java
diff --git a/xiaomi/app/src/main/java/net/micode/notes/ui/AlarmInitReceiver.java b/Notes-master/app/src/main/java/net/micode/notes/ui/AlarmInitReceiver.java
similarity index 99%
rename from xiaomi/app/src/main/java/net/micode/notes/ui/AlarmInitReceiver.java
rename to Notes-master/app/src/main/java/net/micode/notes/ui/AlarmInitReceiver.java
index 35a5c55..f221202 100644
--- a/xiaomi/app/src/main/java/net/micode/notes/ui/AlarmInitReceiver.java
+++ b/Notes-master/app/src/main/java/net/micode/notes/ui/AlarmInitReceiver.java
@@ -53,7 +53,6 @@ public class AlarmInitReceiver extends BroadcastReceiver {
long alertDate = c.getLong(COLUMN_ALERTED_DATE);
Intent sender = new Intent(context, AlarmReceiver.class);
sender.setData(ContentUris.withAppendedId(Notes.CONTENT_NOTE_URI, c.getLong(COLUMN_ID)));
-
PendingIntent pendingIntent = PendingIntent.getBroadcast(context, 0, sender, 0);
AlarmManager alermManager = (AlarmManager) context
.getSystemService(Context.ALARM_SERVICE);
diff --git a/xiaomi/app/src/main/java/net/micode/notes/ui/AlarmReceiver.java b/Notes-master/app/src/main/java/net/micode/notes/ui/AlarmReceiver.java
similarity index 100%
rename from xiaomi/app/src/main/java/net/micode/notes/ui/AlarmReceiver.java
rename to Notes-master/app/src/main/java/net/micode/notes/ui/AlarmReceiver.java
diff --git a/xiaomi/app/src/main/java/net/micode/notes/ui/DateTimePicker.java b/Notes-master/app/src/main/java/net/micode/notes/ui/DateTimePicker.java
similarity index 100%
rename from xiaomi/app/src/main/java/net/micode/notes/ui/DateTimePicker.java
rename to Notes-master/app/src/main/java/net/micode/notes/ui/DateTimePicker.java
diff --git a/xiaomi/app/src/main/java/net/micode/notes/ui/DateTimePickerDialog.java b/Notes-master/app/src/main/java/net/micode/notes/ui/DateTimePickerDialog.java
similarity index 100%
rename from xiaomi/app/src/main/java/net/micode/notes/ui/DateTimePickerDialog.java
rename to Notes-master/app/src/main/java/net/micode/notes/ui/DateTimePickerDialog.java
diff --git a/xiaomi/app/src/main/java/net/micode/notes/ui/DropdownMenu.java b/Notes-master/app/src/main/java/net/micode/notes/ui/DropdownMenu.java
similarity index 100%
rename from xiaomi/app/src/main/java/net/micode/notes/ui/DropdownMenu.java
rename to Notes-master/app/src/main/java/net/micode/notes/ui/DropdownMenu.java
diff --git a/xiaomi/app/src/main/java/net/micode/notes/ui/FoldersListAdapter.java b/Notes-master/app/src/main/java/net/micode/notes/ui/FoldersListAdapter.java
similarity index 100%
rename from xiaomi/app/src/main/java/net/micode/notes/ui/FoldersListAdapter.java
rename to Notes-master/app/src/main/java/net/micode/notes/ui/FoldersListAdapter.java
diff --git a/xiaomi/app/src/main/java/net/micode/notes/ui/NoteEditActivity.java b/Notes-master/app/src/main/java/net/micode/notes/ui/NoteEditActivity.java
similarity index 76%
rename from xiaomi/app/src/main/java/net/micode/notes/ui/NoteEditActivity.java
rename to Notes-master/app/src/main/java/net/micode/notes/ui/NoteEditActivity.java
index 3b9fb47..96a9ff8 100644
--- a/xiaomi/app/src/main/java/net/micode/notes/ui/NoteEditActivity.java
+++ b/Notes-master/app/src/main/java/net/micode/notes/ui/NoteEditActivity.java
@@ -22,34 +22,19 @@ import android.app.AlertDialog;
import android.app.PendingIntent;
import android.app.SearchManager;
import android.appwidget.AppWidgetManager;
-import android.content.ContentResolver;
import android.content.ContentUris;
-import android.content.ContentValues;
import android.content.Context;
import android.content.DialogInterface;
import android.content.Intent;
import android.content.SharedPreferences;
-import android.database.Cursor;
-import android.graphics.Bitmap;
-import android.graphics.BitmapFactory;
-import android.graphics.Matrix;
import android.graphics.Paint;
-import android.graphics.drawable.BitmapDrawable;
-import android.graphics.drawable.Drawable;
-import android.net.Uri;
-import android.os.Build;
import android.os.Bundle;
-import android.os.Environment;
import android.preference.PreferenceManager;
-import android.provider.DocumentsContract;
-import android.provider.MediaStore;
-import android.text.Editable;
import android.text.Spannable;
import android.text.SpannableString;
import android.text.TextUtils;
import android.text.format.DateUtils;
import android.text.style.BackgroundColorSpan;
-import android.text.style.ImageSpan;
import android.util.Log;
import android.view.LayoutInflater;
import android.view.Menu;
@@ -58,12 +43,10 @@ import android.view.MotionEvent;
import android.view.View;
import android.view.View.OnClickListener;
import android.view.WindowManager;
-import android.widget.Button;
import android.widget.CheckBox;
import android.widget.CompoundButton;
import android.widget.CompoundButton.OnCheckedChangeListener;
import android.widget.EditText;
-import android.widget.ImageButton;
import android.widget.ImageView;
import android.widget.LinearLayout;
import android.widget.TextView;
@@ -82,7 +65,6 @@ import net.micode.notes.ui.NoteEditText.OnTextViewChangeListener;
import net.micode.notes.widget.NoteWidgetProvider_2x;
import net.micode.notes.widget.NoteWidgetProvider_4x;
-import java.io.FileNotFoundException;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Map;
@@ -167,10 +149,22 @@ public class NoteEditActivity extends Activity implements OnClickListener,
private String mUserQuery;
private Pattern mPattern;
- private final int PHOTO_REQUEST = 1;//请求码
-
+ @Override
+ protected void onCreate(Bundle savedInstanceState) {
+ super.onCreate(savedInstanceState);
+ this.setContentView(R.layout.note_edit);
+ if (savedInstanceState == null && !initActivityState(getIntent())) {
+ finish();
+ return;
+ }
+ initResources();
+ }
+ /**
+ * Current activity may be killed when the memory is low. Once it is killed, for another time
+ * user load this activity, we should restore the former state
+ */
@Override
protected void onRestoreInstanceState(Bundle savedInstanceState) {
super.onRestoreInstanceState(savedInstanceState);
@@ -269,13 +263,14 @@ public class NoteEditActivity extends Activity implements OnClickListener,
}
@Override
- protected void onResume() {//能获得用户焦点:可以操作
+ protected void onResume() {
super.onResume();
- initNoteScreen();//初始化便签屏幕
+ initNoteScreen();
}
private void initNoteScreen() {
- mNoteEditor.setTextAppearance(this, TextAppearanceResources.getTexAppearanceResource(mFontSizeId));
+ mNoteEditor.setTextAppearance(this, TextAppearanceResources
+ .getTexAppearanceResource(mFontSizeId));
if (mWorkingNote.getCheckListMode() == TextNote.MODE_CHECK_LIST) {
switchToListMode(mWorkingNote.getContent());
} else {
@@ -293,9 +288,11 @@ public class NoteEditActivity extends Activity implements OnClickListener,
| 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
+ */
showAlertHeader();
- //将有图片路径的位置转换为图片
- convertToImage();
}
private void showAlertHeader() {
@@ -314,6 +311,7 @@ public class NoteEditActivity extends Activity implements OnClickListener,
mNoteHeaderHolder.ivAlertIcon.setVisibility(View.GONE);
};
}
+
@Override
protected void onNewIntent(Intent intent) {
super.onNewIntent(intent);
@@ -360,8 +358,8 @@ public class NoteEditActivity extends Activity implements OnClickListener,
|| ev.getX() > (x + view.getWidth())
|| ev.getY() < y
|| ev.getY() > (y + view.getHeight())) {
- return false;
- }
+ return false;
+ }
return true;
}
@@ -420,7 +418,7 @@ public class NoteEditActivity extends Activity implements OnClickListener,
}
intent.putExtra(AppWidgetManager.EXTRA_APPWIDGET_IDS, new int[] {
- mWorkingNote.getWidgetId()
+ mWorkingNote.getWidgetId()
});
sendBroadcast(intent);
@@ -432,7 +430,7 @@ public class NoteEditActivity extends Activity implements OnClickListener,
if (id == R.id.btn_set_bg_color) {
mNoteBgColorSelector.setVisibility(View.VISIBLE);
findViewById(sBgSelectorSelectionMap.get(mWorkingNote.getBgColorId())).setVisibility(
- View.VISIBLE);
+ - View.VISIBLE);
} else if (sBgSelectorBtnsMap.containsKey(id)) {
findViewById(sBgSelectorSelectionMap.get(mWorkingNote.getBgColorId())).setVisibility(
View.GONE);
@@ -565,6 +563,10 @@ public class NoteEditActivity extends Activity implements OnClickListener,
d.show();
}
+ /**
+ * Share note to apps that support {@link Intent#ACTION_SEND} action
+ * and {@text/plain} type
+ */
private void sendTo(Context context, String info) {
Intent intent = new Intent(Intent.ACTION_SEND);
intent.putExtra(Intent.EXTRA_TEXT, info);
@@ -771,12 +773,12 @@ public class NoteEditActivity extends Activity implements OnClickListener,
switchToListMode(mNoteEditor.getText().toString());
} else {
if (!getWorkingText()) {
- mWorkingNote.setWorkingText(mWorkingNote.getContent().replace(TAG_UNCHECKED + " ", ""));
+ mWorkingNote.setWorkingText(mWorkingNote.getContent().replace(TAG_UNCHECKED + " ",
+ ""));
}
mNoteEditor.setText(getHighlightQueryResult(mWorkingNote.getContent(), mUserQuery));
mEditTextList.setVisibility(View.GONE);
mNoteEditor.setVisibility(View.VISIBLE);
- convertToImage(); //退出清单模式,应该将有图片的地方显示出来
}
}
@@ -868,194 +870,4 @@ public class NoteEditActivity extends Activity implements OnClickListener,
private void showToast(int resId, int duration) {
Toast.makeText(this, resId, duration).show();
}
- //获取数据列_获取此 Uri 的数据列的值。这对MediaStore Uris 和其他基于文件的 ContentProvider。
- public String getDataColumn(Context context, Uri uri, String selection, String[] selectionArgs) {
-
- Cursor cursor = null;
- final String column = "_data";
- final String[] projection = {column};
-
- try {
- cursor = context.getContentResolver().query(uri, projection, selection, selectionArgs, null);
- if (cursor != null && cursor.moveToFirst()) {
- final int column_index = cursor.getColumnIndexOrThrow(column);
- return cursor.getString(column_index);
- }
- } finally {
- if (cursor != null)
- cursor.close();
- }
- return null;
- }
-
-
- //是否为外部存储文件
-// public boolean isExternalStorageDocument(Uri uri) {
-// return "com.android.externalstorage.documents".equals(uri.getAuthority());
-// }
-//
-// //是否为下载文件
-// public boolean isDownloadsDocument(Uri uri) {
-// return "com.android.providers.downloads.documents".equals(uri.getAuthority());
-// }
-
- //是否为媒体文件
- public boolean isMediaDocument(Uri uri) {
- return "com.android.providers.media.documents".equals(uri.getAuthority());
- }
- @Override
- protected void onCreate(Bundle savedInstanceState) {
- super.onCreate(savedInstanceState);
- this.setContentView(R.layout.note_edit);
-
- if (savedInstanceState == null && !initActivityState(getIntent())) {
- finish();
- return;
- }
- initResources();
- //根据id获取添加图片按钮
- final ImageButton add_img_btn = (ImageButton) findViewById(R.id.add_img_btn);
- //为点击图片按钮设置监听器
- add_img_btn.setOnClickListener(new View.OnClickListener() {
- @Override
- public void onClick(View view) {
- Log.d(TAG, "onClick: click add image button");
- //ACTION_GET_CONTENT: 允许用户选择特殊种类的数据,并返回(特殊种类的数据:照一张相片或录一段音)
- Intent loadImage = new Intent(Intent.ACTION_GET_CONTENT);
- //Category属性用于指定当前动作(Action)被执行的环境.
- //CATEGORY_OPENABLE; 用来指示一个ACTION_GET_CONTENT的intent
- loadImage.addCategory(Intent.CATEGORY_OPENABLE);
- loadImage.setType("image/*");
- startActivityForResult(loadImage, PHOTO_REQUEST);
- }
- });
- }
-
- //路径字符串格式 转换为 图片image格式
- private void convertToImage() {
- NoteEditText noteEditText = (NoteEditText) findViewById(R.id.note_edit_view); //获取当前的edit
- Editable editable = noteEditText.getText();//1.获取text
- String noteText = editable.toString(); //2.将note内容转换为字符串
- int length = editable.length(); //内容的长度
- //3.截取img片段 [local]+uri+[local],提取uri
- for(int i = 0; i < length; i++) {
- for(int j = i; j < length; j++) {
- String img_fragment = noteText.substring(i, j+1); //img_fragment:关于图片路径的片段
- if(img_fragment.length() > 15 && img_fragment.endsWith("[/local]") && img_fragment.startsWith("[local]")){
- int limit = 7; //[local]为7个字符
- //[local][/local]共15个字符,剩下的为真正的path长度
- int len = img_fragment.length()-15;
- //从[local]之后的len个字符就是path
- String path = img_fragment.substring(limit,limit+len);//获取到了图片路径
- Bitmap bitmap = null;
- Log.d(TAG, "图片的路径是:"+path);
- try {
- bitmap = BitmapFactory.decodeFile(path);//将图片路径解码为图片格式
- } catch (Exception e) {
- e.printStackTrace();
- }
- if(bitmap!=null){ //若图片存在
- Log.d(TAG, "图片不为null");
- ImageSpan imageSpan = new ImageSpan(NoteEditActivity.this, bitmap);
- //4.创建一个SpannableString对象,以便插入用ImageSpan对象封装的图像
- String ss = "[local]" + path + "[/local]";
- SpannableString spannableString = new SpannableString(ss);
- //5.将指定的标记对象附加到文本的开始...结束范围
- spannableString.setSpan(imageSpan, 0, ss.length(), Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
- Log.d(TAG, "Create spannable string success!");
- Editable edit_text = noteEditText.getEditableText();
- edit_text.delete(i,i+len+15); //6.删掉图片路径的文字
- edit_text.insert(i, spannableString); //7.在路径的起始位置插入图片
- }
- }
- }
- }
- }
- @Override
- //重写onActivityResult()来处理返回的数据
- protected void onActivityResult(int requestCode, int resultCode, Intent intent) {
- super.onActivityResult(requestCode, resultCode, intent);
- ContentResolver resolver = getContentResolver();
- switch (requestCode) {
- case PHOTO_REQUEST:
- Uri originalUri = intent.getData(); //1.获得图片的真实路径
- Bitmap bitmap = null;
- try {
- bitmap = BitmapFactory.decodeStream(resolver.openInputStream(originalUri));//2.解码图片
- } catch (FileNotFoundException e) {
- Log.d(TAG, "onActivityResult: get file_exception");
- e.printStackTrace();
- }
-
- if(bitmap != null){
- //3.根据Bitmap对象创建ImageSpan对象
- Log.d(TAG, "onActivityResult: bitmap is not null");
- ImageSpan imageSpan = new ImageSpan(NoteEditActivity.this, bitmap);
- String path = getPath(this,originalUri);
- //4.使用[local][/local]将path括起来,用于之后方便识别图片路径在note中的位置
- String img_fragment= "[local]" + path + "[/local]";
- //创建一个SpannableString对象,以便插入用ImageSpan对象封装的图像
- SpannableString spannableString = new SpannableString(img_fragment);
- spannableString.setSpan(imageSpan, 0, img_fragment.length(), Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
- //5.将选择的图片追加到EditText中光标所在位置
- NoteEditText e = (NoteEditText) findViewById(R.id.note_edit_view);
- int index = e.getSelectionStart(); //获取光标所在位置
- Log.d(TAG, "Index是: " + index);
- Editable edit_text = e.getEditableText();
- edit_text.insert(index, spannableString); //将图片插入到光标所在位置
-
- mWorkingNote.mContent = e.getText().toString();
- //6.把改动提交到数据库中,两个数据库表都要改的
- ContentResolver contentResolver = getContentResolver();
- ContentValues contentValues = new ContentValues();
- final long id = mWorkingNote.getNoteId();
- contentValues.put("snippet",mWorkingNote.mContent);
- contentResolver.update(Uri.parse("content://micode_notes/note"), contentValues,"_id=?",new String[]{""+id});
- ContentValues contentValues1 = new ContentValues();
- contentValues1.put("content",mWorkingNote.mContent);
- contentResolver.update(Uri.parse("content://micode_notes/data"), contentValues1,"mime_type=? and note_id=?", new String[]{"vnd.android.cursor.item/text_note",""+id});
-
- }else{
- Toast.makeText(NoteEditActivity.this, "获取图片失败", Toast.LENGTH_SHORT).show();
- }
- break;
- default:
- break;
- }
- }
- //获取文件的real path
- public String getPath(final Context context, final Uri uri) {
-
- final boolean isKitKat = Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT;
-
- // DocumentProvider
- if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {
- if (isKitKat && DocumentsContract.isDocumentUri(context, uri)) {
- if (isMediaDocument(uri)) {
- final String docId = DocumentsContract.getDocumentId(uri);
- final String[] split = docId.split(":");
- final String type = split[0];
-
- Uri contentUri = null;
- if ("image".equals(type)) {
- contentUri = MediaStore.Images.Media.EXTERNAL_CONTENT_URI;
- }
-
- final String selection = "_id=?";
- final String[] selectionArgs = new String[]{split[1]};
-
- return getDataColumn(context, contentUri, selection, selectionArgs);
- }
- }
- // Media
- else if ("content".equalsIgnoreCase(uri.getScheme())) {
- return getDataColumn(context, uri, null, null);
- }
- // File
- else if ("file".equalsIgnoreCase(uri.getScheme())) {
- return uri.getPath();
- }
- }
- return null;
- }
}
diff --git a/xiaomi/app/src/main/java/net/micode/notes/ui/NoteEditText.java b/Notes-master/app/src/main/java/net/micode/notes/ui/NoteEditText.java
similarity index 100%
rename from xiaomi/app/src/main/java/net/micode/notes/ui/NoteEditText.java
rename to Notes-master/app/src/main/java/net/micode/notes/ui/NoteEditText.java
diff --git a/xiaomi/app/src/main/java/net/micode/notes/ui/NoteItemData.java b/Notes-master/app/src/main/java/net/micode/notes/ui/NoteItemData.java
similarity index 100%
rename from xiaomi/app/src/main/java/net/micode/notes/ui/NoteItemData.java
rename to Notes-master/app/src/main/java/net/micode/notes/ui/NoteItemData.java
diff --git a/xiaomi/app/src/main/java/net/micode/notes/ui/NotesListActivity.java b/Notes-master/app/src/main/java/net/micode/notes/ui/NotesListActivity.java
similarity index 99%
rename from xiaomi/app/src/main/java/net/micode/notes/ui/NotesListActivity.java
rename to Notes-master/app/src/main/java/net/micode/notes/ui/NotesListActivity.java
index 93bef89..e843aec 100644
--- a/xiaomi/app/src/main/java/net/micode/notes/ui/NotesListActivity.java
+++ b/Notes-master/app/src/main/java/net/micode/notes/ui/NotesListActivity.java
@@ -31,7 +31,6 @@ import android.database.Cursor;
import android.os.AsyncTask;
import android.os.Bundle;
import android.preference.PreferenceManager;
-import android.support.v7.app.AppCompatActivity;
import android.text.Editable;
import android.text.TextUtils;
import android.text.TextWatcher;
@@ -79,7 +78,7 @@ import java.io.InputStream;
import java.io.InputStreamReader;
import java.util.HashSet;
-public class NotesListActivity extends AppCompatActivity implements OnClickListener, OnItemLongClickListener {
+public class NotesListActivity extends Activity implements OnClickListener, OnItemLongClickListener {
private static final int FOLDER_NOTE_LIST_QUERY_TOKEN = 0;
private static final int FOLDER_LIST_QUERY_TOKEN = 1;
diff --git a/xiaomi/app/src/main/java/net/micode/notes/ui/NotesListAdapter.java b/Notes-master/app/src/main/java/net/micode/notes/ui/NotesListAdapter.java
similarity index 100%
rename from xiaomi/app/src/main/java/net/micode/notes/ui/NotesListAdapter.java
rename to Notes-master/app/src/main/java/net/micode/notes/ui/NotesListAdapter.java
diff --git a/xiaomi/app/src/main/java/net/micode/notes/ui/NotesListItem.java b/Notes-master/app/src/main/java/net/micode/notes/ui/NotesListItem.java
similarity index 100%
rename from xiaomi/app/src/main/java/net/micode/notes/ui/NotesListItem.java
rename to Notes-master/app/src/main/java/net/micode/notes/ui/NotesListItem.java
diff --git a/xiaomi/app/src/main/java/net/micode/notes/ui/NotesPreferenceActivity.java b/Notes-master/app/src/main/java/net/micode/notes/ui/NotesPreferenceActivity.java
similarity index 100%
rename from xiaomi/app/src/main/java/net/micode/notes/ui/NotesPreferenceActivity.java
rename to Notes-master/app/src/main/java/net/micode/notes/ui/NotesPreferenceActivity.java
diff --git a/xiaomi/app/src/main/java/net/micode/notes/widget/NoteWidgetProvider.java b/Notes-master/app/src/main/java/net/micode/notes/widget/NoteWidgetProvider.java
similarity index 100%
rename from xiaomi/app/src/main/java/net/micode/notes/widget/NoteWidgetProvider.java
rename to Notes-master/app/src/main/java/net/micode/notes/widget/NoteWidgetProvider.java
diff --git a/xiaomi/app/src/main/java/net/micode/notes/widget/NoteWidgetProvider_2x.java b/Notes-master/app/src/main/java/net/micode/notes/widget/NoteWidgetProvider_2x.java
similarity index 100%
rename from xiaomi/app/src/main/java/net/micode/notes/widget/NoteWidgetProvider_2x.java
rename to Notes-master/app/src/main/java/net/micode/notes/widget/NoteWidgetProvider_2x.java
diff --git a/xiaomi/app/src/main/java/net/micode/notes/widget/NoteWidgetProvider_4x.java b/Notes-master/app/src/main/java/net/micode/notes/widget/NoteWidgetProvider_4x.java
similarity index 100%
rename from xiaomi/app/src/main/java/net/micode/notes/widget/NoteWidgetProvider_4x.java
rename to Notes-master/app/src/main/java/net/micode/notes/widget/NoteWidgetProvider_4x.java
diff --git a/xiaomi/app/src/main/res/color/primary_text_dark.xml b/Notes-master/app/src/main/res/color/primary_text_dark.xml
similarity index 100%
rename from xiaomi/app/src/main/res/color/primary_text_dark.xml
rename to Notes-master/app/src/main/res/color/primary_text_dark.xml
diff --git a/xiaomi/app/src/main/res/color/secondary_text_dark.xml b/Notes-master/app/src/main/res/color/secondary_text_dark.xml
similarity index 100%
rename from xiaomi/app/src/main/res/color/secondary_text_dark.xml
rename to Notes-master/app/src/main/res/color/secondary_text_dark.xml
diff --git a/xiaomi/app/src/main/res/drawable-hdpi/bg_btn_set_color.png b/Notes-master/app/src/main/res/drawable-hdpi/bg_btn_set_color.png
similarity index 100%
rename from xiaomi/app/src/main/res/drawable-hdpi/bg_btn_set_color.png
rename to Notes-master/app/src/main/res/drawable-hdpi/bg_btn_set_color.png
diff --git a/xiaomi/app/src/main/res/drawable-hdpi/bg_color_btn_mask.png b/Notes-master/app/src/main/res/drawable-hdpi/bg_color_btn_mask.png
similarity index 100%
rename from xiaomi/app/src/main/res/drawable-hdpi/bg_color_btn_mask.png
rename to Notes-master/app/src/main/res/drawable-hdpi/bg_color_btn_mask.png
diff --git a/xiaomi/app/src/main/res/drawable-hdpi/call_record.png b/Notes-master/app/src/main/res/drawable-hdpi/call_record.png
similarity index 100%
rename from xiaomi/app/src/main/res/drawable-hdpi/call_record.png
rename to Notes-master/app/src/main/res/drawable-hdpi/call_record.png
diff --git a/xiaomi/app/src/main/res/drawable-hdpi/clock.png b/Notes-master/app/src/main/res/drawable-hdpi/clock.png
similarity index 100%
rename from xiaomi/app/src/main/res/drawable-hdpi/clock.png
rename to Notes-master/app/src/main/res/drawable-hdpi/clock.png
diff --git a/xiaomi/app/src/main/res/drawable-hdpi/delete.png b/Notes-master/app/src/main/res/drawable-hdpi/delete.png
similarity index 100%
rename from xiaomi/app/src/main/res/drawable-hdpi/delete.png
rename to Notes-master/app/src/main/res/drawable-hdpi/delete.png
diff --git a/xiaomi/app/src/main/res/drawable-hdpi/dropdown_icon.9.png b/Notes-master/app/src/main/res/drawable-hdpi/dropdown_icon.9.png
similarity index 100%
rename from xiaomi/app/src/main/res/drawable-hdpi/dropdown_icon.9.png
rename to Notes-master/app/src/main/res/drawable-hdpi/dropdown_icon.9.png
diff --git a/xiaomi/app/src/main/res/drawable-hdpi/edit_blue.9.png b/Notes-master/app/src/main/res/drawable-hdpi/edit_blue.9.png
similarity index 100%
rename from xiaomi/app/src/main/res/drawable-hdpi/edit_blue.9.png
rename to Notes-master/app/src/main/res/drawable-hdpi/edit_blue.9.png
diff --git a/xiaomi/app/src/main/res/drawable-hdpi/edit_green.9.png b/Notes-master/app/src/main/res/drawable-hdpi/edit_green.9.png
similarity index 100%
rename from xiaomi/app/src/main/res/drawable-hdpi/edit_green.9.png
rename to Notes-master/app/src/main/res/drawable-hdpi/edit_green.9.png
diff --git a/xiaomi/app/src/main/res/drawable-hdpi/edit_red.9.png b/Notes-master/app/src/main/res/drawable-hdpi/edit_red.9.png
similarity index 100%
rename from xiaomi/app/src/main/res/drawable-hdpi/edit_red.9.png
rename to Notes-master/app/src/main/res/drawable-hdpi/edit_red.9.png
diff --git a/xiaomi/app/src/main/res/drawable-hdpi/edit_title_blue.9.png b/Notes-master/app/src/main/res/drawable-hdpi/edit_title_blue.9.png
similarity index 100%
rename from xiaomi/app/src/main/res/drawable-hdpi/edit_title_blue.9.png
rename to Notes-master/app/src/main/res/drawable-hdpi/edit_title_blue.9.png
diff --git a/xiaomi/app/src/main/res/drawable-hdpi/edit_title_green.9.png b/Notes-master/app/src/main/res/drawable-hdpi/edit_title_green.9.png
similarity index 100%
rename from xiaomi/app/src/main/res/drawable-hdpi/edit_title_green.9.png
rename to Notes-master/app/src/main/res/drawable-hdpi/edit_title_green.9.png
diff --git a/xiaomi/app/src/main/res/drawable-hdpi/edit_title_red.9.png b/Notes-master/app/src/main/res/drawable-hdpi/edit_title_red.9.png
similarity index 100%
rename from xiaomi/app/src/main/res/drawable-hdpi/edit_title_red.9.png
rename to Notes-master/app/src/main/res/drawable-hdpi/edit_title_red.9.png
diff --git a/xiaomi/app/src/main/res/drawable-hdpi/edit_title_white.9.png b/Notes-master/app/src/main/res/drawable-hdpi/edit_title_white.9.png
similarity index 100%
rename from xiaomi/app/src/main/res/drawable-hdpi/edit_title_white.9.png
rename to Notes-master/app/src/main/res/drawable-hdpi/edit_title_white.9.png
diff --git a/xiaomi/app/src/main/res/drawable-hdpi/edit_title_yellow.9.png b/Notes-master/app/src/main/res/drawable-hdpi/edit_title_yellow.9.png
similarity index 100%
rename from xiaomi/app/src/main/res/drawable-hdpi/edit_title_yellow.9.png
rename to Notes-master/app/src/main/res/drawable-hdpi/edit_title_yellow.9.png
diff --git a/xiaomi/app/src/main/res/drawable-hdpi/edit_white.9.png b/Notes-master/app/src/main/res/drawable-hdpi/edit_white.9.png
similarity index 100%
rename from xiaomi/app/src/main/res/drawable-hdpi/edit_white.9.png
rename to Notes-master/app/src/main/res/drawable-hdpi/edit_white.9.png
diff --git a/xiaomi/app/src/main/res/drawable-hdpi/edit_yellow.9.png b/Notes-master/app/src/main/res/drawable-hdpi/edit_yellow.9.png
similarity index 100%
rename from xiaomi/app/src/main/res/drawable-hdpi/edit_yellow.9.png
rename to Notes-master/app/src/main/res/drawable-hdpi/edit_yellow.9.png
diff --git a/xiaomi/app/src/main/res/drawable-hdpi/font_large.png b/Notes-master/app/src/main/res/drawable-hdpi/font_large.png
similarity index 100%
rename from xiaomi/app/src/main/res/drawable-hdpi/font_large.png
rename to Notes-master/app/src/main/res/drawable-hdpi/font_large.png
diff --git a/xiaomi/app/src/main/res/drawable-hdpi/font_normal.png b/Notes-master/app/src/main/res/drawable-hdpi/font_normal.png
similarity index 100%
rename from xiaomi/app/src/main/res/drawable-hdpi/font_normal.png
rename to Notes-master/app/src/main/res/drawable-hdpi/font_normal.png
diff --git a/xiaomi/app/src/main/res/drawable-hdpi/font_size_selector_bg.9.png b/Notes-master/app/src/main/res/drawable-hdpi/font_size_selector_bg.9.png
similarity index 100%
rename from xiaomi/app/src/main/res/drawable-hdpi/font_size_selector_bg.9.png
rename to Notes-master/app/src/main/res/drawable-hdpi/font_size_selector_bg.9.png
diff --git a/xiaomi/app/src/main/res/drawable-hdpi/font_small.png b/Notes-master/app/src/main/res/drawable-hdpi/font_small.png
similarity index 100%
rename from xiaomi/app/src/main/res/drawable-hdpi/font_small.png
rename to Notes-master/app/src/main/res/drawable-hdpi/font_small.png
diff --git a/xiaomi/app/src/main/res/drawable-hdpi/font_super.png b/Notes-master/app/src/main/res/drawable-hdpi/font_super.png
similarity index 100%
rename from xiaomi/app/src/main/res/drawable-hdpi/font_super.png
rename to Notes-master/app/src/main/res/drawable-hdpi/font_super.png
diff --git a/xiaomi/app/src/main/res/drawable-hdpi/icon_app.png b/Notes-master/app/src/main/res/drawable-hdpi/icon_app.png
similarity index 100%
rename from xiaomi/app/src/main/res/drawable-hdpi/icon_app.png
rename to Notes-master/app/src/main/res/drawable-hdpi/icon_app.png
diff --git a/xiaomi/app/src/main/res/drawable-hdpi/list_background.png b/Notes-master/app/src/main/res/drawable-hdpi/list_background.png
similarity index 100%
rename from xiaomi/app/src/main/res/drawable-hdpi/list_background.png
rename to Notes-master/app/src/main/res/drawable-hdpi/list_background.png
diff --git a/xiaomi/app/src/main/res/drawable-hdpi/list_blue_down.9.png b/Notes-master/app/src/main/res/drawable-hdpi/list_blue_down.9.png
similarity index 100%
rename from xiaomi/app/src/main/res/drawable-hdpi/list_blue_down.9.png
rename to Notes-master/app/src/main/res/drawable-hdpi/list_blue_down.9.png
diff --git a/xiaomi/app/src/main/res/drawable-hdpi/list_blue_middle.9.png b/Notes-master/app/src/main/res/drawable-hdpi/list_blue_middle.9.png
similarity index 100%
rename from xiaomi/app/src/main/res/drawable-hdpi/list_blue_middle.9.png
rename to Notes-master/app/src/main/res/drawable-hdpi/list_blue_middle.9.png
diff --git a/xiaomi/app/src/main/res/drawable-hdpi/list_blue_single.9.png b/Notes-master/app/src/main/res/drawable-hdpi/list_blue_single.9.png
similarity index 100%
rename from xiaomi/app/src/main/res/drawable-hdpi/list_blue_single.9.png
rename to Notes-master/app/src/main/res/drawable-hdpi/list_blue_single.9.png
diff --git a/xiaomi/app/src/main/res/drawable-hdpi/list_blue_up.9.png b/Notes-master/app/src/main/res/drawable-hdpi/list_blue_up.9.png
similarity index 100%
rename from xiaomi/app/src/main/res/drawable-hdpi/list_blue_up.9.png
rename to Notes-master/app/src/main/res/drawable-hdpi/list_blue_up.9.png
diff --git a/xiaomi/app/src/main/res/drawable-hdpi/list_folder.9.png b/Notes-master/app/src/main/res/drawable-hdpi/list_folder.9.png
similarity index 100%
rename from xiaomi/app/src/main/res/drawable-hdpi/list_folder.9.png
rename to Notes-master/app/src/main/res/drawable-hdpi/list_folder.9.png
diff --git a/xiaomi/app/src/main/res/drawable-hdpi/list_footer_bg.9.png b/Notes-master/app/src/main/res/drawable-hdpi/list_footer_bg.9.png
similarity index 100%
rename from xiaomi/app/src/main/res/drawable-hdpi/list_footer_bg.9.png
rename to Notes-master/app/src/main/res/drawable-hdpi/list_footer_bg.9.png
diff --git a/xiaomi/app/src/main/res/drawable-hdpi/list_green_down.9.png b/Notes-master/app/src/main/res/drawable-hdpi/list_green_down.9.png
similarity index 100%
rename from xiaomi/app/src/main/res/drawable-hdpi/list_green_down.9.png
rename to Notes-master/app/src/main/res/drawable-hdpi/list_green_down.9.png
diff --git a/xiaomi/app/src/main/res/drawable-hdpi/list_green_middle.9.png b/Notes-master/app/src/main/res/drawable-hdpi/list_green_middle.9.png
similarity index 100%
rename from xiaomi/app/src/main/res/drawable-hdpi/list_green_middle.9.png
rename to Notes-master/app/src/main/res/drawable-hdpi/list_green_middle.9.png
diff --git a/xiaomi/app/src/main/res/drawable-hdpi/list_green_single.9.png b/Notes-master/app/src/main/res/drawable-hdpi/list_green_single.9.png
similarity index 100%
rename from xiaomi/app/src/main/res/drawable-hdpi/list_green_single.9.png
rename to Notes-master/app/src/main/res/drawable-hdpi/list_green_single.9.png
diff --git a/xiaomi/app/src/main/res/drawable-hdpi/list_green_up.9.png b/Notes-master/app/src/main/res/drawable-hdpi/list_green_up.9.png
similarity index 100%
rename from xiaomi/app/src/main/res/drawable-hdpi/list_green_up.9.png
rename to Notes-master/app/src/main/res/drawable-hdpi/list_green_up.9.png
diff --git a/xiaomi/app/src/main/res/drawable-hdpi/list_red_down.9.png b/Notes-master/app/src/main/res/drawable-hdpi/list_red_down.9.png
similarity index 100%
rename from xiaomi/app/src/main/res/drawable-hdpi/list_red_down.9.png
rename to Notes-master/app/src/main/res/drawable-hdpi/list_red_down.9.png
diff --git a/xiaomi/app/src/main/res/drawable-hdpi/list_red_middle.9.png b/Notes-master/app/src/main/res/drawable-hdpi/list_red_middle.9.png
similarity index 100%
rename from xiaomi/app/src/main/res/drawable-hdpi/list_red_middle.9.png
rename to Notes-master/app/src/main/res/drawable-hdpi/list_red_middle.9.png
diff --git a/xiaomi/app/src/main/res/drawable-hdpi/list_red_single.9.png b/Notes-master/app/src/main/res/drawable-hdpi/list_red_single.9.png
similarity index 100%
rename from xiaomi/app/src/main/res/drawable-hdpi/list_red_single.9.png
rename to Notes-master/app/src/main/res/drawable-hdpi/list_red_single.9.png
diff --git a/xiaomi/app/src/main/res/drawable-hdpi/list_red_up.9.png b/Notes-master/app/src/main/res/drawable-hdpi/list_red_up.9.png
similarity index 100%
rename from xiaomi/app/src/main/res/drawable-hdpi/list_red_up.9.png
rename to Notes-master/app/src/main/res/drawable-hdpi/list_red_up.9.png
diff --git a/xiaomi/app/src/main/res/drawable-hdpi/list_white_down.9.png b/Notes-master/app/src/main/res/drawable-hdpi/list_white_down.9.png
similarity index 100%
rename from xiaomi/app/src/main/res/drawable-hdpi/list_white_down.9.png
rename to Notes-master/app/src/main/res/drawable-hdpi/list_white_down.9.png
diff --git a/xiaomi/app/src/main/res/drawable-hdpi/list_white_middle.9.png b/Notes-master/app/src/main/res/drawable-hdpi/list_white_middle.9.png
similarity index 100%
rename from xiaomi/app/src/main/res/drawable-hdpi/list_white_middle.9.png
rename to Notes-master/app/src/main/res/drawable-hdpi/list_white_middle.9.png
diff --git a/xiaomi/app/src/main/res/drawable-hdpi/list_white_single.9.png b/Notes-master/app/src/main/res/drawable-hdpi/list_white_single.9.png
similarity index 100%
rename from xiaomi/app/src/main/res/drawable-hdpi/list_white_single.9.png
rename to Notes-master/app/src/main/res/drawable-hdpi/list_white_single.9.png
diff --git a/xiaomi/app/src/main/res/drawable-hdpi/list_white_up.9.png b/Notes-master/app/src/main/res/drawable-hdpi/list_white_up.9.png
similarity index 100%
rename from xiaomi/app/src/main/res/drawable-hdpi/list_white_up.9.png
rename to Notes-master/app/src/main/res/drawable-hdpi/list_white_up.9.png
diff --git a/xiaomi/app/src/main/res/drawable-hdpi/list_yellow_down.9.png b/Notes-master/app/src/main/res/drawable-hdpi/list_yellow_down.9.png
similarity index 100%
rename from xiaomi/app/src/main/res/drawable-hdpi/list_yellow_down.9.png
rename to Notes-master/app/src/main/res/drawable-hdpi/list_yellow_down.9.png
diff --git a/xiaomi/app/src/main/res/drawable-hdpi/list_yellow_middle.9.png b/Notes-master/app/src/main/res/drawable-hdpi/list_yellow_middle.9.png
similarity index 100%
rename from xiaomi/app/src/main/res/drawable-hdpi/list_yellow_middle.9.png
rename to Notes-master/app/src/main/res/drawable-hdpi/list_yellow_middle.9.png
diff --git a/xiaomi/app/src/main/res/drawable-hdpi/list_yellow_single.9.png b/Notes-master/app/src/main/res/drawable-hdpi/list_yellow_single.9.png
similarity index 100%
rename from xiaomi/app/src/main/res/drawable-hdpi/list_yellow_single.9.png
rename to Notes-master/app/src/main/res/drawable-hdpi/list_yellow_single.9.png
diff --git a/xiaomi/app/src/main/res/drawable-hdpi/list_yellow_up.9.png b/Notes-master/app/src/main/res/drawable-hdpi/list_yellow_up.9.png
similarity index 100%
rename from xiaomi/app/src/main/res/drawable-hdpi/list_yellow_up.9.png
rename to Notes-master/app/src/main/res/drawable-hdpi/list_yellow_up.9.png
diff --git a/xiaomi/app/src/main/res/drawable-hdpi/menu_delete.png b/Notes-master/app/src/main/res/drawable-hdpi/menu_delete.png
similarity index 100%
rename from xiaomi/app/src/main/res/drawable-hdpi/menu_delete.png
rename to Notes-master/app/src/main/res/drawable-hdpi/menu_delete.png
diff --git a/xiaomi/app/src/main/res/drawable-hdpi/menu_move.png b/Notes-master/app/src/main/res/drawable-hdpi/menu_move.png
similarity index 100%
rename from xiaomi/app/src/main/res/drawable-hdpi/menu_move.png
rename to Notes-master/app/src/main/res/drawable-hdpi/menu_move.png
diff --git a/xiaomi/app/src/main/res/drawable-hdpi/new_note_normal.png b/Notes-master/app/src/main/res/drawable-hdpi/new_note_normal.png
similarity index 100%
rename from xiaomi/app/src/main/res/drawable-hdpi/new_note_normal.png
rename to Notes-master/app/src/main/res/drawable-hdpi/new_note_normal.png
diff --git a/xiaomi/app/src/main/res/drawable-hdpi/new_note_pressed.png b/Notes-master/app/src/main/res/drawable-hdpi/new_note_pressed.png
similarity index 100%
rename from xiaomi/app/src/main/res/drawable-hdpi/new_note_pressed.png
rename to Notes-master/app/src/main/res/drawable-hdpi/new_note_pressed.png
diff --git a/xiaomi/app/src/main/res/drawable-hdpi/note_edit_color_selector_panel.png b/Notes-master/app/src/main/res/drawable-hdpi/note_edit_color_selector_panel.png
similarity index 100%
rename from xiaomi/app/src/main/res/drawable-hdpi/note_edit_color_selector_panel.png
rename to Notes-master/app/src/main/res/drawable-hdpi/note_edit_color_selector_panel.png
diff --git a/xiaomi/app/src/main/res/drawable-hdpi/notification.png b/Notes-master/app/src/main/res/drawable-hdpi/notification.png
similarity index 100%
rename from xiaomi/app/src/main/res/drawable-hdpi/notification.png
rename to Notes-master/app/src/main/res/drawable-hdpi/notification.png
diff --git a/xiaomi/app/src/main/res/drawable-hdpi/search_result.png b/Notes-master/app/src/main/res/drawable-hdpi/search_result.png
similarity index 100%
rename from xiaomi/app/src/main/res/drawable-hdpi/search_result.png
rename to Notes-master/app/src/main/res/drawable-hdpi/search_result.png
diff --git a/xiaomi/app/src/main/res/drawable-hdpi/selected.png b/Notes-master/app/src/main/res/drawable-hdpi/selected.png
similarity index 100%
rename from xiaomi/app/src/main/res/drawable-hdpi/selected.png
rename to Notes-master/app/src/main/res/drawable-hdpi/selected.png
diff --git a/xiaomi/app/src/main/res/drawable-hdpi/title_alert.png b/Notes-master/app/src/main/res/drawable-hdpi/title_alert.png
similarity index 100%
rename from xiaomi/app/src/main/res/drawable-hdpi/title_alert.png
rename to Notes-master/app/src/main/res/drawable-hdpi/title_alert.png
diff --git a/xiaomi/app/src/main/res/drawable-hdpi/title_bar_bg.9.png b/Notes-master/app/src/main/res/drawable-hdpi/title_bar_bg.9.png
similarity index 100%
rename from xiaomi/app/src/main/res/drawable-hdpi/title_bar_bg.9.png
rename to Notes-master/app/src/main/res/drawable-hdpi/title_bar_bg.9.png
diff --git a/xiaomi/app/src/main/res/drawable-hdpi/widget_2x_blue.png b/Notes-master/app/src/main/res/drawable-hdpi/widget_2x_blue.png
similarity index 100%
rename from xiaomi/app/src/main/res/drawable-hdpi/widget_2x_blue.png
rename to Notes-master/app/src/main/res/drawable-hdpi/widget_2x_blue.png
diff --git a/xiaomi/app/src/main/res/drawable-hdpi/widget_2x_green.png b/Notes-master/app/src/main/res/drawable-hdpi/widget_2x_green.png
similarity index 100%
rename from xiaomi/app/src/main/res/drawable-hdpi/widget_2x_green.png
rename to Notes-master/app/src/main/res/drawable-hdpi/widget_2x_green.png
diff --git a/xiaomi/app/src/main/res/drawable-hdpi/widget_2x_red.png b/Notes-master/app/src/main/res/drawable-hdpi/widget_2x_red.png
similarity index 100%
rename from xiaomi/app/src/main/res/drawable-hdpi/widget_2x_red.png
rename to Notes-master/app/src/main/res/drawable-hdpi/widget_2x_red.png
diff --git a/xiaomi/app/src/main/res/drawable-hdpi/widget_2x_white.png b/Notes-master/app/src/main/res/drawable-hdpi/widget_2x_white.png
similarity index 100%
rename from xiaomi/app/src/main/res/drawable-hdpi/widget_2x_white.png
rename to Notes-master/app/src/main/res/drawable-hdpi/widget_2x_white.png
diff --git a/xiaomi/app/src/main/res/drawable-hdpi/widget_2x_yellow.png b/Notes-master/app/src/main/res/drawable-hdpi/widget_2x_yellow.png
similarity index 100%
rename from xiaomi/app/src/main/res/drawable-hdpi/widget_2x_yellow.png
rename to Notes-master/app/src/main/res/drawable-hdpi/widget_2x_yellow.png
diff --git a/xiaomi/app/src/main/res/drawable-hdpi/widget_4x_blue.png b/Notes-master/app/src/main/res/drawable-hdpi/widget_4x_blue.png
similarity index 100%
rename from xiaomi/app/src/main/res/drawable-hdpi/widget_4x_blue.png
rename to Notes-master/app/src/main/res/drawable-hdpi/widget_4x_blue.png
diff --git a/xiaomi/app/src/main/res/drawable-hdpi/widget_4x_green.png b/Notes-master/app/src/main/res/drawable-hdpi/widget_4x_green.png
similarity index 100%
rename from xiaomi/app/src/main/res/drawable-hdpi/widget_4x_green.png
rename to Notes-master/app/src/main/res/drawable-hdpi/widget_4x_green.png
diff --git a/xiaomi/app/src/main/res/drawable-hdpi/widget_4x_red.png b/Notes-master/app/src/main/res/drawable-hdpi/widget_4x_red.png
similarity index 100%
rename from xiaomi/app/src/main/res/drawable-hdpi/widget_4x_red.png
rename to Notes-master/app/src/main/res/drawable-hdpi/widget_4x_red.png
diff --git a/xiaomi/app/src/main/res/drawable-hdpi/widget_4x_white.png b/Notes-master/app/src/main/res/drawable-hdpi/widget_4x_white.png
similarity index 100%
rename from xiaomi/app/src/main/res/drawable-hdpi/widget_4x_white.png
rename to Notes-master/app/src/main/res/drawable-hdpi/widget_4x_white.png
diff --git a/xiaomi/app/src/main/res/drawable-hdpi/widget_4x_yellow.png b/Notes-master/app/src/main/res/drawable-hdpi/widget_4x_yellow.png
similarity index 100%
rename from xiaomi/app/src/main/res/drawable-hdpi/widget_4x_yellow.png
rename to Notes-master/app/src/main/res/drawable-hdpi/widget_4x_yellow.png
diff --git a/xiaomi/app/src/main/res/drawable/new_note.xml b/Notes-master/app/src/main/res/drawable/new_note.xml
similarity index 100%
rename from xiaomi/app/src/main/res/drawable/new_note.xml
rename to Notes-master/app/src/main/res/drawable/new_note.xml
diff --git a/xiaomi/app/src/main/res/layout/account_dialog_title.xml b/Notes-master/app/src/main/res/layout/account_dialog_title.xml
similarity index 100%
rename from xiaomi/app/src/main/res/layout/account_dialog_title.xml
rename to Notes-master/app/src/main/res/layout/account_dialog_title.xml
diff --git a/xiaomi/app/src/main/res/layout/add_account_text.xml b/Notes-master/app/src/main/res/layout/add_account_text.xml
similarity index 100%
rename from xiaomi/app/src/main/res/layout/add_account_text.xml
rename to Notes-master/app/src/main/res/layout/add_account_text.xml
diff --git a/xiaomi/app/src/main/res/layout/datetime_picker.xml b/Notes-master/app/src/main/res/layout/datetime_picker.xml
similarity index 100%
rename from xiaomi/app/src/main/res/layout/datetime_picker.xml
rename to Notes-master/app/src/main/res/layout/datetime_picker.xml
diff --git a/xiaomi/app/src/main/res/layout/dialog_edit_text.xml b/Notes-master/app/src/main/res/layout/dialog_edit_text.xml
similarity index 100%
rename from xiaomi/app/src/main/res/layout/dialog_edit_text.xml
rename to Notes-master/app/src/main/res/layout/dialog_edit_text.xml
diff --git a/xiaomi/app/src/main/res/layout/folder_list_item.xml b/Notes-master/app/src/main/res/layout/folder_list_item.xml
similarity index 100%
rename from xiaomi/app/src/main/res/layout/folder_list_item.xml
rename to Notes-master/app/src/main/res/layout/folder_list_item.xml
diff --git a/xiaomi/app/src/main/res/layout/note_edit.xml b/Notes-master/app/src/main/res/layout/note_edit.xml
similarity index 97%
rename from xiaomi/app/src/main/res/layout/note_edit.xml
rename to Notes-master/app/src/main/res/layout/note_edit.xml
index 0efa335..10b2aa7 100644
--- a/xiaomi/app/src/main/res/layout/note_edit.xml
+++ b/Notes-master/app/src/main/res/layout/note_edit.xml
@@ -85,8 +85,7 @@
+ android:layout_height="fill_parent">
-
diff --git a/xiaomi/app/src/main/res/layout/note_edit_list_item.xml b/Notes-master/app/src/main/res/layout/note_edit_list_item.xml
similarity index 100%
rename from xiaomi/app/src/main/res/layout/note_edit_list_item.xml
rename to Notes-master/app/src/main/res/layout/note_edit_list_item.xml
diff --git a/xiaomi/app/src/main/res/layout/note_item.xml b/Notes-master/app/src/main/res/layout/note_item.xml
similarity index 100%
rename from xiaomi/app/src/main/res/layout/note_item.xml
rename to Notes-master/app/src/main/res/layout/note_item.xml
diff --git a/xiaomi/app/src/main/res/layout/note_list.xml b/Notes-master/app/src/main/res/layout/note_list.xml
similarity index 100%
rename from xiaomi/app/src/main/res/layout/note_list.xml
rename to Notes-master/app/src/main/res/layout/note_list.xml
diff --git a/xiaomi/app/src/main/res/layout/note_list_dropdown_menu.xml b/Notes-master/app/src/main/res/layout/note_list_dropdown_menu.xml
similarity index 100%
rename from xiaomi/app/src/main/res/layout/note_list_dropdown_menu.xml
rename to Notes-master/app/src/main/res/layout/note_list_dropdown_menu.xml
diff --git a/xiaomi/app/src/main/res/layout/note_list_footer.xml b/Notes-master/app/src/main/res/layout/note_list_footer.xml
similarity index 100%
rename from xiaomi/app/src/main/res/layout/note_list_footer.xml
rename to Notes-master/app/src/main/res/layout/note_list_footer.xml
diff --git a/xiaomi/app/src/main/res/layout/settings_header.xml b/Notes-master/app/src/main/res/layout/settings_header.xml
similarity index 100%
rename from xiaomi/app/src/main/res/layout/settings_header.xml
rename to Notes-master/app/src/main/res/layout/settings_header.xml
diff --git a/xiaomi/app/src/main/res/layout/widget_2x.xml b/Notes-master/app/src/main/res/layout/widget_2x.xml
similarity index 100%
rename from xiaomi/app/src/main/res/layout/widget_2x.xml
rename to Notes-master/app/src/main/res/layout/widget_2x.xml
diff --git a/xiaomi/app/src/main/res/layout/widget_4x.xml b/Notes-master/app/src/main/res/layout/widget_4x.xml
similarity index 100%
rename from xiaomi/app/src/main/res/layout/widget_4x.xml
rename to Notes-master/app/src/main/res/layout/widget_4x.xml
diff --git a/xiaomi/app/src/main/res/menu/call_note_edit.xml b/Notes-master/app/src/main/res/menu/call_note_edit.xml
similarity index 100%
rename from xiaomi/app/src/main/res/menu/call_note_edit.xml
rename to Notes-master/app/src/main/res/menu/call_note_edit.xml
diff --git a/xiaomi/app/src/main/res/menu/call_record_folder.xml b/Notes-master/app/src/main/res/menu/call_record_folder.xml
similarity index 100%
rename from xiaomi/app/src/main/res/menu/call_record_folder.xml
rename to Notes-master/app/src/main/res/menu/call_record_folder.xml
diff --git a/xiaomi/app/src/main/res/menu/note_edit.xml b/Notes-master/app/src/main/res/menu/note_edit.xml
similarity index 100%
rename from xiaomi/app/src/main/res/menu/note_edit.xml
rename to Notes-master/app/src/main/res/menu/note_edit.xml
diff --git a/xiaomi/app/src/main/res/menu/note_list.xml b/Notes-master/app/src/main/res/menu/note_list.xml
similarity index 100%
rename from xiaomi/app/src/main/res/menu/note_list.xml
rename to Notes-master/app/src/main/res/menu/note_list.xml
diff --git a/xiaomi/app/src/main/res/menu/note_list_dropdown.xml b/Notes-master/app/src/main/res/menu/note_list_dropdown.xml
similarity index 100%
rename from xiaomi/app/src/main/res/menu/note_list_dropdown.xml
rename to Notes-master/app/src/main/res/menu/note_list_dropdown.xml
diff --git a/xiaomi/app/src/main/res/menu/note_list_options.xml b/Notes-master/app/src/main/res/menu/note_list_options.xml
similarity index 100%
rename from xiaomi/app/src/main/res/menu/note_list_options.xml
rename to Notes-master/app/src/main/res/menu/note_list_options.xml
diff --git a/xiaomi/app/src/main/res/menu/sub_folder.xml b/Notes-master/app/src/main/res/menu/sub_folder.xml
similarity index 100%
rename from xiaomi/app/src/main/res/menu/sub_folder.xml
rename to Notes-master/app/src/main/res/menu/sub_folder.xml
diff --git a/xiaomi/app/src/main/res/raw-zh-rCN/introduction b/Notes-master/app/src/main/res/raw-zh-rCN/introduction
similarity index 100%
rename from xiaomi/app/src/main/res/raw-zh-rCN/introduction
rename to Notes-master/app/src/main/res/raw-zh-rCN/introduction
diff --git a/xiaomi/app/src/main/res/raw/introduction b/Notes-master/app/src/main/res/raw/introduction
similarity index 100%
rename from xiaomi/app/src/main/res/raw/introduction
rename to Notes-master/app/src/main/res/raw/introduction
diff --git a/xiaomi/app/src/main/res/values-zh-rCN/arrays.xml b/Notes-master/app/src/main/res/values-zh-rCN/arrays.xml
similarity index 100%
rename from xiaomi/app/src/main/res/values-zh-rCN/arrays.xml
rename to Notes-master/app/src/main/res/values-zh-rCN/arrays.xml
diff --git a/xiaomi/app/src/main/res/values-zh-rCN/strings.xml b/Notes-master/app/src/main/res/values-zh-rCN/strings.xml
similarity index 100%
rename from xiaomi/app/src/main/res/values-zh-rCN/strings.xml
rename to Notes-master/app/src/main/res/values-zh-rCN/strings.xml
diff --git a/xiaomi/app/src/main/res/values-zh-rTW/arrays.xml b/Notes-master/app/src/main/res/values-zh-rTW/arrays.xml
similarity index 100%
rename from xiaomi/app/src/main/res/values-zh-rTW/arrays.xml
rename to Notes-master/app/src/main/res/values-zh-rTW/arrays.xml
diff --git a/xiaomi/app/src/main/res/values-zh-rTW/strings.xml b/Notes-master/app/src/main/res/values-zh-rTW/strings.xml
similarity index 100%
rename from xiaomi/app/src/main/res/values-zh-rTW/strings.xml
rename to Notes-master/app/src/main/res/values-zh-rTW/strings.xml
diff --git a/xiaomi/app/src/main/res/values/arrays.xml b/Notes-master/app/src/main/res/values/arrays.xml
similarity index 100%
rename from xiaomi/app/src/main/res/values/arrays.xml
rename to Notes-master/app/src/main/res/values/arrays.xml
diff --git a/xiaomi/app/src/main/res/values/colors.xml b/Notes-master/app/src/main/res/values/colors.xml
similarity index 100%
rename from xiaomi/app/src/main/res/values/colors.xml
rename to Notes-master/app/src/main/res/values/colors.xml
diff --git a/xiaomi/app/src/main/res/values/dimens.xml b/Notes-master/app/src/main/res/values/dimens.xml
similarity index 100%
rename from xiaomi/app/src/main/res/values/dimens.xml
rename to Notes-master/app/src/main/res/values/dimens.xml
diff --git a/xiaomi/app/src/main/res/values/strings.xml b/Notes-master/app/src/main/res/values/strings.xml
similarity index 100%
rename from xiaomi/app/src/main/res/values/strings.xml
rename to Notes-master/app/src/main/res/values/strings.xml
diff --git a/xiaomi/app/src/main/res/values/styles.xml b/Notes-master/app/src/main/res/values/styles.xml
similarity index 100%
rename from xiaomi/app/src/main/res/values/styles.xml
rename to Notes-master/app/src/main/res/values/styles.xml
diff --git a/xiaomi/app/src/main/res/xml/preferences.xml b/Notes-master/app/src/main/res/xml/preferences.xml
similarity index 92%
rename from xiaomi/app/src/main/res/xml/preferences.xml
rename to Notes-master/app/src/main/res/xml/preferences.xml
index 729ad1b..fe58f8f 100644
--- a/xiaomi/app/src/main/res/xml/preferences.xml
+++ b/Notes-master/app/src/main/res/xml/preferences.xml
@@ -23,9 +23,8 @@
+ android:title="@string/preferences_bg_random_appear_title"
+ android:defaultValue="false" />
diff --git a/xiaomi/app/src/main/res/xml/searchable.xml b/Notes-master/app/src/main/res/xml/searchable.xml
similarity index 100%
rename from xiaomi/app/src/main/res/xml/searchable.xml
rename to Notes-master/app/src/main/res/xml/searchable.xml
diff --git a/xiaomi/app/src/main/res/xml/widget_2x_info.xml b/Notes-master/app/src/main/res/xml/widget_2x_info.xml
similarity index 100%
rename from xiaomi/app/src/main/res/xml/widget_2x_info.xml
rename to Notes-master/app/src/main/res/xml/widget_2x_info.xml
diff --git a/xiaomi/app/src/main/res/xml/widget_4x_info.xml b/Notes-master/app/src/main/res/xml/widget_4x_info.xml
similarity index 100%
rename from xiaomi/app/src/main/res/xml/widget_4x_info.xml
rename to Notes-master/app/src/main/res/xml/widget_4x_info.xml
diff --git a/Notes-master/build.gradle b/Notes-master/build.gradle
new file mode 100644
index 0000000..dc16a26
--- /dev/null
+++ b/Notes-master/build.gradle
@@ -0,0 +1,17 @@
+// Top-level build file where you can add configuration options common to all sub-projects/modules.
+buildscript {
+ repositories {
+ google()
+ jcenter()
+ }
+ dependencies {
+ classpath 'com.android.tools.build:gradle:4.2.2'
+ }
+}
+
+allprojects {
+ repositories {
+ google()
+ jcenter()
+ }
+}
diff --git a/xiaomi/gradle/wrapper/gradle-wrapper.jar b/Notes-master/gradle/wrapper/gradle-wrapper.jar
similarity index 100%
rename from xiaomi/gradle/wrapper/gradle-wrapper.jar
rename to Notes-master/gradle/wrapper/gradle-wrapper.jar
diff --git a/xiaomi/gradle/wrapper/gradle-wrapper.properties b/Notes-master/gradle/wrapper/gradle-wrapper.properties
similarity index 80%
rename from xiaomi/gradle/wrapper/gradle-wrapper.properties
rename to Notes-master/gradle/wrapper/gradle-wrapper.properties
index bfdee35..86eeaf4 100644
--- a/xiaomi/gradle/wrapper/gradle-wrapper.properties
+++ b/Notes-master/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Thu Apr 27 11:23:53 CST 2023
+#Wed Mar 08 15:50:54 CST 2023
distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-bin.zip
distributionPath=wrapper/dists
zipStorePath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
diff --git a/xiaomi/gradlew b/Notes-master/gradlew
similarity index 100%
rename from xiaomi/gradlew
rename to Notes-master/gradlew
diff --git a/xiaomi/gradlew.bat b/Notes-master/gradlew.bat
similarity index 100%
rename from xiaomi/gradlew.bat
rename to Notes-master/gradlew.bat
diff --git a/xiaomi/import-summary.txt b/Notes-master/import-summary.txt
similarity index 100%
rename from xiaomi/import-summary.txt
rename to Notes-master/import-summary.txt
diff --git a/xiaomi/local.properties b/Notes-master/local.properties
similarity index 87%
rename from xiaomi/local.properties
rename to Notes-master/local.properties
index d74fe73..5d68279 100644
--- a/xiaomi/local.properties
+++ b/Notes-master/local.properties
@@ -3,5 +3,5 @@
#
# Location of the SDK. This is only used by Gradle.
#
-#Fri Apr 21 09:15:21 CST 2023
+#Tue Mar 07 14:59:30 CST 2023
sdk.dir=E\:\\AndroidJdk
diff --git a/Notes-master/mylibrary/.gitignore b/Notes-master/mylibrary/.gitignore
new file mode 100644
index 0000000..42afabf
--- /dev/null
+++ b/Notes-master/mylibrary/.gitignore
@@ -0,0 +1 @@
+/build
\ No newline at end of file
diff --git a/Notes-master/mylibrary/build.gradle b/Notes-master/mylibrary/build.gradle
new file mode 100644
index 0000000..39f4cd0
--- /dev/null
+++ b/Notes-master/mylibrary/build.gradle
@@ -0,0 +1,35 @@
+plugins {
+ id 'com.android.library'
+}
+
+android {
+ namespace 'com.example.mylibrary'
+ compileSdk 33
+
+ defaultConfig {
+ minSdk 24
+ targetSdk 33
+
+ testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+ consumerProguardFiles "consumer-rules.pro"
+ }
+
+ buildTypes {
+ release {
+ minifyEnabled false
+ proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
+ }
+ }
+ compileOptions {
+ sourceCompatibility JavaVersion.VERSION_1_8
+ targetCompatibility JavaVersion.VERSION_1_8
+ }
+}
+
+dependencies {
+
+ implementation 'com.android.support:appcompat-v7:28.0.0'
+ testImplementation 'junit:junit:4.13.2'
+ androidTestImplementation 'com.android.support.test:runner:1.0.2'
+ androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
+}
\ No newline at end of file
diff --git a/Notes-master/mylibrary/consumer-rules.pro b/Notes-master/mylibrary/consumer-rules.pro
new file mode 100644
index 0000000..e69de29
diff --git a/Notes-master/mylibrary/proguard-rules.pro b/Notes-master/mylibrary/proguard-rules.pro
new file mode 100644
index 0000000..481bb43
--- /dev/null
+++ b/Notes-master/mylibrary/proguard-rules.pro
@@ -0,0 +1,21 @@
+# Add project specific ProGuard rules here.
+# You can control the set of applied configuration files using the
+# proguardFiles setting in build.gradle.
+#
+# For more details, see
+# http://developer.android.com/guide/developing/tools/proguard.html
+
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class name to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+# public *;
+#}
+
+# Uncomment this to preserve the line number information for
+# debugging stack traces.
+#-keepattributes SourceFile,LineNumberTable
+
+# If you keep the line number information, uncomment this to
+# hide the original source file name.
+#-renamesourcefileattribute SourceFile
\ No newline at end of file
diff --git a/Notes-master/mylibrary/src/androidTest/java/com/example/mylibrary/ExampleInstrumentedTest.java b/Notes-master/mylibrary/src/androidTest/java/com/example/mylibrary/ExampleInstrumentedTest.java
new file mode 100644
index 0000000..d29708b
--- /dev/null
+++ b/Notes-master/mylibrary/src/androidTest/java/com/example/mylibrary/ExampleInstrumentedTest.java
@@ -0,0 +1,25 @@
+package com.example.mylibrary;
+
+import android.content.Context;
+import android.support.test.InstrumentationRegistry;
+import android.support.test.runner.AndroidJUnit4;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import static org.junit.Assert.*;
+
+/**
+ * Instrumented test, which will execute on an Android device.
+ *
+ * @see Testing documentation
+ */
+@RunWith(AndroidJUnit4.class)
+public class ExampleInstrumentedTest {
+ @Test
+ public void useAppContext() {
+ // Context of the app under test.
+ Context appContext = InstrumentationRegistry.getInstrumentation().getTargetContext();
+ assertEquals("com.example.mylibrary.test", appContext.getPackageName());
+ }
+}
\ No newline at end of file
diff --git a/Notes-master/mylibrary/src/main/AndroidManifest.xml b/Notes-master/mylibrary/src/main/AndroidManifest.xml
new file mode 100644
index 0000000..a5918e6
--- /dev/null
+++ b/Notes-master/mylibrary/src/main/AndroidManifest.xml
@@ -0,0 +1,4 @@
+
+
+
+
\ No newline at end of file
diff --git a/Notes-master/mylibrary/src/test/java/com/example/mylibrary/ExampleUnitTest.java b/Notes-master/mylibrary/src/test/java/com/example/mylibrary/ExampleUnitTest.java
new file mode 100644
index 0000000..0c3b084
--- /dev/null
+++ b/Notes-master/mylibrary/src/test/java/com/example/mylibrary/ExampleUnitTest.java
@@ -0,0 +1,17 @@
+package com.example.mylibrary;
+
+import org.junit.Test;
+
+import static org.junit.Assert.*;
+
+/**
+ * Example local unit test, which will execute on the development machine (host).
+ *
+ * @see Testing documentation
+ */
+public class ExampleUnitTest {
+ @Test
+ public void addition_isCorrect() {
+ assertEquals(4, 2 + 2);
+ }
+}
\ No newline at end of file
diff --git a/Notes-master/out/production/Notes-master/.idea/.gitignore b/Notes-master/out/production/Notes-master/.idea/.gitignore
new file mode 100644
index 0000000..359bb53
--- /dev/null
+++ b/Notes-master/out/production/Notes-master/.idea/.gitignore
@@ -0,0 +1,3 @@
+# 默认忽略的文件
+/shelf/
+/workspace.xml
diff --git a/Notes-master/out/production/Notes-master/.idea/Notes-master.iml b/Notes-master/out/production/Notes-master/.idea/Notes-master.iml
new file mode 100644
index 0000000..d6ebd48
--- /dev/null
+++ b/Notes-master/out/production/Notes-master/.idea/Notes-master.iml
@@ -0,0 +1,9 @@
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/Notes-master/out/production/Notes-master/.idea/misc.xml b/Notes-master/out/production/Notes-master/.idea/misc.xml
new file mode 100644
index 0000000..8faa81f
--- /dev/null
+++ b/Notes-master/out/production/Notes-master/.idea/misc.xml
@@ -0,0 +1,9 @@
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/Notes-master/out/production/Notes-master/.idea/modules.xml b/Notes-master/out/production/Notes-master/.idea/modules.xml
new file mode 100644
index 0000000..12dad3f
--- /dev/null
+++ b/Notes-master/out/production/Notes-master/.idea/modules.xml
@@ -0,0 +1,8 @@
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/Notes-master/settings.gradle b/Notes-master/settings.gradle
new file mode 100644
index 0000000..4f937ba
--- /dev/null
+++ b/Notes-master/settings.gradle
@@ -0,0 +1,2 @@
+include ':app'
+include ':mylibrary'
diff --git a/xiaomi/.gradle/7.5/checksums/checksums.lock b/xiaomi/.gradle/7.5/checksums/checksums.lock
deleted file mode 100644
index dee3dfc..0000000
Binary files a/xiaomi/.gradle/7.5/checksums/checksums.lock and /dev/null differ
diff --git a/xiaomi/.gradle/7.5/dependencies-accessors/dependencies-accessors.lock b/xiaomi/.gradle/7.5/dependencies-accessors/dependencies-accessors.lock
deleted file mode 100644
index 1346fa4..0000000
Binary files a/xiaomi/.gradle/7.5/dependencies-accessors/dependencies-accessors.lock and /dev/null differ
diff --git a/xiaomi/.gradle/7.5/executionHistory/executionHistory.bin b/xiaomi/.gradle/7.5/executionHistory/executionHistory.bin
deleted file mode 100644
index 317a03e..0000000
Binary files a/xiaomi/.gradle/7.5/executionHistory/executionHistory.bin and /dev/null differ
diff --git a/xiaomi/.gradle/7.5/executionHistory/executionHistory.lock b/xiaomi/.gradle/7.5/executionHistory/executionHistory.lock
deleted file mode 100644
index 5f997b0..0000000
Binary files a/xiaomi/.gradle/7.5/executionHistory/executionHistory.lock and /dev/null differ
diff --git a/xiaomi/.gradle/7.5/fileHashes/fileHashes.bin b/xiaomi/.gradle/7.5/fileHashes/fileHashes.bin
deleted file mode 100644
index 6d08c1d..0000000
Binary files a/xiaomi/.gradle/7.5/fileHashes/fileHashes.bin and /dev/null differ
diff --git a/xiaomi/.gradle/7.5/fileHashes/fileHashes.lock b/xiaomi/.gradle/7.5/fileHashes/fileHashes.lock
deleted file mode 100644
index 042c0e7..0000000
Binary files a/xiaomi/.gradle/7.5/fileHashes/fileHashes.lock and /dev/null differ
diff --git a/xiaomi/.gradle/7.5/fileHashes/resourceHashesCache.bin b/xiaomi/.gradle/7.5/fileHashes/resourceHashesCache.bin
deleted file mode 100644
index 981583e..0000000
Binary files a/xiaomi/.gradle/7.5/fileHashes/resourceHashesCache.bin and /dev/null differ
diff --git a/xiaomi/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/xiaomi/.gradle/buildOutputCleanup/buildOutputCleanup.lock
deleted file mode 100644
index c6c4a85..0000000
Binary files a/xiaomi/.gradle/buildOutputCleanup/buildOutputCleanup.lock and /dev/null differ
diff --git a/xiaomi/.gradle/buildOutputCleanup/cache.properties b/xiaomi/.gradle/buildOutputCleanup/cache.properties
deleted file mode 100644
index f3d1e22..0000000
--- a/xiaomi/.gradle/buildOutputCleanup/cache.properties
+++ /dev/null
@@ -1,2 +0,0 @@
-#Fri Apr 21 09:15:49 CST 2023
-gradle.version=7.5
diff --git a/xiaomi/.gradle/buildOutputCleanup/outputFiles.bin b/xiaomi/.gradle/buildOutputCleanup/outputFiles.bin
deleted file mode 100644
index 15827c0..0000000
Binary files a/xiaomi/.gradle/buildOutputCleanup/outputFiles.bin and /dev/null differ
diff --git a/xiaomi/.gradle/checksums/checksums.lock b/xiaomi/.gradle/checksums/checksums.lock
deleted file mode 100644
index 6f675df..0000000
Binary files a/xiaomi/.gradle/checksums/checksums.lock and /dev/null differ
diff --git a/xiaomi/.gradle/file-system.probe b/xiaomi/.gradle/file-system.probe
deleted file mode 100644
index 46f4f3a..0000000
Binary files a/xiaomi/.gradle/file-system.probe and /dev/null differ
diff --git a/xiaomi/.idea/compiler.xml b/xiaomi/.idea/compiler.xml
deleted file mode 100644
index b589d56..0000000
--- a/xiaomi/.idea/compiler.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
-
-
-
-
\ No newline at end of file
diff --git a/xiaomi/.idea/misc.xml b/xiaomi/.idea/misc.xml
deleted file mode 100644
index 8ddd1c7..0000000
--- a/xiaomi/.idea/misc.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
-
-
-
-
- */
- public static final String ID = "_id";
-
- /**
- * 便签或文件夹的父ID
- *
类型: INTEGER (long)
- */
- public static final String PARENT_ID = "parent_id";
-
- /**
- * 便签或文件夹的创建日期
- *
类型: INTEGER (long)
- */
- public static final String CREATED_DATE = "created_date";
-
- /**
- * 最后修改日期
- *
类型: INTEGER (long)
- */
- public static final String MODIFIED_DATE = "modified_date";
-
- /**
- * 提醒日期
- *
类型: INTEGER (long)
- */
- public static final String ALERTED_DATE = "alert_date";
-
- /**
- * 文件夹的名称或便签的文本内容
- *
类型: TEXT
- */
- public static final String SNIPPET = "snippet";
-
- /**
- * 便签的小部件ID
- *
类型: INTEGER (long)
- */
- public static final String WIDGET_ID = "widget_id";
-
- /**
- * 便签的小部件类型
- *
类型: INTEGER (long)
- */
- public static final String WIDGET_TYPE = "widget_type";
-
- /**
- * 便签的背景颜色ID
- *
类型: INTEGER (long)
- */
- public static final String BG_COLOR_ID = "bg_color_id";
-
- /**
- * 对于文本便签,没有附件;对于多媒体便签,至少有一个附件
- *
类型: INTEGER
- */
- public static final String HAS_ATTACHMENT = "has_attachment";
-
- /**
- * 文件夹中的便签数目
- *
类型: INTEGER (long)
- */
- public static final String NOTES_COUNT = "notes_count";
-
- /**
- * 文件类型:文件夹或便签
- *
类型: INTEGER
- */
- public static final String TYPE = "type";
-
- /**
- * 最后同步ID
- *
类型: INTEGER (long)
- */
- public static final String SYNC_ID = "sync_id";
-
- /**
- * 标志是否在本地修改
- *
类型: INTEGER
- */
- public static final String LOCAL_MODIFIED = "local_modified";
-
- /**
- * 移动到临时文件夹之前的原始父ID
- *
类型: INTEGER
- */
- public static final String ORIGIN_PARENT_ID = "origin_parent_id";
-
- /**
- * Gtask ID
- *
类型: TEXT
- */
- public static final String GTASK_ID = "gtask_id";
-
- /**
- * 版本代码
- *
类型: INTEGER (long)
- */
- public static final String VERSION = "version";
- }
-
- public interface DataColumns {
- /**
- * 行的唯一ID
- *
类型: INTEGER (long)
- */
- public static final String ID = "_id";
-
- /**
- * 此行所代表的项的MIME类型
- *
类型: TEXT
- */
- public static final String MIME_TYPE = "mime_type";
-
- /**
- * 此数据所属的便签的引用ID
- *
类型: INTEGER (long)
- */
- public static final String NOTE_ID = "note_id";
-
- /**
- * 便签或文件夹的创建日期
- *
类型: INTEGER (long)
- */
- public static final String CREATED_DATE = "created_date";
-
- /**
- * 最后修改日期
- *
类型: INTEGER (long)
- */
- public static final String MODIFIED_DATE = "modified_date";
-
- /**
- * 数据的内容
- *
类型: TEXT
- */
- public static final String CONTENT = "content";
-
- /**
- * 通用数据列,其含义特定,用于整数数据类型
- *
类型: INTEGER
- */
- public static final String DATA1 = "data1";
-
- /**
- * 通用数据列,其含义特定,用于整数数据类型
- *
类型: INTEGER
- */
- public static final String DATA2 = "data2";
-
- /**
- * 通用数据列,其含义特定,用于TEXT数据类型
- *
类型: TEXT
- */
- public static final String DATA3 = "data3";
-
- /**
- * 通用数据列,其含义特定,用于TEXT数据类型
- *
类型: TEXT
- */
- public static final String DATA4 = "data4";
-
- /**
- * 通用数据列,其含义特定,用于TEXT数据类型
- *
类型: TEXT
- */
- public static final String DATA5 = "data5";
- }
-
- public static final class TextNote implements DataColumns {
- /**
- * 指示文本是否处于检查列表模式的模式
- *
类型: Integer 1:检查列表模式 0:正常模式
- */
- public static final String MODE = DATA1;
-
- public static final int MODE_CHECK_LIST = 1;
-
- public static final String CONTENT_TYPE = "vnd.android.cursor.dir/text_note";
-
- public static final String CONTENT_ITEM_TYPE = "vnd.android.cursor.item/text_note";
-
- public static final Uri CONTENT_URI = Uri.parse("content://" + AUTHORITY + "/text_note");
- }
-
- public static final class CallNote implements DataColumns {
- /**
- * 通话记录的日期
- *
类型: INTEGER (long)
- */
- public static final String CALL_DATE = DATA1;
-
- /**
- * 通话记录的电话号码
- *
类型: TEXT
- */
- public static final String PHONE_NUMBER = DATA3;
-
- public static final String CONTENT_TYPE = "vnd.android.cursor.dir/call_note";
-
- public static final String CONTENT_ITEM_TYPE = "vnd.android.cursor.item/call_note";
-
- public static final Uri CONTENT_URI = Uri.parse("content://" + AUTHORITY + "/call_note");
- }
-}
-
diff --git a/xiaomi/app/src/main/java/net/micode/notes/data/NotesDatabaseHelper.java b/xiaomi/app/src/main/java/net/micode/notes/data/NotesDatabaseHelper.java
deleted file mode 100644
index 0735204..0000000
--- a/xiaomi/app/src/main/java/net/micode/notes/data/NotesDatabaseHelper.java
+++ /dev/null
@@ -1,372 +0,0 @@
-/*
- * 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.data;
-
-import android.content.ContentValues;
-import android.content.Context;
-import android.database.sqlite.SQLiteDatabase;
-import android.database.sqlite.SQLiteOpenHelper;
-import android.util.Log;
-
-import net.micode.notes.data.Notes.DataColumns;
-import net.micode.notes.data.Notes.DataConstants;
-import net.micode.notes.data.Notes.NoteColumns;
-
-
-public class NotesDatabaseHelper extends SQLiteOpenHelper {
- private static final String DB_NAME = "note.db"; // 数据库名称
-
- private static final int DB_VERSION = 4; // 数据库版本号
-
- public interface TABLE {
- public static final String NOTE = "note"; // 笔记表名称
-
- public static final String DATA = "data"; // 数据表名称
- }
-
- private static final String TAG = "NotesDatabaseHelper"; // 日志标签
-
- private static NotesDatabaseHelper mInstance; // 数据库帮助类实例
-
- private static final String CREATE_NOTE_TABLE_SQL = // 创建笔记表的SQL语句
- "CREATE TABLE " + TABLE.NOTE + "(" +
- NoteColumns.ID + " INTEGER PRIMARY KEY," +
- NoteColumns.PARENT_ID + " INTEGER NOT NULL DEFAULT 0," +
- NoteColumns.ALERTED_DATE + " INTEGER NOT NULL DEFAULT 0," +
- NoteColumns.BG_COLOR_ID + " INTEGER NOT NULL DEFAULT 0," +
- NoteColumns.CREATED_DATE + " INTEGER NOT NULL DEFAULT (strftime('%s','now') * 1000)," +
- NoteColumns.HAS_ATTACHMENT + " INTEGER NOT NULL DEFAULT 0," +
- NoteColumns.MODIFIED_DATE + " INTEGER NOT NULL DEFAULT (strftime('%s','now') * 1000)," +
- NoteColumns.NOTES_COUNT + " INTEGER NOT NULL DEFAULT 0," +
- NoteColumns.SNIPPET + " TEXT NOT NULL DEFAULT ''," +
- NoteColumns.TYPE + " INTEGER NOT NULL DEFAULT 0," +
- NoteColumns.WIDGET_ID + " INTEGER NOT NULL DEFAULT 0," +
- NoteColumns.WIDGET_TYPE + " INTEGER NOT NULL DEFAULT -1," +
- NoteColumns.SYNC_ID + " INTEGER NOT NULL DEFAULT 0," +
- NoteColumns.LOCAL_MODIFIED + " INTEGER NOT NULL DEFAULT 0," +
- NoteColumns.ORIGIN_PARENT_ID + " INTEGER NOT NULL DEFAULT 0," +
- NoteColumns.GTASK_ID + " TEXT NOT NULL DEFAULT ''," +
- NoteColumns.VERSION + " INTEGER NOT NULL DEFAULT 0" +
- ")";
-
- private static final String CREATE_DATA_TABLE_SQL = // 创建数据表的SQL语句
- "CREATE TABLE " + TABLE.DATA + "(" +
- DataColumns.ID + " INTEGER PRIMARY KEY," +
- DataColumns.MIME_TYPE + " TEXT NOT NULL," +
- DataColumns.NOTE_ID + " INTEGER NOT NULL DEFAULT 0," +
- NoteColumns.CREATED_DATE + " INTEGER NOT NULL DEFAULT (strftime('%s','now') * 1000)," +
- NoteColumns.MODIFIED_DATE + " INTEGER NOT NULL DEFAULT (strftime('%s','now') * 1000)," +
- DataColumns.CONTENT + " TEXT NOT NULL DEFAULT ''," +
- DataColumns.DATA1 + " INTEGER," +
- DataColumns.DATA2 + " INTEGER," +
- DataColumns.DATA3 + " TEXT NOT NULL DEFAULT ''," +
- DataColumns.DATA4 + " TEXT NOT NULL DEFAULT ''," +
- DataColumns.DATA5 + " TEXT NOT NULL DEFAULT ''" +
- ")";
-
- private static final String CREATE_DATA_NOTE_ID_INDEX_SQL = // 创建数据表的索引的SQL语句
- "CREATE INDEX IF NOT EXISTS note_id_index ON " +
- TABLE.DATA + "(" + DataColumns.NOTE_ID + ");";
-
- /**
- * 在移动笔记到文件夹时增加文件夹的笔记计数
- */
- private static final String NOTE_INCREASE_FOLDER_COUNT_ON_UPDATE_TRIGGER = // 创建触发器,当更新笔记的父文件夹时增加文件夹的笔记计数
- "CREATE TRIGGER increase_folder_count_on_update " +
- " AFTER UPDATE OF " + NoteColumns.PARENT_ID + " ON " + TABLE.NOTE +
- " BEGIN " +
- " UPDATE " + TABLE.NOTE +
- " SET " + NoteColumns.NOTES_COUNT + "=" + NoteColumns.NOTES_COUNT + " + 1" +
- " WHERE " + NoteColumns.ID + "=new." + NoteColumns.PARENT_ID + ";" +
- " END";
-
- /**
- * 在从文件夹中移出笔记时减少文件夹的笔记计数
- */
- private static final String NOTE_DECREASE_FOLDER_COUNT_ON_UPDATE_TRIGGER = // 创建触发器,当从文件夹中移出笔记时减少文件夹的笔记计数
- "CREATE TRIGGER decrease_folder_count_on_update " +
- " AFTER UPDATE OF " + NoteColumns.PARENT_ID + " ON " + TABLE.NOTE +
- " BEGIN " +
- " UPDATE " + TABLE.NOTE +
- " SET " + NoteColumns.NOTES_COUNT + "=" + NoteColumns.NOTES_COUNT + "-1" +
- " WHERE " + NoteColumns.ID + "=old." + NoteColumns.PARENT_ID +
- " AND " + NoteColumns.NOTES_COUNT + ">0" + ";" +
- " END";
-
- /**
- * 在插入新笔记到文件夹时增加文件夹的笔记计数
- */
- private static final String NOTE_INCREASE_FOLDER_COUNT_ON_INSERT_TRIGGER = // 创建触发器,当插入新笔记到文件夹时增加文件夹的笔记计数
- "CREATE TRIGGER increase_folder_count_on_insert " +
- " AFTER INSERT ON " + TABLE.NOTE +
- " BEGIN " +
- " UPDATE " + TABLE.NOTE +
- " SET " + NoteColumns.NOTES_COUNT + "=" + NoteColumns.NOTES_COUNT + " + 1" +
- " WHERE " + NoteColumns.ID + "=new." + NoteColumns.PARENT_ID + ";" +
- " END";
-
- /**
- * 在从文件夹中删除笔记时减少文件夹的笔记计数
- */
- private static final String NOTE_DECREASE_FOLDER_COUNT_ON_DELETE_TRIGGER = // 创建触发器,当从文件夹中删除笔记时减少文件夹的笔记计数
- "CREATE TRIGGER decrease_folder_count_on_delete " +
- " AFTER DELETE ON " + TABLE.NOTE +
- " BEGIN " +
- " UPDATE " + TABLE.NOTE +
- " SET " + NoteColumns.NOTES_COUNT + "=" + NoteColumns.NOTES_COUNT + "-1" +
- " WHERE " + NoteColumns.ID + "=old." + NoteColumns.PARENT_ID +
- " AND " + NoteColumns.NOTES_COUNT + ">0;" +
- " END";
-
- /**
- * 当插入类型为{@link DataConstants#NOTE}的数据时,更新笔记的内容
- */
- private static final String DATA_UPDATE_NOTE_CONTENT_ON_INSERT_TRIGGER = // 创建触发器,当插入类型为{@link DataConstants#NOTE}的数据时更新笔记的内容
- "CREATE TRIGGER update_note_content_on_insert " +
- " AFTER INSERT ON " + TABLE.DATA +
- " WHEN new." + DataColumns.MIME_TYPE + "='" + DataConstants.NOTE + "'" +
- " BEGIN" +
- " UPDATE " + TABLE.NOTE +
- " SET " + NoteColumns.SNIPPET + "=new." + DataColumns.CONTENT +
- " WHERE " + NoteColumns.ID + "=new." + DataColumns.NOTE_ID + ";" +
- " END";
-
- /**
- * 当类型为{@link DataConstants#NOTE}的数据发生更改时,更新笔记的内容
- */
- private static final String DATA_UPDATE_NOTE_CONTENT_ON_UPDATE_TRIGGER = // 创建触发器,当类型为{@link DataConstants#NOTE}的数据发生更改时更新笔记的内容
- "CREATE TRIGGER update_note_content_on_update " +
- " AFTER UPDATE ON " + TABLE.DATA +
- " WHEN old." + DataColumns.MIME_TYPE + "='" + DataConstants.NOTE + "'" +
- " BEGIN" +
- " UPDATE " + TABLE.NOTE +
- " SET " + NoteColumns.SNIPPET + "=new." + DataColumns.CONTENT +
- " WHERE " + NoteColumns.ID + "=new." + DataColumns.NOTE_ID + ";" +
- " END";
-
- /**
- * 当类型为{@link DataConstants#NOTE}的数据被删除时,更新笔记的内容
- */
- private static final String DATA_UPDATE_NOTE_CONTENT_ON_DELETE_TRIGGER = // 创建触发器,当类型为{@link DataConstants#NOTE}的数据被删除时更新笔记的内容
- "CREATE TRIGGER update_note_content_on_delete " +
- " AFTER delete ON " + TABLE.DATA +
- " WHEN old." + DataColumns.MIME_TYPE + "='" + DataConstants.NOTE + "'" +
- " BEGIN" +
- " UPDATE " + TABLE.NOTE +
- " SET " + NoteColumns.SNIPPET + "=''" +
- " WHERE " + NoteColumns.ID + "=old." + DataColumns.NOTE_ID + ";" +
- " END";
-
- /**
- * 删除已删除的笔记所属的数据
- */
- private static final String NOTE_DELETE_DATA_ON_DELETE_TRIGGER = // 创建触发器,删除已删除的笔记所属的数据
- "CREATE TRIGGER delete_data_on_delete " +
- " AFTER DELETE ON " + TABLE.NOTE +
- " BEGIN" +
- " DELETE FROM " + TABLE.DATA +
- " WHERE " + DataColumns.NOTE_ID + "=old." + NoteColumns.ID + ";" +
- " END";
-
- /**
- * 删除已删除的文件夹所属的笔记
- */
- private static final String FOLDER_DELETE_NOTES_ON_DELETE_TRIGGER = // 创建触发器,删除已删除的文件夹所属的笔记
- "CREATE TRIGGER folder_delete_notes_on_delete " +
- " AFTER DELETE ON " + TABLE.NOTE +
- " BEGIN" +
- " DELETE FROM " + TABLE.NOTE +
- " WHERE " + NoteColumns.PARENT_ID + "=old." + NoteColumns.ID + ";" +
- " END";
-
-
- /**
- * Move notes belong to folder which has been moved to trash folder
- */
- private static final String FOLDER_MOVE_NOTES_ON_TRASH_TRIGGER =
- "CREATE TRIGGER folder_move_notes_on_trash " +
- " AFTER UPDATE ON " + TABLE.NOTE +
- " WHEN new." + NoteColumns.PARENT_ID + "=" + Notes.ID_TRASH_FOLER +
- " BEGIN" +
- " UPDATE " + TABLE.NOTE +
- " SET " + NoteColumns.PARENT_ID + "=" + Notes.ID_TRASH_FOLER +
- " WHERE " + NoteColumns.PARENT_ID + "=old." + NoteColumns.ID + ";" +
- " END";
-
- public NotesDatabaseHelper(Context context) {
- super(context, DB_NAME, null, DB_VERSION);
- }
-
- // 创建笔记表
- public void createNoteTable(SQLiteDatabase db) {
- db.execSQL(CREATE_NOTE_TABLE_SQL);
- reCreateNoteTableTriggers(db);
- createSystemFolder(db);
- Log.d(TAG, "note table has been created"); // 笔记表已创建
- }
-
- // 重新创建笔记表的触发器
- private void reCreateNoteTableTriggers(SQLiteDatabase db) {
- db.execSQL("DROP TRIGGER IF EXISTS increase_folder_count_on_update");
- db.execSQL("DROP TRIGGER IF EXISTS decrease_folder_count_on_update");
- db.execSQL("DROP TRIGGER IF EXISTS decrease_folder_count_on_delete");
- db.execSQL("DROP TRIGGER IF EXISTS delete_data_on_delete");
- db.execSQL("DROP TRIGGER IF EXISTS increase_folder_count_on_insert");
- db.execSQL("DROP TRIGGER IF EXISTS folder_delete_notes_on_delete");
- db.execSQL("DROP TRIGGER IF EXISTS folder_move_notes_on_trash");
-
- db.execSQL(NOTE_INCREASE_FOLDER_COUNT_ON_UPDATE_TRIGGER);
- db.execSQL(NOTE_DECREASE_FOLDER_COUNT_ON_UPDATE_TRIGGER);
- db.execSQL(NOTE_DECREASE_FOLDER_COUNT_ON_DELETE_TRIGGER);
- db.execSQL(NOTE_DELETE_DATA_ON_DELETE_TRIGGER);
- db.execSQL(NOTE_INCREASE_FOLDER_COUNT_ON_INSERT_TRIGGER);
- db.execSQL(FOLDER_DELETE_NOTES_ON_DELETE_TRIGGER);
- db.execSQL(FOLDER_MOVE_NOTES_ON_TRASH_TRIGGER);
- }
-
- // 创建系统文件夹
- private void createSystemFolder(SQLiteDatabase db) {
- ContentValues values = new ContentValues();
-
- /**
- * call record foler for call notes
- */
- values.put(NoteColumns.ID, Notes.ID_CALL_RECORD_FOLDER);
- values.put(NoteColumns.TYPE, Notes.TYPE_SYSTEM);
- db.insert(TABLE.NOTE, null, values); // 插入呼叫记录文件夹
-
- /**
- * root folder which is default folder
- */
- values.clear();
- values.put(NoteColumns.ID, Notes.ID_ROOT_FOLDER);
- values.put(NoteColumns.TYPE, Notes.TYPE_SYSTEM);
- db.insert(TABLE.NOTE, null, values); // 插入根文件夹(默认文件夹)
-
- /**
- * temporary folder which is used for moving note
- */
- values.clear();
- values.put(NoteColumns.ID, Notes.ID_TEMPARAY_FOLDER);
- values.put(NoteColumns.TYPE, Notes.TYPE_SYSTEM);
- db.insert(TABLE.NOTE, null, values); // 插入临时文件夹(用于移动笔记)
-
- /**
- * create trash folder
- */
- values.clear();
- values.put(NoteColumns.ID, Notes.ID_TRASH_FOLER);
- values.put(NoteColumns.TYPE, Notes.TYPE_SYSTEM);
- db.insert(TABLE.NOTE, null, values); // 插入回收站文件夹
- }
-
- // 创建数据表
- public void createDataTable(SQLiteDatabase db) {
- db.execSQL(CREATE_DATA_TABLE_SQL);
- reCreateDataTableTriggers(db);
- db.execSQL(CREATE_DATA_NOTE_ID_INDEX_SQL);
- Log.d(TAG, "data table has been created"); // 数据表已创建
- }
-
- // 重新创建数据表的触发器
- private void reCreateDataTableTriggers(SQLiteDatabase db) {
- db.execSQL("DROP TRIGGER IF EXISTS update_note_content_on_insert");
- db.execSQL("DROP TRIGGER IF EXISTS update_note_content_on_update");
- db.execSQL("DROP TRIGGER IF EXISTS update_note_content_on_delete");
-
- db.execSQL(DATA_UPDATE_NOTE_CONTENT_ON_INSERT_TRIGGER);
- db.execSQL(DATA_UPDATE_NOTE_CONTENT_ON_UPDATE_TRIGGER);
- db.execSQL(DATA_UPDATE_NOTE_CONTENT_ON_DELETE_TRIGGER);
- }
-
- // 单例模式获取实例
- static synchronized NotesDatabaseHelper getInstance(Context context) {
- if (mInstance == null) {
- mInstance = new NotesDatabaseHelper(context);
- }
- return mInstance;
- }
-
- @Override
- public void onCreate(SQLiteDatabase db) {
- createNoteTable(db);
- createDataTable(db);
- }
-
- @Override
- public void onUpgrade(SQLiteDatabase db, int oldVersion, int newVersion) {
- boolean reCreateTriggers = false;
- boolean skipV2 = false;
-
- if (oldVersion == 1) {
- upgradeToV2(db);
- skipV2 = true; // 此次升级包括从v2到v3的升级
- oldVersion++;
- }
-
- if (oldVersion == 2 && !skipV2) {
- upgradeToV3(db);
- reCreateTriggers = true;
- oldVersion++;
- }
-
- if (oldVersion == 3) {
- upgradeToV4(db);
- oldVersion++;
- }
-
- if (reCreateTriggers) {
- reCreateNoteTableTriggers(db);
- reCreateDataTableTriggers(db);
- }
-
- if (oldVersion != newVersion) {
- throw new IllegalStateException("Upgrade notes database to version " + newVersion
- + "fails"); // 升级笔记数据库到版本X失败
- }
- }
-
- // 升级到版本2
- private void upgradeToV2(SQLiteDatabase db) {
- db.execSQL("DROP TABLE IF EXISTS " + TABLE.NOTE);
- db.execSQL("DROP TABLE IF EXISTS " + TABLE.DATA);
- createNoteTable(db);
- createDataTable(db);
- }
-
- // 升级到版本3
- private void upgradeToV3(SQLiteDatabase db) {
- // 删除未使用的触发器
- db.execSQL("DROP TRIGGER IF EXISTS update_note_modified_date_on_insert");
- db.execSQL("DROP TRIGGER IF EXISTS update_note_modified_date_on_delete");
- db.execSQL("DROP TRIGGER IF EXISTS update_note_modified_date_on_update");
- // 添加一个用于GTask ID的列
- db.execSQL("ALTER TABLE " + TABLE.NOTE + " ADD COLUMN " + NoteColumns.GTASK_ID
- + " TEXT NOT NULL DEFAULT ''");
- // 添加回收站系统文件夹
- ContentValues values = new ContentValues();
- values.put(NoteColumns.ID, Notes.ID_TRASH_FOLER);
- values.put(NoteColumns.TYPE, Notes.TYPE_SYSTEM);
- db.insert(TABLE.NOTE, null, values);
- }
-
- // 升级到版本4
- private void upgradeToV4(SQLiteDatabase db) {
- db.execSQL("ALTER TABLE " + TABLE.NOTE + " ADD COLUMN " + NoteColumns.VERSION
- + " INTEGER NOT NULL DEFAULT 0");
- }
-}
diff --git a/xiaomi/app/src/main/java/net/micode/notes/gtask/data/MetaData.java b/xiaomi/app/src/main/java/net/micode/notes/gtask/data/MetaData.java
deleted file mode 100644
index 4da7d83..0000000
--- a/xiaomi/app/src/main/java/net/micode/notes/gtask/data/MetaData.java
+++ /dev/null
@@ -1,98 +0,0 @@
-/*
- * 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.gtask.data;
-
-import android.database.Cursor;
-import android.util.Log;
-
-import net.micode.notes.tool.GTaskStringUtils;
-
-import org.json.JSONException;
-import org.json.JSONObject;
-
-
-// 定义一个MetaData类,继承自Task类
-public class MetaData extends Task {
- // 定义一个常量,表示这个类的名字
- private final static String TAG = MetaData.class.getSimpleName();
-
- // 定义一个私有变量,表示相关的gid
- private String mRelatedGid = null;
-
- // 定义一个方法,用于设置元数据
- public void setMeta(String gid, JSONObject metaInfo) {
- try {
- // 在metaInfo中添加一个键值对,表示gid
- metaInfo.put(GTaskStringUtils.META_HEAD_GTASK_ID, gid);
- } catch (JSONException e) {
- // 如果出现异常,打印错误日志
- Log.e(TAG, "failed to put related gid");
- }
- // 调用父类的方法,设置notes为metaInfo的字符串形式
- setNotes(metaInfo.toString());
- // 调用父类的方法,设置name为一个常量
- setName(GTaskStringUtils.META_NOTE_NAME);
- }
-
- // 定义一个方法,用于获取相关的gid
- public String getRelatedGid() {
- return mRelatedGid;
- }
-
- // 重写父类的方法,用于根据远程的JSON数据设置内容
- @Override
- public void setContentByRemoteJSON(JSONObject js) {
- // 调用父类的方法
- super.setContentByRemoteJSON(js);
- // 如果notes不为空
- if (getNotes() != null) {
- try {
- // 创建一个JSONObject对象,从notes中解析数据
- JSONObject metaInfo = new JSONObject(getNotes().trim());
- // 从metaInfo中获取gid,并赋值给mRelatedGid
- mRelatedGid = metaInfo.getString(GTaskStringUtils.META_HEAD_GTASK_ID);
- } catch (JSONException e) {
- // 如果出现异常,打印警告日志
- Log.w(TAG, "failed to get related gid");
- // 将mRelatedGid设为null
- mRelatedGid = null;
- }
- }
- }
-
- // 重写父类的方法,用于根据本地的JSON数据设置内容
- @Override
- public void setContentByLocalJSON(JSONObject js) {
- // 这个方法不应该被调用,抛出一个非法访问错误
- throw new IllegalAccessError("MetaData:setContentByLocalJSON should not be called");
- }
-
- // 重写父类的方法,用于从内容中获取本地的JSON数据
- @Override
- public JSONObject getLocalJSONFromContent() {
- // 这个方法不应该被调用,抛出一个非法访问错误
- throw new IllegalAccessError("MetaData:getLocalJSONFromContent should not be called");
- }
-
- // 重写父类的方法,用于获取同步操作的类型
- @Override
- public int getSyncAction(Cursor c) {
- // 这个方法不应该被调用,抛出一个非法访问错误
- throw new IllegalAccessError("MetaData:getSyncAction should not be called");
- }
-
-}
diff --git a/xiaomi/app/src/main/java/net/micode/notes/gtask/data/Node.java b/xiaomi/app/src/main/java/net/micode/notes/gtask/data/Node.java
deleted file mode 100644
index 91f703d..0000000
--- a/xiaomi/app/src/main/java/net/micode/notes/gtask/data/Node.java
+++ /dev/null
@@ -1,143 +0,0 @@
-/*
- * 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.gtask.data;
-
-import android.database.Cursor;
-
-import org.json.JSONObject;
-
-// 定义一个抽象类Node
-public abstract class Node {
- // 定义一个常量,表示没有同步操作
- public static final int SYNC_ACTION_NONE = 0;
-
- // 定义一个常量,表示添加远程节点的操作
- public static final int SYNC_ACTION_ADD_REMOTE = 1;
-
- // 定义一个常量,表示添加本地节点的操作
- public static final int SYNC_ACTION_ADD_LOCAL = 2;
-
- // 定义一个常量,表示删除远程节点的操作
- public static final int SYNC_ACTION_DEL_REMOTE = 3;
-
- // 定义一个常量,表示删除本地节点的操作
- public static final int SYNC_ACTION_DEL_LOCAL = 4;
-
- // 定义一个常量,表示更新远程节点的操作
- public static final int SYNC_ACTION_UPDATE_REMOTE = 5;
-
- // 定义一个常量,表示更新本地节点的操作
- public static final int SYNC_ACTION_UPDATE_LOCAL = 6;
-
- // 定义一个常量,表示更新冲突的操作
- public static final int SYNC_ACTION_UPDATE_CONFLICT = 7;
-
- // 定义一个常量,表示同步错误的操作
- public static final int SYNC_ACTION_ERROR = 8;
-
- // 定义一个私有变量,表示节点的gid
- private String mGid;
-
- // 定义一个私有变量,表示节点的名字
- private String mName;
-
- // 定义一个私有变量,表示节点的最后修改时间
- private long mLastModified;
-
- // 定义一个私有变量,表示节点是否被删除
- private boolean mDeleted;
-
- // 定义一个构造方法,初始化变量
- public Node() {
- // 将mGid设为null
- mGid = null;
- // 将mName设为空字符串
- mName = "";
- // 将mLastModified设为0
- mLastModified = 0;
- // 将mDeleted设为false
- mDeleted = false;
- }
-
- // 定义一个抽象方法,用于获取创建节点的动作,参数是动作的id,返回值是一个JSONObject对象
- public abstract JSONObject getCreateAction(int actionId);
-
- // 定义一个抽象方法,用于获取更新节点的动作,参数是动作的id,返回值是一个JSONObject对象
- public abstract JSONObject getUpdateAction(int actionId);
-
- // 定义一个抽象方法,用于根据远程的JSON数据设置节点的内容,参数是一个JSONObject对象
- public abstract void setContentByRemoteJSON(JSONObject js);
-
- // 定义一个抽象方法,用于根据本地的JSON数据设置节点的内容,参数是一个JSONObject对象
- public abstract void setContentByLocalJSON(JSONObject js);
-
- // 定义一个抽象方法,用于从节点的内容中获取本地的JSON数据,返回值是一个JSONObject对象
- public abstract JSONObject getLocalJSONFromContent();
-
- // 定义一个抽象方法,用于获取同步操作的类型,参数是一个Cursor对象,返回值是一个整数
- public abstract int getSyncAction(Cursor c);
-
- // 定义一个公共方法,用于设置节点的gid,参数是一个字符串
- public void setGid(String gid) {
- // 将mGid赋值为gid
- this.mGid = gid;
- }
-
- // 定义一个公共方法,用于设置节点的名字,参数是一个字符串
- public void setName(String name) {
- // 将mName赋值为name
- this.mName = name;
- }
-
- // 定义一个公共方法,用于设置节点的最后修改时间,参数是一个长整数
- public void setLastModified(long lastModified) {
- // 将mLastModified赋值为lastModified
- this.mLastModified = lastModified;
- }
-
- // 定义一个公共方法,用于设置节点是否被删除,参数是一个布尔值
- public void setDeleted(boolean deleted) {
- // 将mDeleted赋值为deleted
- this.mDeleted = deleted;
- }
-
- // 定义一个公共方法,用于获取节点的gid,返回值是一个字符串
- public String getGid() {
- // 返回mGid的值
- return this.mGid;
- }
-
- // 定义一个公共方法,用于获取节点的名字,返回值是一个字符串
- public String getName() {
- // 返回mName的值
- return this.mName;
- }
-
- // 定义一个公共方法,用于获取节点的最后修改时间,返回值是一个长整数
- public long getLastModified() {
- // 返回mLastModified的值
- return this.mLastModified;
- }
-
- // 定义一个公共方法,用于获取节点是否被删除,返回值是一个布尔值
- public boolean getDeleted() {
- // 返回mDeleted的值
- return this.mDeleted;
- }
-
-}
-
diff --git a/xiaomi/app/src/main/java/net/micode/notes/gtask/data/SqlData.java b/xiaomi/app/src/main/java/net/micode/notes/gtask/data/SqlData.java
deleted file mode 100644
index b497456..0000000
--- a/xiaomi/app/src/main/java/net/micode/notes/gtask/data/SqlData.java
+++ /dev/null
@@ -1,273 +0,0 @@
-/*
- * 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.gtask.data;
-
-import android.content.ContentResolver;
-import android.content.ContentUris;
-import android.content.ContentValues;
-import android.content.Context;
-import android.database.Cursor;
-import android.net.Uri;
-import android.util.Log;
-
-import net.micode.notes.data.Notes;
-import net.micode.notes.data.Notes.DataColumns;
-import net.micode.notes.data.Notes.DataConstants;
-import net.micode.notes.data.Notes.NoteColumns;
-import net.micode.notes.data.NotesDatabaseHelper.TABLE;
-import net.micode.notes.gtask.exception.ActionFailureException;
-
-import org.json.JSONException;
-import org.json.JSONObject;
-
-
-// 定义一个SqlData类
-public class SqlData {
- // 定义一个常量,表示这个类的名字
- private static final String TAG = SqlData.class.getSimpleName();
-
- // 定义一个常量,表示无效的id
- private static final int INVALID_ID = -99999;
-
- // 定义一个常量,表示数据表的列名
- public static final String[] PROJECTION_DATA = new String[]{
- DataColumns.ID, DataColumns.MIME_TYPE, DataColumns.CONTENT, DataColumns.DATA1,
- DataColumns.DATA3
- };
-
- // 定义一些常量,表示数据表的列索引
- public static final int DATA_ID_COLUMN = 0;
-
- public static final int DATA_MIME_TYPE_COLUMN = 1;
-
- public static final int DATA_CONTENT_COLUMN = 2;
-
- public static final int DATA_CONTENT_DATA_1_COLUMN = 3;
-
- public static final int DATA_CONTENT_DATA_3_COLUMN = 4;
-
- // 定义一个私有变量,表示内容解析器
- private ContentResolver mContentResolver;
-
- // 定义一个私有变量,表示是否是创建数据
- private boolean mIsCreate;
-
- // 定义一些私有变量,表示数据的属性
- private long mDataId;
-
- private String mDataMimeType;
-
- private String mDataContent;
-
- private long mDataContentData1;
-
- private String mDataContentData3;
-
- // 定义一个私有变量,表示数据的差异值
- private ContentValues mDiffDataValues;
-
- // 定义一个构造方法,用于创建数据,参数是一个上下文对象
- public SqlData(Context context) {
- // 从上下文对象中获取内容解析器,并赋值给mContentResolver
- mContentResolver = context.getContentResolver();
- // 将mIsCreate设为true,表示是创建数据
- mIsCreate = true;
- // 将mDataId设为无效的id
- mDataId = INVALID_ID;
- // 将mDataMimeType设为一个常量,表示数据的类型
- mDataMimeType = DataConstants.NOTE;
- // 将mDataContent设为空字符串
- mDataContent = "";
- // 将mDataContentData1设为0
- mDataContentData1 = 0;
- // 将mDataContentData3设为空字符串
- mDataContentData3 = "";
- // 创建一个ContentValues对象,并赋值给mDiffDataValues
- mDiffDataValues = new ContentValues();
- }
-
- // 定义一个构造方法,用于从游标中加载数据,参数是一个游标对象
- public SqlData(Context context, Cursor c) {
- // 从上下文对象中获取内容解析器,并赋值给mContentResolver
- mContentResolver = context.getContentResolver();
- // 将mIsCreate设为false,表示不是创建数据
- mIsCreate = false;
- // 调用一个私有方法,从游标中加载数据到变量中
- loadFromCursor(c);
- // 创建一个ContentValues对象,并赋值给mDiffDataValues
- mDiffDataValues = new ContentValues();
- }
-
- // 定义一个私有方法,用于从游标中加载数据到变量中,参数是一个游标对象
- private void loadFromCursor(Cursor c) {
- // 从游标中获取id,并赋值给mDataId
- mDataId = c.getLong(DATA_ID_COLUMN);
- // 从游标中获取类型,并赋值给mDataMimeType
- mDataMimeType = c.getString(DATA_MIME_TYPE_COLUMN);
- // 从游标中获取内容,并赋值给mDataContent
- mDataContent = c.getString(DATA_CONTENT_COLUMN);
- // 从游标中获取内容的第一部分,并赋值给mDataContentData1
- mDataContentData1 = c.getLong(DATA_CONTENT_DATA_1_COLUMN);
- // 从游标中获取内容的第三部分,并赋值给mDataContentData3
- mDataContentData3 = c.getString(DATA_CONTENT_DATA_3_COLUMN);
- }
-
-
- // 定义一个公共方法,用于根据一个JSON对象设置数据的内容,参数是一个JSON对象,可能抛出一个JSONException异常
- public void setContent(JSONObject js) throws JSONException {
- // 从JSON对象中获取id,如果没有则使用无效的id
- long dataId = js.has(DataColumns.ID) ? js.getLong(DataColumns.ID) : INVALID_ID;
- // 如果是创建数据或者id发生了变化
- if (mIsCreate || mDataId != dataId) {
- // 在差异值中添加id
- mDiffDataValues.put(DataColumns.ID, dataId);
- }
- // 将mDataId赋值为dataId
- mDataId = dataId;
-
- // 从JSON对象中获取类型,如果没有则使用一个常量
- String dataMimeType = js.has(DataColumns.MIME_TYPE) ? js.getString(DataColumns.MIME_TYPE)
- : DataConstants.NOTE;
- // 如果是创建数据或者类型发生了变化
- if (mIsCreate || !mDataMimeType.equals(dataMimeType)) {
- // 在差异值中添加类型
- mDiffDataValues.put(DataColumns.MIME_TYPE, dataMimeType);
- }
- // 将mDataMimeType赋值为dataMimeType
- mDataMimeType = dataMimeType;
-
- // 从JSON对象中获取内容,如果没有则使用空字符串
- String dataContent = js.has(DataColumns.CONTENT) ? js.getString(DataColumns.CONTENT) : "";
- // 如果是创建数据或者内容发生了变化
- if (mIsCreate || !mDataContent.equals(dataContent)) {
- // 在差异值中添加内容
- mDiffDataValues.put(DataColumns.CONTENT, dataContent);
- }
- // 将mDataContent赋值为dataContent
- mDataContent = dataContent;
-
- // 从JSON对象中获取内容的第一部分,如果没有则使用0
- long dataContentData1 = js.has(DataColumns.DATA1) ? js.getLong(DataColumns.DATA1) : 0;
- // 如果是创建数据或者内容的第一部分发生了变化
- if (mIsCreate || mDataContentData1 != dataContentData1) {
- // 在差异值中添加内容的第一部分
- mDiffDataValues.put(DataColumns.DATA1, dataContentData1);
- }
- // 将mDataContentData1赋值为dataContentData1
- mDataContentData1 = dataContentData1;
-
- // 从JSON对象中获取内容的第三部分,如果没有则使用空字符串
- String dataContentData3 = js.has(DataColumns.DATA3) ? js.getString(DataColumns.DATA3) : "";
- // 如果是创建数据或者内容的第三部分发生了变化
- if (mIsCreate || !mDataContentData3.equals(dataContentData3)) {
- // 在差异值中添加内容的第三部分
- mDiffDataValues.put(DataColumns.DATA3, dataContentData3);
- }
- // 将mDataContentData3赋值为dataContentData3
- mDataContentData3 = dataContentData3;
- }
-
- // 定义一个公共方法,用于从数据的内容中获取一个JSON对象,返回值是一个JSON对象,可能抛出一个JSONException异常
- public JSONObject getContent() throws JSONException {
- // 如果是创建数据
- if (mIsCreate) {
- // 打印一个错误日志,表示还没有在数据库中创建这个数据
- Log.e(TAG, "it seems that we haven't created this in database yet");
- // 返回null
- return null;
- }
- // 创建一个JSON对象,并赋值给js
- JSONObject js = new JSONObject();
- // 在js中添加id
- js.put(DataColumns.ID, mDataId);
- // 在js中添加类型
- js.put(DataColumns.MIME_TYPE, mDataMimeType);
- // 在js中添加内容
- js.put(DataColumns.CONTENT, mDataContent);
- // 在js中添加内容的第一部分
- js.put(DataColumns.DATA1, mDataContentData1);
- // 在js中添加内容的第三部分
- js.put(DataColumns.DATA3, mDataContentData3);
- // 返回js
- return js;
- }
-
-
- // 定义一个公共方法,用于提交数据到数据库,参数是一个笔记的id,一个是否验证版本的标志,和一个版本号
- public void commit(long noteId, boolean validateVersion, long version) {
-
- // 如果是创建数据
- if (mIsCreate) {
- // 如果数据的id是无效的,并且差异值中包含id
- if (mDataId == INVALID_ID && mDiffDataValues.containsKey(DataColumns.ID)) {
- // 从差异值中移除id
- mDiffDataValues.remove(DataColumns.ID);
- }
-
- // 在差异值中添加笔记的id
- mDiffDataValues.put(DataColumns.NOTE_ID, noteId);
- // 通过内容解析器向数据表中插入差异值,并获取返回的uri
- Uri uri = mContentResolver.insert(Notes.CONTENT_DATA_URI, mDiffDataValues);
- try {
- // 从uri中获取数据的id,并赋值给mDataId
- mDataId = Long.valueOf(uri.getPathSegments().get(1));
- } catch (NumberFormatException e) {
- // 如果出现数字格式异常,打印错误日志
- Log.e(TAG, "Get note id error :" + e.toString());
- // 抛出一个动作失败异常,表示创建笔记失败
- throw new ActionFailureException("create note failed");
- }
- } else {
- // 如果不是创建数据,并且差异值的大小大于0
- if (mDiffDataValues.size() > 0) {
- // 定义一个整数变量,表示更新的结果
- int result = 0;
- // 如果不需要验证版本
- if (!validateVersion) {
- // 通过内容解析器根据数据的id更新数据表中的差异值,并赋值给result
- result = mContentResolver.update(ContentUris.withAppendedId(
- Notes.CONTENT_DATA_URI, mDataId), mDiffDataValues, null, null);
- } else {
- // 如果需要验证版本
- // 通过内容解析器根据数据的id和版本号更新数据表中的差异值,并赋值给result
- result = mContentResolver.update(ContentUris.withAppendedId(
- Notes.CONTENT_DATA_URI, mDataId), mDiffDataValues,
- " ? in (SELECT " + NoteColumns.ID + " FROM " + TABLE.NOTE
- + " WHERE " + NoteColumns.VERSION + "=?)", new String[]{
- String.valueOf(noteId), String.valueOf(version)
- });
- }
- // 如果result等于0
- if (result == 0) {
- // 打印一个警告日志,表示没有更新,可能是用户在同步时更新了笔记
- Log.w(TAG, "there is no update. maybe user updates note when syncing");
- }
- }
- }
-
- // 清空差异值
- mDiffDataValues.clear();
- // 将mIsCreate设为false,表示不是创建数据
- mIsCreate = false;
- }
-
- // 定义一个公共方法,用于获取数据的id,返回值是一个长整数
- public long getId() {
- // 返回mDataId的值
- return mDataId;
- }
-}
diff --git a/xiaomi/app/src/main/java/net/micode/notes/gtask/data/SqlNote.java b/xiaomi/app/src/main/java/net/micode/notes/gtask/data/SqlNote.java
deleted file mode 100644
index 10e7ed6..0000000
--- a/xiaomi/app/src/main/java/net/micode/notes/gtask/data/SqlNote.java
+++ /dev/null
@@ -1,522 +0,0 @@
-/*
- * 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.gtask.data;
-
-import android.appwidget.AppWidgetManager;
-import android.content.ContentResolver;
-import android.content.ContentValues;
-import android.content.Context;
-import android.database.Cursor;
-import android.net.Uri;
-import android.util.Log;
-
-import net.micode.notes.data.Notes;
-import net.micode.notes.data.Notes.DataColumns;
-import net.micode.notes.data.Notes.NoteColumns;
-import net.micode.notes.gtask.exception.ActionFailureException;
-import net.micode.notes.tool.GTaskStringUtils;
-import net.micode.notes.tool.ResourceParser;
-
-import org.json.JSONArray;
-import org.json.JSONException;
-import org.json.JSONObject;
-
-import java.util.ArrayList;
-
-
-public class SqlNote {
- //标签用于日志记录
- private static final String TAG = SqlNote.class.getSimpleName();
- //常量,表示无效的ID
- private static final int INVALID_ID = -99999;
- //数据库查询所需要的投影列
- public static final String[] PROJECTION_NOTE = 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.SYNC_ID,
- NoteColumns.LOCAL_MODIFIED, NoteColumns.ORIGIN_PARENT_ID, NoteColumns.GTASK_ID,
- NoteColumns.VERSION
- };
- //列索引
- public static final int ID_COLUMN = 0;
-
- public static final int ALERTED_DATE_COLUMN = 1;
-
- public static final int BG_COLOR_ID_COLUMN = 2;
-
- public static final int CREATED_DATE_COLUMN = 3;
-
- public static final int HAS_ATTACHMENT_COLUMN = 4;
-
- public static final int MODIFIED_DATE_COLUMN = 5;
-
- public static final int NOTES_COUNT_COLUMN = 6;
-
- public static final int PARENT_ID_COLUMN = 7;
-
- public static final int SNIPPET_COLUMN = 8;
-
- public static final int TYPE_COLUMN = 9;
-
- public static final int WIDGET_ID_COLUMN = 10;
-
- public static final int WIDGET_TYPE_COLUMN = 11;
-
- public static final int SYNC_ID_COLUMN = 12;
-
- public static final int LOCAL_MODIFIED_COLUMN = 13;
-
- public static final int ORIGIN_PARENT_ID_COLUMN = 14;
-
- public static final int GTASK_ID_COLUMN = 15;
-
- public static final int VERSION_COLUMN = 16;
-
- private Context mContext;
-
- private ContentResolver mContentResolver;
-
- private boolean mIsCreate;
-
- private long mId;
-
- private long mAlertDate;
-
- private int mBgColorId;
-
- private long mCreatedDate;
-
- private int mHasAttachment;
-
- private long mModifiedDate;
-
- private long mParentId;
-
- private String mSnippet;
-
- private int mType;
-
- private int mWidgetId;
-
- private int mWidgetType;
-
- private long mOriginParent;
-
- private long mVersion;
-
- private ContentValues mDiffNoteValues;
-
- private ArrayList mDataList;
-
- //构造函数,用于创建新的笔记
- public SqlNote(Context context) {
- mContext = context;
- mContentResolver = context.getContentResolver();
- mIsCreate = true;
- mId = INVALID_ID;
- mAlertDate = 0;
- mBgColorId = ResourceParser.getDefaultBgId(context);
- mCreatedDate = System.currentTimeMillis();
- mHasAttachment = 0;
- mModifiedDate = System.currentTimeMillis();
- mParentId = 0;
- mSnippet = "";
- mType = Notes.TYPE_NOTE;
- mWidgetId = AppWidgetManager.INVALID_APPWIDGET_ID;
- mWidgetType = Notes.TYPE_WIDGET_INVALIDE;
- mOriginParent = 0;
- mVersion = 0;
- mDiffNoteValues = new ContentValues();
- mDataList = new ArrayList();
- }
-
- // 构造函数,从Cursor加载笔记数据
- public SqlNote(Context context, Cursor c) {
- mContext = context;
- mContentResolver = context.getContentResolver();
- mIsCreate = false;
- loadFromCursor(c);
- mDataList = new ArrayList();
- if (mType == Notes.TYPE_NOTE)
- loadDataContent();
- mDiffNoteValues = new ContentValues();
- }
-
- // 构造函数,从ID加载笔记数据
- public SqlNote(Context context, long id) {
- mContext = context;
- mContentResolver = context.getContentResolver();
- mIsCreate = false;
- loadFromCursor(id);
- mDataList = new ArrayList();
- if (mType == Notes.TYPE_NOTE)
- loadDataContent();
- mDiffNoteValues = new ContentValues();
-
- }
-
- // 从ID查询数据库并加载数据
- private void loadFromCursor(long id) {
- Cursor c = null;
- try {
- c = mContentResolver.query(Notes.CONTENT_NOTE_URI, PROJECTION_NOTE, "(_id=?)",
- new String[]{
- String.valueOf(id)
- }, null);
- if (c != null) {
- c.moveToNext();
- loadFromCursor(c);
- } else {
- Log.w(TAG, "loadFromCursor: cursor = null");
- }
- } finally {
- if (c != null)
- c.close();
- }
- }
-
- // 从Cursor加载数据
- private void loadFromCursor(Cursor c) {
- mId = c.getLong(ID_COLUMN);
- mAlertDate = c.getLong(ALERTED_DATE_COLUMN);
- mBgColorId = c.getInt(BG_COLOR_ID_COLUMN);
- mCreatedDate = c.getLong(CREATED_DATE_COLUMN);
- mHasAttachment = c.getInt(HAS_ATTACHMENT_COLUMN);
- mModifiedDate = c.getLong(MODIFIED_DATE_COLUMN);
- mParentId = c.getLong(PARENT_ID_COLUMN);
- mSnippet = c.getString(SNIPPET_COLUMN);
- mType = c.getInt(TYPE_COLUMN);
- mWidgetId = c.getInt(WIDGET_ID_COLUMN);
- mWidgetType = c.getInt(WIDGET_TYPE_COLUMN);
- mVersion = c.getLong(VERSION_COLUMN);
- }
-
- // 加载笔记内容数据
- private void loadDataContent() {
- Cursor c = null;
- mDataList.clear();
- try {
- c = mContentResolver.query(Notes.CONTENT_DATA_URI, SqlData.PROJECTION_DATA,
- "(note_id=?)", new String[]{
- String.valueOf(mId)
- }, null);
- if (c != null) {
- if (c.getCount() == 0) {
- Log.w(TAG, "it seems that the note has not data");
- return;
- }
- while (c.moveToNext()) {
- SqlData data = new SqlData(mContext, c);
- mDataList.add(data);
- }
- } else {
- Log.w(TAG, "loadDataContent: cursor = null");
- }
- } finally {
- if (c != null)
- c.close();
- }
- }
-
- public boolean setContent(JSONObject js) {
- try {
- JSONObject note = js.getJSONObject(GTaskStringUtils.META_HEAD_NOTE); // 从JSON对象中获取"note"字段的值,赋给note变量
- if (note.getInt(NoteColumns.TYPE) == Notes.TYPE_SYSTEM) { // 获取note对象中"type"字段的值,判断是否为系统类型
- Log.w(TAG, "cannot set system folder"); // 输出警告日志,表示无法设置系统文件夹
- } else if (note.getInt(NoteColumns.TYPE) == Notes.TYPE_FOLDER) { // 获取note对象中"type"字段的值,判断是否为文件夹类型
-// 对于文件夹,我们只能更新snippet和type字段
- String snippet = note.has(NoteColumns.SNIPPET) ? note.getString(NoteColumns.SNIPPET) : ""; // 获取note对象中"snippet"字段的值,如果不存在则为空字符串
- if (mIsCreate || !mSnippet.equals(snippet)) { // 判断是否为新建或snippet字段是否与之前的值不同
- mDiffNoteValues.put(NoteColumns.SNIPPET, snippet); // 将snippet字段的差异值添加到mDiffNoteValues中
- }
- mSnippet = snippet; // 更新mSnippet的值为新的snippet值
-
- int type = note.has(NoteColumns.TYPE) ? note.getInt(NoteColumns.TYPE) : Notes.TYPE_NOTE; // 获取note对象中"type"字段的值,如果不存在则默认为笔记类型
- if (mIsCreate || mType != type) { // 判断是否为新建或type字段是否与之前的值不同
- mDiffNoteValues.put(NoteColumns.TYPE, type); // 将type字段的差异值添加到mDiffNoteValues中
- }
- mType = type; // 更新mType的值为新的type值
- } else if (note.getInt(NoteColumns.TYPE) == Notes.TYPE_NOTE) { // 获取note对象中"type"字段的值,判断是否为笔记类型
- JSONArray dataArray = js.getJSONArray(GTaskStringUtils.META_HEAD_DATA); // 从JSON对象中获取"dataArray"字段的值,赋给dataArray变量
- long id = note.has(NoteColumns.ID) ? note.getLong(NoteColumns.ID) : INVALID_ID; // 获取note对象中"id"字段的值,如果不存在则为无效ID
- if (mIsCreate || mId != id) { // 判断是否为新建或id字段是否与之前的值不同
- mDiffNoteValues.put(NoteColumns.ID, id); // 将id字段的差异值添加到mDiffNoteValues中
- }
- mId = id; // 更新mId的值为新的id值
-
- long alertDate = note.has(NoteColumns.ALERTED_DATE) ? note.getLong(NoteColumns.ALERTED_DATE) : 0; // 获取note对象中"alertDate"字段的值,如果不存在则为0
- if (mIsCreate || mAlertDate != alertDate) { // 判断是否为新建或alertDate字段是否与之前的值不同
- mDiffNoteValues.put(NoteColumns.ALERTED_DATE, alertDate); // 将alertDate字段的差异值添加到mDiffNoteValues中
- }
- mAlertDate = alertDate; // 更新mAlertDate的值为新的alertDate值
-
- int bgColorId = note.has(NoteColumns.BG_COLOR_ID) ? note.getInt(NoteColumns.BG_COLOR_ID) : ResourceParser.getDefaultBgId(mContext); // 获取note对象中"bgColorId"字段的值,如果不存在则为默认背景颜色ID
- if (mIsCreate || mBgColorId != bgColorId) { // 判断是否为新建或bgColorId字段是否与之前的值不同
- mDiffNoteValues.put(NoteColumns.BG_COLOR_ID, bgColorId); // 将bgColorId字段的差异值添加到mDiffNoteValues中
- }
- mBgColorId = bgColorId; // 更新mBgColorId的值为新的bgColorId值
-
- long createDate = note.has(NoteColumns.CREATED_DATE) ? note.getLong(NoteColumns.CREATED_DATE) : System.currentTimeMillis(); // 获取note对象中"createDate"字段的值,如果不存在则为当前时间
- if (mIsCreate || mCreatedDate != createDate) { // 判断是否为新建或createDate字段是否与之前的值不同
- mDiffNoteValues.put(NoteColumns.CREATED_DATE, createDate); // 将createDate字段的差异值添加到mDiffNoteValues中
- }
- mCreatedDate = createDate; // 更新mCreatedDate的值为新的createDate值
-
- int hasAttachment = note.has(NoteColumns.HAS_ATTACHMENT) ? note.getInt(NoteColumns.HAS_ATTACHMENT) : 0; // 获取note对象中"hasAttachment"字段的值,如果不存在则为0
- if (mIsCreate || mHasAttachment != hasAttachment) { // 判断是否为新建或hasAttachment字段是否与之前的值不同
- mDiffNoteValues.put(NoteColumns.HAS_ATTACHMENT, hasAttachment); // 将hasAttachment字段的差异值添加到mDiffNoteValues中
- }
- mHasAttachment = hasAttachment; // 更新mHasAttachment的值为新的hasAttachment值
-
- long modifiedDate = note.has(NoteColumns.MODIFIED_DATE) ? note.getLong(NoteColumns.MODIFIED_DATE) : System.currentTimeMillis(); // 获取note对象中"modifiedDate"字段的值,如果不存在则为当前时间
- if (mIsCreate || mModifiedDate != modifiedDate) { // 判断是否为新建或modifiedDate字段是否与之前的值不同
- mDiffNoteValues.put(NoteColumns.MODIFIED_DATE, modifiedDate); // 将modifiedDate字段的差异值添加到mDiffNoteValues中
- }
- mModifiedDate = modifiedDate; // 更新mModifiedDate的值为新的modifiedDate值
-
- long parentId = note.has(NoteColumns.PARENT_ID) ? note.getLong(NoteColumns.PARENT_ID) : 0; // 获取note对象中"parentId"字段的值,如果不存在则为0
- if (mIsCreate || mParentId != parentId) { // 判断是否为新建或parentId字段是否与之前的值不同
- mDiffNoteValues.put(NoteColumns.PARENT_ID, parentId); // 将parentId字段的差异值添加到mDiffNoteValues中
- }
- mParentId = parentId; // 更新mParentId的值为新的parentId值
-
- String snippet = note.has(NoteColumns.SNIPPET) ? note.getString(NoteColumns.SNIPPET) : ""; // 获取note对象中"snippet"字段的值,如果不存在则为空字符串
- if (mIsCreate || !mSnippet.equals(snippet)) { // 判断是否为新建或snippet字段是否与之前的值不同
- mDiffNoteValues.put(NoteColumns.SNIPPET, snippet);// 将snippet字段的差异值添加到mDiffNoteValues中
- }
- mSnippet = snippet; // 更新mSnippet的值为新的snippet值
-
- int type = note.has(NoteColumns.TYPE) ? note.getInt(NoteColumns.TYPE)
- : Notes.TYPE_NOTE; // 获取note对象中"type"字段的值,如果不存在则默认为笔记类型
- if (mIsCreate || mType != type) { // 判断是否为新建或type字段是否与之前的值不同
- mDiffNoteValues.put(NoteColumns.TYPE, type); // 将type字段的差异值添加到mDiffNoteValues中
- }
- mType = type; // 更新mType的值为新的type值
-
- int widgetId = note.has(NoteColumns.WIDGET_ID) ? note.getInt(NoteColumns.WIDGET_ID)
- : AppWidgetManager.INVALID_APPWIDGET_ID; // 获取note对象中"widgetId"字段的值,如果不存在则为无效的小部件ID
- if (mIsCreate || mWidgetId != widgetId) { // 判断是否为新建或widgetId字段是否与之前的值不同
- mDiffNoteValues.put(NoteColumns.WIDGET_ID, widgetId); // 将widgetId字段的差异值添加到mDiffNoteValues中
- }
- mWidgetId = widgetId; // 更新mWidgetId的值为新的widgetId值
-
- int widgetType = note.has(NoteColumns.WIDGET_TYPE) ? note
- .getInt(NoteColumns.WIDGET_TYPE) : Notes.TYPE_WIDGET_INVALIDE; // 获取note对象中"widgetType"字段的值,如果不存在则为无效的小部件类型
- if (mIsCreate || mWidgetType != widgetType) { // 判断是否为新建或widgetType字段是否与之前的值不同
- mDiffNoteValues.put(NoteColumns.WIDGET_TYPE, widgetType); // 将widgetType字段的差异值添加到mDiffNoteValues中
- }
- mWidgetType = widgetType; // 更新mWidgetType的值为新的widgetType值
-
- long originParent = note.has(NoteColumns.ORIGIN_PARENT_ID) ? note
- .getLong(NoteColumns.ORIGIN_PARENT_ID) : 0; // 获取note对象中"originParent"字段的值,如果不存在则为0
- if (mIsCreate || mOriginParent != originParent) { // 判断是否为新建或originParent字段是否与之前的值不同
- mDiffNoteValues.put(NoteColumns.ORIGIN_PARENT_ID, originParent); // 将originParent字段的差异值添加到mDiffNoteValues中
- }
- mOriginParent = originParent; // 更新mOriginParent的值为新的originParent值
-
- for (int i = 0; i < dataArray.length(); i++) {
- JSONObject data = dataArray.getJSONObject(i);
- SqlData sqlData = null;
- if (data.has(DataColumns.ID)) {
- long dataId = data.getLong(DataColumns.ID);
- for (SqlData temp : mDataList) {
- if (dataId == temp.getId()) {
- sqlData = temp;
- }
- }
- }
-
- if (sqlData == null) {
- sqlData = new SqlData(mContext);
- mDataList.add(sqlData);
- }
-
- sqlData.setContent(data);
- }
- }
- } catch (JSONException e) {
- Log.e(TAG, e.toString());
- e.printStackTrace();
- return false;
- }
- return true;
- }
-
- public JSONObject getContent() {
- // 获取当前对象的内容,并以JSONObject的形式返回
- try {
- JSONObject js = new JSONObject();
-
- if (mIsCreate) {
- // 如果当前对象是新创建的,返回null
- Log.e(TAG, "it seems that we haven't created this in database yet");
- return null;
- }
-
- JSONObject note = new JSONObject();
- if (mType == Notes.TYPE_NOTE) {
- // 如果当前对象是Note类型
- // 将Note的属性以键值对的形式放入note对象中
- note.put(NoteColumns.ID, mId);
- note.put(NoteColumns.ALERTED_DATE, mAlertDate);
- note.put(NoteColumns.BG_COLOR_ID, mBgColorId);
- note.put(NoteColumns.CREATED_DATE, mCreatedDate);
- note.put(NoteColumns.HAS_ATTACHMENT, mHasAttachment);
- note.put(NoteColumns.MODIFIED_DATE, mModifiedDate);
- note.put(NoteColumns.PARENT_ID, mParentId);
- note.put(NoteColumns.SNIPPET, mSnippet);
- note.put(NoteColumns.TYPE, mType);
- note.put(NoteColumns.WIDGET_ID, mWidgetId);
- note.put(NoteColumns.WIDGET_TYPE, mWidgetType);
- note.put(NoteColumns.ORIGIN_PARENT_ID, mOriginParent);
- js.put(GTaskStringUtils.META_HEAD_NOTE, note);
-
- JSONArray dataArray = new JSONArray();
- for (SqlData sqlData : mDataList) {
- // 遍历数据列表中的每个SqlData对象,获取其内容,并将其以JSONObject的形式放入dataArray中
- JSONObject data = sqlData.getContent();
- if (data != null) {
- dataArray.put(data);
- }
- }
- js.put(GTaskStringUtils.META_HEAD_DATA, dataArray);
- } else if (mType == Notes.TYPE_FOLDER || mType == Notes.TYPE_SYSTEM) {
- // 如果当前对象是文件夹或系统类型
- // 将文件夹或系统的属性以键值对的形式放入note对象中
- note.put(NoteColumns.ID, mId);
- note.put(NoteColumns.TYPE, mType);
- note.put(NoteColumns.SNIPPET, mSnippet);
- js.put(GTaskStringUtils.META_HEAD_NOTE, note);
- }
-
- return js;
- } catch (JSONException e) {
- Log.e(TAG, e.toString());
- e.printStackTrace();
- }
- return null;
- }
-
- public void setParentId(long id) {
- // 设置父级ID
- mParentId = id;
- mDiffNoteValues.put(NoteColumns.PARENT_ID, id);
- }
-
- public void setGtaskId(String gid) {
- // 设置任务ID
- mDiffNoteValues.put(NoteColumns.GTASK_ID, gid);
- }
-
- public void setSyncId(long syncId) {
- // 设置同步ID
- mDiffNoteValues.put(NoteColumns.SYNC_ID, syncId);
- }
-
- public void resetLocalModified() {
- // 重置本地修改标志
- mDiffNoteValues.put(NoteColumns.LOCAL_MODIFIED, 0);
- }
-
- public long getId() {
- // 获取ID
- return mId;
- }
-
- public long getParentId() {
- // 获取父级ID
- return mParentId;
- }
-
- public String getSnippet() {
- // 获取摘要
- return mSnippet;
- }
-
- public boolean isNoteType() {
- // 判断是否是Note类型
- return mType == Notes.TYPE_NOTE;
- }
-
- public void commit(boolean validateVersion) {
- // 提交更改
- if (mIsCreate) {
- // 如果是新创建的对象
- if (mId == INVALID_ID && mDiffNoteValues.containsKey(NoteColumns.ID)) {
- mDiffNoteValues.remove(NoteColumns.ID);
- }
-
- // 向数据库中插入新的记录,并获取插入的ID
- Uri uri = mContentResolver.insert(Notes.CONTENT_NOTE_URI, mDiffNoteValues);
- try {
- mId = Long.valueOf(uri.getPathSegments().get(1));
- } catch (NumberFormatException e) {
- Log.e(TAG, "Get note id error :" + e.toString());
- throw new ActionFailureException("create note failed");
- }
- if (mId == 0) {
- throw new IllegalStateException("Create thread id failed");
- }
-
- if (mType == Notes.TYPE_NOTE) {
- // 如果是Note类型,提交每个数据对象的更改
- for (SqlData sqlData : mDataList) {
- sqlData.commit(mId, false, -1);
- }
- }
- } else {
- // 如果不是新创建的对象
- if (mId <= 0 && mId != Notes.ID_ROOT_FOLDER && mId != Notes.ID_CALL_RECORD_FOLDER) {
- Log.e(TAG, "No such note");
- throw new IllegalStateException("Try to update note with invalid id");
- }
- if (mDiffNoteValues.size() > 0) {
- mVersion++;
- int result = 0;
- if (!validateVersion) {
- // 根据ID更新数据库中的记录
- result = mContentResolver.update(Notes.CONTENT_NOTE_URI, mDiffNoteValues, "("
- + NoteColumns.ID + "=?)", new String[]{String.valueOf(mId)});
- } else {
- // 根据ID和版本号更新数据库中的记录
- result = mContentResolver.update(Notes.CONTENT_NOTE_URI, mDiffNoteValues, "("
- + NoteColumns.ID + "=?) AND (" + NoteColumns.VERSION + "<=?)",
- new String[]{String.valueOf(mId), String.valueOf(mVersion)});
- }
- if (result == 0) {
- Log.w(TAG, "there is no update. maybe user updates note when syncing");
- }
- }
-
- if (mType == Notes.TYPE_NOTE) {
- // 如果是Note类型,提交每个数据对象的更改
- for (SqlData sqlData : mDataList) {
- sqlData.commit(mId, validateVersion, mVersion);
- }
- }
- }
-
- // 刷新本地信息
- loadFromCursor(mId);
- if (mType == Notes.TYPE_NOTE)
- loadDataContent();
-
- mDiffNoteValues.clear();
- mIsCreate = false;
- }
-}
diff --git a/xiaomi/app/src/main/java/net/micode/notes/gtask/remote/GTaskASyncTask.java b/xiaomi/app/src/main/java/net/micode/notes/gtask/remote/GTaskASyncTask.java
deleted file mode 100644
index f82ad1a..0000000
--- a/xiaomi/app/src/main/java/net/micode/notes/gtask/remote/GTaskASyncTask.java
+++ /dev/null
@@ -1,126 +0,0 @@
-
-/*
- * 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.gtask.remote;
-
-import android.annotation.SuppressLint;
-import android.app.Notification;
-import android.app.NotificationManager;
-import android.app.PendingIntent;
-import android.content.Context;
-import android.content.Intent;
-import android.os.AsyncTask;
-
-import net.micode.notes.R;
-import net.micode.notes.ui.NotesListActivity;
-import net.micode.notes.ui.NotesPreferenceActivity;
-
-
-public class GTaskASyncTask extends AsyncTask {
-
- public interface OnCompleteListener { // 定义一个回调接口,用于任务完成时的通知
- void onComplete();
- }
-
- @SuppressLint("StaticFieldLeak")
- private final Context mContext; // 上下文对象
-
- private final NotificationManager mNotifiManager; // 通知管理器对象
-
- private final GTaskManager mTaskManager; // GTaskManager对象,用于执行后台任务
-
- private final OnCompleteListener mOnCompleteListener; // 完成监听器对象
-
- public GTaskASyncTask(Context context, OnCompleteListener listener) { // 构造函数,接收上下文对象和完成监听器对象
- mContext = context;
- mOnCompleteListener = listener;
- mNotifiManager = (NotificationManager) mContext
- .getSystemService(Context.NOTIFICATION_SERVICE); // 获取通知管理器实例
- mTaskManager = GTaskManager.getInstance(); // 获取GTaskManager实例
- }
-
- public void cancelSync() { // 取消同步操作
- mTaskManager.cancelSync();
- }
-
- public void publishProgess(String message) { // 发布任务进度
- publishProgress(message);
- }
-
- private void showNotification(int tickerId, String content) { // 显示通知
- PendingIntent pendingIntent;
- if (tickerId != R.string.ticker_success) { // 如果tickerId不是成功的标识
- pendingIntent = PendingIntent.getActivity(mContext, 0, new Intent(mContext,
- NotesPreferenceActivity.class), 0); // 创建一个打开NotesPreferenceActivity的PendingIntent
- } else {
- pendingIntent = PendingIntent.getActivity(mContext, 0, new Intent(mContext,
- NotesListActivity.class), 0); // 创建一个打开NotesListActivity的PendingIntent
- }
-
- Notification.Builder builder = new Notification.Builder(mContext)
- .setAutoCancel(true)
- .setContentTitle(mContext.getString(R.string.app_name)) // 设置通知标题为应用名称
- .setContentText(content) // 设置通知内容
- .setContentIntent(pendingIntent) // 设置通知点击事件的PendingIntent
- .setWhen(System.currentTimeMillis())
- .setOngoing(true); // 设置通知为常驻通知
- Notification notification=builder.getNotification(); // 创建通知对象
- // GTASK_SYNC_NOTIFICATION_ID为通知的ID
- int GTASK_SYNC_NOTIFICATION_ID = 5234235;
- mNotifiManager.notify(GTASK_SYNC_NOTIFICATION_ID, notification); // 发送通知
- }
-
- @Override
- protected Integer doInBackground(Void... unused) { // 后台任务的执行方法
- publishProgess(mContext.getString(R.string.sync_progress_login, NotesPreferenceActivity
- .getSyncAccountName(mContext))); // 发布进度,显示登录中的进度信息
- return mTaskManager.sync(mContext, this); // 执行同步操作并返回结果
- }
-
- @Override
- protected void onProgressUpdate(String... progress) { // 进度更新时的回调方法
- showNotification(R.string.ticker_syncing, progress[0]); // 显示同步中的通知,并将进度信息作为内容
- if (mContext instanceof GTaskSyncService) { // 如果上下文对象是GTaskSyncService的实例
- ((GTaskSyncService) mContext).sendBroadcast(progress[0]); // 发送广播,通知进度更新
- }
- }
-
- @Override
- protected void onPostExecute(Integer result) { // 后台任务执行完成后的回调方法
- if (result == GTaskManager.STATE_SUCCESS) { // 如果执行结果是成功的状态
- showNotification(R.string.ticker_success, mContext.getString(
- R.string.success_sync_account, mTaskManager.getSyncAccount())); // 显示同步成功的通知,并将同步账户信息作为内容
- NotesPreferenceActivity.setLastSyncTime(mContext, System.currentTimeMillis()); // 更新最后同步时间
- } else if (result == GTaskManager.STATE_NETWORK_ERROR) { // 如果执行结果是网络错误的状态
- showNotification(R.string.ticker_fail, mContext.getString(R.string.error_sync_network)); // 显示同步失败的通知,并将网络错误信息作为内容
- } else if (result == GTaskManager.STATE_INTERNAL_ERROR) { // 如果执行结果是内部错误的状态
- showNotification(R.string.ticker_fail, mContext.getString(R.string.error_sync_internal)); // 显示同步失败的通知,并将内部错误信息作为内容
- } else if (result == GTaskManager.STATE_SYNC_CANCELLED) { // 如果执行结果是同步被取消的状态
- showNotification(R.string.ticker_cancel, mContext
- .getString(R.string.error_sync_cancelled)); // 显示同步被取消的通知,并将取消信息作为内容
- }
- if (mOnCompleteListener != null) { // 如果完成监听器对象不为空
- new Thread(new Runnable() { // 创建新线程
-
- public void run() {
- mOnCompleteListener.onComplete(); // 调用完成监听器的回调方法
- }
- }).start(); // 启动线程
- }
- }
-}
-
diff --git a/xiaomi/app/src/main/java/net/micode/notes/model/Note.java b/xiaomi/app/src/main/java/net/micode/notes/model/Note.java
deleted file mode 100644
index 818c1af..0000000
--- a/xiaomi/app/src/main/java/net/micode/notes/model/Note.java
+++ /dev/null
@@ -1,336 +0,0 @@
-/*
- * 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.model;
-import android.content.ContentProviderOperation;
-import android.content.ContentProviderResult;
-import android.content.ContentUris;
-import android.content.ContentValues;
-import android.content.Context;
-import android.content.OperationApplicationException;
-import android.net.Uri;
-import android.os.RemoteException;
-import android.util.Log;
-
-import net.micode.notes.data.Notes;
-import net.micode.notes.data.Notes.CallNote;
-import net.micode.notes.data.Notes.DataColumns;
-import net.micode.notes.data.Notes.NoteColumns;
-import net.micode.notes.data.Notes.TextNote;
-
-import java.util.ArrayList;
-
-
-public class Note {
- private ContentValues mNoteDiffValues; // 用于存储笔记的差异值
- private NoteData mNoteData; // 笔记的数据
- private static final String TAG = "Note"; // 日志标签
-
- /**
- * 为添加新笔记到数据库创建一个新的笔记 ID
- *
- * @param context 上下文
- * @param folderId 笔记所属文件夹的 ID
- * @return 新创建的笔记 ID
- */
- public static synchronized long getNewNoteId(Context context, long folderId) {
- // 在数据库中创建新笔记
- ContentValues values = new ContentValues();
- long createdTime = System.currentTimeMillis();
- values.put(NoteColumns.CREATED_DATE, createdTime);
- values.put(NoteColumns.MODIFIED_DATE, createdTime);
- values.put(NoteColumns.TYPE, Notes.TYPE_NOTE);
- values.put(NoteColumns.LOCAL_MODIFIED, 1);
- values.put(NoteColumns.PARENT_ID, folderId);
- Uri uri = context.getContentResolver().insert(Notes.CONTENT_NOTE_URI, values);
-
- long noteId = 0;
- try {
- noteId = Long.valueOf(uri.getPathSegments().get(1));
- } catch (NumberFormatException e) {
- Log.e(TAG, "Get note id error :" + e.toString());
- noteId = 0;
- }
- if (noteId == -1) {
- throw new IllegalStateException("Wrong note id:" + noteId);
- }
- return noteId;
- }
-
- public Note() {
- mNoteDiffValues = new ContentValues();
- mNoteData = new NoteData();
- }
-
- /**
- * 设置笔记的键值对数据
- *
- * @param key 键
- * @param value 值
- */
- public void setNoteValue(String key, String value) {
- mNoteDiffValues.put(key, value);
- mNoteDiffValues.put(NoteColumns.LOCAL_MODIFIED, 1);
- mNoteDiffValues.put(NoteColumns.MODIFIED_DATE, System.currentTimeMillis());
- }
-
- /**
- * 设置文本数据的键值对
- *
- * @param key 键
- * @param value 值
- */
- public void setTextData(String key, String value) {
- mNoteData.setTextData(key, value);
- }
-
- /**
- * 设置文本数据的 ID
- *
- * @param id 文本数据的 ID
- */
- public void setTextDataId(long id) {
- mNoteData.setTextDataId(id);
- }
-
- /**
- * 获取文本数据的 ID
- *
- * @return 文本数据的 ID
- */
- public long getTextDataId() {
- return mNoteData.mTextDataId;
- }
-
- /**
- * 设置通话数据的 ID
- *
- * @param id 通话数据的 ID
- */
- public void setCallDataId(long id) {
- mNoteData.setCallDataId(id);
- }
-
- /**
- * 设置通话数据的键值对
- *
- * @param key 键
- * @param value 值
- */
- public void setCallData(String key, String value) {
- mNoteData.setCallData(key, value);
- }
-
- /**
- * 检查笔记是否有本地修改
- *
- * @return 如果有本地修改,则返回 true;否则返回 false
- */
- public boolean isLocalModified() {
- return mNoteDiffValues.size() > 0 || mNoteData.isLocalModified();
- }
-
- /**
- * 同步笔记到数据库
- *
- * @param context 上下文
- * @param noteId 笔记的 ID
- * @return 同步成功返回 true,否则返回 false
- */
- public boolean syncNote(Context context, long noteId) {
- if (noteId <= 0) {
- throw new IllegalArgumentException("Wrong note id:" + noteId);
- }
-
- if (!isLocalModified()) {
- return true;
- }
-
- /**
- * 理论上,一旦数据发生更改,笔记应该在 {@link NoteColumns#LOCAL_MODIFIED} 和
- * {@link NoteColumns#MODIFIED_DATE} 上进行更新。为了数据的安全性,即使更新笔记失败,我们也会更新笔记数据信息。
- */
- if (context.getContentResolver().update(
- ContentUris.withAppendedId(Notes.CONTENT_NOTE_URI, noteId), mNoteDiffValues, null,
- null) == 0) {
- Log.e(TAG, "Update note error, should not happen");
- // 不返回,继续执行
- }
- mNoteDiffValues.clear();
-
- if (mNoteData.isLocalModified()
- && (mNoteData.pushIntoContentResolver(context, noteId) == null)) {
- return false;
- }
-
- return true;
- }
-
- private class NoteData {
- private long mTextDataId; // 文本数据的 ID
-
- private ContentValues mTextDataValues; // 存储文本数据的差异值
-
- private long mCallDataId; // 通话数据的 ID
-
- private ContentValues mCallDataValues; // 存储通话数据的差异值
-
- private static final String TAG = "NoteData";
-
- public NoteData() {
- mTextDataValues = new ContentValues();
- mCallDataValues = new ContentValues();
- mTextDataId = 0;
- mCallDataId = 0;
- }
-
- /**
- * 检查数据是否有本地修改
- *
- * @return 如果有本地修改,则返回 true;否则返回 false
- */
- boolean isLocalModified() {
- return mTextDataValues.size() > 0 || mCallDataValues.size() > 0;
- }
-
- /**
- * 设置文本数据的 ID
- *
- * @param id 文本数据的 ID
- */
- void setTextDataId(long id) {
- if (id <= 0) {
- throw new IllegalArgumentException("Text data id should larger than 0");
- }
- mTextDataId = id;
- }
-
- /**
- * 设置通话数据的 ID
- *
- * @param id 通话数据的 ID
- */
- void setCallDataId(long id) {
- if (id <= 0) {
- throw new IllegalArgumentException("Call data id should larger than 0");
- }
- mCallDataId = id;
- }
-
- /**
- * 设置通话数据的键值对
- *
- * @param key 键
- * @param value 值
- */
- void setCallData(String key, String value) {
- mCallDataValues.put(key, value);
- mNoteDiffValues.put(NoteColumns.LOCAL_MODIFIED, 1);
- mNoteDiffValues.put(NoteColumns.MODIFIED_DATE, System.currentTimeMillis());
- }
-
- /**
- * 设置文本数据的键值对
- *
- * @param key 键
- * @param value 值
- */
- void setTextData(String key, String value) {
- mTextDataValues.put(key, value);
- mNoteDiffValues.put(NoteColumns.LOCAL_MODIFIED, 1);
- mNoteDiffValues.put(NoteColumns.MODIFIED_DATE, System.currentTimeMillis());
- }
-
- /**
- * 将数据插入到内容提供程序中
- *
- * @param context 上下文
- * @param noteId 笔记的 ID
- * @return 插入成功返回笔记的 URI,否则返回 null
- */
- Uri pushIntoContentResolver(Context context, long noteId) {
- /**
- * 检查安全性
- */
- if (noteId <= 0) {
- throw new IllegalArgumentException("Wrong note id:" + noteId);
- }
-
- ArrayList operationList = new ArrayList();
- ContentProviderOperation.Builder builder = null;
-
- if (mTextDataValues.size() > 0) {
- mTextDataValues.put(DataColumns.NOTE_ID, noteId);
- if (mTextDataId == 0) {
- mTextDataValues.put(DataColumns.MIME_TYPE, TextNote.CONTENT_ITEM_TYPE);
- Uri uri = context.getContentResolver().insert(Notes.CONTENT_DATA_URI,
- mTextDataValues);
- try {
- setTextDataId(Long.valueOf(uri.getPathSegments().get(1)));
- } catch (NumberFormatException e) {
- Log.e(TAG, "Insert new text data fail with noteId" + noteId);
- mTextDataValues.clear();
- return null;
- }
- } else {
- builder = ContentProviderOperation.newUpdate(ContentUris.withAppendedId(
- Notes.CONTENT_DATA_URI, mTextDataId));
- builder.withValues(mTextDataValues);
- operationList.add(builder.build());
- }
- mTextDataValues.clear();
- }
-
- if (mCallDataValues.size() > 0) {
- mCallDataValues.put(DataColumns.NOTE_ID, noteId);
- if (mCallDataId == 0) {
- mCallDataValues.put(DataColumns.MIME_TYPE, CallNote.CONTENT_ITEM_TYPE);
- Uri uri = context.getContentResolver().insert(Notes.CONTENT_DATA_URI,
- mCallDataValues);
- try {
- setCallDataId(Long.valueOf(uri.getPathSegments().get(1)));
- } catch (NumberFormatException e) {
- Log.e(TAG, "Insert new call data fail with noteId" + noteId);
- mCallDataValues.clear();
- return null;
- }
- } else {
- builder = ContentProviderOperation.newUpdate(ContentUris.withAppendedId(
- Notes.CONTENT_DATA_URI, mCallDataId));
- builder.withValues(mCallDataValues);
- operationList.add(builder.build());
- }
- mCallDataValues.clear();
- }
-
- if (operationList.size() > 0) {
- try {
- ContentProviderResult[] results = context.getContentResolver().applyBatch(
- Notes.AUTHORITY, operationList);
- return (results == null || results.length == 0 || results[0] == null) ? null
- : ContentUris.withAppendedId(Notes.CONTENT_NOTE_URI, noteId);
- } catch (RemoteException e) {
- Log.e(TAG, String.format("%s: %s", e.toString(), e.getMessage()));
- return null;
- } catch (OperationApplicationException e) {
- Log.e(TAG, String.format("%s: %s", e.toString(), e.getMessage()));
- return null;
- }
- }
- return null;
- }
- }
-}
diff --git a/xiaomi/app/src/main/java/net/micode/notes/model/WorkingNote.java b/xiaomi/app/src/main/java/net/micode/notes/model/WorkingNote.java
deleted file mode 100644
index d17e54c..0000000
--- a/xiaomi/app/src/main/java/net/micode/notes/model/WorkingNote.java
+++ /dev/null
@@ -1,368 +0,0 @@
-/*
- * 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.model;
-
-import android.appwidget.AppWidgetManager;
-import android.content.ContentUris;
-import android.content.Context;
-import android.database.Cursor;
-import android.text.TextUtils;
-import android.util.Log;
-
-import net.micode.notes.data.Notes;
-import net.micode.notes.data.Notes.CallNote;
-import net.micode.notes.data.Notes.DataColumns;
-import net.micode.notes.data.Notes.DataConstants;
-import net.micode.notes.data.Notes.NoteColumns;
-import net.micode.notes.data.Notes.TextNote;
-import net.micode.notes.tool.ResourceParser.NoteBgResources;
-
-
-
-public class WorkingNote {
- // 工作笔记的注释
- private Note mNote; // 笔记
- private long mNoteId; // 笔记ID
- public String mContent; // 笔记内容
- private int mMode; // 笔记模式
-
- private long mAlertDate;
-
- private long mModifiedDate;
-
- private int mBgColorId;
-
- private int mWidgetId;
-
- private int mWidgetType;
-
- private long mFolderId;
-
- private Context mContext;
-
- private static final String TAG = "WorkingNote";
-
- private boolean mIsDeleted;
-
- private NoteSettingChangedListener mNoteSettingStatusListener;
-
- public static final String[] DATA_PROJECTION = new String[] {
- DataColumns.ID,
- DataColumns.CONTENT,
- DataColumns.MIME_TYPE,
- DataColumns.DATA1,
- DataColumns.DATA2,
- DataColumns.DATA3,
- DataColumns.DATA4,
- };
-
- public static final String[] NOTE_PROJECTION = new String[] {
- NoteColumns.PARENT_ID,
- NoteColumns.ALERTED_DATE,
- NoteColumns.BG_COLOR_ID,
- NoteColumns.WIDGET_ID,
- NoteColumns.WIDGET_TYPE,
- NoteColumns.MODIFIED_DATE
- };
-
- private static final int DATA_ID_COLUMN = 0;
-
- private static final int DATA_CONTENT_COLUMN = 1;
-
- private static final int DATA_MIME_TYPE_COLUMN = 2;
-
- private static final int DATA_MODE_COLUMN = 3;
-
- private static final int NOTE_PARENT_ID_COLUMN = 0;
-
- private static final int NOTE_ALERTED_DATE_COLUMN = 1;
-
- private static final int NOTE_BG_COLOR_ID_COLUMN = 2;
-
- private static final int NOTE_WIDGET_ID_COLUMN = 3;
-
- private static final int NOTE_WIDGET_TYPE_COLUMN = 4;
-
- private static final int NOTE_MODIFIED_DATE_COLUMN = 5;
-
- // New note construct
- private WorkingNote(Context context, long folderId) {
- mContext = context;
- mAlertDate = 0;
- mModifiedDate = System.currentTimeMillis();
- mFolderId = folderId;
- mNote = new Note();
- mNoteId = 0;
- mIsDeleted = false;
- mMode = 0;
- mWidgetType = Notes.TYPE_WIDGET_INVALIDE;
- }
-
- // Existing note construct
- private WorkingNote(Context context, long noteId, long folderId) {
- mContext = context; // 设置上下文对象
- mNoteId = noteId; // 设置笔记ID
- mFolderId = folderId; // 设置文件夹ID
- mIsDeleted = false; // 设置删除标志为否
- mNote = new Note(); // 创建笔记对象
- loadNote(); // 加载笔记
- }
-
- private void loadNote() {
- Cursor cursor = mContext.getContentResolver().query(
- ContentUris.withAppendedId(Notes.CONTENT_NOTE_URI, mNoteId), NOTE_PROJECTION, null,
- null, null); // 查询笔记表
-
- if (cursor != null) { // 如果查询结果不为空
- if (cursor.moveToFirst()) { // 如果有第一条记录
- mFolderId = cursor.getLong(NOTE_PARENT_ID_COLUMN); // 获取父ID
- mBgColorId = cursor.getInt(NOTE_BG_COLOR_ID_COLUMN); // 获取背景颜色编号
- mWidgetId = cursor.getInt(NOTE_WIDGET_ID_COLUMN); // 获取小部件编号
- mWidgetType = cursor.getInt(NOTE_WIDGET_TYPE_COLUMN); // 获取小部件类型
- mAlertDate = cursor.getLong(NOTE_ALERTED_DATE_COLUMN); // 获取提醒日期
- mModifiedDate = cursor.getLong(NOTE_MODIFIED_DATE_COLUMN); // 获取修改日期
- }
- cursor.close(); // 关闭游标
- } else { // 如果查询结果为空
- Log.e(TAG, "No note with id:" + mNoteId); // 打印错误日志
- throw new IllegalArgumentException("Unable to find note with id " + mNoteId); // 抛出异常
- }
- loadNoteData(); // 加载笔记数据
- }
-
- private void loadNoteData() {
- Cursor cursor = mContext.getContentResolver().query(Notes.CONTENT_DATA_URI, DATA_PROJECTION,
- DataColumns.NOTE_ID + "=?", new String[] {
- String.valueOf(mNoteId)
- }, null); // 查询数据表
-
- if (cursor != null) { // 如果查询结果不为空
- if (cursor.moveToFirst()) { // 如果有第一条记录
- do {
- String type = cursor.getString(DATA_MIME_TYPE_COLUMN); // 获取MIME类型
- if (DataConstants.NOTE.equals(type)) { // 如果是普通笔记类型
- mContent = cursor.getString(DATA_CONTENT_COLUMN); // 获取内容
- mMode = cursor.getInt(DATA_MODE_COLUMN); // 获取模式
- mNote.setTextDataId(cursor.getLong(DATA_ID_COLUMN)); // 获取数据ID
- } else if (DataConstants.CALL_NOTE.equals(type)) { // 如果是通话笔记类型
- mNote.setCallDataId(cursor.getLong(DATA_ID_COLUMN)); // 获取数据ID
- } else { // 如果是其他类型
- Log.d(TAG, "Wrong note type with type:" + type); // 打印调试日志
- }
- } while (cursor.moveToNext()); // 循环遍历所有记录
- }
- cursor.close(); // 关闭游标
- } else { // 如果查询结果为空
- Log.e(TAG, "No data with id:" + mNoteId); // 打印错误日志
- throw new IllegalArgumentException("Unable to find note's data with id " + mNoteId); // 抛出异常
- }
- }
-
- public static WorkingNote createEmptyNote(Context context, long folderId, int widgetId,
- int widgetType, int defaultBgColorId) {
- WorkingNote note = new WorkingNote(context, folderId); // 创建一个新的工作笔记对象
- note.setBgColorId(defaultBgColorId); // 设置笔记的背景颜色编号
- note.setWidgetId(widgetId); // 设置笔记的小部件编号
- note.setWidgetType(widgetType); // 设置笔记的小部件类型
- return note; // 返回工作笔记对象
- }
-
- public static WorkingNote load(Context context, long id) {
- return new WorkingNote(context, id, 0); // 根据ID加载一个工作笔记对象
- }
-
- public synchronized boolean saveNote() {
- if (isWorthSaving()) { // 如果笔记值得保存
- if (!existInDatabase()) { // 如果笔记不存在于数据库中
- if ((mNoteId = Note.getNewNoteId(mContext, mFolderId)) == 0) { // 如果获取新的笔记ID失败
- Log.e(TAG, "Create new note fail with id:" + mNoteId); // 打印错误日志
- return false; // 返回保存失败
- }
- }
-
- mNote.syncNote(mContext, mNoteId); // 同步笔记到数据库
-
- /**
- * Update widget content if there exist any widget of this note
- */
- if (mWidgetId != AppWidgetManager.INVALID_APPWIDGET_ID
- && mWidgetType != Notes.TYPE_WIDGET_INVALIDE
- && mNoteSettingStatusListener != null) { // 如果有小部件存在并且有设置监听器
- mNoteSettingStatusListener.onWidgetChanged(); // 通知小部件变化
- }
- return true; // 返回保存成功
- } else { // 如果笔记不值得保存
- return false; // 返回保存失败
- }
- }
-
- public boolean existInDatabase() {
- return mNoteId > 0; // 判断笔记是否存在于数据库中,根据ID是否大于0
- }
-
- private boolean isWorthSaving() {
- if (mIsDeleted || (!existInDatabase() && TextUtils.isEmpty(mContent))
- || (existInDatabase() && !mNote.isLocalModified())) { // 如果笔记被删除,或者不存在于数据库且内容为空,或者存在于数据库但没有本地修改
- return false; // 返回不值得保存
- } else { // 否则
- return true; // 返回值得保存
- }
- }
-
- public void setOnSettingStatusChangedListener(NoteSettingChangedListener l) {
- mNoteSettingStatusListener = l; // 设置笔记设置变化的监听器
- }
-
- public void setAlertDate(long date, boolean set) {
- if (date != mAlertDate) { // 如果日期不等于当前的提醒日期
- mAlertDate = date; // 更新提醒日期
- mNote.setNoteValue(NoteColumns.ALERTED_DATE, String.valueOf(mAlertDate)); // 设置笔记的提醒日期值
- }
- if (mNoteSettingStatusListener != null) { // 如果有设置监听器
- mNoteSettingStatusListener.onClockAlertChanged(date, set); // 通知时钟提醒变化
- }
- }
-
- public void markDeleted(boolean mark) {
- mIsDeleted = mark; // 设置删除标志为参数值
- if (mWidgetId != AppWidgetManager.INVALID_APPWIDGET_ID
- && mWidgetType != Notes.TYPE_WIDGET_INVALIDE && mNoteSettingStatusListener != null) { // 如果有小部件存在并且有设置监听器
- mNoteSettingStatusListener.onWidgetChanged(); // 通知小部件变化
- }
- }
-
-
- public void setBgColorId(int id) {
- if (id != mBgColorId) {
- mBgColorId = id;
- if (mNoteSettingStatusListener != null) {
- mNoteSettingStatusListener.onBackgroundColorChanged();
- }
- mNote.setNoteValue(NoteColumns.BG_COLOR_ID, String.valueOf(id));
- }
- }
-
- public void setCheckListMode(int mode) {
- if (mMode != mode) {
- if (mNoteSettingStatusListener != null) {
- mNoteSettingStatusListener.onCheckListModeChanged(mMode, mode);
- }
- mMode = mode;
- mNote.setTextData(TextNote.MODE, String.valueOf(mMode));
- }
- }
-
- public void setWidgetType(int type) {
- if (type != mWidgetType) {
- mWidgetType = type;
- mNote.setNoteValue(NoteColumns.WIDGET_TYPE, String.valueOf(mWidgetType));
- }
- }
-
- public void setWidgetId(int id) {
- if (id != mWidgetId) {
- mWidgetId = id;
- mNote.setNoteValue(NoteColumns.WIDGET_ID, String.valueOf(mWidgetId));
- }
- }
-
- public void setWorkingText(String text) {
- if (!TextUtils.equals(mContent, text)) { // 如果文本不等于当前的内容
- mContent = text; // 更新内容
- mNote.setTextData(DataColumns.CONTENT, mContent); // 设置笔记的文本数据
- }
- }
-
- public void convertToCallNote(String phoneNumber, long callDate) {
- mNote.setCallData(CallNote.CALL_DATE, String.valueOf(callDate)); // 设置笔记的通话日期数据
- mNote.setCallData(CallNote.PHONE_NUMBER, phoneNumber); // 设置笔记的电话号码数据
- mNote.setNoteValue(NoteColumns.PARENT_ID, String.valueOf(Notes.ID_CALL_RECORD_FOLDER)); // 设置笔记的父ID为通话记录文件夹
- }
-
- public boolean hasClockAlert() {
- return (mAlertDate > 0 ? true : false); // 判断是否有时钟提醒,根据提醒日期是否大于0
- }
-
- public String getContent() {
- return mContent; // 返回内容
- }
-
- public long getAlertDate() {
- return mAlertDate; // 返回提醒日期
- }
-
- public long getModifiedDate() {
- return mModifiedDate; // 返回修改日期
- }
-
- public int getBgColorResId() {
- return NoteBgResources.getNoteBgResource(mBgColorId); // 返回背景颜色资源ID,根据背景颜色编号
- }
-
- public int getBgColorId() {
- return mBgColorId; // 返回背景颜色编号
- }
-
- public int getTitleBgResId() {
- return NoteBgResources.getNoteTitleBgResource(mBgColorId); // 返回标题背景资源ID,根据背景颜色编号
- }
-
- public int getCheckListMode() {
- return mMode; // 返回清单模式
- }
-
- public long getNoteId() {
- return mNoteId; // 返回笔记ID
- }
-
- public long getFolderId() {
- return mFolderId; // 返回文件夹ID
- }
-
- public int getWidgetId() {
- return mWidgetId; // 返回小部件ID
- }
-
- public int getWidgetType() {
- return mWidgetType; // 返回小部件类型
- }
-
- public interface NoteSettingChangedListener { // 笔记设置变化的监听器接口
- /**
- * Called when the background color of current note has just changed
- */
- void onBackgroundColorChanged(); // 当笔记的背景颜色刚刚改变时调用
-
- /**
- * Called when user set clock
- */
- void onClockAlertChanged(long date, boolean set); // 当用户设置时钟时调用
-
- /**
- * Call when user create note from widget
- */
- void onWidgetChanged(); // 当用户从小部件创建笔记时调用
-
- /**
- * Call when switch between check list mode and normal mode
- * @param oldMode is previous mode before change
- * @param newMode is new mode
- */
- void onCheckListModeChanged(int oldMode, int newMode); // 当用户在清单模式和普通模式之间切换时调用
- }
-}
-
diff --git a/xiaomi/build.gradle b/xiaomi/build.gradle
deleted file mode 100644
index cdb59e3..0000000
--- a/xiaomi/build.gradle
+++ /dev/null
@@ -1,17 +0,0 @@
-// Top-level build file where you can add configuration options common to all sub-projects/modules.
-buildscript {
- repositories {
- google()
- jcenter()
- }
- dependencies {
- classpath 'com.android.tools.build:gradle:7.4.2'
- }
-}
-
-allprojects {
- repositories {
- google()
- jcenter()
- }
-}
diff --git a/xiaomi/httpcomponents-client-4.5.14-bin/LICENSE.txt b/xiaomi/httpcomponents-client-4.5.14-bin/LICENSE.txt
deleted file mode 100644
index 32f01ed..0000000
--- a/xiaomi/httpcomponents-client-4.5.14-bin/LICENSE.txt
+++ /dev/null
@@ -1,558 +0,0 @@
- Apache License
- Version 2.0, January 2004
- http://www.apache.org/licenses/
-
- TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
- 1. Definitions.
-
- "License" shall mean the terms and conditions for use, reproduction,
- and distribution as defined by Sections 1 through 9 of this document.
-
- "Licensor" shall mean the copyright owner or entity authorized by
- the copyright owner that is granting the License.
-
- "Legal Entity" shall mean the union of the acting entity and all
- other entities that control, are controlled by, or are under common
- control with that entity. For the purposes of this definition,
- "control" means (i) the power, direct or indirect, to cause the
- direction or management of such entity, whether by contract or
- otherwise, or (ii) ownership of fifty percent (50%) or more of the
- outstanding shares, or (iii) beneficial ownership of such entity.
-
- "You" (or "Your") shall mean an individual or Legal Entity
- exercising permissions granted by this License.
-
- "Source" form shall mean the preferred form for making modifications,
- including but not limited to software source code, documentation
- source, and configuration files.
-
- "Object" form shall mean any form resulting from mechanical
- transformation or translation of a Source form, including but
- not limited to compiled object code, generated documentation,
- and conversions to other media types.
-
- "Work" shall mean the work of authorship, whether in Source or
- Object form, made available under the License, as indicated by a
- copyright notice that is included in or attached to the work
- (an example is provided in the Appendix below).
-
- "Derivative Works" shall mean any work, whether in Source or Object
- form, that is based on (or derived from) the Work and for which the
- editorial revisions, annotations, elaborations, or other modifications
- represent, as a whole, an original work of authorship. For the purposes
- of this License, Derivative Works shall not include works that remain
- separable from, or merely link (or bind by name) to the interfaces of,
- the Work and Derivative Works thereof.
-
- "Contribution" shall mean any work of authorship, including
- the original version of the Work and any modifications or additions
- to that Work or Derivative Works thereof, that is intentionally
- submitted to Licensor for inclusion in the Work by the copyright owner
- or by an individual or Legal Entity authorized to submit on behalf of
- the copyright owner. For the purposes of this definition, "submitted"
- means any form of electronic, verbal, or written communication sent
- to the Licensor or its representatives, including but not limited to
- communication on electronic mailing lists, source code control systems,
- and issue tracking systems that are managed by, or on behalf of, the
- Licensor for the purpose of discussing and improving the Work, but
- excluding communication that is conspicuously marked or otherwise
- designated in writing by the copyright owner as "Not a Contribution."
-
- "Contributor" shall mean Licensor and any individual or Legal Entity
- on behalf of whom a Contribution has been received by Licensor and
- subsequently incorporated within the Work.
-
- 2. Grant of Copyright License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- copyright license to reproduce, prepare Derivative Works of,
- publicly display, publicly perform, sublicense, and distribute the
- Work and such Derivative Works in Source or Object form.
-
- 3. Grant of Patent License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- (except as stated in this section) patent license to make, have made,
- use, offer to sell, sell, import, and otherwise transfer the Work,
- where such license applies only to those patent claims licensable
- by such Contributor that are necessarily infringed by their
- Contribution(s) alone or by combination of their Contribution(s)
- with the Work to which such Contribution(s) was submitted. If You
- institute patent litigation against any entity (including a
- cross-claim or counterclaim in a lawsuit) alleging that the Work
- or a Contribution incorporated within the Work constitutes direct
- or contributory patent infringement, then any patent licenses
- granted to You under this License for that Work shall terminate
- as of the date such litigation is filed.
-
- 4. Redistribution. You may reproduce and distribute copies of the
- Work or Derivative Works thereof in any medium, with or without
- modifications, and in Source or Object form, provided that You
- meet the following conditions:
-
- (a) You must give any other recipients of the Work or
- Derivative Works a copy of this License; and
-
- (b) You must cause any modified files to carry prominent notices
- stating that You changed the files; and
-
- (c) You must retain, in the Source form of any Derivative Works
- that You distribute, all copyright, patent, trademark, and
- attribution notices from the Source form of the Work,
- excluding those notices that do not pertain to any part of
- the Derivative Works; and
-
- (d) If the Work includes a "NOTICE" text file as part of its
- distribution, then any Derivative Works that You distribute must
- include a readable copy of the attribution notices contained
- within such NOTICE file, excluding those notices that do not
- pertain to any part of the Derivative Works, in at least one
- of the following places: within a NOTICE text file distributed
- as part of the Derivative Works; within the Source form or
- documentation, if provided along with the Derivative Works; or,
- within a display generated by the Derivative Works, if and
- wherever such third-party notices normally appear. The contents
- of the NOTICE file are for informational purposes only and
- do not modify the License. You may add Your own attribution
- notices within Derivative Works that You distribute, alongside
- or as an addendum to the NOTICE text from the Work, provided
- that such additional attribution notices cannot be construed
- as modifying the License.
-
- You may add Your own copyright statement to Your modifications and
- may provide additional or different license terms and conditions
- for use, reproduction, or distribution of Your modifications, or
- for any such Derivative Works as a whole, provided Your use,
- reproduction, and distribution of the Work otherwise complies with
- the conditions stated in this License.
-
- 5. Submission of Contributions. Unless You explicitly state otherwise,
- any Contribution intentionally submitted for inclusion in the Work
- by You to the Licensor shall be under the terms and conditions of
- this License, without any additional terms or conditions.
- Notwithstanding the above, nothing herein shall supersede or modify
- the terms of any separate license agreement you may have executed
- with Licensor regarding such Contributions.
-
- 6. Trademarks. This License does not grant permission to use the trade
- names, trademarks, service marks, or product names of the Licensor,
- except as required for reasonable and customary use in describing the
- origin of the Work and reproducing the content of the NOTICE file.
-
- 7. Disclaimer of Warranty. Unless required by applicable law or
- agreed to in writing, Licensor provides the Work (and each
- Contributor provides its Contributions) on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
- implied, including, without limitation, any warranties or conditions
- of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
- PARTICULAR PURPOSE. You are solely responsible for determining the
- appropriateness of using or redistributing the Work and assume any
- risks associated with Your exercise of permissions under this License.
-
- 8. Limitation of Liability. In no event and under no legal theory,
- whether in tort (including negligence), contract, or otherwise,
- unless required by applicable law (such as deliberate and grossly
- negligent acts) or agreed to in writing, shall any Contributor be
- liable to You for damages, including any direct, indirect, special,
- incidental, or consequential damages of any character arising as a
- result of this License or out of the use or inability to use the
- Work (including but not limited to damages for loss of goodwill,
- work stoppage, computer failure or malfunction, or any and all
- other commercial damages or losses), even if such Contributor
- has been advised of the possibility of such damages.
-
- 9. Accepting Warranty or Additional Liability. While redistributing
- the Work or Derivative Works thereof, You may choose to offer,
- and charge a fee for, acceptance of support, warranty, indemnity,
- or other liability obligations and/or rights consistent with this
- License. However, in accepting such obligations, You may act only
- on Your own behalf and on Your sole responsibility, not on behalf
- of any other Contributor, and only if You agree to indemnify,
- defend, and hold each Contributor harmless for any liability
- incurred by, or claims asserted against, such Contributor by reason
- of your accepting any such warranty or additional liability.
-
- END OF TERMS AND CONDITIONS
-
-=========================================================================
-
-This project includes Public Suffix List copied from
-
-licensed under the terms of the Mozilla Public License, v. 2.0
-
-Full license text:
-
-Mozilla Public License Version 2.0
-==================================
-
-1. Definitions
---------------
-
-1.1. "Contributor"
- means each individual or legal entity that creates, contributes to
- the creation of, or owns Covered Software.
-
-1.2. "Contributor Version"
- means the combination of the Contributions of others (if any) used
- by a Contributor and that particular Contributor's Contribution.
-
-1.3. "Contribution"
- means Covered Software of a particular Contributor.
-
-1.4. "Covered Software"
- means Source Code Form to which the initial Contributor has attached
- the notice in Exhibit A, the Executable Form of such Source Code
- Form, and Modifications of such Source Code Form, in each case
- including portions thereof.
-
-1.5. "Incompatible With Secondary Licenses"
- means
-
- (a) that the initial Contributor has attached the notice described
- in Exhibit B to the Covered Software; or
-
- (b) that the Covered Software was made available under the terms of
- version 1.1 or earlier of the License, but not also under the
- terms of a Secondary License.
-
-1.6. "Executable Form"
- means any form of the work other than Source Code Form.
-
-1.7. "Larger Work"
- means a work that combines Covered Software with other material, in
- a separate file or files, that is not Covered Software.
-
-1.8. "License"
- means this document.
-
-1.9. "Licensable"
- means having the right to grant, to the maximum extent possible,
- whether at the time of the initial grant or subsequently, any and
- all of the rights conveyed by this License.
-
-1.10. "Modifications"
- means any of the following:
-
- (a) any file in Source Code Form that results from an addition to,
- deletion from, or modification of the contents of Covered
- Software; or
-
- (b) any new file in Source Code Form that contains any Covered
- Software.
-
-1.11. "Patent Claims" of a Contributor
- means any patent claim(s), including without limitation, method,
- process, and apparatus claims, in any patent Licensable by such
- Contributor that would be infringed, but for the grant of the
- License, by the making, using, selling, offering for sale, having
- made, import, or transfer of either its Contributions or its
- Contributor Version.
-
-1.12. "Secondary License"
- means either the GNU General Public License, Version 2.0, the GNU
- Lesser General Public License, Version 2.1, the GNU Affero General
- Public License, Version 3.0, or any later versions of those
- licenses.
-
-1.13. "Source Code Form"
- means the form of the work preferred for making modifications.
-
-1.14. "You" (or "Your")
- means an individual or a legal entity exercising rights under this
- License. For legal entities, "You" includes any entity that
- controls, is controlled by, or is under common control with You. For
- purposes of this definition, "control" means (a) the power, direct
- or indirect, to cause the direction or management of such entity,
- whether by contract or otherwise, or (b) ownership of more than
- fifty percent (50%) of the outstanding shares or beneficial
- ownership of such entity.
-
-2. License Grants and Conditions
---------------------------------
-
-2.1. Grants
-
-Each Contributor hereby grants You a world-wide, royalty-free,
-non-exclusive license:
-
-(a) under intellectual property rights (other than patent or trademark)
- Licensable by such Contributor to use, reproduce, make available,
- modify, display, perform, distribute, and otherwise exploit its
- Contributions, either on an unmodified basis, with Modifications, or
- as part of a Larger Work; and
-
-(b) under Patent Claims of such Contributor to make, use, sell, offer
- for sale, have made, import, and otherwise transfer either its
- Contributions or its Contributor Version.
-
-2.2. Effective Date
-
-The licenses granted in Section 2.1 with respect to any Contribution
-become effective for each Contribution on the date the Contributor first
-distributes such Contribution.
-
-2.3. Limitations on Grant Scope
-
-The licenses granted in this Section 2 are the only rights granted under
-this License. No additional rights or licenses will be implied from the
-distribution or licensing of Covered Software under this License.
-Notwithstanding Section 2.1(b) above, no patent license is granted by a
-Contributor:
-
-(a) for any code that a Contributor has removed from Covered Software;
- or
-
-(b) for infringements caused by: (i) Your and any other third party's
- modifications of Covered Software, or (ii) the combination of its
- Contributions with other software (except as part of its Contributor
- Version); or
-
-(c) under Patent Claims infringed by Covered Software in the absence of
- its Contributions.
-
-This License does not grant any rights in the trademarks, service marks,
-or logos of any Contributor (except as may be necessary to comply with
-the notice requirements in Section 3.4).
-
-2.4. Subsequent Licenses
-
-No Contributor makes additional grants as a result of Your choice to
-distribute the Covered Software under a subsequent version of this
-License (see Section 10.2) or under the terms of a Secondary License (if
-permitted under the terms of Section 3.3).
-
-2.5. Representation
-
-Each Contributor represents that the Contributor believes its
-Contributions are its original creation(s) or it has sufficient rights
-to grant the rights to its Contributions conveyed by this License.
-
-2.6. Fair Use
-
-This License is not intended to limit any rights You have under
-applicable copyright doctrines of fair use, fair dealing, or other
-equivalents.
-
-2.7. Conditions
-
-Sections 3.1, 3.2, 3.3, and 3.4 are conditions of the licenses granted
-in Section 2.1.
-
-3. Responsibilities
--------------------
-
-3.1. Distribution of Source Form
-
-All distribution of Covered Software in Source Code Form, including any
-Modifications that You create or to which You contribute, must be under
-the terms of this License. You must inform recipients that the Source
-Code Form of the Covered Software is governed by the terms of this
-License, and how they can obtain a copy of this License. You may not
-attempt to alter or restrict the recipients' rights in the Source Code
-Form.
-
-3.2. Distribution of Executable Form
-
-If You distribute Covered Software in Executable Form then:
-
-(a) such Covered Software must also be made available in Source Code
- Form, as described in Section 3.1, and You must inform recipients of
- the Executable Form how they can obtain a copy of such Source Code
- Form by reasonable means in a timely manner, at a charge no more
- than the cost of distribution to the recipient; and
-
-(b) You may distribute such Executable Form under the terms of this
- License, or sublicense it under different terms, provided that the
- license for the Executable Form does not attempt to limit or alter
- the recipients' rights in the Source Code Form under this License.
-
-3.3. Distribution of a Larger Work
-
-You may create and distribute a Larger Work under terms of Your choice,
-provided that You also comply with the requirements of this License for
-the Covered Software. If the Larger Work is a combination of Covered
-Software with a work governed by one or more Secondary Licenses, and the
-Covered Software is not Incompatible With Secondary Licenses, this
-License permits You to additionally distribute such Covered Software
-under the terms of such Secondary License(s), so that the recipient of
-the Larger Work may, at their option, further distribute the Covered
-Software under the terms of either this License or such Secondary
-License(s).
-
-3.4. Notices
-
-You may not remove or alter the substance of any license notices
-(including copyright notices, patent notices, disclaimers of warranty,
-or limitations of liability) contained within the Source Code Form of
-the Covered Software, except that You may alter any license notices to
-the extent required to remedy known factual inaccuracies.
-
-3.5. Application of Additional Terms
-
-You may choose to offer, and to charge a fee for, warranty, support,
-indemnity or liability obligations to one or more recipients of Covered
-Software. However, You may do so only on Your own behalf, and not on
-behalf of any Contributor. You must make it absolutely clear that any
-such warranty, support, indemnity, or liability obligation is offered by
-You alone, and You hereby agree to indemnify every Contributor for any
-liability incurred by such Contributor as a result of warranty, support,
-indemnity or liability terms You offer. You may include additional
-disclaimers of warranty and limitations of liability specific to any
-jurisdiction.
-
-4. Inability to Comply Due to Statute or Regulation
----------------------------------------------------
-
-If it is impossible for You to comply with any of the terms of this
-License with respect to some or all of the Covered Software due to
-statute, judicial order, or regulation then You must: (a) comply with
-the terms of this License to the maximum extent possible; and (b)
-describe the limitations and the code they affect. Such description must
-be placed in a text file included with all distributions of the Covered
-Software under this License. Except to the extent prohibited by statute
-or regulation, such description must be sufficiently detailed for a
-recipient of ordinary skill to be able to understand it.
-
-5. Termination
---------------
-
-5.1. The rights granted under this License will terminate automatically
-if You fail to comply with any of its terms. However, if You become
-compliant, then the rights granted under this License from a particular
-Contributor are reinstated (a) provisionally, unless and until such
-Contributor explicitly and finally terminates Your grants, and (b) on an
-ongoing basis, if such Contributor fails to notify You of the
-non-compliance by some reasonable means prior to 60 days after You have
-come back into compliance. Moreover, Your grants from a particular
-Contributor are reinstated on an ongoing basis if such Contributor
-notifies You of the non-compliance by some reasonable means, this is the
-first time You have received notice of non-compliance with this License
-from such Contributor, and You become compliant prior to 30 days after
-Your receipt of the notice.
-
-5.2. If You initiate litigation against any entity by asserting a patent
-infringement claim (excluding declaratory judgment actions,
-counter-claims, and cross-claims) alleging that a Contributor Version
-directly or indirectly infringes any patent, then the rights granted to
-You by any and all Contributors for the Covered Software under Section
-2.1 of this License shall terminate.
-
-5.3. In the event of termination under Sections 5.1 or 5.2 above, all
-end user license agreements (excluding distributors and resellers) which
-have been validly granted by You or Your distributors under this License
-prior to termination shall survive termination.
-
-************************************************************************
-* *
-* 6. Disclaimer of Warranty *
-* ------------------------- *
-* *
-* Covered Software is provided under this License on an "as is" *
-* basis, without warranty of any kind, either expressed, implied, or *
-* statutory, including, without limitation, warranties that the *
-* Covered Software is free of defects, merchantable, fit for a *
-* particular purpose or non-infringing. The entire risk as to the *
-* quality and performance of the Covered Software is with You. *
-* Should any Covered Software prove defective in any respect, You *
-* (not any Contributor) assume the cost of any necessary servicing, *
-* repair, or correction. This disclaimer of warranty constitutes an *
-* essential part of this License. No use of any Covered Software is *
-* authorized under this License except under this disclaimer. *
-* *
-************************************************************************
-
-************************************************************************
-* *
-* 7. Limitation of Liability *
-* -------------------------- *
-* *
-* Under no circumstances and under no legal theory, whether tort *
-* (including negligence), contract, or otherwise, shall any *
-* Contributor, or anyone who distributes Covered Software as *
-* permitted above, be liable to You for any direct, indirect, *
-* special, incidental, or consequential damages of any character *
-* including, without limitation, damages for lost profits, loss of *
-* goodwill, work stoppage, computer failure or malfunction, or any *
-* and all other commercial damages or losses, even if such party *
-* shall have been informed of the possibility of such damages. This *
-* limitation of liability shall not apply to liability for death or *
-* personal injury resulting from such party's negligence to the *
-* extent applicable law prohibits such limitation. Some *
-* jurisdictions do not allow the exclusion or limitation of *
-* incidental or consequential damages, so this exclusion and *
-* limitation may not apply to You. *
-* *
-************************************************************************
-
-8. Litigation
--------------
-
-Any litigation relating to this License may be brought only in the
-courts of a jurisdiction where the defendant maintains its principal
-place of business and such litigation shall be governed by laws of that
-jurisdiction, without reference to its conflict-of-law provisions.
-Nothing in this Section shall prevent a party's ability to bring
-cross-claims or counter-claims.
-
-9. Miscellaneous
-----------------
-
-This License represents the complete agreement concerning the subject
-matter hereof. If any provision of this License is held to be
-unenforceable, such provision shall be reformed only to the extent
-necessary to make it enforceable. Any law or regulation which provides
-that the language of a contract shall be construed against the drafter
-shall not be used to construe this License against a Contributor.
-
-10. Versions of the License
----------------------------
-
-10.1. New Versions
-
-Mozilla Foundation is the license steward. Except as provided in Section
-10.3, no one other than the license steward has the right to modify or
-publish new versions of this License. Each version will be given a
-distinguishing version number.
-
-10.2. Effect of New Versions
-
-You may distribute the Covered Software under the terms of the version
-of the License under which You originally received the Covered Software,
-or under the terms of any subsequent version published by the license
-steward.
-
-10.3. Modified Versions
-
-If you create software not governed by this License, and you want to
-create a new license for such software, you may create and use a
-modified version of this License if you rename the license and remove
-any references to the name of the license steward (except to note that
-such modified license differs from this License).
-
-10.4. Distributing Source Code Form that is Incompatible With Secondary
-Licenses
-
-If You choose to distribute Source Code Form that is Incompatible With
-Secondary Licenses under the terms of this version of the License, the
-notice described in Exhibit B of this License must be attached.
-
-Exhibit A - Source Code Form License Notice
--------------------------------------------
-
- This Source Code Form is subject to the terms of the Mozilla Public
- License, v. 2.0. If a copy of the MPL was not distributed with this
- file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-If it is not possible or desirable to put the notice in a particular
-file, then You may include the notice in a location (such as a LICENSE
-file in a relevant directory) where a recipient would be likely to look
-for such a notice.
-
-You may add additional accurate notices of copyright ownership.
-
-Exhibit B - "Incompatible With Secondary Licenses" Notice
----------------------------------------------------------
-
- This Source Code Form is "Incompatible With Secondary Licenses", as
- defined by the Mozilla Public License, v. 2.0.
diff --git a/xiaomi/httpcomponents-client-4.5.14-bin/NOTICE.txt b/xiaomi/httpcomponents-client-4.5.14-bin/NOTICE.txt
deleted file mode 100644
index 10a2916..0000000
--- a/xiaomi/httpcomponents-client-4.5.14-bin/NOTICE.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-Apache HttpComponents Client
-Copyright 1999-2021 The Apache Software Foundation
-
-This product includes software developed at
-The Apache Software Foundation (http://www.apache.org/).
-
diff --git a/xiaomi/httpcomponents-client-4.5.14-bin/RELEASE_NOTES.txt b/xiaomi/httpcomponents-client-4.5.14-bin/RELEASE_NOTES.txt
deleted file mode 100644
index c1f0a0f..0000000
--- a/xiaomi/httpcomponents-client-4.5.14-bin/RELEASE_NOTES.txt
+++ /dev/null
@@ -1,2613 +0,0 @@
-Release 4.5.14
--------------------
-
-This is a maintenance release that fixes several minor bugs reported discovered since
-the 4.5.13 release.
-
-
-Changelog:
--------------------
-
-* HTTPCLIENT-2206: Corrected resource de-allocation by fluent response objects.
- Contributed by Oleg Kalnichevski
-
-* HTTPCLIENT-2174: URIBuilder to return a new empty list instead of unmodifiable
- Collections#emptyList.
- Contributed by Oleg Kalnichevski
-
-* Don't retry requests in case of NoRouteToHostException.
- Contributed by Jaikiran Pai
-
-* HTTPCLIENT-2144: RequestBuilder fails to correctly copy charset of requests with
- form url-encoded body.
- Contributed by Oleg Kalnichevski
-
-* PR #269: 4.5.x use array fill and more.
- - Use Arrays.fill().
- - Remove redundant modifiers.
- - Use Collections.addAll() and Collection.addAll() APIs instead of loops.
- - Remove redundant returns.
- - No need to explicitly declare an array when calling a vararg method.
- - Remote extra semicolons (;).
- - Use a 'L' instead of 'l' to make long literals more readable.
- Contributed by Gary Gregory
-
-* PublicSuffixListParser.parseByType(Reader) allocates but does not use a 256 char
- StringBuilder.
- Contributed by Gary Gregory
-
-
-
-Release 4.5.13
--------------------
-
-This is a maintenance release that fixes incorrect handling of malformed authority component
-in request URIs.
-
-
-Changelog:
--------------------
-
-* Incorrect handling of malformed authority component by URIUtils#extractHost.
- Contributed by Oleg Kalnichevski
-
-* Avoid updating Content-Length header in a 304 response.
- Contributed by Dirk Henselin
-
-* Bug fix: BasicExpiresHandler is annotated as immutable but is not (#239)
- Contributed by Gary Gregory
-
-* HTTPCLIENT-2076: Fixed NPE in LaxExpiresHandler (#222).
- Contributed by heejeongkim
-
-
-Release 4.5.12
--------------------
-
-This is a maintenance release that fixes a regression introduced by the previous release
-that caused rejection of certificates with non-standard domains.
-
-Changelog:
--------------------
-
-* HTTPCLIENT-2053: Add SC_PERMANENT_REDIRECT (308) to DefaultRedirectStrategy
- Contributed by Michael Osipov
-
-* HTTPCLIENT-2052: Fixed redirection of entity enclosing requests with non-repeatable entities
- Contributed by Oleg Kalnichevski
-
-* HTTPCLIENT-2047: Fixed regression in DefaultHostnameVerifier causing rejection of certificates
- with non-standard domains.
- Contributed by Oleg Kalnichevski
-
-* Bug fix: Fixed handling of private domains by PublicSuffixMatcher
- Contributed by Oleg Kalnichevski
-
-
-Release 4.5.11
--------------------
-
-This is a maintenance release that fixes a number defects discovered since 4.5.10
-and upgrades HttpCore dependency to version 4.4.13.
-
-
-Changelog:
--------------------
-
-* Improved domain name normalization by DefaultHostnameVerifier.
- Contributed by Oleg Kalnichevski
-
-* HTTPCLIENT-2033: Connection managers to immediately shut down all leased connection upon shutdown.
- Contributed by Oleg Kalnichevski
-
-* HTTPCLIENT-2020: DefaultBackoffStrategy to support TOO_MANY_REQUESTS (429).
- Contributed by Michael Osipov
-
-* HTTPCLIENT-2030: Fixed PublicSuffixMatcher#getDomainRoot behavior with invalid hostnames.
- Contributed by Niels Basjes
-
-* HTTPCLIENT-2029: URIBuilder to support parsing of non-UTF8 URIs.
- Contributed by Oleg Kalnichevski
-
-* HTTPCLIENT-2026: Fixed URIBuilder#isOpaque() logic.
- Contributed by Oleg Kalnichevski
-
-* Updated text in pool stats description
- Contributed by chao chang
-
-* HTTPCLIENT-2023: Allow nested arrays and all primitive types in DefaultHttpCacheEntrySerializer.
- Contributed by Olof Larsson
-
-* Fixed fallback PublicSuffixMatcher instance.
- Contributed by Ryan Schmitt
-
-* Added family property #145.
- Contributed by behrangsa
-
-
-Release 4.5.10
--------------------
-
-This is a maintenance release that fixes a number defects discovered since 4.5.9
-and upgrades HttpCore dependency to version 4.4.12.
-
-
-Changelog:
--------------------
-
-* Refactor DefaultRedirectStrategy for subclassing.
- Contributed by Gary Gregory
-
-* Improved handling of request cancellation.
- Contributed by Oleg Kalnichevski
-
-* Fixed concurrent use of threading unsafe HttpUriRequest messages.
- Contributed by Oleg Kalnichevski
-
-* HTTPCLIENT-1997: Return the last domain segment instead of normalized domain name
- from PublicSuffixMatcher#getDomainRoot in case there is no match.
- Contributed by jeromedemangel
-
-* Preserve original encoding of the URI path component if the URI is valid.
- Contributed by Oleg Kalnichevski
-
-
-Release 4.5.9
--------------------
-
-This is a maintenance release that fixes a number defects discovered since 4.5.8.
-
-
-Changelog:
--------------------
-
-* HTTPCLIENT-1991: incorrect handling of non-standard DNS entries by PublicSuffixMatcher
- Contributed by Oleg Kalnichevski
-
-* Fix bug in URIBuilder#isPathEmpty method to verify if encodedPath is an empty string
- Contributed by Varun Nandi
-
-* HTTPCLIENT-1984: Add normalize URI to RequestConfig copy constructor
- Contributed by Matt Nelson
-
-* HTTPCLIENT-1976: Unsafe deserialization in DefaultHttpCacheEntrySerializer
- Contributed by Artem Smotrakov
-
-
-
-Release 4.5.8
--------------------
-
-This is a maintenance release that makes request URI normalization configurable on per request basis
-and also ports several improvements in URI handling from HttpCore master.
-
-
-Changelog:
--------------------
-
-* HTTPCLIENT-1969: Filter out weak cipher suites.
- Contributed by Artem Smotrakov
-
-* HTTPCLIENT-1968: Preserve escaped PATHSAFE characters when normalizing URI path segments.
- Contributed by Oleg Kalnichevski
-
-* HTTPCLIENT-1968: URIBuilder to split path component into path segments when digesting a URI
- (ported from HttpCore master).
- Contributed by Oleg Kalnichevski
-
-* Improved cache key generation (ported from HttpCore master).
- Contributed by Oleg Kalnichevski
-
-* HTTPCLIENT-1968: added utility methods to parse and format URI path segments (ported
- from HttpCore master).
- Contributed by Oleg Kalnichevski
-
-* HTTPCLIENT-1968: Make normalization of URI paths optional.
- Contributed by Tamas Cservenak
-
-* Some well known proxies respond with Content-Length=0, when returning 304. For robustness, always use the
- cached entity's content length, as modern browsers do.
- Contributed by Author: Jayson Raymond
-
-
-
-Release 4.5.7
--------------------
-
-This is a maintenance release that corrects Automatic-Module-Name definitions added in the previous
-release and fixes a number of minor defects discovered since 4.5.6.
-
-Please note that as of 4.4, HttpClient requires Java 1.6 or newer.
-
-Changelog:
--------------------
-
-* Upgraded HttpCore to version 4.4.11
- Contributed by Oleg Kalnichevski
-
-* HTTPCLIENT-1960: URIBuilder incorrect handling of multiple leading slashes in path component
- Contributed by Oleg Kalnichevski
-
-* HTTPCLIENT-1958: PoolingHttpClientConnectionManager to throw ExecutionException in case of a lease operation
- cancellation instead of InterruptedException.
- Contributed by Oleg Kalnichevski
-
-* HTTPCLIENT-1952: Allow default User Agent to be disabled.
- Contributed by Michael Osipov
-
-* HTTPCLIENT-1956: CONNECT overwrites the main request object in the HTTP context when requests are executed
- via a proxy tunnel.
- Contributed by Oleg Kalnichevski
-
-* HTTPCLIENT-1940: deprecated SSLSocketFactory made to rethrow SocketTimeoutException as
- ConnectTimeoutException for consistency with non-deprecated code.
- Contributed by Oleg Kalnichevski
-
-* Fixed regression in BasicCookieStore serialization.
- Contributed by Author: Mark Mielke
-
-* HTTPCLIENT-1929: Corrected Automatic-Module-Name entries for HttpClient Fluent, HttpClient Windows
- and HttpClient Cache.
- Contributed by Oleg Kalnichevski
-
-* HTTPCLIENT-1927: URLEncodedUtils#parse breaks at double quotes when parsing unquoted values.
- Contributed by Oleg Kalnichevski
-
-* HTTPCLIENT-1939: Update Apache Commons Codec from 1.10 to 1.11
- Contributed by Gary Gregory
-
-
-Release 4.5.6
--------------------
-
-This is a maintenance release that adds Automatic-Module-Name to the manifest for compatibility
-with Java 9 Platform Module System and fixes a number of issues discovered since 4.5.5
-
-Please note that as of 4.4, HttpClient requires Java 1.6 or newer.
-
-Changelog:
--------------------
-
-* [HTTPCLIENT-1882=: reset authentication state on I/O or runtime error for connection based
- authentication schemes (such as NTLM)
- Contributed by Oleg Kalnichevski
-
-* [HTTPCLIENT-1924]: HttpClient to shut down the connection manager if a fatal error occurs
- in the course of a request execution.
- Contributed by Oleg Kalnichevski
-
-* Add Automatic-Module-Name in manifest so Java9 modular applications can depend on this library
- Contributed by Varun Nandi
-
-* [HTTPCLIENT-1923]: fixed incorrect connection close on shutdown + fixed corresponding test
- Contributed by Aleksei Arsenev
-
-* [HTTPCLIENT-1906]: certificates containing alternative subject names other than DNS and IP
- (such as RFC822) get rejected as invalid
- Contributed by Oleg Kalnichevski
-
-* [HTTPCLIENT-1904]: check cookie domain for null
- Contributed by Hans-Peter Keck
-
-* [HTTPCLIENT-1900]: proxy protocol processor does not post-process CONNECT response messages
- Contributed by Oleg Kalnichevski
-
-* [HTTPCLIENT-1911]: Failing tests on Fedora 28 due to weak encryption algorithms in test
- keystore.
- Contributed by Gary Gregory and Michael Simacek
-
-
-Release 4.5.5
--------------------
-
-HttpClient 4.5.5 (GA) is a maintenance release that fixes a regression introduced
-by the previous release causing a NPE in SystemDefaultCredentialsProvider.
-
-Please note that as of 4.4, HttpClient requires Java 1.6 or newer.
-
-Changelog:
--------------------
-
-* [HTTPCLIENT-1690] Avoid merging Content-Encoding headers coming with 304 status to cache entry.
- Contributed by Sudheera Palihakkara
-
-* [HTTPCLIENT-1888] Regression in SystemDefaultCredentialsProvider#getCredentials causing NPE.
- Contributed by Oleg Kalnichevski
-
-* [HTTPCLIENT-1886] Update HttpClient 4.5.x from HttpCore 4.4.7 to 4.4.9
- Contributed by Gary Gregory
-
-* [HTTPCLIENT-1889] org.apache.http.client.utils.URLEncodedUtils.parse()
- should return a new ArrayList when there are no query parameters.
- Contributed by Gary Gregory
-
-
-Release 4.5.4
--------------------
-
-HttpClient 4.5.4 (GA) is a maintenance release that fixes a number of defects found since 4.5.3.
-
-Please note that as of 4.4, HttpClient requires Java 1.6 or newer.
-
-Changelog:
--------------------
-
-* [HTTPCLIENT-1883] SystemDefaultCredentialsProvider to use https.proxy* system properties
- for origins with port 443.
- Contributed by Oleg Kalnichevski
-
-* [HTTPCLIENT-1881] Allow truncated NTLM packets to work with this client.
- Contributed by Karl Wright
-
-* [HTTPCLIENT-1855] Disabled caching of DIGEST auth scheme instances due to unreliability of nonce counter
- when the auth cache is shared by multiple sessions.
- Contributed by Oleg Kalnichevski
-
-* BasicCookieStore uses a ReentrantReadWriteLock to avoid synchronization on #getCookies/#toString
- while maintaining thread safety.
- Contributed by Carter Kozak
-
-* [HTTPCLIENT-1865] DefaultServiceUnavailableRetryStrategy does not respect HttpEntity#isRepeatable.
- Contributed by Tomas Celaya
-
-* [HTTPCLIENT-1859] Encode Content-Disposition name and filename elements appropriately.
- Contributed by Karl Wright
-
-* Avoid fetching the cached entity twice on cache hit.
- Contributed by Leandro Nunes
-
-* [HTTPCLIENT-1835] #evictExpiredConnections no longer causes the #evictIdleConnections behaviour
- to be implicitly enabled.
- Contributed by Oleg Kalnichevski
-
-* [HTTPCLIENT-1831= URIBuilder should not prepend a leading slash to relative URIs.
- Contributed by Oleg Kalnichevski
-
-* [HTTPCLIENT-1833] Fix Windows Negotiate-NTLM handling of proxies.
- Contributed by Roman Stoffel
-
-* [HTTPCLIENT-1817] Add a "Trust All" TrustStrategy implementation.
- Contributed by Gary Gregory
-
-* [HTTPCLIENT-1816] Update Apache Commons Codec 1.9 to 1.10.
- Contributed by Gary Gregory
-
-* [HTTPCLIENT-1836] DefaultHostnameVerifier#getSubjectAltNames(X509Certificate) throws java.lang.ClassCastException.
- Contributed by Gary Gregory , Ilian Iliev
-
-* [HTTPCLIENT-1845]: Extract InputStreamFactory classes out of GzipDecompressingEntity and
- DeflateDecompressingEntity for reuse and to create less garbage.
- Contributed by Gary Gregory
-
-* [HTTPCLIENT-1847] Update Ehcache from 2.6.9 to 2.6.11.
- Contributed by Gary Gregory
-
-* [HTTPCLIENT-1848] Update spymemcached from 2.11.4 to 2.12.3.
- Contributed by Gary Gregory
-
-* [HTTPCLIENT-1849] Update JNA from 4.1.0 to 4.4.0.
- Contributed by Gary Gregory
-
-* [HTTPCLIENT-1850] Update SLF4J from 1.7.6 to 1.7.25.
- Contributed by Gary Gregory
-
-
-Release 4.5.3
--------------------
-
-HttpClient 4.5.3 (GA) is a maintenance release that fixes a number of defects found since 4.5.2.
-
-Please note that as of 4.4, HttpClient requires Java 1.6 or newer.
-
-Changelog:
--------------------
-
-* [HTTPCLIENT-1803] Improved handling of malformed paths by URIBuilder.
- Contributed by Oleg Kalnichevski
-
-* [HTTPCLIENT-1802] Do not attempt to match SSL host to subject CN if subject alternative name of any type are given.
- Contributed by Oleg Kalnichevski
-
-* [HTTPCLIENT-1788] RFC 6265 policy must not reject cookies with paths that are no prefix of the uri path.
- Contributed by Oleg Kalnichevski
-
-* [HTTPCLIENT-1792] SSLConnectionSocketFactory to throw SSLPeerUnverifiedException with a better error message
- when hostname verification fails.
- Contributed by Oleg Kalnichevski
-
-* [HTTPCLIENT-1779] [OSGi] support NTLM proxy authentication.
- Contributed by Julian Sedding
-
-* [HTTPCLIENT-1773] [OSGi] HttpProxyConfigurationActivator does not unregister HttpClientBuilderFactory.
- Contributed by Julian Sedding
-
-* [HTTPCLIENT-1771] improve OSGi webconsole display for org.apache.http.proxyconfigurator.
- Contributed by Julian Sedding
-
-* [HTTPCLIENT-1770] OSGi metatype for org.apache.http.proxyconfigurator missing factoryPid.
- Contributed by Julian Sedding
-
-* [HTTPCLIENT-1767] Null pointer dereference in EofSensorInputStream and ResponseEntityProxy.
- Contributed by Peter Ansell
-
-* Support changing system default ProxySelector.
- Contributed by Robin Stevens
-
-* All services registered in the OSGi service registry provide the whole bundle header dictionary as vendor
- property value.
- Contributed by Christoph Fiehe
-
-* [HTTPCLIENT-1750] OSGi support for CachingHttpClientBuilder.
- Contributed by Justin Edelson
-
-* [HTTPCLIENT-1749] OSGi client builder to use weak references to track HttpClient instances.
- Contributed by Justin Edelson
-
-* [HTTPCLIENT-1747] apply RequestConfig defaults when using HttpParams values in backward compatibility mode.
- Contributed by Oleg Kalnichevski
-
-* Override LaxRedirectStrategy's INSTANCE field.
- Contributed by Eric Wu
-
-* [HTTPCLIENT-1736] do not request cred delegation by default when using Kerberos auth.
- Contributed by Oleg Kalnichevski
-
-* [HTTPCLIENT-1744] normalize hostname and certificate CN when matching to CN.
- Contributed by Oleg Kalnichevski
-
-* [HTTPCLIENT-1732] SystemDefaultCredentialsProvider to take http.proxyHost and http.proxyPort system
- properties into account.
- Contributed by Oleg Kalnichevski
-
-* Revert "HTTPCLIENT-1712: SPNego schemes to take service scheme into account when generating auth token".
- Contributed by Oleg Kalnichevski
-
-* [HTTPCLIENT-1727] AbstractHttpClient#createClientConnectionManager does not account for context class loader.
- Contributed by Charles Allen
-
-* [HTTPCLIENT-1726:] Copy the SNI fix from SSLConnectionSocketFactory to the deprecated SSLSocketFactory class.
- Contributed by David Black
-
-
-Release 4.5.2
--------------------
-
-HttpClient 4.5.2 (GA) is a maintenance release that fixes a number of minor defects found since 4.5.1.
-
-Please note that as of 4.4, HttpClient requires Java 1.6 or newer.
-
-Changelog:
--------------------
-
-* [HTTPCLIENT-1710, HTTPCLIENT-1718, HTTPCLEINT-1719] OSGi container compatibility improvements.
- Contributed by 212427891
-
-* [HTTPCLIENT-1717] Make fluent API Content#Content(byte[], ContentType) public.
- Contributed by Cash Costello
-
-* [HTTPCLIENT-1715] NTLMEngineImpl#Type1Message not thread safe but declared as a constant.
- Contributed by Olivier Lafontaine , Gary Gregory
-
-* [HTTPCLIENT-1714] Add HttpClientBuilder#setDnsResolver(DnsResolver).
- Contributed by Alexis Thaveau
-
-* [HTTPCLIENT-1712] SPNego schemes to take service scheme into account when generating auth token.
- Contributed by Georg Romstorfer
-
-* [HTTPCLIENT-1700] Netscape draft, browser compatibility, RFC 2109, RFC 2965 and default cookie
- specs to ignore cookies with empty name for consistency with RFC 6265 specs.
- Contributed by Oleg Kalnichevski
-
-* [HTTPCLIENT-1704] IgnoreSpec#match to always return false.
- Contributed by Oleg Kalnichevski
-
-* [HTTPCLIENT-1550] Fixed 'deflate' zlib header check.
- Contributed by Oleg Kalnichevski
-
-* [HTTPCLIENT-1698] Fixed matching of IPv6 addresses by DefaultHostnameVerifier
- Contributed by Oleg Kalnichevski
-
-* [HTTPCLIENT-1695] RFC 6265 compliant cookie spec to ignore cookies with empty name / missing
- value.
- Contributed by Oleg Kalnichevski
-
-* [HTTPCLIENT-1216] Removed ThreadLocal subclass from DateUtils.
- Contributed by Jochen Kemnade
-
-* [HTTPCLIENT-1685] PublicSuffixDomainFilter to ignore local hosts and local domains.
- Contributed by Oleg Kalnichevski
-
-
-
-Release 4.5.1
--------------------
-
-HttpClient 4.5.1 (GA) is a maintenance release that fixes a number of minor defects found since 4.5.
-
-Please note that as of 4.4, HttpClient requires Java 1.6 or newer.
-
-Changelog:
--------------------
-
-* [HTTPCLIENT-1680] redirect of a POST request causes ClientProtocolException.
- Contributed by Oleg Kalnichevski
-
-* [HTTPCLIENT-1673] org.apache.http.entity.mime.content.* missing from OSGi exports.
- Contributed by Benson Margulies
-
-* [HTTPCLIENT-1668] Fluent request incorrectly handles connect timeout setting.
- Contributed by Oleg Kalnichevski
-
-* [HTTPCLIENT-1667] RequestBuilder does not take charset into account when creating
- UrlEncodedFormEntity.
- Contributed by Sergey Smith
-
-* [HTTPCLIENT-1655] HttpClient sends RST instead of FIN ACK sequence when using non-persistant
- connections.
- Contributed by Oleg Kalnichevski
-
-
-
-Release 4.5
--------------------
-
-HttpClient 4.5 (GA) is a minor feature release that includes several incremental enhancements
-to the exisitng functionality such as support for private domains in the Mozilla Public Suffix List.
-
-Changelog:
--------------------
-
-* Reduced default validate after inactivity setting from 5 sec to 2 sec
- Contributed by Oleg Kalnichevski
-
-* [HTTPCLIENT-1649] Fixed serialization of auth schemes
- Contributed by Oleg Kalnichevski
-
-* [HTTPCLIENT-1645]: Fluent requests to inherit config parameters of the executor.
- Contributed by Oleg Kalnichevski
-
-* [HTTPCLIENT-1640]: RFC6265 lax cookie policy fails to parse 'max-age' attribute.
- Contributed by Oleg Kalnichevski
-
-* [HTTPCLIENT-1633]: RFC6265CookieSpecProvider compatibility level setting has no effect.
- Contributed by Oleg Kalnichevski
-
-* [HTTPCLIENT-1613]: Support for private domains in Mozilla Public Suffix List.
- Contributed by Oleg Kalnichevski
-
-* [HTTPCLIENT-1651]: Add ability to disable content compression on a request basis
- Contributed by Michael Osipov
-
-* [HTTPCLIENT-1654]: Deprecate/remove RequestConfig#decompressionEnabled in favor of #contentCompressionEnabled
- Contributed by Michael Osipov
-
-
-
-Release 4.4.1
--------------------
-
-HttpClient 4.4.1 (GA) is a maintenance release that fixes a number of defects in new functionality
-introduced in version 4.4.
-
-Users of HttpClient 4.4 are encouraged to upgrade.
-
-Please note that as of 4.4, HttpClient requires Java 1.6 or newer.
-
-Changelog:
--------------------
-
-* Marked RFC 2109, RFC 2965, Netscape draft cookie specs as obsolete
- Contributed by Oleg Kalnichevski
-
-* [HTTPCLIENT-1633] RFC6265CookieSpecProvider compatibility level setting has no effect.
- Contributed by Oleg Kalnichevski
-
-* [HTTPCLIENT-1628]: Auth cache can fail when domain name contains uppercase characters.
- Contributed by Dennis Ju
-
-* [HTTPCLIENT-1609] Stale connection check in PoolingHttpClientConnectionManager has no effect.
- Internal connection pool does not correctly implement connection validation.
- Contributed by Charles Lip
-
-
-
-Release 4.4 Final
--------------------
-
-This is the first stable (GA) release of HttpClient 4.4. Notable features and enhancements included
-in 4.4 series are:
-
-* Support for the latest HTTP state management specification (RFC 6265). Please note that the old
-cookie policy is still used by default for compatibility reasons. RFC 6265 compliant cookie
-policies need to be explicitly configured by the user. Please also note that as of next feature
-release support for Netscape draft, RFC 2109 and RFC 2965 cookie policies will be deprecated
-and disabled by default. It is recommended to use RFC 6265 compliant policies for new applications
-unless compatibility with RFC 2109 and RFC 2965 is required and to migrate existing applications
-to the default cookie policy.
-
-* Enhanced, redesigned and rewritten default SSL hostname verifier with improved RFC 2818
-compliance
-
-* Default SSL hostname verifier and default cookie policy now validate certificate identity
-and cookie domain of origin against the public suffix list maintained by Mozilla.org
-
-
-* More efficient stale connection checking: indiscriminate connection checking which results
-in approximately 20 to 50 ms overhead per request has been deprecated in favor of conditional
-connection state validation (persistent connections are to be re-validated only if a specified
-period inactivity has elapsed)
-
-* Authentication cache thread-safety: authentication cache used by HttpClient is now thread-safe
-and can be shared by multiple threads in order to re-use authentication state for subsequent
-requests
-
-* Native Windows Negotiate and NTLM via SSPI through JNA: when running on Windows OS HttpClient
-configured to use native NTLM or SPNEGO authentication schemes can make use of platform specific
-functionality via JNA and current user credentials. This functionality is still considered
-experimental, known to have compatibility issues and subject to change without prior notice.
-Use at your discretion.
-
-This release also includes all fixes from the stable 4.3.x release branch.
-
-Please note that as of 4.4, HttpClient requires Java 1.6 or newer.
-
-
-Changelog:
--------------------
-
-* Support for the latest HTTP state management specification (RFC 6265).
- Contributed by Oleg Kalnichevski
-
-* [HTTPCLIENT-1515] Caching of responses to HEAD requests
- Contributed by Tyrone Cutajar and
- Francois-Xavier Bonnet
-
-* [HTTPCLIENT-1560] Native Windows auth improvements
- Contributed by Michael Osipov
-
-* Update Apache Commons Logging version from 1.1.3 to 1.2.
- Contributed by Gary Gregory
-
-* Update Apache Commons Codec version from 1.6 to 1.9.
- Contributed by Gary Gregory
-
-* Update Ehcache version from 2.2.0 to 2.6.9.
- Contributed by Gary Gregory
-
-* Update Ehcache version from 2.2.0 to 2.6.9.
- Contributed by Gary Gregory
-
-* Update Spymemcached version from 2.6 to 2.11.4.
- Contributed by Gary Gregory
-
-* Update SLF4J version from 1.5.11 to 1.7.7.
- Contributed by Gary Gregory
-
-
-
-
-
-Release 4.4 BETA1
--------------------
-
-This is the first BETA release of HttpClient 4.4. Notable features and enhancements included
-in 4.4 series are:
-
-* Enhanced redesigned and rewritten default SSL hostname verifier with improved RFC 2818
-compliance
-
-* Default SSL hostname verifier and default cookie policy now validate certificate identity
-and cookie domain of origin against the public suffix list maintained by Mozilla.org
-
-
-* Native windows Negotiate/NTLM via JNA: when running on Windows OS HttpClient configured to use
-native NTLM or SPNEGO authentication schemes can make use of platform specific functionality
-via JNA and current user system credentials
-
-* More efficient stale connection checking: indiscriminate connection checking which results
-in approximately 20 to 50 ms overhead per request has been deprecated in favor of conditional
-connection state validation (persistent connections are to be re-validated only if a specified
-period inactivity has elapsed)
-
-* Authentication cache thread-safety: authentication caches used by HttpClient is now thread-safe
-and can be shared by multiple threads in order to re-use authentication state for subsequent
-requests
-
-This release also includes all fixes from the stable 4.3.x release branch.
-
-Please note that as of 4.4, HttpClient requires Java 1.6 or newer.
-
-
-Changelog:
--------------------
-
-* [HTTPCLIENT-1547] HttpClient OSGi bundle doesn't import the package "javax.naming".
- Contributed by Willem Jiang
-
-* [HTTPCLIENT-1541] Use correct (HTTP/hostname) service principal name for Windows native
- Negotiate/NTLM auth schemes.
- Contributed by Ka-Lok Fung
-
-* Improved compliance with RFC 2818: default hostname verifier to ignore the common name of the
- certificate subject if alternative subject names (dNSName or iPAddress) are present.
- Contributed by Oleg Kalnichevski
-
-* [HTTPCLIENT-1540] Support delegated credentials (ISC_REQ_DELEGATE) by Native windows
- native Negotiate/NTLM auth schemes.
- Contributed by Ka-Lok Fung
-
-
-
-Release 4.4 ALPHA1
--------------------
-
-This is the first ALPHA release of HttpClient 4.4. Notable features and enhancements included
-in the 4.4 branch are:
-
-* More efficient stale connection checking: indiscriminate connection checking which results
-in approximately 20 to 50 ms overhead per request has been deprecated in favor of conditional
-connection state validation (persistent connections are to be re-validated only if a specified
-period inactivity has elapsed)
-
-* Native windows Negotiate/NTLM via JNA: when running on Windows OS HttpClient configured to use
-native NTLM or SPNEGO authentication schemes can make use of platform specific functionality
-via JNA and current user system credentials
-
-* Authentication cache thread-safety: authentication caches used by HttpClient is now thread-safe
-and can be shared by multiple threads in order to re-use authentication state for subsequent
-requests
-
-This release also includes all fixes from the stable 4.3.x release branch.
-
-Please note that as of 4.4, HttpClient requires Java 1.6 or newer.
-
-Please note that new features included in this release are still considered experimental and
-their API may change in the future 4.4 alpha and beta releases.
-
-
-Changelog:
--------------------
-
-* [HTTPCLIENT-1493] Indiscriminate connection checking has been deprecated in favor of conditional
- connection state validation. Persistent connections are to be re-validated only after a defined
- period inactivity prior to being leased to the consumer.
- Contributed by Oleg Kalnichevski
-
-* [HTTPCLIENT-1519] Use the original HttpHost instance passed as a parameter to
- HttpClient#execute when generating 'Host' request header.
- Contributed by Oleg Kalnichevski
-
-* [HTTPCLIENT-1491] Enable provision of Service Principal Name in Windows native
- auth scheme.
- Contributed by Malcolm Smith
-
-* [HTTPCLIENT-1403] Pluggable content decoders.
- Contributed by Oleg Kalnichevski
-
-* [HTTPCLIENT-1466] FileBodyPart#generateContentType() ignores custom ContentType values.
- Contributed by Oleg Kalnichevski
-
-* [HTTPCLIENT-1461] fixed performance degradation in gzip encoded content processing
- introduced by HTTPCLIENT-1432.
- Contributed by Oleg Kalnichevski
-
-* [HTTPCLIENT-1457] Incorrect handling of Windows (NT) credentials by
- SystemDefaultCredentialsProvider.
- Contributed by Oleg Kalnichevski
-
-* [HTTPCLIENT-1456] Request retrial after status 503 causes ClientProtocolException.
- Contributed by Oleg Kalnichevski
-
-* [HTTPCLIENT-1454] Make connection operator APIs public.
- Contributed by Tamas Cservenak
-
-* Update JUnit to version 4.11 from 4.9
- Contributed by Gary Gregory
-
-
-
-Release 4.3.4
--------------------
-
-HttpClient 4.3.4 (GA) is a maintenance release that improves performance in high concurrency
-scenarios. This version replaces dynamic proxies with custom proxy classes and eliminates thread
-contention in java.reflect.Proxy.newInstance() when leasing connections from the connection pool
-and processing response messages.
-
-
-Changelog:
--------------------
-
-* Replaced dynamic proxies with custom proxy classes to reduce thread contention.
- Contributed by Oleg Kalnichevski
-
-* [HTTPCLIENT-1484] GzipCompressingEntity should not close the underlying output stream
- if the entity has not been fully written out due to an exception.
- Contributed by Oleg Kalnichevski
-
-* [HTTPCLIENT-1474] Fixed broken entity enclosing requests in HC Fluent.
- Contributed by Oleg Kalnichevski
-
-* [HTTPCLIENT-1470] CachingExec(ClientExecChain, HttpCache, CacheConfig, AsynchronousValidator)
- throws NPE if config is null
-
-
-
-
-Release 4.3.3
--------------------
-
-HttpClient 4.3.3 (GA) is a bug fix release that fixes a regression introduced by the previous
-release causing a significant performance degradation in compressed content processing.
-
-Users of HttpClient 4.3 are encouraged to upgrade.
-
-Changelog:
--------------------
-
-* [HTTPCLIENT-1466] FileBodyPart#generateContentType() ignores custom ContentType values.
- Contributed by Oleg Kalnichevski
-
-* [HTTPCLIENT-1453] Thread safety regression in PoolingHttpClientConnectionManager
- #closeExpiredConnections that can lead to ConcurrentModificationException.
- Contributed by Oleg Kalnichevski
-
-* [HTTPCLIENT-1461] fixed performance degradation in compressed content processing
- introduced by HTTPCLIENT-1432.
- Contributed by Oleg Kalnichevski
-
-* [HTTPCLIENT-1457] Incorrect handling of Windows (NT) credentials by
- SystemDefaultCredentialsProvider.
- Contributed by Oleg Kalnichevski
-
-* [HTTPCLIENT-1456] Request retrial after status 503 causes ClientProtocolException.
- Contributed by Oleg Kalnichevski
-
-
-Release 4.3.2
--------------------
-
-HttpClient 4.3.2 (GA) is a maintenance release that delivers a number of improvements
-as well as bug fixes for issues reported since 4.3.1 release. SNI support for
-Oracle JRE 1.7+ is being among the most notable improvements.
-
-Users of HttpClient 4.3 are encouraged to upgrade.
-
-Changelog:
--------------------
-
-* [HTTPCLIENT-1447] Clients created with HttpClients.createMinimal do not work with absolute URIs
- Contributed by Joseph Walton
-
-* [HTTPCLIENT-1446] NTLM proxy + BASIC target auth fails with 'Unexpected state:
- MSG_TYPE3_GENERATED'.
- Contributed by Oleg Kalnichevski
-
-* [HTTPCLIENT-1443] HttpCache uses the physical host instead of the virtual host as a cache key.
- Contributed by Francois-Xavier Bonnet
-
-* [HTTPCLIENT-1442] Authentication header set by the user gets removed in case
- of proxy authentication (affects plan HTTP requests only).
- Contributed by Oleg Kalnichevski
-
-* [HTTPCLIENT-1441] Caching AsynchronousValidationRequest leaks connections.
- Contributed by Dominic Tootell
-
-* [HTTPCLIENT-1440] 'file' scheme in redirect location URI causes NPE.
- Contributed by James Leigh
-
-* [HTTPCLIENT-1437] Made Executor#execute thread safe.
- Contributed by Oleg Kalnichevski
-
-* [HTTPCLIENT-1119] SNI support (Oracle Java 1.7+ only).
- Contributed by Bruno Harbulot
-
-* [HTTPCLIENT-1435] Fluent Executor ignores custom request properties.
- Contributed by Oleg Kalnichevski
-
-* [HTTPCLIENT-1432] Lazy decompressing of HttpEntity#getContent() to avoid EOFException
- in case of an empty response with 'Content-Encoding: gzip' header.
- Contributed by Yihua Huang
-
-* [HTTPCLIENT-1431] (Regression) deprecated connection manager cannot be used with
- a custom LayeredSchemeSocketFactory.
- Contributed by Oleg Kalnichevski
-
-* [HTTPCLIENT-1425] Fixed socket closed exception thrown by caching HttpClient when the origin
- server sends a long chunked response.
- Contributed by James Leigh
-
-* [HTTPCLIENT-1417] Fixed NPE in BrowserCompatSpec#formatCookies caused by version 1
- cookies with null cookie value.
- Contributed by Oleg Kalnichevski
-
-* [HTTPCLIENT-1416] Fixed NPE in CachingHttpClientBuilder#build().
- Contributed by Oleg Kalnichevski
-
-
-
-Release 4.3.1
--------------------
-
-HttpClient 4.3.1 (GA) is a bug fix release that addresses a number of issues reported since
-release 4.3.
-
-Users of HttpClient 4.3 are strongly encouraged to upgrade.
-
-Changelog
--------------------
-
-* [HTTPCLIENT-1410] Browser compatible hostname verifier no longer rejects
- *.co., *.gov., *.info., etc as invalid.
- Contributed by Oleg Kalnichevski
-
-* Ensure X509HostnameVerifier is never null.
- Contributed by Oleg Kalnichevski
-
-* [HTTPCLIENT-1405] CONNECT HTTP/1.1 requests lack mandatory 'Host' header.
- Contributed by Oleg Kalnichevski
-
-* [HTTPCLIENT-1402] Cache default User-Agent value.
- Contributed by yuexiaojun
-
-* [HTTPCLIENT-1398] Fixed invalid OSGi metadata caused by corrupted Maven bundle plugin metadata.
- Contributed by Oleg Kalnichevski
-
-* [HTTPCLIENT-1399] Fixed NPE in RequestBuilder.
- Contributed by Oleg Kalnichevski
-
-
-
-
-Release 4.3 Final
--------------------
-
-This is the first stable (GA) release of HttpClient 4.3. The most notable enhancements included
-in this release are:
-
-* Support for Java 7 try-with-resources for resource management (connection release.)
-
-* Added fluent Builder classes for HttpEntity, HttpRequest, HttpClient and SSLContext instances.
-
-* Deprecation of preference and configuration API based on HttpParams interface in favor of
-constructor injection and plain configuration objects.
-
-* Reliance on object immutability instead of access synchronization for thread safety.
-Several old classes whose instances can be shared by multiple request exchanges have
-been replaced by immutable equivalents.
-
-* DefaultHttpClient, DecompressingHttpClient, CachingHttpClient and similar classes are
-deprecated in favor of builder classes that produce immutable HttpClient instances.
-
-* HttpClient builders now dynamically construct a request execution pipeline tailored
-specifically to the user configuration by physically excluding unnecessary protocol components.
-
-* There is now an option to construct a minimal HttpClient implementation that can only execute
-basic HTTP message exchanges without redirects, authentication, state management or proxy support.
-This feature might be of particular use in web crawler development.
-
-* There is now option to avoid strict URI syntax for request URIs by executing HTTP requests
-with an explicitly specified target host. HttpClient will no longer attempt to parse the request
-URI if it does not need to extract the target host from it.
-
-This release also includes all fixes from the stable 4.2.x release branch.
-
-
-Changelog
--------------------
-* [HTTPCLIENT-1371] Weak ETag Validation is Useful On PUT With If-Match
- Contributed by James Leigh