diff --git a/doc/实践三/登录交互图.vsdx b/doc/实践三/登录顺序图.vsdx
similarity index 100%
rename from doc/实践三/登录交互图.vsdx
rename to doc/实践三/登录顺序图.vsdx
diff --git a/doc/汇报结果/分工.docx b/doc/汇报结果/分工.docx
new file mode 100644
index 0000000..321a450
Binary files /dev/null and b/doc/汇报结果/分工.docx differ
diff --git a/doc/汇报结果/小米便签开源代码的泛读报告-模板 (1).docx b/doc/汇报结果/小米便签开源代码的泛读报告-模板 (1).docx
new file mode 100644
index 0000000..a044199
Binary files /dev/null and b/doc/汇报结果/小米便签开源代码的泛读报告-模板 (1).docx differ
diff --git a/doc/汇报结果/小米便签开源代码的质量分析报告-模板.docx b/doc/汇报结果/小米便签开源代码的质量分析报告-模板.docx
new file mode 100644
index 0000000..3fa8cd8
Binary files /dev/null and b/doc/汇报结果/小米便签开源代码的质量分析报告-模板.docx differ
diff --git a/doc/汇报结果/小米便签维护需求与设计方案-模板.docx b/doc/汇报结果/小米便签维护需求与设计方案-模板.docx
new file mode 100644
index 0000000..b4d3ad2
Binary files /dev/null and b/doc/汇报结果/小米便签维护需求与设计方案-模板.docx differ
diff --git a/doc/汇报结果/小米便签阅读与维护-汇报模板 (1).pptx b/doc/汇报结果/小米便签阅读与维护-汇报模板 (1).pptx
new file mode 100644
index 0000000..97fb201
Binary files /dev/null and b/doc/汇报结果/小米便签阅读与维护-汇报模板 (1).pptx differ
diff --git a/src/Notes-master3/.gradle/7.5/executionHistory/executionHistory.lock b/src/Notes-master3/.gradle/7.5/executionHistory/executionHistory.lock
deleted file mode 100644
index 0392cf9..0000000
Binary files a/src/Notes-master3/.gradle/7.5/executionHistory/executionHistory.lock and /dev/null differ
diff --git a/src/Notes-master3/.gradle/7.5/fileHashes/fileHashes.bin b/src/Notes-master3/.gradle/7.5/fileHashes/fileHashes.bin
deleted file mode 100644
index 8eed591..0000000
Binary files a/src/Notes-master3/.gradle/7.5/fileHashes/fileHashes.bin and /dev/null differ
diff --git a/src/Notes-master3/.gradle/7.5/fileHashes/fileHashes.lock b/src/Notes-master3/.gradle/7.5/fileHashes/fileHashes.lock
deleted file mode 100644
index cc3e662..0000000
Binary files a/src/Notes-master3/.gradle/7.5/fileHashes/fileHashes.lock and /dev/null differ
diff --git a/src/Notes-master3/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/src/Notes-master3/.gradle/buildOutputCleanup/buildOutputCleanup.lock
deleted file mode 100644
index 2bb10b7..0000000
Binary files a/src/Notes-master3/.gradle/buildOutputCleanup/buildOutputCleanup.lock and /dev/null differ
diff --git a/src/Notes-master3/.gradle/buildOutputCleanup/outputFiles.bin b/src/Notes-master3/.gradle/buildOutputCleanup/outputFiles.bin
deleted file mode 100644
index e8eefc9..0000000
Binary files a/src/Notes-master3/.gradle/buildOutputCleanup/outputFiles.bin and /dev/null differ
diff --git a/src/Notes-master3/.gradle/file-system.probe b/src/Notes-master3/.gradle/file-system.probe
deleted file mode 100644
index 9282449..0000000
Binary files a/src/Notes-master3/.gradle/file-system.probe and /dev/null differ
diff --git a/src/Notes-master3/.idea/deploymentTargetDropDown.xml b/src/Notes-master3/.idea/deploymentTargetDropDown.xml
deleted file mode 100644
index 9ab0eaf..0000000
--- a/src/Notes-master3/.idea/deploymentTargetDropDown.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="deploymentTargetDropDown">
-    <targetSelectedWithDropDown>
-      <Target>
-        <type value="QUICK_BOOT_TARGET" />
-        <deviceKey>
-          <Key>
-            <type value="VIRTUAL_DEVICE_PATH" />
-            <value value="C:\Users\王俊龙\.android\avd\Pixel_3_API_24.avd" />
-          </Key>
-        </deviceKey>
-      </Target>
-    </targetSelectedWithDropDown>
-<<<<<<< HEAD
-    <timeTargetWasSelectedWithDropDown value="2023-03-28T10:51:38.430158700Z" />
-=======
-    <timeTargetWasSelectedWithDropDown value="2023-04-07T09:01:01.813209800Z" />
->>>>>>> fc6c397b4d7cb3bef819bb2f46b3aab3cc752780
-  </component>
-</project>
\ No newline at end of file
diff --git a/src/Notes-master3/.idea/vcs.xml b/src/Notes-master3/.idea/vcs.xml
deleted file mode 100644
index b2bdec2..0000000
--- a/src/Notes-master3/.idea/vcs.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="VcsDirectoryMappings">
-    <mapping directory="$PROJECT_DIR$/../.." vcs="Git" />
-  </component>
-</project>
\ No newline at end of file
diff --git a/src/Notes-master3/.gradle/7.5/checksums/checksums.lock b/src/Notes-master3/Notes-master3/.gradle/7.5/checksums/checksums.lock
similarity index 100%
rename from src/Notes-master3/.gradle/7.5/checksums/checksums.lock
rename to src/Notes-master3/Notes-master3/.gradle/7.5/checksums/checksums.lock
diff --git a/src/Notes-master3/.gradle/7.5/checksums/md5-checksums.bin b/src/Notes-master3/Notes-master3/.gradle/7.5/checksums/md5-checksums.bin
similarity index 100%
rename from src/Notes-master3/.gradle/7.5/checksums/md5-checksums.bin
rename to src/Notes-master3/Notes-master3/.gradle/7.5/checksums/md5-checksums.bin
diff --git a/src/Notes-master3/.gradle/7.5/checksums/sha1-checksums.bin b/src/Notes-master3/Notes-master3/.gradle/7.5/checksums/sha1-checksums.bin
similarity index 100%
rename from src/Notes-master3/.gradle/7.5/checksums/sha1-checksums.bin
rename to src/Notes-master3/Notes-master3/.gradle/7.5/checksums/sha1-checksums.bin
diff --git a/src/Notes-master3/.gradle/7.5/dependencies-accessors/dependencies-accessors.lock b/src/Notes-master3/Notes-master3/.gradle/7.5/dependencies-accessors/dependencies-accessors.lock
similarity index 100%
rename from src/Notes-master3/.gradle/7.5/dependencies-accessors/dependencies-accessors.lock
rename to src/Notes-master3/Notes-master3/.gradle/7.5/dependencies-accessors/dependencies-accessors.lock
diff --git a/src/Notes-master3/.gradle/7.5/dependencies-accessors/gc.properties b/src/Notes-master3/Notes-master3/.gradle/7.5/dependencies-accessors/gc.properties
similarity index 100%
rename from src/Notes-master3/.gradle/7.5/dependencies-accessors/gc.properties
rename to src/Notes-master3/Notes-master3/.gradle/7.5/dependencies-accessors/gc.properties
diff --git a/src/Notes-master3/.gradle/7.5/executionHistory/executionHistory.bin b/src/Notes-master3/Notes-master3/.gradle/7.5/executionHistory/executionHistory.bin
similarity index 61%
rename from src/Notes-master3/.gradle/7.5/executionHistory/executionHistory.bin
rename to src/Notes-master3/Notes-master3/.gradle/7.5/executionHistory/executionHistory.bin
index 5582e53..13391c7 100644
Binary files a/src/Notes-master3/.gradle/7.5/executionHistory/executionHistory.bin and b/src/Notes-master3/Notes-master3/.gradle/7.5/executionHistory/executionHistory.bin differ
diff --git a/src/Notes-master3/Notes-master3/.gradle/7.5/executionHistory/executionHistory.lock b/src/Notes-master3/Notes-master3/.gradle/7.5/executionHistory/executionHistory.lock
new file mode 100644
index 0000000..01aeee5
Binary files /dev/null and b/src/Notes-master3/Notes-master3/.gradle/7.5/executionHistory/executionHistory.lock differ
diff --git a/src/Notes-master3/.gradle/7.5/fileChanges/last-build.bin b/src/Notes-master3/Notes-master3/.gradle/7.5/fileChanges/last-build.bin
similarity index 100%
rename from src/Notes-master3/.gradle/7.5/fileChanges/last-build.bin
rename to src/Notes-master3/Notes-master3/.gradle/7.5/fileChanges/last-build.bin
diff --git a/src/Notes-master3/Notes-master3/.gradle/7.5/fileHashes/fileHashes.bin b/src/Notes-master3/Notes-master3/.gradle/7.5/fileHashes/fileHashes.bin
new file mode 100644
index 0000000..36805e3
Binary files /dev/null and b/src/Notes-master3/Notes-master3/.gradle/7.5/fileHashes/fileHashes.bin differ
diff --git a/src/Notes-master3/Notes-master3/.gradle/7.5/fileHashes/fileHashes.lock b/src/Notes-master3/Notes-master3/.gradle/7.5/fileHashes/fileHashes.lock
new file mode 100644
index 0000000..9cc71ae
Binary files /dev/null and b/src/Notes-master3/Notes-master3/.gradle/7.5/fileHashes/fileHashes.lock differ
diff --git a/src/Notes-master3/.gradle/7.5/fileHashes/resourceHashesCache.bin b/src/Notes-master3/Notes-master3/.gradle/7.5/fileHashes/resourceHashesCache.bin
similarity index 57%
rename from src/Notes-master3/.gradle/7.5/fileHashes/resourceHashesCache.bin
rename to src/Notes-master3/Notes-master3/.gradle/7.5/fileHashes/resourceHashesCache.bin
index 3d3e915..c499637 100644
Binary files a/src/Notes-master3/.gradle/7.5/fileHashes/resourceHashesCache.bin and b/src/Notes-master3/Notes-master3/.gradle/7.5/fileHashes/resourceHashesCache.bin differ
diff --git a/src/Notes-master3/.gradle/7.5/gc.properties b/src/Notes-master3/Notes-master3/.gradle/7.5/gc.properties
similarity index 100%
rename from src/Notes-master3/.gradle/7.5/gc.properties
rename to src/Notes-master3/Notes-master3/.gradle/7.5/gc.properties
diff --git a/src/Notes-master3/Notes-master3/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/src/Notes-master3/Notes-master3/.gradle/buildOutputCleanup/buildOutputCleanup.lock
new file mode 100644
index 0000000..1b247dd
Binary files /dev/null and b/src/Notes-master3/Notes-master3/.gradle/buildOutputCleanup/buildOutputCleanup.lock differ
diff --git a/src/Notes-master3/.gradle/buildOutputCleanup/cache.properties b/src/Notes-master3/Notes-master3/.gradle/buildOutputCleanup/cache.properties
similarity index 100%
rename from src/Notes-master3/.gradle/buildOutputCleanup/cache.properties
rename to src/Notes-master3/Notes-master3/.gradle/buildOutputCleanup/cache.properties
diff --git a/src/Notes-master3/Notes-master3/.gradle/buildOutputCleanup/outputFiles.bin b/src/Notes-master3/Notes-master3/.gradle/buildOutputCleanup/outputFiles.bin
new file mode 100644
index 0000000..dbf0f2d
Binary files /dev/null and b/src/Notes-master3/Notes-master3/.gradle/buildOutputCleanup/outputFiles.bin differ
diff --git a/src/Notes-master3/Notes-master3/.gradle/file-system.probe b/src/Notes-master3/Notes-master3/.gradle/file-system.probe
new file mode 100644
index 0000000..f709581
Binary files /dev/null and b/src/Notes-master3/Notes-master3/.gradle/file-system.probe differ
diff --git a/src/Notes-master3/.gradle/vcs-1/gc.properties b/src/Notes-master3/Notes-master3/.gradle/vcs-1/gc.properties
similarity index 100%
rename from src/Notes-master3/.gradle/vcs-1/gc.properties
rename to src/Notes-master3/Notes-master3/.gradle/vcs-1/gc.properties
diff --git a/src/Notes-master3/.idea/.gitignore b/src/Notes-master3/Notes-master3/.idea/.gitignore
similarity index 100%
rename from src/Notes-master3/.idea/.gitignore
rename to src/Notes-master3/Notes-master3/.idea/.gitignore
diff --git a/src/Notes-master3/.idea/compiler.xml b/src/Notes-master3/Notes-master3/.idea/compiler.xml
similarity index 100%
rename from src/Notes-master3/.idea/compiler.xml
rename to src/Notes-master3/Notes-master3/.idea/compiler.xml
diff --git a/src/Notes-master3/.idea/gradle.xml b/src/Notes-master3/Notes-master3/.idea/gradle.xml
similarity index 80%
rename from src/Notes-master3/.idea/gradle.xml
rename to src/Notes-master3/Notes-master3/.idea/gradle.xml
index 6e5389e..a9f4e52 100644
--- a/src/Notes-master3/.idea/gradle.xml
+++ b/src/Notes-master3/Notes-master3/.idea/gradle.xml
@@ -1,13 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="GradleMigrationSettings" migrationVersion="1" />
   <component name="GradleSettings">
     <option name="linkedExternalProjectsSettings">
       <GradleProjectSettings>
         <option name="testRunner" value="GRADLE" />
         <option name="distributionType" value="DEFAULT_WRAPPED" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="gradleJvm" value="Android Studio default JDK" />
         <option name="modules">
           <set>
             <option value="$PROJECT_DIR$" />
diff --git a/src/Notes-master3/.idea/jarRepositories.xml b/src/Notes-master3/Notes-master3/.idea/jarRepositories.xml
similarity index 100%
rename from src/Notes-master3/.idea/jarRepositories.xml
rename to src/Notes-master3/Notes-master3/.idea/jarRepositories.xml
diff --git a/src/Notes-master3/.idea/misc.xml b/src/Notes-master3/Notes-master3/.idea/misc.xml
similarity index 75%
rename from src/Notes-master3/.idea/misc.xml
rename to src/Notes-master3/Notes-master3/.idea/misc.xml
index 5da8073..bdd9278 100644
--- a/src/Notes-master3/.idea/misc.xml
+++ b/src/Notes-master3/Notes-master3/.idea/misc.xml
@@ -1,7 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="ExternalStorageConfigurationManager" enabled="true" />
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_11" default="true" project-jdk-name="Android Studio default JDK" project-jdk-type="JavaSDK" />
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_11" default="true" project-jdk-name="Android Studio default JDK" project-jdk-type="JavaSDK">
+    <output url="file://$PROJECT_DIR$/build/classes" />
+  </component>
   <component name="ProjectType">
     <option name="id" value="Android" />
   </component>
diff --git a/src/Notes-master3/app/build.gradle b/src/Notes-master3/Notes-master3/app/build.gradle
similarity index 100%
rename from src/Notes-master3/app/build.gradle
rename to src/Notes-master3/Notes-master3/app/build.gradle
diff --git a/src/Notes-master3/app/build/generated/source/buildConfig/debug/net/micode/notes/BuildConfig.java b/src/Notes-master3/Notes-master3/app/build/generated/source/buildConfig/debug/net/micode/notes/BuildConfig.java
similarity index 100%
rename from src/Notes-master3/app/build/generated/source/buildConfig/debug/net/micode/notes/BuildConfig.java
rename to src/Notes-master3/Notes-master3/app/build/generated/source/buildConfig/debug/net/micode/notes/BuildConfig.java
diff --git a/src/Notes-master3/app/build/intermediates/annotation_processor_list/debug/annotationProcessors.json b/src/Notes-master3/Notes-master3/app/build/intermediates/annotation_processor_list/debug/annotationProcessors.json
similarity index 100%
rename from src/Notes-master3/app/build/intermediates/annotation_processor_list/debug/annotationProcessors.json
rename to src/Notes-master3/Notes-master3/app/build/intermediates/annotation_processor_list/debug/annotationProcessors.json
diff --git a/src/Notes-master3/Notes-master3/app/build/intermediates/apk/debug/app-debug.apk b/src/Notes-master3/Notes-master3/app/build/intermediates/apk/debug/app-debug.apk
new file mode 100644
index 0000000..b2e6ded
Binary files /dev/null and b/src/Notes-master3/Notes-master3/app/build/intermediates/apk/debug/app-debug.apk differ
diff --git a/src/Notes-master3/app/build/outputs/apk/debug/output-metadata.json b/src/Notes-master3/Notes-master3/app/build/intermediates/apk/debug/output-metadata.json
similarity index 100%
rename from src/Notes-master3/app/build/outputs/apk/debug/output-metadata.json
rename to src/Notes-master3/Notes-master3/app/build/intermediates/apk/debug/output-metadata.json
diff --git a/src/Notes-master3/Notes-master3/app/build/intermediates/apk_ide_redirect_file/debug/redirect.txt b/src/Notes-master3/Notes-master3/app/build/intermediates/apk_ide_redirect_file/debug/redirect.txt
new file mode 100644
index 0000000..46dacc6
--- /dev/null
+++ b/src/Notes-master3/Notes-master3/app/build/intermediates/apk_ide_redirect_file/debug/redirect.txt
@@ -0,0 +1,2 @@
+#- File Locator -
+listingFile=../../apk/debug/output-metadata.json
diff --git a/src/Notes-master3/app/build/intermediates/app_metadata/debug/app-metadata.properties b/src/Notes-master3/Notes-master3/app/build/intermediates/app_metadata/debug/app-metadata.properties
similarity index 100%
rename from src/Notes-master3/app/build/intermediates/app_metadata/debug/app-metadata.properties
rename to src/Notes-master3/Notes-master3/app/build/intermediates/app_metadata/debug/app-metadata.properties
diff --git a/src/Notes-master3/app/build/intermediates/compatible_screen_manifest/debug/output-metadata.json b/src/Notes-master3/Notes-master3/app/build/intermediates/compatible_screen_manifest/debug/output-metadata.json
similarity index 100%
rename from src/Notes-master3/app/build/intermediates/compatible_screen_manifest/debug/output-metadata.json
rename to src/Notes-master3/Notes-master3/app/build/intermediates/compatible_screen_manifest/debug/output-metadata.json
diff --git a/src/Notes-master3/Notes-master3/app/build/intermediates/compile_and_runtime_not_namespaced_r_class_jar/debug/R.jar b/src/Notes-master3/Notes-master3/app/build/intermediates/compile_and_runtime_not_namespaced_r_class_jar/debug/R.jar
new file mode 100644
index 0000000..9e23cc5
Binary files /dev/null and b/src/Notes-master3/Notes-master3/app/build/intermediates/compile_and_runtime_not_namespaced_r_class_jar/debug/R.jar differ
diff --git a/src/Notes-master3/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_2fcbdec2893b4b6441c5f27cd8642bbcdaefd5b736fb11cd588c534c69d24d0e_bucket_0/graph.bin b/src/Notes-master3/Notes-master3/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_0/graph.bin
similarity index 100%
rename from src/Notes-master3/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_2fcbdec2893b4b6441c5f27cd8642bbcdaefd5b736fb11cd588c534c69d24d0e_bucket_0/graph.bin
rename to src/Notes-master3/Notes-master3/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_0/graph.bin
diff --git a/src/Notes-master3/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_2fcbdec2893b4b6441c5f27cd8642bbcdaefd5b736fb11cd588c534c69d24d0e_bucket_1/graph.bin b/src/Notes-master3/Notes-master3/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_1/graph.bin
similarity index 100%
rename from src/Notes-master3/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_2fcbdec2893b4b6441c5f27cd8642bbcdaefd5b736fb11cd588c534c69d24d0e_bucket_1/graph.bin
rename to src/Notes-master3/Notes-master3/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_1/graph.bin
diff --git a/src/Notes-master3/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_2fcbdec2893b4b6441c5f27cd8642bbcdaefd5b736fb11cd588c534c69d24d0e_bucket_2/graph.bin b/src/Notes-master3/Notes-master3/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_2/graph.bin
similarity index 100%
rename from src/Notes-master3/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_2fcbdec2893b4b6441c5f27cd8642bbcdaefd5b736fb11cd588c534c69d24d0e_bucket_2/graph.bin
rename to src/Notes-master3/Notes-master3/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_2/graph.bin
diff --git a/src/Notes-master3/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_2fcbdec2893b4b6441c5f27cd8642bbcdaefd5b736fb11cd588c534c69d24d0e_bucket_3/graph.bin b/src/Notes-master3/Notes-master3/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_3/graph.bin
similarity index 100%
rename from src/Notes-master3/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_2fcbdec2893b4b6441c5f27cd8642bbcdaefd5b736fb11cd588c534c69d24d0e_bucket_3/graph.bin
rename to src/Notes-master3/Notes-master3/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_3/graph.bin
diff --git a/src/Notes-master3/Notes-master3/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_8a091fedea22d20d20bac079c45e96565b086402155df33678594459d2648d12_bucket_0/graph.bin b/src/Notes-master3/Notes-master3/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_8a091fedea22d20d20bac079c45e96565b086402155df33678594459d2648d12_bucket_0/graph.bin
new file mode 100644
index 0000000..601f245
Binary files /dev/null and b/src/Notes-master3/Notes-master3/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_8a091fedea22d20d20bac079c45e96565b086402155df33678594459d2648d12_bucket_0/graph.bin differ
diff --git a/src/Notes-master3/Notes-master3/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_8a091fedea22d20d20bac079c45e96565b086402155df33678594459d2648d12_bucket_1/graph.bin b/src/Notes-master3/Notes-master3/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_8a091fedea22d20d20bac079c45e96565b086402155df33678594459d2648d12_bucket_1/graph.bin
new file mode 100644
index 0000000..601f245
Binary files /dev/null and b/src/Notes-master3/Notes-master3/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_8a091fedea22d20d20bac079c45e96565b086402155df33678594459d2648d12_bucket_1/graph.bin differ
diff --git a/src/Notes-master3/Notes-master3/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_8a091fedea22d20d20bac079c45e96565b086402155df33678594459d2648d12_bucket_2/graph.bin b/src/Notes-master3/Notes-master3/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_8a091fedea22d20d20bac079c45e96565b086402155df33678594459d2648d12_bucket_2/graph.bin
new file mode 100644
index 0000000..601f245
Binary files /dev/null and b/src/Notes-master3/Notes-master3/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_8a091fedea22d20d20bac079c45e96565b086402155df33678594459d2648d12_bucket_2/graph.bin differ
diff --git a/src/Notes-master3/Notes-master3/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_8a091fedea22d20d20bac079c45e96565b086402155df33678594459d2648d12_bucket_3/graph.bin b/src/Notes-master3/Notes-master3/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_8a091fedea22d20d20bac079c45e96565b086402155df33678594459d2648d12_bucket_3/graph.bin
new file mode 100644
index 0000000..601f245
Binary files /dev/null and b/src/Notes-master3/Notes-master3/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_8a091fedea22d20d20bac079c45e96565b086402155df33678594459d2648d12_bucket_3/graph.bin differ
diff --git a/src/Notes-master3/Notes-master3/app/build/intermediates/dex/debug/mergeDexDebug/classes.dex b/src/Notes-master3/Notes-master3/app/build/intermediates/dex/debug/mergeDexDebug/classes.dex
new file mode 100644
index 0000000..a3d7469
Binary files /dev/null and b/src/Notes-master3/Notes-master3/app/build/intermediates/dex/debug/mergeDexDebug/classes.dex differ
diff --git a/src/Notes-master3/Notes-master3/app/build/intermediates/dex_archive_input_jar_hashes/debug/out b/src/Notes-master3/Notes-master3/app/build/intermediates/dex_archive_input_jar_hashes/debug/out
new file mode 100644
index 0000000..a6ba1e0
Binary files /dev/null and b/src/Notes-master3/Notes-master3/app/build/intermediates/dex_archive_input_jar_hashes/debug/out differ
diff --git a/src/Notes-master3/app/build/intermediates/dex_number_of_buckets_file/debug/out b/src/Notes-master3/Notes-master3/app/build/intermediates/dex_number_of_buckets_file/debug/out
similarity index 100%
rename from src/Notes-master3/app/build/intermediates/dex_number_of_buckets_file/debug/out
rename to src/Notes-master3/Notes-master3/app/build/intermediates/dex_number_of_buckets_file/debug/out
diff --git a/src/Notes-master3/app/build/intermediates/incremental/debug-mergeJavaRes/merge-state b/src/Notes-master3/Notes-master3/app/build/intermediates/incremental/debug-mergeJavaRes/merge-state
similarity index 100%
rename from src/Notes-master3/app/build/intermediates/incremental/debug-mergeJavaRes/merge-state
rename to src/Notes-master3/Notes-master3/app/build/intermediates/incremental/debug-mergeJavaRes/merge-state
diff --git a/src/Notes-master3/Notes-master3/app/build/intermediates/incremental/debug/mergeDebugResources/compile-file-map.properties b/src/Notes-master3/Notes-master3/app/build/intermediates/incremental/debug/mergeDebugResources/compile-file-map.properties
new file mode 100644
index 0000000..6043793
--- /dev/null
+++ b/src/Notes-master3/Notes-master3/app/build/intermediates/incremental/debug/mergeDebugResources/compile-file-map.properties
@@ -0,0 +1,100 @@
+#Mon Jun 05 21:54:21 CST 2023
+net.micode.notes.app-main-7\:/drawable-hdpi/call_record.png=C\:\\Users\\13293\\Desktop\\Notes-master3\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_call_record.png.flat
+net.micode.notes.app-main-7\:/drawable-hdpi/edit_title_green.9.png=C\:\\Users\\13293\\Desktop\\Notes-master3\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_green.9.png.flat
+net.micode.notes.app-main-7\:/drawable-hdpi/edit_title_yellow.9.png=C\:\\Users\\13293\\Desktop\\Notes-master3\\Notes-master3\\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=C\:\\Users\\13293\\Desktop\\Notes-master3\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_small.png.flat
+net.micode.notes.app-main-7\:/layout/activity_login.xml=C\:\\Users\\13293\\Desktop\\Notes-master3\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\layout_activity_login.xml.flat
+net.micode.notes.app-main-7\:/drawable-hdpi/widget_2x_white.png=C\:\\Users\\13293\\Desktop\\Notes-master3\\Notes-master3\\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=C\:\\Users\\13293\\Desktop\\Notes-master3\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_white.9.png.flat
+net.micode.notes.app-main-7\:/drawable-hdpi/list_blue_down.9.png=C\:\\Users\\13293\\Desktop\\Notes-master3\\Notes-master3\\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=C\:\\Users\\13293\\Desktop\\Notes-master3\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\color_secondary_text_dark.xml.flat
+net.micode.notes.app-main-7\:/layout/widget_4x.xml=C\:\\Users\\13293\\Desktop\\Notes-master3\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\layout_widget_4x.xml.flat
+net.micode.notes.app-main-7\:/drawable-hdpi/menu_delete.png=C\:\\Users\\13293\\Desktop\\Notes-master3\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_menu_delete.png.flat
+net.micode.notes.app-main-7\:/drawable-hdpi/clock.png=C\:\\Users\\13293\\Desktop\\Notes-master3\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_clock.png.flat
+net.micode.notes.app-main-7\:/drawable-hdpi/dropdown_icon.9.png=C\:\\Users\\13293\\Desktop\\Notes-master3\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_dropdown_icon.9.png.flat
+net.micode.notes.app-main-7\:/drawable-hdpi/edit_green.9.png=C\:\\Users\\13293\\Desktop\\Notes-master3\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_green.9.png.flat
+net.micode.notes.app-main-7\:/drawable-hdpi/list_white_single.9.png=C\:\\Users\\13293\\Desktop\\Notes-master3\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_single.9.png.flat
+net.micode.notes.app-main-7\:/raw-zh-rCN/introduction=C\:\\Users\\13293\\Desktop\\Notes-master3\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\raw-zh-rCN_introduction.flat
+net.micode.notes.app-main-7\:/drawable-hdpi/widget_2x_green.png=C\:\\Users\\13293\\Desktop\\Notes-master3\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_green.png.flat
+net.micode.notes.app-main-7\:/xml/preferences.xml=C\:\\Users\\13293\\Desktop\\Notes-master3\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\xml_preferences.xml.flat
+net.micode.notes.app-main-7\:/drawable-hdpi/delete.png=C\:\\Users\\13293\\Desktop\\Notes-master3\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_delete.png.flat
+net.micode.notes.app-main-7\:/menu/call_record_folder.xml=C\:\\Users\\13293\\Desktop\\Notes-master3\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\menu_call_record_folder.xml.flat
+net.micode.notes.app-main-7\:/drawable-hdpi/widget_2x_red.png=C\:\\Users\\13293\\Desktop\\Notes-master3\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_red.png.flat
+net.micode.notes.app-main-7\:/layout/widget_2x.xml=C\:\\Users\\13293\\Desktop\\Notes-master3\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\layout_widget_2x.xml.flat
+net.micode.notes.app-main-7\:/layout/add_account_text.xml=C\:\\Users\\13293\\Desktop\\Notes-master3\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\layout_add_account_text.xml.flat
+net.micode.notes.app-main-7\:/drawable-hdpi/selected.png=C\:\\Users\\13293\\Desktop\\Notes-master3\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_selected.png.flat
+net.micode.notes.app-main-7\:/drawable-hdpi/list_blue_middle.9.png=C\:\\Users\\13293\\Desktop\\Notes-master3\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_blue_middle.9.png.flat
+net.micode.notes.app-main-7\:/drawable-hdpi/list_blue_single.9.png=C\:\\Users\\13293\\Desktop\\Notes-master3\\Notes-master3\\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=C\:\\Users\\13293\\Desktop\\Notes-master3\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_large.png.flat
+net.micode.notes.app-main-7\:/layout/settings_header.xml=C\:\\Users\\13293\\Desktop\\Notes-master3\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\layout_settings_header.xml.flat
+net.micode.notes.app-main-7\:/menu/call_note_edit.xml=C\:\\Users\\13293\\Desktop\\Notes-master3\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\menu_call_note_edit.xml.flat
+net.micode.notes.app-main-7\:/raw/introduction=C\:\\Users\\13293\\Desktop\\Notes-master3\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\raw_introduction.flat
+net.micode.notes.app-main-7\:/drawable-hdpi/widget_4x_yellow.png=C\:\\Users\\13293\\Desktop\\Notes-master3\\Notes-master3\\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=C\:\\Users\\13293\\Desktop\\Notes-master3\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_red.png.flat
+net.micode.notes.app-main-7\:/drawable-hdpi/title_alert.png=C\:\\Users\\13293\\Desktop\\Notes-master3\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_title_alert.png.flat
+net.micode.notes.app-main-7\:/drawable-hdpi/widget_2x_yellow.png=C\:\\Users\\13293\\Desktop\\Notes-master3\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_yellow.png.flat
+net.micode.notes.app-main-7\:/drawable-hdpi/edit_title_red.9.png=C\:\\Users\\13293\\Desktop\\Notes-master3\\Notes-master3\\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=C\:\\Users\\13293\\Desktop\\Notes-master3\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_title_bar_bg.9.png.flat
+net.micode.notes.app-main-7\:/drawable-hdpi/list_green_up.9.png=C\:\\Users\\13293\\Desktop\\Notes-master3\\Notes-master3\\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=C\:\\Users\\13293\\Desktop\\Notes-master3\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\layout_note_list_dropdown_menu.xml.flat
+net.micode.notes.app-main-7\:/layout/note_list_footer.xml=C\:\\Users\\13293\\Desktop\\Notes-master3\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\layout_note_list_footer.xml.flat
+net.micode.notes.app-main-7\:/drawable-hdpi/list_white_up.9.png=C\:\\Users\\13293\\Desktop\\Notes-master3\\Notes-master3\\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=C\:\\Users\\13293\\Desktop\\Notes-master3\\Notes-master3\\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=C\:\\Users\\13293\\Desktop\\Notes-master3\\Notes-master3\\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=C\:\\Users\\13293\\Desktop\\Notes-master3\\Notes-master3\\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=C\:\\Users\\13293\\Desktop\\Notes-master3\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_bg_btn_set_color.png.flat
+net.micode.notes.app-main-7\:/xml/searchable.xml=C\:\\Users\\13293\\Desktop\\Notes-master3\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\xml_searchable.xml.flat
+net.micode.notes.app-main-7\:/drawable-hdpi/notification.png=C\:\\Users\\13293\\Desktop\\Notes-master3\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_notification.png.flat
+net.micode.notes.app-main-7\:/drawable-hdpi/list_blue_up.9.png=C\:\\Users\\13293\\Desktop\\Notes-master3\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_blue_up.9.png.flat
+net.micode.notes.app-main-7\:/drawable-hdpi/note_edit_color_selector_panel.png=C\:\\Users\\13293\\Desktop\\Notes-master3\\Notes-master3\\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=C\:\\Users\\13293\\Desktop\\Notes-master3\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_middle.9.png.flat
+net.micode.notes.app-main-7\:/drawable-hdpi/list_folder.9.png=C\:\\Users\\13293\\Desktop\\Notes-master3\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_folder.9.png.flat
+net.micode.notes.app-main-7\:/menu/note_edit.xml=C\:\\Users\\13293\\Desktop\\Notes-master3\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\menu_note_edit.xml.flat
+net.micode.notes.app-main-7\:/drawable-hdpi/font_super.png=C\:\\Users\\13293\\Desktop\\Notes-master3\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_super.png.flat
+net.micode.notes.app-main-7\:/drawable-hdpi/new_note_normal.png=C\:\\Users\\13293\\Desktop\\Notes-master3\\Notes-master3\\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=C\:\\Users\\13293\\Desktop\\Notes-master3\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_yellow.9.png.flat
+net.micode.notes.app-main-7\:/menu/sub_folder.xml=C\:\\Users\\13293\\Desktop\\Notes-master3\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\menu_sub_folder.xml.flat
+net.micode.notes.app-main-7\:/layout/account_dialog_title.xml=C\:\\Users\\13293\\Desktop\\Notes-master3\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\layout_account_dialog_title.xml.flat
+net.micode.notes.app-main-7\:/drawable-hdpi/widget_4x_green.png=C\:\\Users\\13293\\Desktop\\Notes-master3\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_green.png.flat
+net.micode.notes.app-main-7\:/layout/dialog_edit_text.xml=C\:\\Users\\13293\\Desktop\\Notes-master3\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\layout_dialog_edit_text.xml.flat
+net.micode.notes.app-main-7\:/drawable-hdpi/list_yellow_middle.9.png=C\:\\Users\\13293\\Desktop\\Notes-master3\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_middle.9.png.flat
+net.micode.notes.app-main-7\:/drawable-hdpi/font_normal.png=C\:\\Users\\13293\\Desktop\\Notes-master3\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_normal.png.flat
+net.micode.notes.app-main-7\:/drawable-hdpi/cauc.png=C\:\\Users\\13293\\Desktop\\Notes-master3\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_cauc.png.flat
+net.micode.notes.app-main-7\:/layout/note_edit.xml=C\:\\Users\\13293\\Desktop\\Notes-master3\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\layout_note_edit.xml.flat
+net.micode.notes.app-main-7\:/drawable-hdpi/list_green_single.9.png=C\:\\Users\\13293\\Desktop\\Notes-master3\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_green_single.9.png.flat
+net.micode.notes.app-main-7\:/drawable-hdpi/list_red_single.9.png=C\:\\Users\\13293\\Desktop\\Notes-master3\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_single.9.png.flat
+net.micode.notes.app-main-7\:/drawable-hdpi/menu_move.png=C\:\\Users\\13293\\Desktop\\Notes-master3\\Notes-master3\\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=C\:\\Users\\13293\\Desktop\\Notes-master3\\Notes-master3\\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=C\:\\Users\\13293\\Desktop\\Notes-master3\\Notes-master3\\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=C\:\\Users\\13293\\Desktop\\Notes-master3\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_blue.png.flat
+net.micode.notes.app-main-7\:/drawable-hdpi/font_size_selector_bg.9.png=C\:\\Users\\13293\\Desktop\\Notes-master3\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_size_selector_bg.9.png.flat
+net.micode.notes.app-main-7\:/xml/widget_4x_info.xml=C\:\\Users\\13293\\Desktop\\Notes-master3\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\xml_widget_4x_info.xml.flat
+net.micode.notes.app-main-7\:/drawable-hdpi/search_result.png=C\:\\Users\\13293\\Desktop\\Notes-master3\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_search_result.png.flat
+net.micode.notes.app-main-7\:/drawable-hdpi/widget_4x_white.png=C\:\\Users\\13293\\Desktop\\Notes-master3\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_white.png.flat
+net.micode.notes.app-main-7\:/drawable-hdpi/list_green_middle.9.png=C\:\\Users\\13293\\Desktop\\Notes-master3\\Notes-master3\\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=C\:\\Users\\13293\\Desktop\\Notes-master3\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_down.9.png.flat
+net.micode.notes.app-main-7\:/drawable-hdpi/list_yellow_up.9.png=C\:\\Users\\13293\\Desktop\\Notes-master3\\Notes-master3\\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=C\:\\Users\\13293\\Desktop\\Notes-master3\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_middle.9.png.flat
+net.micode.notes.app-main-7\:/menu/note_list.xml=C\:\\Users\\13293\\Desktop\\Notes-master3\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\menu_note_list.xml.flat
+net.micode.notes.app-main-7\:/drawable/new_note.xml=C\:\\Users\\13293\\Desktop\\Notes-master3\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable_new_note.xml.flat
+net.micode.notes.app-main-7\:/drawable-hdpi/edit_red.9.png=C\:\\Users\\13293\\Desktop\\Notes-master3\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_red.9.png.flat
+net.micode.notes.app-main-7\:/layout/note_list.xml=C\:\\Users\\13293\\Desktop\\Notes-master3\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\layout_note_list.xml.flat
+net.micode.notes.app-main-7\:/color/primary_text_dark.xml=C\:\\Users\\13293\\Desktop\\Notes-master3\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\color_primary_text_dark.xml.flat
+net.micode.notes.app-main-7\:/layout/datetime_picker.xml=C\:\\Users\\13293\\Desktop\\Notes-master3\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\layout_datetime_picker.xml.flat
+net.micode.notes.app-main-7\:/drawable-hdpi/list_yellow_single.9.png=C\:\\Users\\13293\\Desktop\\Notes-master3\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_single.9.png.flat
+net.micode.notes.app-main-7\:/drawable-hdpi/list_red_down.9.png=C\:\\Users\\13293\\Desktop\\Notes-master3\\Notes-master3\\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=C\:\\Users\\13293\\Desktop\\Notes-master3\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\menu_note_list_options.xml.flat
+net.micode.notes.app-main-7\:/drawable-hdpi/icon_app.png=C\:\\Users\\13293\\Desktop\\Notes-master3\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_icon_app.png.flat
+net.micode.notes.app-main-7\:/layout/note_item.xml=C\:\\Users\\13293\\Desktop\\Notes-master3\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\layout_note_item.xml.flat
+net.micode.notes.app-main-7\:/drawable-hdpi/list_background.png=C\:\\Users\\13293\\Desktop\\Notes-master3\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_background.png.flat
+net.micode.notes.app-main-7\:/drawable-hdpi/list_footer_bg.9.png=C\:\\Users\\13293\\Desktop\\Notes-master3\\Notes-master3\\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=C\:\\Users\\13293\\Desktop\\Notes-master3\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_new_note_pressed.png.flat
+net.micode.notes.app-main-7\:/drawable-hdpi/grassland.jpg=C\:\\Users\\13293\\Desktop\\Notes-master3\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_grassland.jpg.flat
+net.micode.notes.app-main-7\:/drawable-hdpi/list_red_up.9.png=C\:\\Users\\13293\\Desktop\\Notes-master3\\Notes-master3\\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=C\:\\Users\\13293\\Desktop\\Notes-master3\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\menu_note_list_dropdown.xml.flat
+net.micode.notes.app-main-7\:/drawable-hdpi/edit_title_white.9.png=C\:\\Users\\13293\\Desktop\\Notes-master3\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_white.9.png.flat
+net.micode.notes.app-main-7\:/xml/widget_2x_info.xml=C\:\\Users\\13293\\Desktop\\Notes-master3\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\xml_widget_2x_info.xml.flat
+net.micode.notes.app-main-7\:/layout/folder_list_item.xml=C\:\\Users\\13293\\Desktop\\Notes-master3\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\layout_folder_list_item.xml.flat
+net.micode.notes.app-main-7\:/drawable-hdpi/widget_4x_blue.png=C\:\\Users\\13293\\Desktop\\Notes-master3\\Notes-master3\\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=C\:\\Users\\13293\\Desktop\\Notes-master3\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_down.9.png.flat
+net.micode.notes.app-main-7\:/drawable-hdpi/ikun.png=C\:\\Users\\13293\\Desktop\\Notes-master3\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_ikun.png.flat
diff --git a/src/Notes-master3/Notes-master3/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values-zh-rCN/values-zh-rCN.xml b/src/Notes-master3/Notes-master3/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values-zh-rCN/values-zh-rCN.xml
new file mode 100644
index 0000000..7fbb598
--- /dev/null
+++ b/src/Notes-master3/Notes-master3/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values-zh-rCN/values-zh-rCN.xml
@@ -0,0 +1,109 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:ns1="urn:oasis:names:tc:xliff:document:1.2">
+    <string-array name="menu_share_ways">
+        <item>短信</item>
+        <item>邮件</item>
+    </string-array>
+    <plurals name="search_results_title">
+        <item quantity="other"><ns1:g id="NUMBER">%1$s</ns1:g> 条符合“<ns1:g id="SEARCH">%2$s</ns1:g>”的搜索结果</item>
+    </plurals>
+    <string name="alert_message_delete_folder">确认删除文件夹及所包含的便签吗？</string>
+    <string name="alert_message_delete_note">确认要删除该条便签吗?</string>
+    <string name="alert_message_delete_notes">确认要删除所选的 %d 条便签吗?</string>
+    <string name="alert_title_delete">删除</string>
+    <string name="app_name">便签</string>
+    <string name="app_widget2x2">便签2x2</string>
+    <string name="app_widget4x4">便签4x4</string>
+    <string name="button_delete">删除</string>
+    <string name="call_record_folder_name">通话便签</string>
+    <string name="datetime_dialog_cancel">取消</string>
+    <string name="datetime_dialog_ok">设置</string>
+    <string name="delete_remind_time_message">成功删除提醒</string>
+    <string name="error_note_empty_for_clock">不能为空便签设置闹钟提醒</string>
+    <string name="error_note_empty_for_send_to_desktop">不能将空便签发送到桌面</string>
+    <string name="error_note_not_exist">要查看的便签不存在</string>
+    <string name="error_sdcard_export">导出文本时发生错误，请检查SD卡</string>
+    <string name="error_sdcard_unmounted">SD卡被占用，不能操作</string>
+    <string name="error_sync_cancelled">同步已取消</string>
+    <string name="error_sync_internal">同步失败，发生内部错误</string>
+    <string name="error_sync_network">同步失败，请检查网络和帐号设置</string>
+    <string name="failed_sdcard_export">导出失败</string>
+    <string name="folder_exist">文件夹 %1$s 已存在，请重新命名</string>
+    <string name="format_date_ymd">yyyyMMdd</string>
+    <string name="format_datetime_mdhm">MM月dd日 kk:mm</string>
+    <string name="format_exported_file_location">已将文本文件(%1$s)输出至SD卡(%2$s)目录</string>
+    <string name="format_move_notes_to_folder">已将所选 %1$d 条便签移到 %2$s 文件夹</string>
+    <string name="hint_foler_name">请输入名称</string>
+    <string name="info_note_enter_desktop">已添加到桌面</string>
+    <string name="menu_alert">提醒我</string>
+    <string name="menu_create_folder">新建文件夹</string>
+    <string name="menu_delete">删除</string>
+    <string name="menu_deselect_all">取消全选</string>
+    <string name="menu_export_text">导出文本</string>
+    <string name="menu_folder_change_name">修改文件夹名称</string>
+    <string name="menu_folder_delete">刪除文件夹</string>
+    <string name="menu_folder_view">查看文件夹</string>
+    <string name="menu_font_large">大</string>
+    <string name="menu_font_normal">正常</string>
+    <string name="menu_font_size">文字大小</string>
+    <string name="menu_font_small">小</string>
+    <string name="menu_font_super">超大</string>
+    <string name="menu_grassland">Background: grassland</string>
+    <string name="menu_list_mode">进入清单模式</string>
+    <string name="menu_move">移动到文件夹</string>
+    <string name="menu_move_parent_folder">上一级文件夹</string>
+    <string name="menu_normal_mode">退出清单模式</string>
+    <string name="menu_remove_remind">删除提醒</string>
+    <string name="menu_search">搜索</string>
+    <string name="menu_select_all">全选</string>
+    <string name="menu_select_none">没有选中项，操作无效</string>
+    <string name="menu_select_title">选中了 %d 项</string>
+    <string name="menu_send_to_desktop">发送到桌面</string>
+    <string name="menu_setting">设置</string>
+    <string name="menu_share">分享</string>
+    <string name="menu_sync">同步</string>
+    <string name="menu_sync_cancel">取消同步</string>
+    <string name="menu_title_select_folder">选择文件夹</string>
+    <string name="note_alert_expired">已过期</string>
+    <string name="note_link_email">发送邮件</string>
+    <string name="note_link_other">打开地图</string>
+    <string name="note_link_tel">呼叫电话</string>
+    <string name="note_link_web">浏览网页</string>
+    <string name="notealert_enter">查看</string>
+    <string name="notealert_ok">知道了</string>
+    <string name="notelist_menu_new">新建便签</string>
+    <string name="notelist_string_info">...</string>
+    <string name="preferences_account_summary">与google task同步便签记录</string>
+    <string name="preferences_account_title">同步账号</string>
+    <string name="preferences_add_account">添加账号</string>
+    <string name="preferences_bg_random_appear_title">新建便签背景颜色随机</string>
+    <string name="preferences_button_sync_cancel">取消同步</string>
+    <string name="preferences_button_sync_immediately">立即同步</string>
+    <string name="preferences_dialog_change_account_title">当前帐号 %1$s</string>
+    <string name="preferences_dialog_change_account_warn_msg">如更换同步帐号，过去的帐号同步信息将被清空，再次切换的同时可能会造成数据重复</string>
+    <string name="preferences_dialog_select_account_tips">请选择google帐号，便签将与该帐号的google task内容同步。</string>
+    <string name="preferences_dialog_select_account_title">同步便签</string>
+    <string name="preferences_last_sync_time">上次同步于 %1$s</string>
+    <string name="preferences_menu_cancel">取消</string>
+    <string name="preferences_menu_change_account">更换账号</string>
+    <string name="preferences_menu_remove_account">删除账号</string>
+    <string name="preferences_title">设置</string>
+    <string name="preferences_toast_cannot_change_account">正在同步中，不能修改同步帐号</string>
+    <string name="preferences_toast_success_set_accout">同步帐号已设置为%1$s</string>
+    <string name="search">便签</string>
+    <string name="search_hint">搜索便签</string>
+    <string name="search_label">正在搜索便签</string>
+    <string name="search_setting_description">便签中的文字</string>
+    <string name="set_remind_time_message">创建提醒</string>
+    <string name="success_sdcard_export">导出成功</string>
+    <string name="success_sync_account">与%1$s同步成功</string>
+    <string name="sync_progress_init_list">正在获取服务器便签列表...</string>
+    <string name="sync_progress_login">登录%1$s...</string>
+    <string name="sync_progress_syncing">正在同步本地便签...</string>
+    <string name="ticker_cancel">同步已取消</string>
+    <string name="ticker_fail">同步失败</string>
+    <string name="ticker_success">同步成功</string>
+    <string name="ticker_syncing">同步便签...</string>
+    <string name="widget_havenot_content">没有关联内容，点击新建便签。</string>
+    <string name="widget_under_visit_mode">访客模式下，便签内容不可见</string>
+</resources>
\ No newline at end of file
diff --git a/src/Notes-master3/Notes-master3/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values-zh-rTW/values-zh-rTW.xml b/src/Notes-master3/Notes-master3/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/src/Notes-master3/Notes-master3/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values-zh-rTW/values-zh-rTW.xml
@@ -0,0 +1,108 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:ns1="urn:oasis:names:tc:xliff:document:1.2">
+    <string-array name="menu_share_ways">
+        <item>短信</item>
+        <item>郵件</item>
+    </string-array>
+    <plurals name="search_results_title">
+        <item quantity="other"><ns1:g id="NUMBER">%1$s</ns1:g> 條符合”<ns1:g id="SEARCH">%2$s</ns1:g>“的搜尋結果</item>
+    </plurals>
+    <string name="alert_message_delete_folder">確認刪除檔夾及所包含的便簽嗎？</string>
+    <string name="alert_message_delete_note">确认要删除該條便籤嗎?</string>
+    <string name="alert_message_delete_notes">确认要刪除所選的 %d 條便籤嗎?</string>
+    <string name="alert_title_delete">刪除</string>
+    <string name="app_name">便簽</string>
+    <string name="app_widget2x2">便簽2x2</string>
+    <string name="app_widget4x4">便簽4x4</string>
+    <string name="button_delete">刪除</string>
+    <string name="call_record_folder_name">通話便籤</string>
+    <string name="datetime_dialog_cancel">取消</string>
+    <string name="datetime_dialog_ok">設置</string>
+    <string name="delete_remind_time_message">成功刪除提醒</string>
+    <string name="error_note_empty_for_clock">不能爲空便籤設置鬧鐘提醒</string>
+    <string name="error_note_empty_for_send_to_desktop">不能將空便籤發送到桌面</string>
+    <string name="error_note_not_exist">要查看的便籤不存在</string>
+    <string name="error_sdcard_export">導出TXT時發生錯誤，請檢查SD卡</string>
+    <string name="error_sdcard_unmounted">SD卡被佔用，不能操作</string>
+    <string name="error_sync_cancelled">同步已取消</string>
+    <string name="error_sync_internal">同步失敗，發生內部錯誤</string>
+    <string name="error_sync_network">同步失敗，請檢查網絡和帳號設置</string>
+    <string name="failed_sdcard_export">導出失敗</string>
+    <string name="folder_exist">文件夾 %1$s 已存在，請重新命名</string>
+    <string name="format_date_ymd">yyyyMMdd</string>
+    <string name="format_datetime_mdhm">MM月dd日 kk:mm</string>
+    <string name="format_exported_file_location">已將文本文件(%1$s)導出至SD(%2$s)目錄</string>
+    <string name="format_move_notes_to_folder">已將所選 %1$d 便籤移到 %2$s 文件夾</string>
+    <string name="hint_foler_name">請輸入名稱</string>
+    <string name="info_note_enter_desktop">已添加到桌面</string>
+    <string name="menu_alert">提醒我</string>
+    <string name="menu_create_folder">新建文件夾</string>
+    <string name="menu_delete">刪除</string>
+    <string name="menu_deselect_all">取消全選</string>
+    <string name="menu_export_text">導出文本</string>
+    <string name="menu_folder_change_name">修改文件夾名稱</string>
+    <string name="menu_folder_delete">刪除文件夾</string>
+    <string name="menu_folder_view">查看文件夾</string>
+    <string name="menu_font_large">大</string>
+    <string name="menu_font_normal">正常</string>
+    <string name="menu_font_size">文字大小</string>
+    <string name="menu_font_small">小</string>
+    <string name="menu_font_super">超大</string>
+    <string name="menu_list_mode">進入清單模式</string>
+    <string name="menu_move">移動到文件夾</string>
+    <string name="menu_move_parent_folder">上一級文件夾</string>
+    <string name="menu_normal_mode">退出清單模式</string>
+    <string name="menu_remove_remind">刪除提醒</string>
+    <string name="menu_search">搜尋</string>
+    <string name="menu_select_all">全選</string>
+    <string name="menu_select_none">沒有選中項，操作無效</string>
+    <string name="menu_select_title">選中了 %d 項</string>
+    <string name="menu_send_to_desktop">發送到桌面</string>
+    <string name="menu_setting">設置</string>
+    <string name="menu_share">分享</string>
+    <string name="menu_sync">同步</string>
+    <string name="menu_sync_cancel">取消同步</string>
+    <string name="menu_title_select_folder">選擇文件夾</string>
+    <string name="note_alert_expired">已過期</string>
+    <string name="note_link_email">發送郵件</string>
+    <string name="note_link_other">打開地圖</string>
+    <string name="note_link_tel">呼叫電話</string>
+    <string name="note_link_web">浏覽網頁</string>
+    <string name="notealert_enter">查看</string>
+    <string name="notealert_ok">知道了</string>
+    <string name="notelist_menu_new">新建便簽</string>
+    <string name="notelist_string_info">...</string>
+    <string name="preferences_account_summary">与google task同步便簽記錄</string>
+    <string name="preferences_account_title">同步賬號</string>
+    <string name="preferences_add_account">添加賬號</string>
+    <string name="preferences_bg_random_appear_title">新建便籤背景顏色隨機</string>
+    <string name="preferences_button_sync_cancel">取消同步</string>
+    <string name="preferences_button_sync_immediately">立即同步</string>
+    <string name="preferences_dialog_change_account_title">當前帳號 %1$s</string>
+    <string name="preferences_dialog_change_account_warn_msg">如更換同步帳號，過去的帳號同步信息將被清空，再次切換的同時可能會造成數據重復</string>
+    <string name="preferences_dialog_select_account_tips">請選擇google帳號，便簽將與該帳號的google task內容同步。</string>
+    <string name="preferences_dialog_select_account_title">同步便簽</string>
+    <string name="preferences_last_sync_time">上次同步于 %1$s</string>
+    <string name="preferences_menu_cancel">取消</string>
+    <string name="preferences_menu_change_account">更換賬號</string>
+    <string name="preferences_menu_remove_account">刪除賬號</string>
+    <string name="preferences_title">設置</string>
+    <string name="preferences_toast_cannot_change_account">正在同步中，不能修改同步帳號</string>
+    <string name="preferences_toast_success_set_accout">同步帳號已設置為%1$s</string>
+    <string name="search">便籤</string>
+    <string name="search_hint">搜索便籤</string>
+    <string name="search_label">正在搜索便籤</string>
+    <string name="search_setting_description">便籤中的文字</string>
+    <string name="set_remind_time_message">創建提醒</string>
+    <string name="success_sdcard_export">導出成功</string>
+    <string name="success_sync_account">與%1$s同步成功</string>
+    <string name="sync_progress_init_list">正在獲取服務器便籤列表...</string>
+    <string name="sync_progress_login">登陸%1$s...</string>
+    <string name="sync_progress_syncing">正在同步本地便籤...</string>
+    <string name="ticker_cancel">同步已取消</string>
+    <string name="ticker_fail">同步失敗</string>
+    <string name="ticker_success">同步成功</string>
+    <string name="ticker_syncing">同步便簽...</string>
+    <string name="widget_havenot_content">沒有關聯內容，點擊新建便簽。</string>
+    <string name="widget_under_visit_mode">訪客模式下，便籤內容不可見</string>
+</resources>
\ No newline at end of file
diff --git a/src/Notes-master3/Notes-master3/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values/values.xml b/src/Notes-master3/Notes-master3/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values/values.xml
new file mode 100644
index 0000000..478fe71
--- /dev/null
+++ b/src/Notes-master3/Notes-master3/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values/values.xml
@@ -0,0 +1,178 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:ns1="urn:oasis:names:tc:xliff:document:1.2" xmlns:ns2="http://schemas.android.com/tools">
+    <string-array name="format_for_exported_note">
+        <item>-%s</item>      
+        <item>--%s</item>     
+        <item>--%s</item>     
+        <item>--%s</item>     
+    </string-array>
+    <string-array name="menu_share_ways">
+        <item>Messaging</item>
+        <item>Email</item>
+    </string-array>
+    <color name="user_query_highlight">#335b5b5b</color>
+    <dimen name="text_font_size_large">26sp</dimen>
+    <dimen name="text_font_size_medium">20sp</dimen>
+    <dimen name="text_font_size_normal">17sp</dimen>
+    <dimen name="text_font_size_small">14sp</dimen>
+    <dimen name="text_font_size_super">33sp</dimen>
+    <plurals name="search_results_title">
+        <item quantity="one"><ns1:g example="1" id="number">%1$s</ns1:g> result for \"<ns1:g example="???" id="search">%2$s</ns1:g>\"</item>
+        
+        <item quantity="other"><ns1:g example="15" id="number">%1$s</ns1:g> results for \"<ns1:g example="???" id="search">%2$s</ns1:g>\"</item>
+    </plurals>
+    <string name="Loading" translatable="false">正在登陆.....</string>
+    <string name="alert_message_delete_folder">Confirm to delete folder and its notes?</string>
+    <string name="alert_message_delete_note">Confirm to delete this note?</string>
+    <string name="alert_message_delete_notes">Confirm to delete the selected %d notes?</string>
+    <string name="alert_title_delete">Delete selected notes</string>
+    <string name="app_already_quit" translatable="false">app_already_quit</string>
+    <string name="app_name">Notes</string>
+    <string name="app_widget2x2">Notes 2x2</string>
+    <string name="app_widget4x4">Notes 4x4</string>
+    <string name="button_delete">Delete</string>
+    <string name="call_record_folder_name">Call notes</string>
+    <string name="cancel" translatable="false">取消</string>
+    <string name="datetime_dialog_cancel" ns2:ignore="ButtonCase">cancel</string>
+    <string name="datetime_dialog_ok">set</string>
+    <string name="delete_remind_time_message">Delete reminder successfully</string>
+    <string name="error_note_empty_for_clock">Sorry, can not set clock on empty note</string>
+    <string name="error_note_empty_for_send_to_desktop">Sorry, can not send and empty note to home</string>
+    <string name="error_note_not_exist">The note is not exist</string>
+    <string name="error_sdcard_export">Export failed, please check SD card</string>
+    <string name="error_sdcard_unmounted">SD card busy, not available now</string>
+    <string name="error_sync_cancelled">Sync is canceled</string>
+    <string name="error_sync_internal">Sync failed, internal error occurs</string>
+    <string name="error_sync_network">Sync failed, please check network and account settings</string>
+    <string name="failed_sdcard_export">Export fail</string>
+    <string name="file_name_txt_format">notes_%s.txt</string>
+    <string name="file_path">/MIUI/notes/</string>
+    <string name="folder_exist">The folder %1$s exist, please rename</string>
+    <string name="format_date_ymd">yyyyMMdd</string>
+    <string name="format_datetime_mdhm">MMMd kk:mm</string>
+    <string name="format_exported_file_location">Export text file (%1$s) to SD (%2$s) directory</string>
+    <string name="format_folder_files_count">(%d)</string>
+    <string name="format_move_notes_to_folder">Have moved selected %1$d notes to %2$s folder</string>
+    <string name="hint_foler_name">Input name</string>
+    <string name="info_note_enter_desktop">Note added to home</string>
+    <string name="invalid" translatable="false">无效账号</string>
+    <string name="menu_alert">Remind me</string>
+    <string name="menu_cauc">Background: cauc</string>
+    <string name="menu_create_folder">New Folder</string>
+    <string name="menu_delete">Delete</string>
+    <string name="menu_deselect_all">Deselect all</string>
+    <string name="menu_export_text">Export text</string>
+    <string name="menu_folder_change_name">Change folder name</string>
+    <string name="menu_folder_delete">Delete folder</string>
+    <string name="menu_folder_view">View folder</string>
+    <string name="menu_font_large">Large</string>
+    <string name="menu_font_normal">Medium</string>
+    <string name="menu_font_size">Font size</string>
+    <string name="menu_font_small">Small</string>
+    <string name="menu_font_super">Super</string>
+    <string name="menu_grassland">Background: grassland</string>
+    <string name="menu_list_mode">Enter check list</string>
+    <string name="menu_move">Move to folder</string>
+    <string name="menu_move_parent_folder">Parent folder</string>
+    <string name="menu_normal_mode">Leave check list</string>
+    <string name="menu_remove_remind">Delete reminder</string>
+    <string name="menu_search">Search</string>
+    <string name="menu_select_all">Select all</string>
+    <string name="menu_select_none">Nothing selected, the operation is invalid</string>
+    <string name="menu_select_title">%d selected</string>
+    <string name="menu_send_to_desktop">Send to home</string>
+    <string name="menu_setting">Settings</string>
+    <string name="menu_share">Share</string>
+    <string name="menu_sync">Sync</string>
+    <string name="menu_sync_cancel">Cancel syncing</string>
+    <string name="menu_title_select_folder">Select folder</string>
+    <string name="note_alert_expired">Expired</string>
+    <string name="note_link_email">Send email</string>
+    <string name="note_link_other">Open map</string>
+    <string name="note_link_tel">Call</string>
+    <string name="note_link_web">Browse web</string>
+    <string name="notealert_enter">Take a look</string>
+    <string name="notealert_ok">Got it</string>
+    <string name="notelist_menu_new">Add note</string>
+    <string name="notelist_string_info">...</string>
+    <string name="preferences_account_summary">Sync notes with google task</string>
+    <string name="preferences_account_title">Sync account</string>
+    <string name="preferences_add_account">Add account</string>
+    <string name="preferences_bg_random_appear_title">New note background color random</string>
+    <string name="preferences_button_sync_cancel">Cancel syncing</string>
+    <string name="preferences_button_sync_immediately">Sync immediately</string>
+    <string name="preferences_dialog_change_account_title">Current account %1$s</string>
+    <string name="preferences_dialog_change_account_warn_msg">All sync related information will be deleted, which may result in duplicated items sometime</string>
+    <string name="preferences_dialog_select_account_tips">Please select a google account. Local notes will be synced with google task.</string>
+    <string name="preferences_dialog_select_account_title">Sync notes</string>
+    <string name="preferences_last_sync_time">Last sync time %1$s</string>
+    <string name="preferences_last_sync_time_format">yyyy-MM-dd hh:mm:ss</string>
+    <string name="preferences_menu_cancel">Cancel</string>
+    <string name="preferences_menu_change_account">Change sync account</string>
+    <string name="preferences_menu_remove_account">Remove sync account</string>
+    <string name="preferences_title">Settings</string>
+    <string name="preferences_toast_cannot_change_account">Cannot change the account because sync is in progress</string>
+    <string name="preferences_toast_success_set_accout">%1$s has been set as the sync account</string>
+    <string name="prompt_account" translatable="false">账户</string>
+    <string name="prompt_login" translatable="false">登录</string>
+    <string name="prompt_password" translatable="false">密码</string>
+    <string name="search">Notes</string>
+    <string name="search_hint">Search notes</string>
+    <string name="search_label">Searching Notes</string>
+    <string name="search_setting_description">Text in your notes</string>
+    <string name="set_remind_time_message">Set reminder</string>
+    <string name="success_sdcard_export">Export successful</string>
+    <string name="success_sync_account">Sync is successful with account %1$s</string>
+    <string name="sync_progress_init_list">Getting remote note list...</string>
+    <string name="sync_progress_login">Logging into %1$s...</string>
+    <string name="sync_progress_syncing">Synchronize local notes with Google Task...</string>
+    <string name="ticker_cancel">Sync is canceled</string>
+    <string name="ticker_fail">Sync is failed</string>
+    <string name="ticker_success">Sync is successful</string>
+    <string name="ticker_syncing">Syncing notes...</string>
+    <string name="widget_havenot_content">No associated note found, click to create associated note.</string>
+    <string name="widget_under_visit_mode">Privacy mode，can not see note content</string>
+    <style name="HighlightTextAppearancePrimary">
+    <item name="android:textSize">@dimen/text_font_size_normal</item>
+        <item name="android:textColor">@color/primary_text_dark</item>
+    </style>
+    <style name="HighlightTextAppearanceSecondary">
+        <item name="android:textSize">@dimen/text_font_size_small</item>
+        <item name="android:textColor">@color/secondary_text_dark</item>
+    </style>
+    <style name="NoteActionBarStyle" parent="@android:style/Widget.Holo.Light.ActionBar.Solid">
+        <item name="android:displayOptions"/>
+        <item name="android:visibility">visible</item>
+    </style>
+    <style name="NoteTheme" parent="@android:style/Theme.Holo.Light">
+        <item name="android:actionBarStyle">@style/NoteActionBarStyle</item>
+    </style>
+    <style name="TextAppearanceLarge">
+        <item name="android:textSize">@dimen/text_font_size_large</item>
+        <item name="android:textColorLink">#0000ff</item>
+    </style>
+    <style name="TextAppearanceMedium">
+        <item name="android:textSize">@dimen/text_font_size_medium</item>
+        <item name="android:textColorLink">#0000ff</item>
+    </style>
+    <style name="TextAppearanceNormal">
+        <item name="android:textSize">@dimen/text_font_size_normal</item>
+        <item name="android:textColorLink">#0000ff</item>
+    </style>
+    <style name="TextAppearancePrimaryItem">
+        <item name="android:textSize">@dimen/text_font_size_normal</item>
+        <item name="android:textColor">@color/primary_text_dark</item>
+    </style>
+    <style name="TextAppearanceSecondaryItem">
+        <item name="android:textSize">@dimen/text_font_size_small</item>
+        <item name="android:textColor">@color/secondary_text_dark</item>
+    </style>
+    <style name="TextAppearanceSuper">
+        <item name="android:textSize">@dimen/text_font_size_super</item>
+        <item name="android:textColorLink">#0000ff</item>
+    </style>
+    <style name="TextAppearanceUnderMenuIcon">
+        <item name="android:textSize">@dimen/text_font_size_normal</item>
+        <item name="android:textColor">@android:color/black</item>
+    </style>
+</resources>
\ No newline at end of file
diff --git a/src/Notes-master3/Notes-master3/app/build/intermediates/incremental/debug/mergeDebugResources/merger.xml b/src/Notes-master3/Notes-master3/app/build/intermediates/incremental/debug/mergeDebugResources/merger.xml
new file mode 100644
index 0000000..eba371a
--- /dev/null
+++ b/src/Notes-master3/Notes-master3/app/build/intermediates/incremental/debug/mergeDebugResources/merger.xml
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="utf-8"?>
+<merger version="3" xmlns:ns1="http://schemas.android.com/tools" xmlns:ns2="urn:oasis:names:tc:xliff:document:1.2"><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="main$Generated" generated="true" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="C:\Users\13293\Desktop\Notes-master3\Notes-master3\app\src\main\res"/><source path="C:\Users\13293\Desktop\Notes-master3\Notes-master3\app\build\generated\res\rs\debug"/><source path="C:\Users\13293\Desktop\Notes-master3\Notes-master3\app\build\generated\res\resValues\debug"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="main" generated-set="main$Generated" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="C:\Users\13293\Desktop\Notes-master3\Notes-master3\app\src\main\res"><file name="primary_text_dark" path="C:\Users\13293\Desktop\Notes-master3\Notes-master3\app\src\main\res\color\primary_text_dark.xml" qualifiers="" type="color"/><file name="secondary_text_dark" path="C:\Users\13293\Desktop\Notes-master3\Notes-master3\app\src\main\res\color\secondary_text_dark.xml" qualifiers="" type="color"/><file name="new_note" path="C:\Users\13293\Desktop\Notes-master3\Notes-master3\app\src\main\res\drawable\new_note.xml" qualifiers="" type="drawable"/><file name="bg_btn_set_color" path="C:\Users\13293\Desktop\Notes-master3\Notes-master3\app\src\main\res\drawable-hdpi\bg_btn_set_color.png" qualifiers="hdpi-v4" type="drawable"/><file name="bg_color_btn_mask" path="C:\Users\13293\Desktop\Notes-master3\Notes-master3\app\src\main\res\drawable-hdpi\bg_color_btn_mask.png" qualifiers="hdpi-v4" type="drawable"/><file name="call_record" path="C:\Users\13293\Desktop\Notes-master3\Notes-master3\app\src\main\res\drawable-hdpi\call_record.png" qualifiers="hdpi-v4" type="drawable"/><file name="cauc" path="C:\Users\13293\Desktop\Notes-master3\Notes-master3\app\src\main\res\drawable-hdpi\cauc.png" qualifiers="hdpi-v4" type="drawable"/><file name="clock" path="C:\Users\13293\Desktop\Notes-master3\Notes-master3\app\src\main\res\drawable-hdpi\clock.png" qualifiers="hdpi-v4" type="drawable"/><file name="delete" path="C:\Users\13293\Desktop\Notes-master3\Notes-master3\app\src\main\res\drawable-hdpi\delete.png" qualifiers="hdpi-v4" type="drawable"/><file name="dropdown_icon" path="C:\Users\13293\Desktop\Notes-master3\Notes-master3\app\src\main\res\drawable-hdpi\dropdown_icon.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="edit_blue" path="C:\Users\13293\Desktop\Notes-master3\Notes-master3\app\src\main\res\drawable-hdpi\edit_blue.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="edit_green" path="C:\Users\13293\Desktop\Notes-master3\Notes-master3\app\src\main\res\drawable-hdpi\edit_green.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="edit_red" path="C:\Users\13293\Desktop\Notes-master3\Notes-master3\app\src\main\res\drawable-hdpi\edit_red.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="edit_title_blue" path="C:\Users\13293\Desktop\Notes-master3\Notes-master3\app\src\main\res\drawable-hdpi\edit_title_blue.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="edit_title_green" path="C:\Users\13293\Desktop\Notes-master3\Notes-master3\app\src\main\res\drawable-hdpi\edit_title_green.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="edit_title_red" path="C:\Users\13293\Desktop\Notes-master3\Notes-master3\app\src\main\res\drawable-hdpi\edit_title_red.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="edit_title_white" path="C:\Users\13293\Desktop\Notes-master3\Notes-master3\app\src\main\res\drawable-hdpi\edit_title_white.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="edit_title_yellow" path="C:\Users\13293\Desktop\Notes-master3\Notes-master3\app\src\main\res\drawable-hdpi\edit_title_yellow.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="edit_white" path="C:\Users\13293\Desktop\Notes-master3\Notes-master3\app\src\main\res\drawable-hdpi\edit_white.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="edit_yellow" path="C:\Users\13293\Desktop\Notes-master3\Notes-master3\app\src\main\res\drawable-hdpi\edit_yellow.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="font_large" path="C:\Users\13293\Desktop\Notes-master3\Notes-master3\app\src\main\res\drawable-hdpi\font_large.png" qualifiers="hdpi-v4" type="drawable"/><file name="font_normal" path="C:\Users\13293\Desktop\Notes-master3\Notes-master3\app\src\main\res\drawable-hdpi\font_normal.png" qualifiers="hdpi-v4" type="drawable"/><file name="font_size_selector_bg" path="C:\Users\13293\Desktop\Notes-master3\Notes-master3\app\src\main\res\drawable-hdpi\font_size_selector_bg.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="font_small" path="C:\Users\13293\Desktop\Notes-master3\Notes-master3\app\src\main\res\drawable-hdpi\font_small.png" qualifiers="hdpi-v4" type="drawable"/><file name="font_super" path="C:\Users\13293\Desktop\Notes-master3\Notes-master3\app\src\main\res\drawable-hdpi\font_super.png" qualifiers="hdpi-v4" type="drawable"/><file name="grassland" path="C:\Users\13293\Desktop\Notes-master3\Notes-master3\app\src\main\res\drawable-hdpi\grassland.jpg" qualifiers="hdpi-v4" type="drawable"/><file name="icon_app" path="C:\Users\13293\Desktop\Notes-master3\Notes-master3\app\src\main\res\drawable-hdpi\icon_app.png" qualifiers="hdpi-v4" type="drawable"/><file name="ikun" path="C:\Users\13293\Desktop\Notes-master3\Notes-master3\app\src\main\res\drawable-hdpi\ikun.png" qualifiers="hdpi-v4" type="drawable"/><file name="list_background" path="C:\Users\13293\Desktop\Notes-master3\Notes-master3\app\src\main\res\drawable-hdpi\list_background.png" qualifiers="hdpi-v4" type="drawable"/><file name="list_blue_down" path="C:\Users\13293\Desktop\Notes-master3\Notes-master3\app\src\main\res\drawable-hdpi\list_blue_down.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="list_blue_middle" path="C:\Users\13293\Desktop\Notes-master3\Notes-master3\app\src\main\res\drawable-hdpi\list_blue_middle.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="list_blue_single" path="C:\Users\13293\Desktop\Notes-master3\Notes-master3\app\src\main\res\drawable-hdpi\list_blue_single.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="list_blue_up" path="C:\Users\13293\Desktop\Notes-master3\Notes-master3\app\src\main\res\drawable-hdpi\list_blue_up.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="list_folder" path="C:\Users\13293\Desktop\Notes-master3\Notes-master3\app\src\main\res\drawable-hdpi\list_folder.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="list_footer_bg" path="C:\Users\13293\Desktop\Notes-master3\Notes-master3\app\src\main\res\drawable-hdpi\list_footer_bg.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="list_green_down" path="C:\Users\13293\Desktop\Notes-master3\Notes-master3\app\src\main\res\drawable-hdpi\list_green_down.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="list_green_middle" path="C:\Users\13293\Desktop\Notes-master3\Notes-master3\app\src\main\res\drawable-hdpi\list_green_middle.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="list_green_single" path="C:\Users\13293\Desktop\Notes-master3\Notes-master3\app\src\main\res\drawable-hdpi\list_green_single.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="list_green_up" path="C:\Users\13293\Desktop\Notes-master3\Notes-master3\app\src\main\res\drawable-hdpi\list_green_up.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="list_red_down" path="C:\Users\13293\Desktop\Notes-master3\Notes-master3\app\src\main\res\drawable-hdpi\list_red_down.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="list_red_middle" path="C:\Users\13293\Desktop\Notes-master3\Notes-master3\app\src\main\res\drawable-hdpi\list_red_middle.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="list_red_single" path="C:\Users\13293\Desktop\Notes-master3\Notes-master3\app\src\main\res\drawable-hdpi\list_red_single.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="list_red_up" path="C:\Users\13293\Desktop\Notes-master3\Notes-master3\app\src\main\res\drawable-hdpi\list_red_up.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="list_white_down" path="C:\Users\13293\Desktop\Notes-master3\Notes-master3\app\src\main\res\drawable-hdpi\list_white_down.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="list_white_middle" path="C:\Users\13293\Desktop\Notes-master3\Notes-master3\app\src\main\res\drawable-hdpi\list_white_middle.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="list_white_single" path="C:\Users\13293\Desktop\Notes-master3\Notes-master3\app\src\main\res\drawable-hdpi\list_white_single.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="list_white_up" path="C:\Users\13293\Desktop\Notes-master3\Notes-master3\app\src\main\res\drawable-hdpi\list_white_up.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="list_yellow_down" path="C:\Users\13293\Desktop\Notes-master3\Notes-master3\app\src\main\res\drawable-hdpi\list_yellow_down.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="list_yellow_middle" path="C:\Users\13293\Desktop\Notes-master3\Notes-master3\app\src\main\res\drawable-hdpi\list_yellow_middle.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="list_yellow_single" path="C:\Users\13293\Desktop\Notes-master3\Notes-master3\app\src\main\res\drawable-hdpi\list_yellow_single.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="list_yellow_up" path="C:\Users\13293\Desktop\Notes-master3\Notes-master3\app\src\main\res\drawable-hdpi\list_yellow_up.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="menu_delete" path="C:\Users\13293\Desktop\Notes-master3\Notes-master3\app\src\main\res\drawable-hdpi\menu_delete.png" qualifiers="hdpi-v4" type="drawable"/><file name="menu_move" path="C:\Users\13293\Desktop\Notes-master3\Notes-master3\app\src\main\res\drawable-hdpi\menu_move.png" qualifiers="hdpi-v4" type="drawable"/><file name="new_note_normal" path="C:\Users\13293\Desktop\Notes-master3\Notes-master3\app\src\main\res\drawable-hdpi\new_note_normal.png" qualifiers="hdpi-v4" type="drawable"/><file name="new_note_pressed" path="C:\Users\13293\Desktop\Notes-master3\Notes-master3\app\src\main\res\drawable-hdpi\new_note_pressed.png" qualifiers="hdpi-v4" type="drawable"/><file name="note_edit_color_selector_panel" path="C:\Users\13293\Desktop\Notes-master3\Notes-master3\app\src\main\res\drawable-hdpi\note_edit_color_selector_panel.png" qualifiers="hdpi-v4" type="drawable"/><file name="notification" path="C:\Users\13293\Desktop\Notes-master3\Notes-master3\app\src\main\res\drawable-hdpi\notification.png" qualifiers="hdpi-v4" type="drawable"/><file name="search_result" path="C:\Users\13293\Desktop\Notes-master3\Notes-master3\app\src\main\res\drawable-hdpi\search_result.png" qualifiers="hdpi-v4" type="drawable"/><file name="selected" path="C:\Users\13293\Desktop\Notes-master3\Notes-master3\app\src\main\res\drawable-hdpi\selected.png" qualifiers="hdpi-v4" type="drawable"/><file name="title_alert" path="C:\Users\13293\Desktop\Notes-master3\Notes-master3\app\src\main\res\drawable-hdpi\title_alert.png" qualifiers="hdpi-v4" type="drawable"/><file name="title_bar_bg" path="C:\Users\13293\Desktop\Notes-master3\Notes-master3\app\src\main\res\drawable-hdpi\title_bar_bg.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="widget_2x_blue" path="C:\Users\13293\Desktop\Notes-master3\Notes-master3\app\src\main\res\drawable-hdpi\widget_2x_blue.png" qualifiers="hdpi-v4" type="drawable"/><file name="widget_2x_green" path="C:\Users\13293\Desktop\Notes-master3\Notes-master3\app\src\main\res\drawable-hdpi\widget_2x_green.png" qualifiers="hdpi-v4" type="drawable"/><file name="widget_2x_red" path="C:\Users\13293\Desktop\Notes-master3\Notes-master3\app\src\main\res\drawable-hdpi\widget_2x_red.png" qualifiers="hdpi-v4" type="drawable"/><file name="widget_2x_white" path="C:\Users\13293\Desktop\Notes-master3\Notes-master3\app\src\main\res\drawable-hdpi\widget_2x_white.png" qualifiers="hdpi-v4" type="drawable"/><file name="widget_2x_yellow" path="C:\Users\13293\Desktop\Notes-master3\Notes-master3\app\src\main\res\drawable-hdpi\widget_2x_yellow.png" qualifiers="hdpi-v4" type="drawable"/><file name="widget_4x_blue" path="C:\Users\13293\Desktop\Notes-master3\Notes-master3\app\src\main\res\drawable-hdpi\widget_4x_blue.png" qualifiers="hdpi-v4" type="drawable"/><file name="widget_4x_green" path="C:\Users\13293\Desktop\Notes-master3\Notes-master3\app\src\main\res\drawable-hdpi\widget_4x_green.png" qualifiers="hdpi-v4" type="drawable"/><file name="widget_4x_red" path="C:\Users\13293\Desktop\Notes-master3\Notes-master3\app\src\main\res\drawable-hdpi\widget_4x_red.png" qualifiers="hdpi-v4" type="drawable"/><file name="widget_4x_white" path="C:\Users\13293\Desktop\Notes-master3\Notes-master3\app\src\main\res\drawable-hdpi\widget_4x_white.png" qualifiers="hdpi-v4" type="drawable"/><file name="widget_4x_yellow" path="C:\Users\13293\Desktop\Notes-master3\Notes-master3\app\src\main\res\drawable-hdpi\widget_4x_yellow.png" qualifiers="hdpi-v4" type="drawable"/><file name="account_dialog_title" path="C:\Users\13293\Desktop\Notes-master3\Notes-master3\app\src\main\res\layout\account_dialog_title.xml" qualifiers="" type="layout"/><file name="activity_login" path="C:\Users\13293\Desktop\Notes-master3\Notes-master3\app\src\main\res\layout\activity_login.xml" qualifiers="" type="layout"/><file name="add_account_text" path="C:\Users\13293\Desktop\Notes-master3\Notes-master3\app\src\main\res\layout\add_account_text.xml" qualifiers="" type="layout"/><file name="datetime_picker" path="C:\Users\13293\Desktop\Notes-master3\Notes-master3\app\src\main\res\layout\datetime_picker.xml" qualifiers="" type="layout"/><file name="dialog_edit_text" path="C:\Users\13293\Desktop\Notes-master3\Notes-master3\app\src\main\res\layout\dialog_edit_text.xml" qualifiers="" type="layout"/><file name="folder_list_item" path="C:\Users\13293\Desktop\Notes-master3\Notes-master3\app\src\main\res\layout\folder_list_item.xml" qualifiers="" type="layout"/><file name="note_edit" path="C:\Users\13293\Desktop\Notes-master3\Notes-master3\app\src\main\res\layout\note_edit.xml" qualifiers="" type="layout"/><file name="note_edit_list_item" path="C:\Users\13293\Desktop\Notes-master3\Notes-master3\app\src\main\res\layout\note_edit_list_item.xml" qualifiers="" type="layout"/><file name="note_item" path="C:\Users\13293\Desktop\Notes-master3\Notes-master3\app\src\main\res\layout\note_item.xml" qualifiers="" type="layout"/><file name="note_list" path="C:\Users\13293\Desktop\Notes-master3\Notes-master3\app\src\main\res\layout\note_list.xml" qualifiers="" type="layout"/><file name="note_list_dropdown_menu" path="C:\Users\13293\Desktop\Notes-master3\Notes-master3\app\src\main\res\layout\note_list_dropdown_menu.xml" qualifiers="" type="layout"/><file name="note_list_footer" path="C:\Users\13293\Desktop\Notes-master3\Notes-master3\app\src\main\res\layout\note_list_footer.xml" qualifiers="" type="layout"/><file name="settings_header" path="C:\Users\13293\Desktop\Notes-master3\Notes-master3\app\src\main\res\layout\settings_header.xml" qualifiers="" type="layout"/><file name="widget_2x" path="C:\Users\13293\Desktop\Notes-master3\Notes-master3\app\src\main\res\layout\widget_2x.xml" qualifiers="" type="layout"/><file name="widget_4x" path="C:\Users\13293\Desktop\Notes-master3\Notes-master3\app\src\main\res\layout\widget_4x.xml" qualifiers="" type="layout"/><file name="call_note_edit" path="C:\Users\13293\Desktop\Notes-master3\Notes-master3\app\src\main\res\menu\call_note_edit.xml" qualifiers="" type="menu"/><file name="call_record_folder" path="C:\Users\13293\Desktop\Notes-master3\Notes-master3\app\src\main\res\menu\call_record_folder.xml" qualifiers="" type="menu"/><file name="note_edit" path="C:\Users\13293\Desktop\Notes-master3\Notes-master3\app\src\main\res\menu\note_edit.xml" qualifiers="" type="menu"/><file name="note_list" path="C:\Users\13293\Desktop\Notes-master3\Notes-master3\app\src\main\res\menu\note_list.xml" qualifiers="" type="menu"/><file name="note_list_dropdown" path="C:\Users\13293\Desktop\Notes-master3\Notes-master3\app\src\main\res\menu\note_list_dropdown.xml" qualifiers="" type="menu"/><file name="note_list_options" path="C:\Users\13293\Desktop\Notes-master3\Notes-master3\app\src\main\res\menu\note_list_options.xml" qualifiers="" type="menu"/><file name="sub_folder" path="C:\Users\13293\Desktop\Notes-master3\Notes-master3\app\src\main\res\menu\sub_folder.xml" qualifiers="" type="menu"/><file name="introduction" path="C:\Users\13293\Desktop\Notes-master3\Notes-master3\app\src\main\res\raw\introduction" qualifiers="" type="raw"/><file name="introduction" path="C:\Users\13293\Desktop\Notes-master3\Notes-master3\app\src\main\res\raw-zh-rCN\introduction" qualifiers="zh-rCN" type="raw"/><file path="C:\Users\13293\Desktop\Notes-master3\Notes-master3\app\src\main\res\values\arrays.xml" qualifiers=""><string-array name="format_for_exported_note">
+        <item>-%s</item>      
+        <item>--%s</item>     
+        <item>--%s</item>     
+        <item>--%s</item>     
+    </string-array><string-array name="menu_share_ways">
+        <item>Messaging</item>
+        <item>Email</item>
+    </string-array></file><file path="C:\Users\13293\Desktop\Notes-master3\Notes-master3\app\src\main\res\values\colors.xml" qualifiers=""><color name="user_query_highlight">#335b5b5b</color></file><file path="C:\Users\13293\Desktop\Notes-master3\Notes-master3\app\src\main\res\values\dimens.xml" qualifiers=""><dimen name="text_font_size_super">33sp</dimen><dimen name="text_font_size_large">26sp</dimen><dimen name="text_font_size_medium">20sp</dimen><dimen name="text_font_size_normal">17sp</dimen><dimen name="text_font_size_small">14sp</dimen></file><file path="C:\Users\13293\Desktop\Notes-master3\Notes-master3\app\src\main\res\values\strings.xml" qualifiers=""><string name="app_name">Notes</string><string name="app_widget2x2">Notes 2x2</string><string name="app_widget4x4">Notes 4x4</string><string name="widget_havenot_content">No associated note found, click to create associated note.</string><string name="widget_under_visit_mode">Privacy mode，can not see note content</string><string name="notelist_string_info">...</string><string name="notelist_menu_new">Add note</string><string name="delete_remind_time_message">Delete reminder successfully</string><string name="set_remind_time_message">Set reminder</string><string name="note_alert_expired">Expired</string><string name="format_date_ymd">yyyyMMdd</string><string name="format_datetime_mdhm">MMMd kk:mm</string><string name="notealert_ok">Got it</string><string name="notealert_enter">Take a look</string><string name="note_link_tel">Call</string><string name="note_link_email">Send email</string><string name="note_link_web">Browse web</string><string name="note_link_other">Open map</string><string name="file_path">/MIUI/notes/</string><string name="file_name_txt_format">notes_%s.txt</string><string name="menu_grassland">Background: grassland</string><string name="menu_cauc">Background: cauc</string><string name="format_folder_files_count">(%d)</string><string name="menu_create_folder">New Folder</string><string name="menu_export_text">Export text</string><string name="menu_sync">Sync</string><string name="menu_sync_cancel">Cancel syncing</string><string name="menu_setting">Settings</string><string name="menu_search">Search</string><string name="menu_delete">Delete</string><string name="menu_move">Move to folder</string><string name="menu_select_title">%d selected</string><string name="menu_select_none">Nothing selected, the operation is invalid</string><string name="menu_select_all">Select all</string><string name="menu_deselect_all">Deselect all</string><string name="menu_font_size">Font size</string><string name="menu_font_small">Small</string><string name="menu_font_normal">Medium</string><string name="menu_font_large">Large</string><string name="menu_font_super">Super</string><string name="menu_list_mode">Enter check list</string><string name="menu_normal_mode">Leave check list</string><string name="menu_folder_view">View folder</string><string name="menu_folder_delete">Delete folder</string><string name="menu_folder_change_name">Change folder name</string><string name="folder_exist">The folder %1$s exist, please rename</string><string name="menu_share">Share</string><string name="menu_send_to_desktop">Send to home</string><string name="menu_alert">Remind me</string><string name="menu_remove_remind">Delete reminder</string><string name="menu_title_select_folder">Select folder</string><string name="menu_move_parent_folder">Parent folder</string><string name="info_note_enter_desktop">Note added to home</string><string name="alert_message_delete_folder">Confirm to delete folder and its notes?</string><string name="alert_title_delete">Delete selected notes</string><string name="alert_message_delete_notes">Confirm to delete the selected %d notes?</string><string name="alert_message_delete_note">Confirm to delete this note?</string><string name="format_move_notes_to_folder">Have moved selected %1$d notes to %2$s folder</string><string name="error_sdcard_unmounted">SD card busy, not available now</string><string name="error_sdcard_export">Export failed, please check SD card</string><string name="error_note_not_exist">The note is not exist</string><string name="error_note_empty_for_clock">Sorry, can not set clock on empty note</string><string name="error_note_empty_for_send_to_desktop">Sorry, can not send and empty note to home</string><string name="success_sdcard_export">Export successful</string><string name="failed_sdcard_export">Export fail</string><string name="format_exported_file_location">Export text file (%1$s) to SD (%2$s) directory</string><string name="ticker_syncing">Syncing notes...</string><string name="ticker_success">Sync is successful</string><string name="ticker_fail">Sync is failed</string><string name="ticker_cancel">Sync is canceled</string><string name="success_sync_account">Sync is successful with account %1$s</string><string name="error_sync_network">Sync failed, please check network and account settings</string><string name="error_sync_internal">Sync failed, internal error occurs</string><string name="error_sync_cancelled">Sync is canceled</string><string name="sync_progress_login">Logging into %1$s...</string><string name="sync_progress_init_list">Getting remote note list...</string><string name="sync_progress_syncing">Synchronize local notes with Google Task...</string><string name="preferences_title">Settings</string><string name="preferences_account_title">Sync account</string><string name="preferences_account_summary">Sync notes with google task</string><string name="preferences_last_sync_time">Last sync time %1$s</string><string name="preferences_last_sync_time_format">yyyy-MM-dd hh:mm:ss</string><string name="preferences_add_account">Add account</string><string name="preferences_menu_change_account">Change sync account</string><string name="preferences_menu_remove_account">Remove sync account</string><string name="preferences_menu_cancel">Cancel</string><string name="preferences_button_sync_immediately">Sync immediately</string><string name="preferences_button_sync_cancel">Cancel syncing</string><string name="preferences_dialog_change_account_title">Current account %1$s</string><string name="preferences_dialog_change_account_warn_msg">All sync related information will be deleted, which may result in duplicated items sometime</string><string name="preferences_dialog_select_account_title">Sync notes</string><string name="preferences_dialog_select_account_tips">Please select a google account. Local notes will be synced with google task.</string><string name="preferences_toast_cannot_change_account">Cannot change the account because sync is in progress</string><string name="preferences_toast_success_set_accout">%1$s has been set as the sync account</string><string name="preferences_bg_random_appear_title">New note background color random</string><string name="button_delete">Delete</string><string name="call_record_folder_name">Call notes</string><string name="hint_foler_name">Input name</string><string name="search_label">Searching Notes</string><string name="search_hint">Search notes</string><string name="search_setting_description">Text in your notes</string><string name="search">Notes</string><string name="datetime_dialog_ok">set</string><string name="datetime_dialog_cancel" ns1:ignore="ButtonCase">cancel</string><string name="prompt_account" translatable="false">账户</string><string name="prompt_password" translatable="false">密码</string><string name="prompt_login" translatable="false">登录</string><string name="cancel" translatable="false">取消</string><string name="Loading" translatable="false">正在登陆.....</string><string name="invalid" translatable="false">无效账号</string><string name="app_already_quit" translatable="false">app_already_quit</string><plurals name="search_results_title">
+        <item quantity="one"><ns2:g example="1" id="number">%1$s</ns2:g> result for \"<ns2:g example="???" id="search">%2$s</ns2:g>\"</item>
+        
+        <item quantity="other"><ns2:g example="15" id="number">%1$s</ns2:g> results for \"<ns2:g example="???" id="search">%2$s</ns2:g>\"</item>
+    </plurals></file><file path="C:\Users\13293\Desktop\Notes-master3\Notes-master3\app\src\main\res\values\styles.xml" qualifiers=""><style name="TextAppearanceSuper">
+        <item name="android:textSize">@dimen/text_font_size_super</item>
+        <item name="android:textColorLink">#0000ff</item>
+    </style><style name="TextAppearanceLarge">
+        <item name="android:textSize">@dimen/text_font_size_large</item>
+        <item name="android:textColorLink">#0000ff</item>
+    </style><style name="TextAppearanceMedium">
+        <item name="android:textSize">@dimen/text_font_size_medium</item>
+        <item name="android:textColorLink">#0000ff</item>
+    </style><style name="TextAppearanceNormal">
+        <item name="android:textSize">@dimen/text_font_size_normal</item>
+        <item name="android:textColorLink">#0000ff</item>
+    </style><style name="TextAppearancePrimaryItem">
+        <item name="android:textSize">@dimen/text_font_size_normal</item>
+        <item name="android:textColor">@color/primary_text_dark</item>
+    </style><style name="TextAppearanceSecondaryItem">
+        <item name="android:textSize">@dimen/text_font_size_small</item>
+        <item name="android:textColor">@color/secondary_text_dark</item>
+    </style><style name="TextAppearanceUnderMenuIcon">
+        <item name="android:textSize">@dimen/text_font_size_normal</item>
+        <item name="android:textColor">@android:color/black</item>
+    </style><style name="HighlightTextAppearancePrimary">
+    <item name="android:textSize">@dimen/text_font_size_normal</item>
+        <item name="android:textColor">@color/primary_text_dark</item>
+    </style><style name="HighlightTextAppearanceSecondary">
+        <item name="android:textSize">@dimen/text_font_size_small</item>
+        <item name="android:textColor">@color/secondary_text_dark</item>
+    </style><style name="NoteTheme" parent="@android:style/Theme.Holo.Light">
+        <item name="android:actionBarStyle">@style/NoteActionBarStyle</item>
+    </style><style name="NoteActionBarStyle" parent="@android:style/Widget.Holo.Light.ActionBar.Solid">
+        <item name="android:displayOptions"/>
+        <item name="android:visibility">visible</item>
+    </style></file><file path="C:\Users\13293\Desktop\Notes-master3\Notes-master3\app\src\main\res\values-zh-rCN\arrays.xml" qualifiers="zh-rCN"><string-array name="menu_share_ways">
+        <item>短信</item>
+        <item>邮件</item>
+    </string-array></file><file path="C:\Users\13293\Desktop\Notes-master3\Notes-master3\app\src\main\res\values-zh-rCN\strings.xml" qualifiers="zh-rCN"><string name="app_name">便签</string><string name="app_widget2x2">便签2x2</string><string name="app_widget4x4">便签4x4</string><string name="widget_havenot_content">没有关联内容，点击新建便签。</string><string name="widget_under_visit_mode">访客模式下，便签内容不可见</string><string name="notelist_string_info">...</string><string name="notelist_menu_new">新建便签</string><string name="delete_remind_time_message">成功删除提醒</string><string name="set_remind_time_message">创建提醒</string><string name="note_alert_expired">已过期</string><string name="format_date_ymd">yyyyMMdd</string><string name="format_datetime_mdhm">MM月dd日 kk:mm</string><string name="notealert_ok">知道了</string><string name="notealert_enter">查看</string><string name="note_link_tel">呼叫电话</string><string name="note_link_email">发送邮件</string><string name="note_link_web">浏览网页</string><string name="note_link_other">打开地图</string><string name="menu_grassland">Background: grassland</string><string name="menu_create_folder">新建文件夹</string><string name="menu_export_text">导出文本</string><string name="menu_sync">同步</string><string name="menu_sync_cancel">取消同步</string><string name="menu_setting">设置</string><string name="menu_search">搜索</string><string name="menu_delete">删除</string><string name="menu_move">移动到文件夹</string><string name="menu_select_title">选中了 %d 项</string><string name="menu_select_none">没有选中项，操作无效</string><string name="menu_select_all">全选</string><string name="menu_deselect_all">取消全选</string><string name="menu_font_size">文字大小</string><string name="menu_font_small">小</string><string name="menu_font_normal">正常</string><string name="menu_font_large">大</string><string name="menu_font_super">超大</string><string name="menu_list_mode">进入清单模式</string><string name="menu_normal_mode">退出清单模式</string><string name="menu_folder_view">查看文件夹</string><string name="menu_folder_delete">刪除文件夹</string><string name="menu_folder_change_name">修改文件夹名称</string><string name="folder_exist">文件夹 %1$s 已存在，请重新命名</string><string name="menu_share">分享</string><string name="menu_send_to_desktop">发送到桌面</string><string name="menu_alert">提醒我</string><string name="menu_remove_remind">删除提醒</string><string name="menu_title_select_folder">选择文件夹</string><string name="menu_move_parent_folder">上一级文件夹</string><string name="info_note_enter_desktop">已添加到桌面</string><string name="alert_title_delete">删除</string><string name="alert_message_delete_notes">确认要删除所选的 %d 条便签吗?</string><string name="alert_message_delete_note">确认要删除该条便签吗?</string><string name="alert_message_delete_folder">确认删除文件夹及所包含的便签吗？</string><string name="format_move_notes_to_folder">已将所选 %1$d 条便签移到 %2$s 文件夹</string><string name="error_sdcard_unmounted">SD卡被占用，不能操作</string><string name="error_sdcard_export">导出文本时发生错误，请检查SD卡</string><string name="error_note_not_exist">要查看的便签不存在</string><string name="error_note_empty_for_clock">不能为空便签设置闹钟提醒</string><string name="error_note_empty_for_send_to_desktop">不能将空便签发送到桌面</string><string name="success_sdcard_export">导出成功</string><string name="failed_sdcard_export">导出失败</string><string name="format_exported_file_location">已将文本文件(%1$s)输出至SD卡(%2$s)目录</string><string name="ticker_syncing">同步便签...</string><string name="ticker_success">同步成功</string><string name="ticker_fail">同步失败</string><string name="ticker_cancel">同步已取消</string><string name="success_sync_account">与%1$s同步成功</string><string name="error_sync_network">同步失败，请检查网络和帐号设置</string><string name="error_sync_internal">同步失败，发生内部错误</string><string name="error_sync_cancelled">同步已取消</string><string name="sync_progress_login">登录%1$s...</string><string name="sync_progress_init_list">正在获取服务器便签列表...</string><string name="sync_progress_syncing">正在同步本地便签...</string><string name="preferences_title">设置</string><string name="preferences_account_title">同步账号</string><string name="preferences_account_summary">与google task同步便签记录</string><string name="preferences_last_sync_time">上次同步于 %1$s</string><string name="preferences_add_account">添加账号</string><string name="preferences_menu_change_account">更换账号</string><string name="preferences_menu_remove_account">删除账号</string><string name="preferences_menu_cancel">取消</string><string name="preferences_button_sync_immediately">立即同步</string><string name="preferences_button_sync_cancel">取消同步</string><string name="preferences_dialog_change_account_title">当前帐号 %1$s</string><string name="preferences_dialog_change_account_warn_msg">如更换同步帐号，过去的帐号同步信息将被清空，再次切换的同时可能会造成数据重复</string><string name="preferences_dialog_select_account_title">同步便签</string><string name="preferences_dialog_select_account_tips">请选择google帐号，便签将与该帐号的google task内容同步。</string><string name="preferences_toast_cannot_change_account">正在同步中，不能修改同步帐号</string><string name="preferences_toast_success_set_accout">同步帐号已设置为%1$s</string><string name="preferences_bg_random_appear_title">新建便签背景颜色随机</string><string name="button_delete">删除</string><string name="call_record_folder_name">通话便签</string><string name="hint_foler_name">请输入名称</string><string name="search_label">正在搜索便签</string><string name="search_hint">搜索便签</string><string name="search_setting_description">便签中的文字</string><string name="search">便签</string><string name="datetime_dialog_ok">设置</string><string name="datetime_dialog_cancel">取消</string><plurals name="search_results_title">
+        <item quantity="other"><ns2:g id="NUMBER">%1$s</ns2:g> 条符合“<ns2:g id="SEARCH">%2$s</ns2:g>”的搜索结果</item>
+    </plurals></file><file path="C:\Users\13293\Desktop\Notes-master3\Notes-master3\app\src\main\res\values-zh-rTW\arrays.xml" qualifiers="zh-rTW"><string-array name="menu_share_ways">
+        <item>短信</item>
+        <item>郵件</item>
+    </string-array></file><file path="C:\Users\13293\Desktop\Notes-master3\Notes-master3\app\src\main\res\values-zh-rTW\strings.xml" qualifiers="zh-rTW"><string name="app_name">便簽</string><string name="app_widget2x2">便簽2x2</string><string name="app_widget4x4">便簽4x4</string><string name="widget_havenot_content">沒有關聯內容，點擊新建便簽。</string><string name="widget_under_visit_mode">訪客模式下，便籤內容不可見</string><string name="notelist_string_info">...</string><string name="notelist_menu_new">新建便簽</string><string name="delete_remind_time_message">成功刪除提醒</string><string name="set_remind_time_message">創建提醒</string><string name="note_alert_expired">已過期</string><string name="format_date_ymd">yyyyMMdd</string><string name="format_datetime_mdhm">MM月dd日 kk:mm</string><string name="notealert_ok">知道了</string><string name="notealert_enter">查看</string><string name="note_link_tel">呼叫電話</string><string name="note_link_email">發送郵件</string><string name="note_link_web">浏覽網頁</string><string name="note_link_other">打開地圖</string><string name="format_move_notes_to_folder">已將所選 %1$d 便籤移到 %2$s 文件夾</string><string name="menu_create_folder">新建文件夾</string><string name="menu_export_text">導出文本</string><string name="menu_sync">同步</string><string name="menu_sync_cancel">取消同步</string><string name="menu_setting">設置</string><string name="menu_search">搜尋</string><string name="menu_delete">刪除</string><string name="menu_move">移動到文件夾</string><string name="menu_select_title">選中了 %d 項</string><string name="menu_select_none">沒有選中項，操作無效</string><string name="menu_select_all">全選</string><string name="menu_deselect_all">取消全選</string><string name="menu_font_size">文字大小</string><string name="menu_font_small">小</string><string name="menu_font_normal">正常</string><string name="menu_font_large">大</string><string name="menu_font_super">超大</string><string name="menu_list_mode">進入清單模式</string><string name="menu_normal_mode">退出清單模式</string><string name="menu_folder_view">查看文件夾</string><string name="menu_folder_delete">刪除文件夾</string><string name="menu_folder_change_name">修改文件夾名稱</string><string name="folder_exist">文件夾 %1$s 已存在，請重新命名</string><string name="menu_share">分享</string><string name="menu_send_to_desktop">發送到桌面</string><string name="menu_alert">提醒我</string><string name="menu_remove_remind">刪除提醒</string><string name="menu_title_select_folder">選擇文件夾</string><string name="menu_move_parent_folder">上一級文件夾</string><string name="info_note_enter_desktop">已添加到桌面</string><string name="alert_title_delete">刪除</string><string name="alert_message_delete_notes">确认要刪除所選的 %d 條便籤嗎?</string><string name="alert_message_delete_note">确认要删除該條便籤嗎?</string><string name="alert_message_delete_folder">確認刪除檔夾及所包含的便簽嗎？</string><string name="error_sdcard_unmounted">SD卡被佔用，不能操作</string><string name="error_sdcard_export">導出TXT時發生錯誤，請檢查SD卡</string><string name="error_note_not_exist">要查看的便籤不存在</string><string name="error_note_empty_for_clock">不能爲空便籤設置鬧鐘提醒</string><string name="error_note_empty_for_send_to_desktop">不能將空便籤發送到桌面</string><string name="success_sdcard_export">導出成功</string><string name="failed_sdcard_export">導出失敗</string><string name="format_exported_file_location">已將文本文件(%1$s)導出至SD(%2$s)目錄</string><string name="ticker_syncing">同步便簽...</string><string name="ticker_success">同步成功</string><string name="ticker_fail">同步失敗</string><string name="ticker_cancel">同步已取消</string><string name="success_sync_account">與%1$s同步成功</string><string name="error_sync_network">同步失敗，請檢查網絡和帳號設置</string><string name="error_sync_internal">同步失敗，發生內部錯誤</string><string name="error_sync_cancelled">同步已取消</string><string name="sync_progress_login">登陸%1$s...</string><string name="sync_progress_init_list">正在獲取服務器便籤列表...</string><string name="sync_progress_syncing">正在同步本地便籤...</string><string name="preferences_title">設置</string><string name="preferences_account_title">同步賬號</string><string name="preferences_account_summary">与google task同步便簽記錄</string><string name="preferences_last_sync_time">上次同步于 %1$s</string><string name="preferences_add_account">添加賬號</string><string name="preferences_menu_change_account">更換賬號</string><string name="preferences_menu_remove_account">刪除賬號</string><string name="preferences_menu_cancel">取消</string><string name="preferences_button_sync_immediately">立即同步</string><string name="preferences_button_sync_cancel">取消同步</string><string name="preferences_dialog_change_account_title">當前帳號 %1$s</string><string name="preferences_dialog_change_account_warn_msg">如更換同步帳號，過去的帳號同步信息將被清空，再次切換的同時可能會造成數據重復</string><string name="preferences_dialog_select_account_title">同步便簽</string><string name="preferences_dialog_select_account_tips">請選擇google帳號，便簽將與該帳號的google task內容同步。</string><string name="preferences_toast_cannot_change_account">正在同步中，不能修改同步帳號</string><string name="preferences_toast_success_set_accout">同步帳號已設置為%1$s</string><string name="preferences_bg_random_appear_title">新建便籤背景顏色隨機</string><string name="button_delete">刪除</string><string name="call_record_folder_name">通話便籤</string><string name="hint_foler_name">請輸入名稱</string><string name="search_label">正在搜索便籤</string><string name="search_hint">搜索便籤</string><string name="search_setting_description">便籤中的文字</string><string name="search">便籤</string><string name="datetime_dialog_ok">設置</string><string name="datetime_dialog_cancel">取消</string><plurals name="search_results_title">
+        <item quantity="other"><ns2:g id="NUMBER">%1$s</ns2:g> 條符合”<ns2:g id="SEARCH">%2$s</ns2:g>“的搜尋結果</item>
+    </plurals></file><file name="preferences" path="C:\Users\13293\Desktop\Notes-master3\Notes-master3\app\src\main\res\xml\preferences.xml" qualifiers="" type="xml"/><file name="searchable" path="C:\Users\13293\Desktop\Notes-master3\Notes-master3\app\src\main\res\xml\searchable.xml" qualifiers="" type="xml"/><file name="widget_2x_info" path="C:\Users\13293\Desktop\Notes-master3\Notes-master3\app\src\main\res\xml\widget_2x_info.xml" qualifiers="" type="xml"/><file name="widget_4x_info" path="C:\Users\13293\Desktop\Notes-master3\Notes-master3\app\src\main\res\xml\widget_4x_info.xml" qualifiers="" type="xml"/></source><source path="C:\Users\13293\Desktop\Notes-master3\Notes-master3\app\build\generated\res\rs\debug"/><source path="C:\Users\13293\Desktop\Notes-master3\Notes-master3\app\build\generated\res\resValues\debug"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="debug$Generated" generated="true" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="C:\Users\13293\Desktop\Notes-master3\Notes-master3\app\src\debug\res"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="debug" generated-set="debug$Generated" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="C:\Users\13293\Desktop\Notes-master3\Notes-master3\app\src\debug\res"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="generated$Generated" generated="true" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"/><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="generated" generated-set="generated$Generated" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"/><mergedItems/></merger>
\ No newline at end of file
diff --git a/src/Notes-master3/Notes-master3/app/build/intermediates/incremental/mergeDebugAssets/merger.xml b/src/Notes-master3/Notes-master3/app/build/intermediates/incremental/mergeDebugAssets/merger.xml
new file mode 100644
index 0000000..4eeb4e3
--- /dev/null
+++ b/src/Notes-master3/Notes-master3/app/build/intermediates/incremental/mergeDebugAssets/merger.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="C:\Users\13293\Desktop\Notes-master3\Notes-master3\app\src\main\assets"/><source path="C:\Users\13293\Desktop\Notes-master3\Notes-master3\app\build\intermediates\shader_assets\debug\out"/></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="C:\Users\13293\Desktop\Notes-master3\Notes-master3\app\src\debug\assets"/></dataSet></merger>
\ No newline at end of file
diff --git a/src/Notes-master3/Notes-master3/app/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml b/src/Notes-master3/Notes-master3/app/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml
new file mode 100644
index 0000000..9c0cab5
--- /dev/null
+++ b/src/Notes-master3/Notes-master3/app/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="C:\Users\13293\Desktop\Notes-master3\Notes-master3\app\src\main\jniLibs"/></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="C:\Users\13293\Desktop\Notes-master3\Notes-master3\app\src\debug\jniLibs"/></dataSet></merger>
\ No newline at end of file
diff --git a/src/Notes-master3/Notes-master3/app/build/intermediates/incremental/mergeDebugShaders/merger.xml b/src/Notes-master3/Notes-master3/app/build/intermediates/incremental/mergeDebugShaders/merger.xml
new file mode 100644
index 0000000..3089230
--- /dev/null
+++ b/src/Notes-master3/Notes-master3/app/build/intermediates/incremental/mergeDebugShaders/merger.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="C:\Users\13293\Desktop\Notes-master3\Notes-master3\app\src\main\shaders"/></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="C:\Users\13293\Desktop\Notes-master3\Notes-master3\app\src\debug\shaders"/></dataSet></merger>
\ No newline at end of file
diff --git a/src/Notes-master3/Notes-master3/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt b/src/Notes-master3/Notes-master3/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt
new file mode 100644
index 0000000..0eecc03
--- /dev/null
+++ b/src/Notes-master3/Notes-master3/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt
@@ -0,0 +1,4 @@
+#Mon Jun 05 21:55:03 CST 2023
+base.0=C\:\\Users\\13293\\Desktop\\Notes-master3\\Notes-master3\\app\\build\\intermediates\\dex\\debug\\mergeDexDebug\\classes.dex
+renamed.0=classes.dex
+path.0=classes.dex
diff --git a/src/Notes-master3/Notes-master3/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/androidResources b/src/Notes-master3/Notes-master3/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/androidResources
new file mode 100644
index 0000000..bc9cb85
Binary files /dev/null and b/src/Notes-master3/Notes-master3/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/androidResources differ
diff --git a/src/Notes-master3/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/javaResources0 b/src/Notes-master3/Notes-master3/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/javaResources0
similarity index 100%
rename from src/Notes-master3/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/javaResources0
rename to src/Notes-master3/Notes-master3/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/javaResources0
diff --git a/src/Notes-master3/Notes-master3/app/build/intermediates/incremental/processDebugResources/resources-list-for-resources-debug.ap_.txt b/src/Notes-master3/Notes-master3/app/build/intermediates/incremental/processDebugResources/resources-list-for-resources-debug.ap_.txt
new file mode 100644
index 0000000..e22cc9f
--- /dev/null
+++ b/src/Notes-master3/Notes-master3/app/build/intermediates/incremental/processDebugResources/resources-list-for-resources-debug.ap_.txt
@@ -0,0 +1 @@
+C:\Users\13293\Desktop\Notes-master3\app\build\intermediates\merged_res\debug\color_primary_text_dark.xml.flat C:\Users\13293\Desktop\Notes-master3\app\build\intermediates\merged_res\debug\color_secondary_text_dark.xml.flat C:\Users\13293\Desktop\Notes-master3\app\build\intermediates\merged_res\debug\drawable-hdpi_bg_btn_set_color.png.flat C:\Users\13293\Desktop\Notes-master3\app\build\intermediates\merged_res\debug\drawable-hdpi_bg_color_btn_mask.png.flat C:\Users\13293\Desktop\Notes-master3\app\build\intermediates\merged_res\debug\drawable-hdpi_call_record.png.flat C:\Users\13293\Desktop\Notes-master3\app\build\intermediates\merged_res\debug\drawable-hdpi_clock.png.flat C:\Users\13293\Desktop\Notes-master3\app\build\intermediates\merged_res\debug\drawable-hdpi_delete.png.flat C:\Users\13293\Desktop\Notes-master3\app\build\intermediates\merged_res\debug\drawable-hdpi_dropdown_icon.9.png.flat C:\Users\13293\Desktop\Notes-master3\app\build\intermediates\merged_res\debug\drawable-hdpi_edit_blue.9.png.flat C:\Users\13293\Desktop\Notes-master3\app\build\intermediates\merged_res\debug\drawable-hdpi_edit_green.9.png.flat C:\Users\13293\Desktop\Notes-master3\app\build\intermediates\merged_res\debug\drawable-hdpi_edit_red.9.png.flat C:\Users\13293\Desktop\Notes-master3\app\build\intermediates\merged_res\debug\drawable-hdpi_edit_title_blue.9.png.flat C:\Users\13293\Desktop\Notes-master3\app\build\intermediates\merged_res\debug\drawable-hdpi_edit_title_green.9.png.flat C:\Users\13293\Desktop\Notes-master3\app\build\intermediates\merged_res\debug\drawable-hdpi_edit_title_red.9.png.flat C:\Users\13293\Desktop\Notes-master3\app\build\intermediates\merged_res\debug\drawable-hdpi_edit_title_white.9.png.flat C:\Users\13293\Desktop\Notes-master3\app\build\intermediates\merged_res\debug\drawable-hdpi_edit_title_yellow.9.png.flat C:\Users\13293\Desktop\Notes-master3\app\build\intermediates\merged_res\debug\drawable-hdpi_edit_white.9.png.flat C:\Users\13293\Desktop\Notes-master3\app\build\intermediates\merged_res\debug\drawable-hdpi_edit_yellow.9.png.flat C:\Users\13293\Desktop\Notes-master3\app\build\intermediates\merged_res\debug\drawable-hdpi_font_large.png.flat C:\Users\13293\Desktop\Notes-master3\app\build\intermediates\merged_res\debug\drawable-hdpi_font_normal.png.flat C:\Users\13293\Desktop\Notes-master3\app\build\intermediates\merged_res\debug\drawable-hdpi_font_size_selector_bg.9.png.flat C:\Users\13293\Desktop\Notes-master3\app\build\intermediates\merged_res\debug\drawable-hdpi_font_small.png.flat C:\Users\13293\Desktop\Notes-master3\app\build\intermediates\merged_res\debug\drawable-hdpi_font_super.png.flat C:\Users\13293\Desktop\Notes-master3\app\build\intermediates\merged_res\debug\drawable-hdpi_grassland.jpg.flat C:\Users\13293\Desktop\Notes-master3\app\build\intermediates\merged_res\debug\drawable-hdpi_icon_app.png.flat C:\Users\13293\Desktop\Notes-master3\app\build\intermediates\merged_res\debug\drawable-hdpi_list_background.png.flat C:\Users\13293\Desktop\Notes-master3\app\build\intermediates\merged_res\debug\drawable-hdpi_list_blue_down.9.png.flat C:\Users\13293\Desktop\Notes-master3\app\build\intermediates\merged_res\debug\drawable-hdpi_list_blue_middle.9.png.flat C:\Users\13293\Desktop\Notes-master3\app\build\intermediates\merged_res\debug\drawable-hdpi_list_blue_single.9.png.flat C:\Users\13293\Desktop\Notes-master3\app\build\intermediates\merged_res\debug\drawable-hdpi_list_blue_up.9.png.flat C:\Users\13293\Desktop\Notes-master3\app\build\intermediates\merged_res\debug\drawable-hdpi_list_folder.9.png.flat C:\Users\13293\Desktop\Notes-master3\app\build\intermediates\merged_res\debug\drawable-hdpi_list_footer_bg.9.png.flat C:\Users\13293\Desktop\Notes-master3\app\build\intermediates\merged_res\debug\drawable-hdpi_list_green_down.9.png.flat C:\Users\13293\Desktop\Notes-master3\app\build\intermediates\merged_res\debug\drawable-hdpi_list_green_middle.9.png.flat C:\Users\13293\Desktop\Notes-master3\app\build\intermediates\merged_res\debug\drawable-hdpi_list_green_single.9.png.flat C:\Users\13293\Desktop\Notes-master3\app\build\intermediates\merged_res\debug\drawable-hdpi_list_green_up.9.png.flat C:\Users\13293\Desktop\Notes-master3\app\build\intermediates\merged_res\debug\drawable-hdpi_list_red_down.9.png.flat C:\Users\13293\Desktop\Notes-master3\app\build\intermediates\merged_res\debug\drawable-hdpi_list_red_middle.9.png.flat C:\Users\13293\Desktop\Notes-master3\app\build\intermediates\merged_res\debug\drawable-hdpi_list_red_single.9.png.flat C:\Users\13293\Desktop\Notes-master3\app\build\intermediates\merged_res\debug\drawable-hdpi_list_red_up.9.png.flat C:\Users\13293\Desktop\Notes-master3\app\build\intermediates\merged_res\debug\drawable-hdpi_list_white_down.9.png.flat C:\Users\13293\Desktop\Notes-master3\app\build\intermediates\merged_res\debug\drawable-hdpi_list_white_middle.9.png.flat C:\Users\13293\Desktop\Notes-master3\app\build\intermediates\merged_res\debug\drawable-hdpi_list_white_single.9.png.flat C:\Users\13293\Desktop\Notes-master3\app\build\intermediates\merged_res\debug\drawable-hdpi_list_white_up.9.png.flat C:\Users\13293\Desktop\Notes-master3\app\build\intermediates\merged_res\debug\drawable-hdpi_list_yellow_down.9.png.flat C:\Users\13293\Desktop\Notes-master3\app\build\intermediates\merged_res\debug\drawable-hdpi_list_yellow_middle.9.png.flat C:\Users\13293\Desktop\Notes-master3\app\build\intermediates\merged_res\debug\drawable-hdpi_list_yellow_single.9.png.flat C:\Users\13293\Desktop\Notes-master3\app\build\intermediates\merged_res\debug\drawable-hdpi_list_yellow_up.9.png.flat C:\Users\13293\Desktop\Notes-master3\app\build\intermediates\merged_res\debug\drawable-hdpi_menu_delete.png.flat C:\Users\13293\Desktop\Notes-master3\app\build\intermediates\merged_res\debug\drawable-hdpi_menu_move.png.flat C:\Users\13293\Desktop\Notes-master3\app\build\intermediates\merged_res\debug\drawable-hdpi_new_note_normal.png.flat C:\Users\13293\Desktop\Notes-master3\app\build\intermediates\merged_res\debug\drawable-hdpi_new_note_pressed.png.flat C:\Users\13293\Desktop\Notes-master3\app\build\intermediates\merged_res\debug\drawable-hdpi_note_edit_color_selector_panel.png.flat C:\Users\13293\Desktop\Notes-master3\app\build\intermediates\merged_res\debug\drawable-hdpi_notification.png.flat C:\Users\13293\Desktop\Notes-master3\app\build\intermediates\merged_res\debug\drawable-hdpi_search_result.png.flat C:\Users\13293\Desktop\Notes-master3\app\build\intermediates\merged_res\debug\drawable-hdpi_selected.png.flat C:\Users\13293\Desktop\Notes-master3\app\build\intermediates\merged_res\debug\drawable-hdpi_title_alert.png.flat C:\Users\13293\Desktop\Notes-master3\app\build\intermediates\merged_res\debug\drawable-hdpi_title_bar_bg.9.png.flat C:\Users\13293\Desktop\Notes-master3\app\build\intermediates\merged_res\debug\drawable-hdpi_widget_2x_blue.png.flat C:\Users\13293\Desktop\Notes-master3\app\build\intermediates\merged_res\debug\drawable-hdpi_widget_2x_green.png.flat C:\Users\13293\Desktop\Notes-master3\app\build\intermediates\merged_res\debug\drawable-hdpi_widget_2x_red.png.flat C:\Users\13293\Desktop\Notes-master3\app\build\intermediates\merged_res\debug\drawable-hdpi_widget_2x_white.png.flat C:\Users\13293\Desktop\Notes-master3\app\build\intermediates\merged_res\debug\drawable-hdpi_widget_2x_yellow.png.flat C:\Users\13293\Desktop\Notes-master3\app\build\intermediates\merged_res\debug\drawable-hdpi_widget_4x_blue.png.flat C:\Users\13293\Desktop\Notes-master3\app\build\intermediates\merged_res\debug\drawable-hdpi_widget_4x_green.png.flat C:\Users\13293\Desktop\Notes-master3\app\build\intermediates\merged_res\debug\drawable-hdpi_widget_4x_red.png.flat C:\Users\13293\Desktop\Notes-master3\app\build\intermediates\merged_res\debug\drawable-hdpi_widget_4x_white.png.flat C:\Users\13293\Desktop\Notes-master3\app\build\intermediates\merged_res\debug\drawable-hdpi_widget_4x_yellow.png.flat C:\Users\13293\Desktop\Notes-master3\app\build\intermediates\merged_res\debug\drawable_new_note.xml.flat C:\Users\13293\Desktop\Notes-master3\app\build\intermediates\merged_res\debug\layout_account_dialog_title.xml.flat C:\Users\13293\Desktop\Notes-master3\app\build\intermediates\merged_res\debug\layout_add_account_text.xml.flat C:\Users\13293\Desktop\Notes-master3\app\build\intermediates\merged_res\debug\layout_datetime_picker.xml.flat C:\Users\13293\Desktop\Notes-master3\app\build\intermediates\merged_res\debug\layout_dialog_edit_text.xml.flat C:\Users\13293\Desktop\Notes-master3\app\build\intermediates\merged_res\debug\layout_folder_list_item.xml.flat C:\Users\13293\Desktop\Notes-master3\app\build\intermediates\merged_res\debug\layout_note_edit.xml.flat C:\Users\13293\Desktop\Notes-master3\app\build\intermediates\merged_res\debug\layout_note_edit_list_item.xml.flat C:\Users\13293\Desktop\Notes-master3\app\build\intermediates\merged_res\debug\layout_note_item.xml.flat C:\Users\13293\Desktop\Notes-master3\app\build\intermediates\merged_res\debug\layout_note_list.xml.flat C:\Users\13293\Desktop\Notes-master3\app\build\intermediates\merged_res\debug\layout_note_list_dropdown_menu.xml.flat C:\Users\13293\Desktop\Notes-master3\app\build\intermediates\merged_res\debug\layout_note_list_footer.xml.flat C:\Users\13293\Desktop\Notes-master3\app\build\intermediates\merged_res\debug\layout_settings_header.xml.flat C:\Users\13293\Desktop\Notes-master3\app\build\intermediates\merged_res\debug\layout_widget_2x.xml.flat C:\Users\13293\Desktop\Notes-master3\app\build\intermediates\merged_res\debug\layout_widget_4x.xml.flat C:\Users\13293\Desktop\Notes-master3\app\build\intermediates\merged_res\debug\menu_call_note_edit.xml.flat C:\Users\13293\Desktop\Notes-master3\app\build\intermediates\merged_res\debug\menu_call_record_folder.xml.flat C:\Users\13293\Desktop\Notes-master3\app\build\intermediates\merged_res\debug\menu_note_edit.xml.flat C:\Users\13293\Desktop\Notes-master3\app\build\intermediates\merged_res\debug\menu_note_list.xml.flat C:\Users\13293\Desktop\Notes-master3\app\build\intermediates\merged_res\debug\menu_note_list_dropdown.xml.flat C:\Users\13293\Desktop\Notes-master3\app\build\intermediates\merged_res\debug\menu_note_list_options.xml.flat C:\Users\13293\Desktop\Notes-master3\app\build\intermediates\merged_res\debug\menu_sub_folder.xml.flat C:\Users\13293\Desktop\Notes-master3\app\build\intermediates\merged_res\debug\raw-zh-rCN_introduction.flat C:\Users\13293\Desktop\Notes-master3\app\build\intermediates\merged_res\debug\raw_introduction.flat C:\Users\13293\Desktop\Notes-master3\app\build\intermediates\merged_res\debug\values-zh-rCN_values-zh-rCN.arsc.flat C:\Users\13293\Desktop\Notes-master3\app\build\intermediates\merged_res\debug\values-zh-rTW_values-zh-rTW.arsc.flat C:\Users\13293\Desktop\Notes-master3\app\build\intermediates\merged_res\debug\values_values.arsc.flat C:\Users\13293\Desktop\Notes-master3\app\build\intermediates\merged_res\debug\xml_preferences.xml.flat C:\Users\13293\Desktop\Notes-master3\app\build\intermediates\merged_res\debug\xml_searchable.xml.flat C:\Users\13293\Desktop\Notes-master3\app\build\intermediates\merged_res\debug\xml_widget_2x_info.xml.flat C:\Users\13293\Desktop\Notes-master3\app\build\intermediates\merged_res\debug\xml_widget_4x_info.xml.flat 
\ No newline at end of file
diff --git a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/BuildConfig.class b/src/Notes-master3/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/BuildConfig.class
similarity index 100%
rename from src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/BuildConfig.class
rename to src/Notes-master3/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/BuildConfig.class
diff --git a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Contact.class b/src/Notes-master3/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Contact.class
similarity index 100%
rename from src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Contact.class
rename to src/Notes-master3/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Contact.class
diff --git a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$CallNote.class b/src/Notes-master3/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$CallNote.class
similarity index 100%
rename from src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$CallNote.class
rename to src/Notes-master3/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$CallNote.class
diff --git a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$DataColumns.class b/src/Notes-master3/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$DataColumns.class
similarity index 100%
rename from src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$DataColumns.class
rename to src/Notes-master3/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$DataColumns.class
diff --git a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$DataConstants.class b/src/Notes-master3/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$DataConstants.class
similarity index 100%
rename from src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$DataConstants.class
rename to src/Notes-master3/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$DataConstants.class
diff --git a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$NoteColumns.class b/src/Notes-master3/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$NoteColumns.class
similarity index 100%
rename from src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$NoteColumns.class
rename to src/Notes-master3/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$NoteColumns.class
diff --git a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$TextNote.class b/src/Notes-master3/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$TextNote.class
similarity index 100%
rename from src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$TextNote.class
rename to src/Notes-master3/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$TextNote.class
diff --git a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes.class b/src/Notes-master3/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes.class
similarity index 100%
rename from src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes.class
rename to src/Notes-master3/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes.class
diff --git a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/data/NotesDatabaseHelper$TABLE.class b/src/Notes-master3/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/data/NotesDatabaseHelper$TABLE.class
similarity index 100%
rename from src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/data/NotesDatabaseHelper$TABLE.class
rename to src/Notes-master3/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/data/NotesDatabaseHelper$TABLE.class
diff --git a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/data/NotesDatabaseHelper.class b/src/Notes-master3/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/data/NotesDatabaseHelper.class
similarity index 100%
rename from src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/data/NotesDatabaseHelper.class
rename to src/Notes-master3/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/data/NotesDatabaseHelper.class
diff --git a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/data/NotesProvider.class b/src/Notes-master3/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/data/NotesProvider.class
similarity index 98%
rename from src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/data/NotesProvider.class
rename to src/Notes-master3/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/data/NotesProvider.class
index 631d177..f0186d8 100644
Binary files a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/data/NotesProvider.class and b/src/Notes-master3/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/data/NotesProvider.class differ
diff --git a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/MetaData.class b/src/Notes-master3/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/MetaData.class
similarity index 100%
rename from src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/MetaData.class
rename to src/Notes-master3/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/MetaData.class
diff --git a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/Node.class b/src/Notes-master3/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/Node.class
similarity index 100%
rename from src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/Node.class
rename to src/Notes-master3/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/Node.class
diff --git a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/SqlData.class b/src/Notes-master3/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/SqlData.class
similarity index 100%
rename from src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/SqlData.class
rename to src/Notes-master3/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/SqlData.class
diff --git a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/SqlNote.class b/src/Notes-master3/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/SqlNote.class
similarity index 100%
rename from src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/SqlNote.class
rename to src/Notes-master3/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/SqlNote.class
diff --git a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/Task.class b/src/Notes-master3/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/Task.class
similarity index 100%
rename from src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/Task.class
rename to src/Notes-master3/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/Task.class
diff --git a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/TaskList.class b/src/Notes-master3/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/TaskList.class
similarity index 100%
rename from src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/TaskList.class
rename to src/Notes-master3/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/TaskList.class
diff --git a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/exception/ActionFailureException.class b/src/Notes-master3/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/exception/ActionFailureException.class
similarity index 100%
rename from src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/exception/ActionFailureException.class
rename to src/Notes-master3/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/exception/ActionFailureException.class
diff --git a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/exception/NetworkFailureException.class b/src/Notes-master3/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/exception/NetworkFailureException.class
similarity index 100%
rename from src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/exception/NetworkFailureException.class
rename to src/Notes-master3/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/exception/NetworkFailureException.class
diff --git a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskASyncTask$1.class b/src/Notes-master3/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskASyncTask$1.class
similarity index 100%
rename from src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskASyncTask$1.class
rename to src/Notes-master3/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskASyncTask$1.class
diff --git a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskASyncTask$OnCompleteListener.class b/src/Notes-master3/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskASyncTask$OnCompleteListener.class
similarity index 100%
rename from src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskASyncTask$OnCompleteListener.class
rename to src/Notes-master3/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskASyncTask$OnCompleteListener.class
diff --git a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskASyncTask.class b/src/Notes-master3/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskASyncTask.class
similarity index 97%
rename from src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskASyncTask.class
rename to src/Notes-master3/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskASyncTask.class
index 7299c91..d438997 100644
Binary files a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskASyncTask.class and b/src/Notes-master3/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskASyncTask.class differ
diff --git a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskClient.class b/src/Notes-master3/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskClient.class
similarity index 100%
rename from src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskClient.class
rename to src/Notes-master3/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskClient.class
diff --git a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskManager.class b/src/Notes-master3/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskManager.class
similarity index 99%
rename from src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskManager.class
rename to src/Notes-master3/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskManager.class
index 5aae52d..5bf9173 100644
Binary files a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskManager.class and b/src/Notes-master3/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskManager.class differ
diff --git a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskSyncService$1.class b/src/Notes-master3/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskSyncService$1.class
similarity index 100%
rename from src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskSyncService$1.class
rename to src/Notes-master3/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskSyncService$1.class
diff --git a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskSyncService.class b/src/Notes-master3/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskSyncService.class
similarity index 100%
rename from src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskSyncService.class
rename to src/Notes-master3/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskSyncService.class
diff --git a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/model/Note$NoteData.class b/src/Notes-master3/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/model/Note$NoteData.class
similarity index 100%
rename from src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/model/Note$NoteData.class
rename to src/Notes-master3/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/model/Note$NoteData.class
diff --git a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/model/Note.class b/src/Notes-master3/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/model/Note.class
similarity index 100%
rename from src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/model/Note.class
rename to src/Notes-master3/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/model/Note.class
diff --git a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/model/WorkingNote$NoteSettingChangedListener.class b/src/Notes-master3/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/model/WorkingNote$NoteSettingChangedListener.class
similarity index 100%
rename from src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/model/WorkingNote$NoteSettingChangedListener.class
rename to src/Notes-master3/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/model/WorkingNote$NoteSettingChangedListener.class
diff --git a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/model/WorkingNote.class b/src/Notes-master3/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/model/WorkingNote.class
similarity index 100%
rename from src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/model/WorkingNote.class
rename to src/Notes-master3/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/model/WorkingNote.class
diff --git a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/BackupUtils$TextExport.class b/src/Notes-master3/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/BackupUtils$TextExport.class
similarity index 99%
rename from src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/BackupUtils$TextExport.class
rename to src/Notes-master3/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/BackupUtils$TextExport.class
index bfb671c..a7bfab1 100644
Binary files a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/BackupUtils$TextExport.class and b/src/Notes-master3/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/BackupUtils$TextExport.class differ
diff --git a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/BackupUtils.class b/src/Notes-master3/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/BackupUtils.class
similarity index 99%
rename from src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/BackupUtils.class
rename to src/Notes-master3/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/BackupUtils.class
index ed4ac8e..a5167e2 100644
Binary files a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/BackupUtils.class and b/src/Notes-master3/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/BackupUtils.class differ
diff --git a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/DataUtils.class b/src/Notes-master3/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/DataUtils.class
similarity index 85%
rename from src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/DataUtils.class
rename to src/Notes-master3/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/DataUtils.class
index fc1d9a2..b282c11 100644
Binary files a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/DataUtils.class and b/src/Notes-master3/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/DataUtils.class differ
diff --git a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/GTaskStringUtils.class b/src/Notes-master3/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/GTaskStringUtils.class
similarity index 97%
rename from src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/GTaskStringUtils.class
rename to src/Notes-master3/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/GTaskStringUtils.class
index d4500ff..c95e31c 100644
Binary files a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/GTaskStringUtils.class and b/src/Notes-master3/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/GTaskStringUtils.class differ
diff --git a/src/Notes-master3/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$NoteBgResources.class b/src/Notes-master3/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$NoteBgResources.class
new file mode 100644
index 0000000..6f71be5
Binary files /dev/null and b/src/Notes-master3/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$NoteBgResources.class differ
diff --git a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$NoteItemBgResources.class b/src/Notes-master3/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$NoteItemBgResources.class
similarity index 56%
rename from src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$NoteItemBgResources.class
rename to src/Notes-master3/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$NoteItemBgResources.class
index 34b5c02..70a3d68 100644
Binary files a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$NoteItemBgResources.class and b/src/Notes-master3/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$NoteItemBgResources.class differ
diff --git a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$TextAppearanceResources.class b/src/Notes-master3/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$TextAppearanceResources.class
similarity index 73%
rename from src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$TextAppearanceResources.class
rename to src/Notes-master3/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$TextAppearanceResources.class
index 1714fc2..e0cf3ac 100644
Binary files a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$TextAppearanceResources.class and b/src/Notes-master3/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$TextAppearanceResources.class differ
diff --git a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$WidgetBgResources.class b/src/Notes-master3/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$WidgetBgResources.class
similarity index 61%
rename from src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$WidgetBgResources.class
rename to src/Notes-master3/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$WidgetBgResources.class
index 595f36d..628474b 100644
Binary files a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$WidgetBgResources.class and b/src/Notes-master3/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$WidgetBgResources.class differ
diff --git a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser.class b/src/Notes-master3/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser.class
similarity index 90%
rename from src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser.class
rename to src/Notes-master3/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser.class
index 7ded6f4..9cc6124 100644
Binary files a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser.class and b/src/Notes-master3/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser.class differ
diff --git a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/AlarmAlertActivity.class b/src/Notes-master3/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/AlarmAlertActivity.class
similarity index 87%
rename from src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/AlarmAlertActivity.class
rename to src/Notes-master3/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/AlarmAlertActivity.class
index 79598f6..b1ac847 100644
Binary files a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/AlarmAlertActivity.class and b/src/Notes-master3/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/AlarmAlertActivity.class differ
diff --git a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/AlarmInitReceiver.class b/src/Notes-master3/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/AlarmInitReceiver.class
similarity index 89%
rename from src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/AlarmInitReceiver.class
rename to src/Notes-master3/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/AlarmInitReceiver.class
index 124eb6a..fac5cc4 100644
Binary files a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/AlarmInitReceiver.class and b/src/Notes-master3/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/AlarmInitReceiver.class differ
diff --git a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/AlarmReceiver.class b/src/Notes-master3/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/AlarmReceiver.class
similarity index 100%
rename from src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/AlarmReceiver.class
rename to src/Notes-master3/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/AlarmReceiver.class
diff --git a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$1.class b/src/Notes-master3/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$1.class
similarity index 100%
rename from src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$1.class
rename to src/Notes-master3/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$1.class
diff --git a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$2.class b/src/Notes-master3/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$2.class
similarity index 100%
rename from src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$2.class
rename to src/Notes-master3/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$2.class
diff --git a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$3.class b/src/Notes-master3/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$3.class
similarity index 100%
rename from src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$3.class
rename to src/Notes-master3/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$3.class
diff --git a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$4.class b/src/Notes-master3/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$4.class
similarity index 100%
rename from src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$4.class
rename to src/Notes-master3/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$4.class
diff --git a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$OnDateTimeChangedListener.class b/src/Notes-master3/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$OnDateTimeChangedListener.class
similarity index 100%
rename from src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$OnDateTimeChangedListener.class
rename to src/Notes-master3/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$OnDateTimeChangedListener.class
diff --git a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker.class b/src/Notes-master3/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker.class
similarity index 98%
rename from src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker.class
rename to src/Notes-master3/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker.class
index ff95cab..63288e3 100644
Binary files a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker.class and b/src/Notes-master3/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker.class differ
diff --git a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePickerDialog$1.class b/src/Notes-master3/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePickerDialog$1.class
similarity index 87%
rename from src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePickerDialog$1.class
rename to src/Notes-master3/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePickerDialog$1.class
index 75a9a17..599971f 100644
Binary files a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePickerDialog$1.class and b/src/Notes-master3/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePickerDialog$1.class differ
diff --git a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePickerDialog$OnDateTimeSetListener.class b/src/Notes-master3/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePickerDialog$OnDateTimeSetListener.class
similarity index 100%
rename from src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePickerDialog$OnDateTimeSetListener.class
rename to src/Notes-master3/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePickerDialog$OnDateTimeSetListener.class
diff --git a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePickerDialog.class b/src/Notes-master3/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePickerDialog.class
similarity index 83%
rename from src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePickerDialog.class
rename to src/Notes-master3/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePickerDialog.class
index 81d6513..c94ab71 100644
Binary files a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePickerDialog.class and b/src/Notes-master3/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePickerDialog.class differ
diff --git a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DropdownMenu$1.class b/src/Notes-master3/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DropdownMenu$1.class
similarity index 87%
rename from src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DropdownMenu$1.class
rename to src/Notes-master3/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DropdownMenu$1.class
index 66c9e6f..e75b5b3 100644
Binary files a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DropdownMenu$1.class and b/src/Notes-master3/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DropdownMenu$1.class differ
diff --git a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DropdownMenu.class b/src/Notes-master3/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DropdownMenu.class
similarity index 84%
rename from src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DropdownMenu.class
rename to src/Notes-master3/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DropdownMenu.class
index 86cabc1..ab5ea67 100644
Binary files a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DropdownMenu.class and b/src/Notes-master3/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DropdownMenu.class differ
diff --git a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/FoldersListAdapter$FolderListItem.class b/src/Notes-master3/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/FoldersListAdapter$FolderListItem.class
similarity index 84%
rename from src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/FoldersListAdapter$FolderListItem.class
rename to src/Notes-master3/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/FoldersListAdapter$FolderListItem.class
index 5012ef9..6a1e3c8 100644
Binary files a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/FoldersListAdapter$FolderListItem.class and b/src/Notes-master3/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/FoldersListAdapter$FolderListItem.class differ
diff --git a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/FoldersListAdapter.class b/src/Notes-master3/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/FoldersListAdapter.class
similarity index 85%
rename from src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/FoldersListAdapter.class
rename to src/Notes-master3/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/FoldersListAdapter.class
index 354ae8e..002ad52 100644
Binary files a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/FoldersListAdapter.class and b/src/Notes-master3/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/FoldersListAdapter.class differ
diff --git a/src/Notes-master3/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/LoginActivity$1.class b/src/Notes-master3/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/LoginActivity$1.class
new file mode 100644
index 0000000..d2049f5
Binary files /dev/null and b/src/Notes-master3/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/LoginActivity$1.class differ
diff --git a/src/Notes-master3/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/LoginActivity$2.class b/src/Notes-master3/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/LoginActivity$2.class
new file mode 100644
index 0000000..7a3338c
Binary files /dev/null and b/src/Notes-master3/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/LoginActivity$2.class differ
diff --git a/src/Notes-master3/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/LoginActivity.class b/src/Notes-master3/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/LoginActivity.class
new file mode 100644
index 0000000..f77beba
Binary files /dev/null and b/src/Notes-master3/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/LoginActivity.class differ
diff --git a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$1.class b/src/Notes-master3/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$1.class
similarity index 80%
rename from src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$1.class
rename to src/Notes-master3/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$1.class
index 4064ac0..0d20969 100644
Binary files a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$1.class and b/src/Notes-master3/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$1.class differ
diff --git a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$2.class b/src/Notes-master3/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$2.class
similarity index 60%
rename from src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$2.class
rename to src/Notes-master3/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$2.class
index 19383ea..071160b 100644
Binary files a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$2.class and b/src/Notes-master3/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$2.class differ
diff --git a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$3.class b/src/Notes-master3/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$3.class
similarity index 88%
rename from src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$3.class
rename to src/Notes-master3/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$3.class
index 29d4cf9..2e75295 100644
Binary files a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$3.class and b/src/Notes-master3/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$3.class differ
diff --git a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$HeadViewHolder.class b/src/Notes-master3/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$HeadViewHolder.class
similarity index 83%
rename from src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$HeadViewHolder.class
rename to src/Notes-master3/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$HeadViewHolder.class
index 432dd4e..c1166d5 100644
Binary files a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$HeadViewHolder.class and b/src/Notes-master3/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$HeadViewHolder.class differ
diff --git a/src/Notes-master3/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity.class b/src/Notes-master3/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity.class
new file mode 100644
index 0000000..eb494d7
Binary files /dev/null and b/src/Notes-master3/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity.class differ
diff --git a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditText$1.class b/src/Notes-master3/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditText$1.class
similarity index 100%
rename from src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditText$1.class
rename to src/Notes-master3/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditText$1.class
diff --git a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditText$OnTextViewChangeListener.class b/src/Notes-master3/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditText$OnTextViewChangeListener.class
similarity index 100%
rename from src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditText$OnTextViewChangeListener.class
rename to src/Notes-master3/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditText$OnTextViewChangeListener.class
diff --git a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditText.class b/src/Notes-master3/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditText.class
similarity index 98%
rename from src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditText.class
rename to src/Notes-master3/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditText.class
index 93cd34b..e976591 100644
Binary files a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditText.class and b/src/Notes-master3/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditText.class differ
diff --git a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteItemData.class b/src/Notes-master3/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteItemData.class
similarity index 70%
rename from src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteItemData.class
rename to src/Notes-master3/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteItemData.class
index fea6568..f9ff47c 100644
Binary files a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteItemData.class and b/src/Notes-master3/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteItemData.class differ
diff --git a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$1.class b/src/Notes-master3/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$1.class
similarity index 93%
rename from src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$1.class
rename to src/Notes-master3/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$1.class
index 864ac3f..b3bb900 100644
Binary files a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$1.class and b/src/Notes-master3/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$1.class differ
diff --git a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$2.class b/src/Notes-master3/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$2.class
similarity index 88%
rename from src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$2.class
rename to src/Notes-master3/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$2.class
index 4121fa5..fc2043f 100644
Binary files a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$2.class and b/src/Notes-master3/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$2.class differ
diff --git a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$3.class b/src/Notes-master3/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$3.class
similarity index 85%
rename from src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$3.class
rename to src/Notes-master3/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$3.class
index 53c8d55..24ee9a2 100644
Binary files a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$3.class and b/src/Notes-master3/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$3.class differ
diff --git a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$4.class b/src/Notes-master3/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$4.class
similarity index 92%
rename from src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$4.class
rename to src/Notes-master3/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$4.class
index fe615e5..b1b05a3 100644
Binary files a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$4.class and b/src/Notes-master3/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$4.class differ
diff --git a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$5.class b/src/Notes-master3/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$5.class
similarity index 82%
rename from src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$5.class
rename to src/Notes-master3/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$5.class
index 16e7cca..0252a6e 100644
Binary files a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$5.class and b/src/Notes-master3/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$5.class differ
diff --git a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$6.class b/src/Notes-master3/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$6.class
similarity index 85%
rename from src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$6.class
rename to src/Notes-master3/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$6.class
index 6cb3e5c..196a964 100644
Binary files a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$6.class and b/src/Notes-master3/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$6.class differ
diff --git a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$7.class b/src/Notes-master3/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$7.class
similarity index 88%
rename from src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$7.class
rename to src/Notes-master3/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$7.class
index 7d0dfb1..600894e 100644
Binary files a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$7.class and b/src/Notes-master3/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$7.class differ
diff --git a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$8.class b/src/Notes-master3/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$8.class
similarity index 83%
rename from src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$8.class
rename to src/Notes-master3/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$8.class
index 03e742a..2c4b0e3 100644
Binary files a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$8.class and b/src/Notes-master3/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$8.class differ
diff --git a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$9.class b/src/Notes-master3/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$9.class
similarity index 88%
rename from src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$9.class
rename to src/Notes-master3/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$9.class
index c71fabd..198039f 100644
Binary files a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$9.class and b/src/Notes-master3/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$9.class differ
diff --git a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$BackgroundQueryHandler.class b/src/Notes-master3/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$BackgroundQueryHandler.class
similarity index 87%
rename from src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$BackgroundQueryHandler.class
rename to src/Notes-master3/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$BackgroundQueryHandler.class
index 04bd75e..0bd6529 100644
Binary files a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$BackgroundQueryHandler.class and b/src/Notes-master3/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$BackgroundQueryHandler.class differ
diff --git a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ListEditState.class b/src/Notes-master3/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ListEditState.class
similarity index 84%
rename from src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ListEditState.class
rename to src/Notes-master3/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ListEditState.class
index d5141ec..e0c91ae 100644
Binary files a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ListEditState.class and b/src/Notes-master3/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ListEditState.class differ
diff --git a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback$1.class b/src/Notes-master3/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback$1.class
similarity index 92%
rename from src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback$1.class
rename to src/Notes-master3/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback$1.class
index b6d967b..c93cf29 100644
Binary files a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback$1.class and b/src/Notes-master3/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback$1.class differ
diff --git a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback$2.class b/src/Notes-master3/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback$2.class
similarity index 89%
rename from src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback$2.class
rename to src/Notes-master3/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback$2.class
index fb094fd..1286378 100644
Binary files a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback$2.class and b/src/Notes-master3/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback$2.class differ
diff --git a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback.class b/src/Notes-master3/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback.class
similarity index 78%
rename from src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback.class
rename to src/Notes-master3/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback.class
index 1e80cb2..828fab3 100644
Binary files a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback.class and b/src/Notes-master3/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback.class differ
diff --git a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$NewNoteOnTouchListener.class b/src/Notes-master3/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$NewNoteOnTouchListener.class
similarity index 89%
rename from src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$NewNoteOnTouchListener.class
rename to src/Notes-master3/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$NewNoteOnTouchListener.class
index 3cd4c7a..6a0ede7 100644
Binary files a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$NewNoteOnTouchListener.class and b/src/Notes-master3/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$NewNoteOnTouchListener.class differ
diff --git a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.class b/src/Notes-master3/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.class
similarity index 90%
rename from src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.class
rename to src/Notes-master3/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.class
index 00dcca6..7797da3 100644
Binary files a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.class and b/src/Notes-master3/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.class differ
diff --git a/src/Notes-master3/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity.class b/src/Notes-master3/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity.class
new file mode 100644
index 0000000..482042a
Binary files /dev/null and b/src/Notes-master3/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity.class differ
diff --git a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListAdapter$AppWidgetAttribute.class b/src/Notes-master3/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListAdapter$AppWidgetAttribute.class
similarity index 100%
rename from src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListAdapter$AppWidgetAttribute.class
rename to src/Notes-master3/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListAdapter$AppWidgetAttribute.class
diff --git a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListAdapter.class b/src/Notes-master3/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListAdapter.class
similarity index 100%
rename from src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListAdapter.class
rename to src/Notes-master3/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListAdapter.class
diff --git a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListItem.class b/src/Notes-master3/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListItem.class
similarity index 97%
rename from src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListItem.class
rename to src/Notes-master3/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListItem.class
index c500eba..31ab120 100644
Binary files a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListItem.class and b/src/Notes-master3/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListItem.class differ
diff --git a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$1.class b/src/Notes-master3/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$1.class
similarity index 99%
rename from src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$1.class
rename to src/Notes-master3/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$1.class
index ca8227c..1cce5e0 100644
Binary files a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$1.class and b/src/Notes-master3/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$1.class differ
diff --git a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$2.class b/src/Notes-master3/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$2.class
similarity index 100%
rename from src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$2.class
rename to src/Notes-master3/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$2.class
diff --git a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$3.class b/src/Notes-master3/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$3.class
similarity index 100%
rename from src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$3.class
rename to src/Notes-master3/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$3.class
diff --git a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$4.class b/src/Notes-master3/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$4.class
similarity index 100%
rename from src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$4.class
rename to src/Notes-master3/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$4.class
diff --git a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$5.class b/src/Notes-master3/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$5.class
similarity index 100%
rename from src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$5.class
rename to src/Notes-master3/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$5.class
diff --git a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$6.class b/src/Notes-master3/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$6.class
similarity index 100%
rename from src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$6.class
rename to src/Notes-master3/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$6.class
diff --git a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$7.class b/src/Notes-master3/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$7.class
similarity index 100%
rename from src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$7.class
rename to src/Notes-master3/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$7.class
diff --git a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$8.class b/src/Notes-master3/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$8.class
similarity index 100%
rename from src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$8.class
rename to src/Notes-master3/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$8.class
diff --git a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$GTaskReceiver.class b/src/Notes-master3/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$GTaskReceiver.class
similarity index 96%
rename from src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$GTaskReceiver.class
rename to src/Notes-master3/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$GTaskReceiver.class
index b42fab7..936977e 100644
Binary files a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$GTaskReceiver.class and b/src/Notes-master3/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$GTaskReceiver.class differ
diff --git a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity.class b/src/Notes-master3/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity.class
similarity index 98%
rename from src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity.class
rename to src/Notes-master3/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity.class
index 6b50285..7a47f7b 100644
Binary files a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity.class and b/src/Notes-master3/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity.class differ
diff --git a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider.class b/src/Notes-master3/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider.class
similarity index 98%
rename from src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider.class
rename to src/Notes-master3/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider.class
index 265b0b7..b1e079e 100644
Binary files a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider.class and b/src/Notes-master3/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider.class differ
diff --git a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider_2x.class b/src/Notes-master3/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider_2x.class
similarity index 76%
rename from src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider_2x.class
rename to src/Notes-master3/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider_2x.class
index 0eaab60..47fe7d1 100644
Binary files a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider_2x.class and b/src/Notes-master3/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider_2x.class differ
diff --git a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider_4x.class b/src/Notes-master3/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider_4x.class
similarity index 76%
rename from src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider_4x.class
rename to src/Notes-master3/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider_4x.class
index e315716..279b9df 100644
Binary files a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider_4x.class and b/src/Notes-master3/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider_4x.class differ
diff --git a/src/Notes-master3/Notes-master3/app/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt b/src/Notes-master3/Notes-master3/app/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt
new file mode 100644
index 0000000..b93dd84
--- /dev/null
+++ b/src/Notes-master3/Notes-master3/app/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt
@@ -0,0 +1,304 @@
+1<?xml version="1.0" encoding="utf-8"?>
+2<!--
+3 Copyright (c) 2010-2011, The MiCode Open Source Community (www.micode.net)
+4
+5     Licensed under the Apache License, Version 2.0 (the "License");
+6     you may not use this file except in compliance with the License.
+7     You may obtain a copy of the License at
+8
+9          http://www.apache.org/licenses/LICENSE-2.0
+10
+11     Unless required by applicable law or agreed to in writing, software
+12     distributed under the License is distributed on an "AS IS" BASIS,
+13     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+14     See the License for the specific language governing permissions and
+15     limitations under the License.
+16-->
+17<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+18    package="net.micode.notes"
+19    android:versionCode="1"
+20    android:versionName="0.1" >
+21
+22    <uses-sdk
+22-->C:\Users\13293\Desktop\Notes-master3\Notes-master3\app\src\main\AndroidManifest.xml:24:5-25:42
+23        android:minSdkVersion="14"
+23-->C:\Users\13293\Desktop\Notes-master3\Notes-master3\app\src\main\AndroidManifest.xml:24:15-41
+24        android:targetSdkVersion="33" />
+24-->C:\Users\13293\Desktop\Notes-master3\Notes-master3\app\src\main\AndroidManifest.xml:24:5-25:42
+25
+26    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+26-->C:\Users\13293\Desktop\Notes-master3\Notes-master3\app\src\main\AndroidManifest.xml:27:5-81
+26-->C:\Users\13293\Desktop\Notes-master3\Notes-master3\app\src\main\AndroidManifest.xml:27:22-78
+27    <uses-permission android:name="com.android.launcher.permission.INSTALL_SHORTCUT" />
+27-->C:\Users\13293\Desktop\Notes-master3\Notes-master3\app\src\main\AndroidManifest.xml:28:5-88
+27-->C:\Users\13293\Desktop\Notes-master3\Notes-master3\app\src\main\AndroidManifest.xml:28:22-85
+28    <uses-permission android:name="android.permission.INTERNET" />
+28-->C:\Users\13293\Desktop\Notes-master3\Notes-master3\app\src\main\AndroidManifest.xml:29:5-67
+28-->C:\Users\13293\Desktop\Notes-master3\Notes-master3\app\src\main\AndroidManifest.xml:29:22-64
+29    <uses-permission android:name="android.permission.READ_CONTACTS" />
+29-->C:\Users\13293\Desktop\Notes-master3\Notes-master3\app\src\main\AndroidManifest.xml:30:5-72
+29-->C:\Users\13293\Desktop\Notes-master3\Notes-master3\app\src\main\AndroidManifest.xml:30:22-69
+30    <uses-permission android:name="android.permission.MANAGE_ACCOUNTS" />
+30-->C:\Users\13293\Desktop\Notes-master3\Notes-master3\app\src\main\AndroidManifest.xml:31:5-74
+30-->C:\Users\13293\Desktop\Notes-master3\Notes-master3\app\src\main\AndroidManifest.xml:31:22-71
+31    <uses-permission android:name="android.permission.AUTHENTICATE_ACCOUNTS" />
+31-->C:\Users\13293\Desktop\Notes-master3\Notes-master3\app\src\main\AndroidManifest.xml:32:5-80
+31-->C:\Users\13293\Desktop\Notes-master3\Notes-master3\app\src\main\AndroidManifest.xml:32:22-77
+32    <uses-permission android:name="android.permission.GET_ACCOUNTS" />
+32-->C:\Users\13293\Desktop\Notes-master3\Notes-master3\app\src\main\AndroidManifest.xml:33:5-71
+32-->C:\Users\13293\Desktop\Notes-master3\Notes-master3\app\src\main\AndroidManifest.xml:33:22-68
+33    <uses-permission android:name="android.permission.USE_CREDENTIALS" />
+33-->C:\Users\13293\Desktop\Notes-master3\Notes-master3\app\src\main\AndroidManifest.xml:34:5-74
+33-->C:\Users\13293\Desktop\Notes-master3\Notes-master3\app\src\main\AndroidManifest.xml:34:22-71
+34    <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
+34-->C:\Users\13293\Desktop\Notes-master3\Notes-master3\app\src\main\AndroidManifest.xml:35:5-81
+34-->C:\Users\13293\Desktop\Notes-master3\Notes-master3\app\src\main\AndroidManifest.xml:35:22-78
+35
+36    <application
+36-->C:\Users\13293\Desktop\Notes-master3\Notes-master3\app\src\main\AndroidManifest.xml:37:5-170:19
+37        android:debuggable="true"
+38        android:icon="@drawable/icon_app"
+38-->C:\Users\13293\Desktop\Notes-master3\Notes-master3\app\src\main\AndroidManifest.xml:38:13-46
+39        android:label="@string/app_name"
+39-->C:\Users\13293\Desktop\Notes-master3\Notes-master3\app\src\main\AndroidManifest.xml:39:13-45
+40        android:testOnly="true" >
+41        <activity
+41-->C:\Users\13293\Desktop\Notes-master3\Notes-master3\app\src\main\AndroidManifest.xml:40:9-50:20
+42            android:name="net.micode.notes.ui.LoginActivity"
+42-->C:\Users\13293\Desktop\Notes-master3\Notes-master3\app\src\main\AndroidManifest.xml:41:17-49
+43            android:exported="true"
+43-->C:\Users\13293\Desktop\Notes-master3\Notes-master3\app\src\main\AndroidManifest.xml:42:17-40
+44            android:theme="@style/NoteTheme" >
+44-->C:\Users\13293\Desktop\Notes-master3\Notes-master3\app\src\main\AndroidManifest.xml:43:17-51
+45            <intent-filter>
+45-->C:\Users\13293\Desktop\Notes-master3\Notes-master3\app\src\main\AndroidManifest.xml:46:13-49:29
+46                <action android:name="android.intent.action.MAIN" />
+46-->C:\Users\13293\Desktop\Notes-master3\Notes-master3\app\src\main\AndroidManifest.xml:47:17-69
+46-->C:\Users\13293\Desktop\Notes-master3\Notes-master3\app\src\main\AndroidManifest.xml:47:25-66
+47
+48                <category android:name="android.intent.category.LAUNCHER" />
+48-->C:\Users\13293\Desktop\Notes-master3\Notes-master3\app\src\main\AndroidManifest.xml:48:17-77
+48-->C:\Users\13293\Desktop\Notes-master3\Notes-master3\app\src\main\AndroidManifest.xml:48:27-74
+49            </intent-filter>
+50        </activity>
+51        <activity
+51-->C:\Users\13293\Desktop\Notes-master3\Notes-master3\app\src\main\AndroidManifest.xml:52:9-65:20
+52            android:name="net.micode.notes.ui.NotesListActivity"
+52-->C:\Users\13293\Desktop\Notes-master3\Notes-master3\app\src\main\AndroidManifest.xml:53:13-49
+53            android:configChanges="keyboardHidden|orientation|screenSize"
+53-->C:\Users\13293\Desktop\Notes-master3\Notes-master3\app\src\main\AndroidManifest.xml:54:13-74
+54            android:exported="true"
+54-->C:\Users\13293\Desktop\Notes-master3\Notes-master3\app\src\main\AndroidManifest.xml:55:13-36
+55            android:launchMode="singleTop"
+55-->C:\Users\13293\Desktop\Notes-master3\Notes-master3\app\src\main\AndroidManifest.xml:56:13-43
+56            android:theme="@style/NoteTheme"
+56-->C:\Users\13293\Desktop\Notes-master3\Notes-master3\app\src\main\AndroidManifest.xml:57:13-45
+57            android:uiOptions="splitActionBarWhenNarrow"
+57-->C:\Users\13293\Desktop\Notes-master3\Notes-master3\app\src\main\AndroidManifest.xml:58:13-57
+58            android:windowSoftInputMode="adjustPan" >
+58-->C:\Users\13293\Desktop\Notes-master3\Notes-master3\app\src\main\AndroidManifest.xml:59:13-52
+59            <intent-filter>
+59-->C:\Users\13293\Desktop\Notes-master3\Notes-master3\app\src\main\AndroidManifest.xml:61:13-64:29
+60                <action android:name="android.intent.action.MAIN" />
+60-->C:\Users\13293\Desktop\Notes-master3\Notes-master3\app\src\main\AndroidManifest.xml:47:17-69
+60-->C:\Users\13293\Desktop\Notes-master3\Notes-master3\app\src\main\AndroidManifest.xml:47:25-66
+61
+62                <category android:name="android.intent.category.DEFAULT" />
+62-->C:\Users\13293\Desktop\Notes-master3\Notes-master3\app\src\main\AndroidManifest.xml:63:17-76
+62-->C:\Users\13293\Desktop\Notes-master3\Notes-master3\app\src\main\AndroidManifest.xml:63:27-73
+63            </intent-filter>
+64        </activity>
+65        <activity
+65-->C:\Users\13293\Desktop\Notes-master3\Notes-master3\app\src\main\AndroidManifest.xml:67:9-97:20
+66            android:name="net.micode.notes.ui.NoteEditActivity"
+66-->C:\Users\13293\Desktop\Notes-master3\Notes-master3\app\src\main\AndroidManifest.xml:68:13-48
+67            android:configChanges="keyboardHidden|orientation|screenSize"
+67-->C:\Users\13293\Desktop\Notes-master3\Notes-master3\app\src\main\AndroidManifest.xml:69:13-74
+68            android:exported="true"
+68-->C:\Users\13293\Desktop\Notes-master3\Notes-master3\app\src\main\AndroidManifest.xml:72:13-36
+69            android:launchMode="singleTop"
+69-->C:\Users\13293\Desktop\Notes-master3\Notes-master3\app\src\main\AndroidManifest.xml:70:13-43
+70            android:theme="@style/NoteTheme" >
+70-->C:\Users\13293\Desktop\Notes-master3\Notes-master3\app\src\main\AndroidManifest.xml:71:13-45
+71            <intent-filter android:scheme="http" >
+71-->C:\Users\13293\Desktop\Notes-master3\Notes-master3\app\src\main\AndroidManifest.xml:74:13-80:29
+71-->C:\Users\13293\Desktop\Notes-master3\Notes-master3\app\src\main\AndroidManifest.xml:74:28-49
+72                <action android:name="android.intent.action.VIEW" />
+72-->C:\Users\13293\Desktop\Notes-master3\Notes-master3\app\src\main\AndroidManifest.xml:76:17-69
+72-->C:\Users\13293\Desktop\Notes-master3\Notes-master3\app\src\main\AndroidManifest.xml:76:25-66
+73
+74                <category android:name="android.intent.category.DEFAULT" />
+74-->C:\Users\13293\Desktop\Notes-master3\Notes-master3\app\src\main\AndroidManifest.xml:63:17-76
+74-->C:\Users\13293\Desktop\Notes-master3\Notes-master3\app\src\main\AndroidManifest.xml:63:27-73
+75
+76                <data android:mimeType="vnd.android.cursor.item/text_note" />
+76-->C:\Users\13293\Desktop\Notes-master3\Notes-master3\app\src\main\AndroidManifest.xml:78:17-78
+76-->C:\Users\13293\Desktop\Notes-master3\Notes-master3\app\src\main\AndroidManifest.xml:78:23-75
+77                <data android:mimeType="vnd.android.cursor.item/call_note" />
+77-->C:\Users\13293\Desktop\Notes-master3\Notes-master3\app\src\main\AndroidManifest.xml:78:17-78
+77-->C:\Users\13293\Desktop\Notes-master3\Notes-master3\app\src\main\AndroidManifest.xml:78:23-75
+78            </intent-filter>
+79            <intent-filter>
+79-->C:\Users\13293\Desktop\Notes-master3\Notes-master3\app\src\main\AndroidManifest.xml:82:13-87:29
+80                <action android:name="android.intent.action.INSERT_OR_EDIT" />
+80-->C:\Users\13293\Desktop\Notes-master3\Notes-master3\app\src\main\AndroidManifest.xml:83:17-79
+80-->C:\Users\13293\Desktop\Notes-master3\Notes-master3\app\src\main\AndroidManifest.xml:83:25-76
+81
+82                <category android:name="android.intent.category.DEFAULT" />
+82-->C:\Users\13293\Desktop\Notes-master3\Notes-master3\app\src\main\AndroidManifest.xml:63:17-76
+82-->C:\Users\13293\Desktop\Notes-master3\Notes-master3\app\src\main\AndroidManifest.xml:63:27-73
+83
+84                <data android:mimeType="vnd.android.cursor.item/text_note" />
+84-->C:\Users\13293\Desktop\Notes-master3\Notes-master3\app\src\main\AndroidManifest.xml:78:17-78
+84-->C:\Users\13293\Desktop\Notes-master3\Notes-master3\app\src\main\AndroidManifest.xml:78:23-75
+85                <data android:mimeType="vnd.android.cursor.item/call_note" />
+85-->C:\Users\13293\Desktop\Notes-master3\Notes-master3\app\src\main\AndroidManifest.xml:78:17-78
+85-->C:\Users\13293\Desktop\Notes-master3\Notes-master3\app\src\main\AndroidManifest.xml:78:23-75
+86            </intent-filter>
+87            <intent-filter>
+87-->C:\Users\13293\Desktop\Notes-master3\Notes-master3\app\src\main\AndroidManifest.xml:89:13-92:29
+88                <action android:name="android.intent.action.SEARCH" />
+88-->C:\Users\13293\Desktop\Notes-master3\Notes-master3\app\src\main\AndroidManifest.xml:90:17-71
+88-->C:\Users\13293\Desktop\Notes-master3\Notes-master3\app\src\main\AndroidManifest.xml:90:25-68
+89
+90                <category android:name="android.intent.category.DEFAULT" />
+90-->C:\Users\13293\Desktop\Notes-master3\Notes-master3\app\src\main\AndroidManifest.xml:63:17-76
+90-->C:\Users\13293\Desktop\Notes-master3\Notes-master3\app\src\main\AndroidManifest.xml:63:27-73
+91            </intent-filter>
+92
+93            <meta-data
+93-->C:\Users\13293\Desktop\Notes-master3\Notes-master3\app\src\main\AndroidManifest.xml:94:13-96:54
+94                android:name="android.app.searchable"
+94-->C:\Users\13293\Desktop\Notes-master3\Notes-master3\app\src\main\AndroidManifest.xml:95:17-54
+95                android:resource="@xml/searchable" />
+95-->C:\Users\13293\Desktop\Notes-master3\Notes-master3\app\src\main\AndroidManifest.xml:96:17-51
+96        </activity>
+97
+98        <provider
+98-->C:\Users\13293\Desktop\Notes-master3\Notes-master3\app\src\main\AndroidManifest.xml:99:9-103:40
+99            android:name="net.micode.notes.data.NotesProvider"
+99-->C:\Users\13293\Desktop\Notes-master3\Notes-master3\app\src\main\AndroidManifest.xml:100:13-63
+100            android:authorities="micode_notes"
+100-->C:\Users\13293\Desktop\Notes-master3\Notes-master3\app\src\main\AndroidManifest.xml:101:13-47
+101            android:exported="false"
+101-->C:\Users\13293\Desktop\Notes-master3\Notes-master3\app\src\main\AndroidManifest.xml:103:13-37
+102            android:multiprocess="true" />
+102-->C:\Users\13293\Desktop\Notes-master3\Notes-master3\app\src\main\AndroidManifest.xml:102:13-40
+103
+104        <receiver
+104-->C:\Users\13293\Desktop\Notes-master3\Notes-master3\app\src\main\AndroidManifest.xml:105:9-118:20
+105            android:name="net.micode.notes.widget.NoteWidgetProvider_2x"
+105-->C:\Users\13293\Desktop\Notes-master3\Notes-master3\app\src\main\AndroidManifest.xml:106:13-57
+106            android:exported="true"
+106-->C:\Users\13293\Desktop\Notes-master3\Notes-master3\app\src\main\AndroidManifest.xml:108:13-36
+107            android:label="@string/app_widget2x2" >
+107-->C:\Users\13293\Desktop\Notes-master3\Notes-master3\app\src\main\AndroidManifest.xml:107:13-50
+108            <intent-filter>
+108-->C:\Users\13293\Desktop\Notes-master3\Notes-master3\app\src\main\AndroidManifest.xml:109:13-113:29
+109                <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
+109-->C:\Users\13293\Desktop\Notes-master3\Notes-master3\app\src\main\AndroidManifest.xml:110:17-84
+109-->C:\Users\13293\Desktop\Notes-master3\Notes-master3\app\src\main\AndroidManifest.xml:110:25-81
+110                <action android:name="android.appwidget.action.APPWIDGET_DELETED" />
+110-->C:\Users\13293\Desktop\Notes-master3\Notes-master3\app\src\main\AndroidManifest.xml:111:17-85
+110-->C:\Users\13293\Desktop\Notes-master3\Notes-master3\app\src\main\AndroidManifest.xml:111:25-82
+111                <action android:name="android.intent.action.PRIVACY_MODE_CHANGED" />
+111-->C:\Users\13293\Desktop\Notes-master3\Notes-master3\app\src\main\AndroidManifest.xml:112:17-85
+111-->C:\Users\13293\Desktop\Notes-master3\Notes-master3\app\src\main\AndroidManifest.xml:112:25-82
+112            </intent-filter>
+113
+114            <meta-data
+114-->C:\Users\13293\Desktop\Notes-master3\Notes-master3\app\src\main\AndroidManifest.xml:115:13-117:58
+115                android:name="android.appwidget.provider"
+115-->C:\Users\13293\Desktop\Notes-master3\Notes-master3\app\src\main\AndroidManifest.xml:116:17-58
+116                android:resource="@xml/widget_2x_info" />
+116-->C:\Users\13293\Desktop\Notes-master3\Notes-master3\app\src\main\AndroidManifest.xml:117:17-55
+117        </receiver>
+118        <receiver
+118-->C:\Users\13293\Desktop\Notes-master3\Notes-master3\app\src\main\AndroidManifest.xml:119:9-133:20
+119            android:name="net.micode.notes.widget.NoteWidgetProvider_4x"
+119-->C:\Users\13293\Desktop\Notes-master3\Notes-master3\app\src\main\AndroidManifest.xml:120:13-57
+120            android:exported="true"
+120-->C:\Users\13293\Desktop\Notes-master3\Notes-master3\app\src\main\AndroidManifest.xml:122:13-36
+121            android:label="@string/app_widget4x4" >
+121-->C:\Users\13293\Desktop\Notes-master3\Notes-master3\app\src\main\AndroidManifest.xml:121:13-50
+122            <intent-filter>
+122-->C:\Users\13293\Desktop\Notes-master3\Notes-master3\app\src\main\AndroidManifest.xml:109:13-113:29
+123                <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
+123-->C:\Users\13293\Desktop\Notes-master3\Notes-master3\app\src\main\AndroidManifest.xml:110:17-84
+123-->C:\Users\13293\Desktop\Notes-master3\Notes-master3\app\src\main\AndroidManifest.xml:110:25-81
+124                <action android:name="android.appwidget.action.APPWIDGET_DELETED" />
+124-->C:\Users\13293\Desktop\Notes-master3\Notes-master3\app\src\main\AndroidManifest.xml:111:17-85
+124-->C:\Users\13293\Desktop\Notes-master3\Notes-master3\app\src\main\AndroidManifest.xml:111:25-82
+125                <action android:name="android.intent.action.PRIVACY_MODE_CHANGED" />
+125-->C:\Users\13293\Desktop\Notes-master3\Notes-master3\app\src\main\AndroidManifest.xml:112:17-85
+125-->C:\Users\13293\Desktop\Notes-master3\Notes-master3\app\src\main\AndroidManifest.xml:112:25-82
+126            </intent-filter>
+127
+128            <meta-data
+128-->C:\Users\13293\Desktop\Notes-master3\Notes-master3\app\src\main\AndroidManifest.xml:115:13-117:58
+129                android:name="android.appwidget.provider"
+129-->C:\Users\13293\Desktop\Notes-master3\Notes-master3\app\src\main\AndroidManifest.xml:116:17-58
+130                android:resource="@xml/widget_4x_info" />
+130-->C:\Users\13293\Desktop\Notes-master3\Notes-master3\app\src\main\AndroidManifest.xml:117:17-55
+131        </receiver>
+132        <receiver
+132-->C:\Users\13293\Desktop\Notes-master3\Notes-master3\app\src\main\AndroidManifest.xml:135:9-140:20
+133            android:name="net.micode.notes.ui.AlarmInitReceiver"
+133-->C:\Users\13293\Desktop\Notes-master3\Notes-master3\app\src\main\AndroidManifest.xml:135:19-55
+134            android:exported="true" >
+134-->C:\Users\13293\Desktop\Notes-master3\Notes-master3\app\src\main\AndroidManifest.xml:136:13-36
+135            <intent-filter>
+135-->C:\Users\13293\Desktop\Notes-master3\Notes-master3\app\src\main\AndroidManifest.xml:137:13-139:29
+136                <action android:name="android.intent.action.BOOT_COMPLETED" />
+136-->C:\Users\13293\Desktop\Notes-master3\Notes-master3\app\src\main\AndroidManifest.xml:138:17-79
+136-->C:\Users\13293\Desktop\Notes-master3\Notes-master3\app\src\main\AndroidManifest.xml:138:25-76
+137            </intent-filter>
+138        </receiver>
+139        <receiver
+139-->C:\Users\13293\Desktop\Notes-master3\Notes-master3\app\src\main\AndroidManifest.xml:142:9-145:20
+140            android:name="net.micode.notes.ui.AlarmReceiver"
+140-->C:\Users\13293\Desktop\Notes-master3\Notes-master3\app\src\main\AndroidManifest.xml:143:13-61
+141            android:process=":remote" >
+141-->C:\Users\13293\Desktop\Notes-master3\Notes-master3\app\src\main\AndroidManifest.xml:144:13-38
+142        </receiver>
+143
+144        <activity
+144-->C:\Users\13293\Desktop\Notes-master3\Notes-master3\app\src\main\AndroidManifest.xml:147:9-153:20
+145            android:name="net.micode.notes.ui.AlarmAlertActivity"
+145-->C:\Users\13293\Desktop\Notes-master3\Notes-master3\app\src\main\AndroidManifest.xml:148:13-50
+146            android:label="@string/app_name"
+146-->C:\Users\13293\Desktop\Notes-master3\Notes-master3\app\src\main\AndroidManifest.xml:149:13-45
+147            android:launchMode="singleInstance"
+147-->C:\Users\13293\Desktop\Notes-master3\Notes-master3\app\src\main\AndroidManifest.xml:150:13-48
+148            android:theme="@android:style/Theme.Holo.Wallpaper.NoTitleBar" >
+148-->C:\Users\13293\Desktop\Notes-master3\Notes-master3\app\src\main\AndroidManifest.xml:151:13-75
+149        </activity>
+150        <activity
+150-->C:\Users\13293\Desktop\Notes-master3\Notes-master3\app\src\main\AndroidManifest.xml:155:9-160:20
+151            android:name="net.micode.notes.ui.NotesPreferenceActivity"
+151-->C:\Users\13293\Desktop\Notes-master3\Notes-master3\app\src\main\AndroidManifest.xml:156:13-71
+152            android:label="@string/preferences_title"
+152-->C:\Users\13293\Desktop\Notes-master3\Notes-master3\app\src\main\AndroidManifest.xml:157:13-54
+153            android:launchMode="singleTop"
+153-->C:\Users\13293\Desktop\Notes-master3\Notes-master3\app\src\main\AndroidManifest.xml:158:13-43
+154            android:theme="@android:style/Theme.Holo.Light" >
+154-->C:\Users\13293\Desktop\Notes-master3\Notes-master3\app\src\main\AndroidManifest.xml:159:13-60
+155        </activity>
+156
+157        <service
+157-->C:\Users\13293\Desktop\Notes-master3\Notes-master3\app\src\main\AndroidManifest.xml:162:9-165:19
+158            android:name="net.micode.notes.gtask.remote.GTaskSyncService"
+158-->C:\Users\13293\Desktop\Notes-master3\Notes-master3\app\src\main\AndroidManifest.xml:163:13-74
+159            android:exported="false" >
+159-->C:\Users\13293\Desktop\Notes-master3\Notes-master3\app\src\main\AndroidManifest.xml:164:13-37
+160        </service>
+161
+162        <meta-data
+162-->C:\Users\13293\Desktop\Notes-master3\Notes-master3\app\src\main\AndroidManifest.xml:167:9-169:52
+163            android:name="android.app.default_searchable"
+163-->C:\Users\13293\Desktop\Notes-master3\Notes-master3\app\src\main\AndroidManifest.xml:168:13-58
+164            android:value=".ui.NoteEditActivity" />
+164-->C:\Users\13293\Desktop\Notes-master3\Notes-master3\app\src\main\AndroidManifest.xml:169:13-49
+165    </application>
+166
+167</manifest>
diff --git a/src/Notes-master3/Notes-master3/app/build/intermediates/merged_java_res/debug/base.jar b/src/Notes-master3/Notes-master3/app/build/intermediates/merged_java_res/debug/base.jar
new file mode 100644
index 0000000..15cb0ec
Binary files /dev/null and b/src/Notes-master3/Notes-master3/app/build/intermediates/merged_java_res/debug/base.jar differ
diff --git a/src/Notes-master3/app/build/intermediates/merged_manifest/debug/AndroidManifest.xml b/src/Notes-master3/Notes-master3/app/build/intermediates/merged_manifest/debug/AndroidManifest.xml
similarity index 93%
rename from src/Notes-master3/app/build/intermediates/merged_manifest/debug/AndroidManifest.xml
rename to src/Notes-master3/Notes-master3/app/build/intermediates/merged_manifest/debug/AndroidManifest.xml
index 4ce9215..4953700 100644
--- a/src/Notes-master3/app/build/intermediates/merged_manifest/debug/AndroidManifest.xml
+++ b/src/Notes-master3/Notes-master3/app/build/intermediates/merged_manifest/debug/AndroidManifest.xml
@@ -36,7 +36,18 @@
     <application
         android:debuggable="true"
         android:icon="@drawable/icon_app"
-        android:label="@string/app_name" >
+        android:label="@string/app_name"
+        android:testOnly="true" >
+        <activity
+            android:name="net.micode.notes.ui.LoginActivity"
+            android:exported="true"
+            android:theme="@style/NoteTheme" >
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+        </activity>
         <activity
             android:name="net.micode.notes.ui.NotesListActivity"
             android:configChanges="keyboardHidden|orientation|screenSize"
@@ -48,7 +59,7 @@
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 
-                <category android:name="android.intent.category.LAUNCHER" />
+                <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
         </activity>
         <activity
diff --git a/src/Notes-master3/app/build/intermediates/merged_manifests/debug/AndroidManifest.xml b/src/Notes-master3/Notes-master3/app/build/intermediates/merged_manifests/debug/AndroidManifest.xml
similarity index 93%
rename from src/Notes-master3/app/build/intermediates/merged_manifests/debug/AndroidManifest.xml
rename to src/Notes-master3/Notes-master3/app/build/intermediates/merged_manifests/debug/AndroidManifest.xml
index 4ce9215..4953700 100644
--- a/src/Notes-master3/app/build/intermediates/merged_manifests/debug/AndroidManifest.xml
+++ b/src/Notes-master3/Notes-master3/app/build/intermediates/merged_manifests/debug/AndroidManifest.xml
@@ -36,7 +36,18 @@
     <application
         android:debuggable="true"
         android:icon="@drawable/icon_app"
-        android:label="@string/app_name" >
+        android:label="@string/app_name"
+        android:testOnly="true" >
+        <activity
+            android:name="net.micode.notes.ui.LoginActivity"
+            android:exported="true"
+            android:theme="@style/NoteTheme" >
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+        </activity>
         <activity
             android:name="net.micode.notes.ui.NotesListActivity"
             android:configChanges="keyboardHidden|orientation|screenSize"
@@ -48,7 +59,7 @@
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 
-                <category android:name="android.intent.category.LAUNCHER" />
+                <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
         </activity>
         <activity
diff --git a/src/Notes-master3/app/build/intermediates/merged_manifests/debug/output-metadata.json b/src/Notes-master3/Notes-master3/app/build/intermediates/merged_manifests/debug/output-metadata.json
similarity index 100%
rename from src/Notes-master3/app/build/intermediates/merged_manifests/debug/output-metadata.json
rename to src/Notes-master3/Notes-master3/app/build/intermediates/merged_manifests/debug/output-metadata.json
diff --git a/src/Notes-master3/Notes-master3/app/build/intermediates/merged_res/debug/color_primary_text_dark.xml.flat b/src/Notes-master3/Notes-master3/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/src/Notes-master3/Notes-master3/app/build/intermediates/merged_res/debug/color_primary_text_dark.xml.flat differ
diff --git a/src/Notes-master3/Notes-master3/app/build/intermediates/merged_res/debug/color_secondary_text_dark.xml.flat b/src/Notes-master3/Notes-master3/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/src/Notes-master3/Notes-master3/app/build/intermediates/merged_res/debug/color_secondary_text_dark.xml.flat differ
diff --git a/src/Notes-master3/Notes-master3/app/build/intermediates/merged_res/debug/drawable-hdpi_bg_btn_set_color.png.flat b/src/Notes-master3/Notes-master3/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/src/Notes-master3/Notes-master3/app/build/intermediates/merged_res/debug/drawable-hdpi_bg_btn_set_color.png.flat differ
diff --git a/src/Notes-master3/Notes-master3/app/build/intermediates/merged_res/debug/drawable-hdpi_bg_color_btn_mask.png.flat b/src/Notes-master3/Notes-master3/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/src/Notes-master3/Notes-master3/app/build/intermediates/merged_res/debug/drawable-hdpi_bg_color_btn_mask.png.flat differ
diff --git a/src/Notes-master3/Notes-master3/app/build/intermediates/merged_res/debug/drawable-hdpi_call_record.png.flat b/src/Notes-master3/Notes-master3/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/src/Notes-master3/Notes-master3/app/build/intermediates/merged_res/debug/drawable-hdpi_call_record.png.flat differ
diff --git a/src/Notes-master3/Notes-master3/app/build/intermediates/merged_res/debug/drawable-hdpi_cauc.png.flat b/src/Notes-master3/Notes-master3/app/build/intermediates/merged_res/debug/drawable-hdpi_cauc.png.flat
new file mode 100644
index 0000000..84f3398
Binary files /dev/null and b/src/Notes-master3/Notes-master3/app/build/intermediates/merged_res/debug/drawable-hdpi_cauc.png.flat differ
diff --git a/src/Notes-master3/Notes-master3/app/build/intermediates/merged_res/debug/drawable-hdpi_clock.png.flat b/src/Notes-master3/Notes-master3/app/build/intermediates/merged_res/debug/drawable-hdpi_clock.png.flat
new file mode 100644
index 0000000..a5cd8ef
Binary files /dev/null and b/src/Notes-master3/Notes-master3/app/build/intermediates/merged_res/debug/drawable-hdpi_clock.png.flat differ
diff --git a/src/Notes-master3/Notes-master3/app/build/intermediates/merged_res/debug/drawable-hdpi_delete.png.flat b/src/Notes-master3/Notes-master3/app/build/intermediates/merged_res/debug/drawable-hdpi_delete.png.flat
new file mode 100644
index 0000000..b5e283d
Binary files /dev/null and b/src/Notes-master3/Notes-master3/app/build/intermediates/merged_res/debug/drawable-hdpi_delete.png.flat differ
diff --git a/src/Notes-master3/Notes-master3/app/build/intermediates/merged_res/debug/drawable-hdpi_dropdown_icon.9.png.flat b/src/Notes-master3/Notes-master3/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/src/Notes-master3/Notes-master3/app/build/intermediates/merged_res/debug/drawable-hdpi_dropdown_icon.9.png.flat differ
diff --git a/src/Notes-master3/Notes-master3/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_blue.9.png.flat b/src/Notes-master3/Notes-master3/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/src/Notes-master3/Notes-master3/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_blue.9.png.flat differ
diff --git a/src/Notes-master3/Notes-master3/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_green.9.png.flat b/src/Notes-master3/Notes-master3/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/src/Notes-master3/Notes-master3/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_green.9.png.flat differ
diff --git a/src/Notes-master3/Notes-master3/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_red.9.png.flat b/src/Notes-master3/Notes-master3/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/src/Notes-master3/Notes-master3/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_red.9.png.flat differ
diff --git a/src/Notes-master3/Notes-master3/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_title_blue.9.png.flat b/src/Notes-master3/Notes-master3/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/src/Notes-master3/Notes-master3/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_title_blue.9.png.flat differ
diff --git a/src/Notes-master3/Notes-master3/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_title_green.9.png.flat b/src/Notes-master3/Notes-master3/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/src/Notes-master3/Notes-master3/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_title_green.9.png.flat differ
diff --git a/src/Notes-master3/Notes-master3/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_title_red.9.png.flat b/src/Notes-master3/Notes-master3/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/src/Notes-master3/Notes-master3/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_title_red.9.png.flat differ
diff --git a/src/Notes-master3/Notes-master3/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_title_white.9.png.flat b/src/Notes-master3/Notes-master3/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/src/Notes-master3/Notes-master3/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_title_white.9.png.flat differ
diff --git a/src/Notes-master3/Notes-master3/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_title_yellow.9.png.flat b/src/Notes-master3/Notes-master3/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/src/Notes-master3/Notes-master3/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_title_yellow.9.png.flat differ
diff --git a/src/Notes-master3/Notes-master3/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_white.9.png.flat b/src/Notes-master3/Notes-master3/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/src/Notes-master3/Notes-master3/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_white.9.png.flat differ
diff --git a/src/Notes-master3/Notes-master3/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_yellow.9.png.flat b/src/Notes-master3/Notes-master3/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/src/Notes-master3/Notes-master3/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_yellow.9.png.flat differ
diff --git a/src/Notes-master3/Notes-master3/app/build/intermediates/merged_res/debug/drawable-hdpi_font_large.png.flat b/src/Notes-master3/Notes-master3/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/src/Notes-master3/Notes-master3/app/build/intermediates/merged_res/debug/drawable-hdpi_font_large.png.flat differ
diff --git a/src/Notes-master3/Notes-master3/app/build/intermediates/merged_res/debug/drawable-hdpi_font_normal.png.flat b/src/Notes-master3/Notes-master3/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/src/Notes-master3/Notes-master3/app/build/intermediates/merged_res/debug/drawable-hdpi_font_normal.png.flat differ
diff --git a/src/Notes-master3/Notes-master3/app/build/intermediates/merged_res/debug/drawable-hdpi_font_size_selector_bg.9.png.flat b/src/Notes-master3/Notes-master3/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/src/Notes-master3/Notes-master3/app/build/intermediates/merged_res/debug/drawable-hdpi_font_size_selector_bg.9.png.flat differ
diff --git a/src/Notes-master3/Notes-master3/app/build/intermediates/merged_res/debug/drawable-hdpi_font_small.png.flat b/src/Notes-master3/Notes-master3/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/src/Notes-master3/Notes-master3/app/build/intermediates/merged_res/debug/drawable-hdpi_font_small.png.flat differ
diff --git a/src/Notes-master3/Notes-master3/app/build/intermediates/merged_res/debug/drawable-hdpi_font_super.png.flat b/src/Notes-master3/Notes-master3/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/src/Notes-master3/Notes-master3/app/build/intermediates/merged_res/debug/drawable-hdpi_font_super.png.flat differ
diff --git a/src/Notes-master3/Notes-master3/app/build/intermediates/merged_res/debug/drawable-hdpi_grassland.jpg.flat b/src/Notes-master3/Notes-master3/app/build/intermediates/merged_res/debug/drawable-hdpi_grassland.jpg.flat
new file mode 100644
index 0000000..dca4d01
Binary files /dev/null and b/src/Notes-master3/Notes-master3/app/build/intermediates/merged_res/debug/drawable-hdpi_grassland.jpg.flat differ
diff --git a/src/Notes-master3/Notes-master3/app/build/intermediates/merged_res/debug/drawable-hdpi_icon_app.png.flat b/src/Notes-master3/Notes-master3/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/src/Notes-master3/Notes-master3/app/build/intermediates/merged_res/debug/drawable-hdpi_icon_app.png.flat differ
diff --git a/src/Notes-master3/Notes-master3/app/build/intermediates/merged_res/debug/drawable-hdpi_ikun.png.flat b/src/Notes-master3/Notes-master3/app/build/intermediates/merged_res/debug/drawable-hdpi_ikun.png.flat
new file mode 100644
index 0000000..bd9356c
Binary files /dev/null and b/src/Notes-master3/Notes-master3/app/build/intermediates/merged_res/debug/drawable-hdpi_ikun.png.flat differ
diff --git a/src/Notes-master3/app/build/intermediates/processed_res/debug/out/resources-debug.ap_ b/src/Notes-master3/Notes-master3/app/build/intermediates/merged_res/debug/drawable-hdpi_list_background.png.flat
similarity index 59%
rename from src/Notes-master3/app/build/intermediates/processed_res/debug/out/resources-debug.ap_
rename to src/Notes-master3/Notes-master3/app/build/intermediates/merged_res/debug/drawable-hdpi_list_background.png.flat
index 5e131fb..0bda0bc 100644
Binary files a/src/Notes-master3/app/build/intermediates/processed_res/debug/out/resources-debug.ap_ and b/src/Notes-master3/Notes-master3/app/build/intermediates/merged_res/debug/drawable-hdpi_list_background.png.flat differ
diff --git a/src/Notes-master3/Notes-master3/app/build/intermediates/merged_res/debug/drawable-hdpi_list_blue_down.9.png.flat b/src/Notes-master3/Notes-master3/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/src/Notes-master3/Notes-master3/app/build/intermediates/merged_res/debug/drawable-hdpi_list_blue_down.9.png.flat differ
diff --git a/src/Notes-master3/Notes-master3/app/build/intermediates/merged_res/debug/drawable-hdpi_list_blue_middle.9.png.flat b/src/Notes-master3/Notes-master3/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/src/Notes-master3/Notes-master3/app/build/intermediates/merged_res/debug/drawable-hdpi_list_blue_middle.9.png.flat differ
diff --git a/src/Notes-master3/Notes-master3/app/build/intermediates/merged_res/debug/drawable-hdpi_list_blue_single.9.png.flat b/src/Notes-master3/Notes-master3/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/src/Notes-master3/Notes-master3/app/build/intermediates/merged_res/debug/drawable-hdpi_list_blue_single.9.png.flat differ
diff --git a/src/Notes-master3/Notes-master3/app/build/intermediates/merged_res/debug/drawable-hdpi_list_blue_up.9.png.flat b/src/Notes-master3/Notes-master3/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/src/Notes-master3/Notes-master3/app/build/intermediates/merged_res/debug/drawable-hdpi_list_blue_up.9.png.flat differ
diff --git a/src/Notes-master3/Notes-master3/app/build/intermediates/merged_res/debug/drawable-hdpi_list_folder.9.png.flat b/src/Notes-master3/Notes-master3/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/src/Notes-master3/Notes-master3/app/build/intermediates/merged_res/debug/drawable-hdpi_list_folder.9.png.flat differ
diff --git a/src/Notes-master3/Notes-master3/app/build/intermediates/merged_res/debug/drawable-hdpi_list_footer_bg.9.png.flat b/src/Notes-master3/Notes-master3/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/src/Notes-master3/Notes-master3/app/build/intermediates/merged_res/debug/drawable-hdpi_list_footer_bg.9.png.flat differ
diff --git a/src/Notes-master3/Notes-master3/app/build/intermediates/merged_res/debug/drawable-hdpi_list_green_down.9.png.flat b/src/Notes-master3/Notes-master3/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/src/Notes-master3/Notes-master3/app/build/intermediates/merged_res/debug/drawable-hdpi_list_green_down.9.png.flat differ
diff --git a/src/Notes-master3/Notes-master3/app/build/intermediates/merged_res/debug/drawable-hdpi_list_green_middle.9.png.flat b/src/Notes-master3/Notes-master3/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/src/Notes-master3/Notes-master3/app/build/intermediates/merged_res/debug/drawable-hdpi_list_green_middle.9.png.flat differ
diff --git a/src/Notes-master3/Notes-master3/app/build/intermediates/merged_res/debug/drawable-hdpi_list_green_single.9.png.flat b/src/Notes-master3/Notes-master3/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/src/Notes-master3/Notes-master3/app/build/intermediates/merged_res/debug/drawable-hdpi_list_green_single.9.png.flat differ
diff --git a/src/Notes-master3/Notes-master3/app/build/intermediates/merged_res/debug/drawable-hdpi_list_green_up.9.png.flat b/src/Notes-master3/Notes-master3/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/src/Notes-master3/Notes-master3/app/build/intermediates/merged_res/debug/drawable-hdpi_list_green_up.9.png.flat differ
diff --git a/src/Notes-master3/Notes-master3/app/build/intermediates/merged_res/debug/drawable-hdpi_list_red_down.9.png.flat b/src/Notes-master3/Notes-master3/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/src/Notes-master3/Notes-master3/app/build/intermediates/merged_res/debug/drawable-hdpi_list_red_down.9.png.flat differ
diff --git a/src/Notes-master3/Notes-master3/app/build/intermediates/merged_res/debug/drawable-hdpi_list_red_middle.9.png.flat b/src/Notes-master3/Notes-master3/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/src/Notes-master3/Notes-master3/app/build/intermediates/merged_res/debug/drawable-hdpi_list_red_middle.9.png.flat differ
diff --git a/src/Notes-master3/Notes-master3/app/build/intermediates/merged_res/debug/drawable-hdpi_list_red_single.9.png.flat b/src/Notes-master3/Notes-master3/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/src/Notes-master3/Notes-master3/app/build/intermediates/merged_res/debug/drawable-hdpi_list_red_single.9.png.flat differ
diff --git a/src/Notes-master3/Notes-master3/app/build/intermediates/merged_res/debug/drawable-hdpi_list_red_up.9.png.flat b/src/Notes-master3/Notes-master3/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/src/Notes-master3/Notes-master3/app/build/intermediates/merged_res/debug/drawable-hdpi_list_red_up.9.png.flat differ
diff --git a/src/Notes-master3/Notes-master3/app/build/intermediates/merged_res/debug/drawable-hdpi_list_white_down.9.png.flat b/src/Notes-master3/Notes-master3/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/src/Notes-master3/Notes-master3/app/build/intermediates/merged_res/debug/drawable-hdpi_list_white_down.9.png.flat differ
diff --git a/src/Notes-master3/Notes-master3/app/build/intermediates/merged_res/debug/drawable-hdpi_list_white_middle.9.png.flat b/src/Notes-master3/Notes-master3/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/src/Notes-master3/Notes-master3/app/build/intermediates/merged_res/debug/drawable-hdpi_list_white_middle.9.png.flat differ
diff --git a/src/Notes-master3/Notes-master3/app/build/intermediates/merged_res/debug/drawable-hdpi_list_white_single.9.png.flat b/src/Notes-master3/Notes-master3/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/src/Notes-master3/Notes-master3/app/build/intermediates/merged_res/debug/drawable-hdpi_list_white_single.9.png.flat differ
diff --git a/src/Notes-master3/Notes-master3/app/build/intermediates/merged_res/debug/drawable-hdpi_list_white_up.9.png.flat b/src/Notes-master3/Notes-master3/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/src/Notes-master3/Notes-master3/app/build/intermediates/merged_res/debug/drawable-hdpi_list_white_up.9.png.flat differ
diff --git a/src/Notes-master3/Notes-master3/app/build/intermediates/merged_res/debug/drawable-hdpi_list_yellow_down.9.png.flat b/src/Notes-master3/Notes-master3/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/src/Notes-master3/Notes-master3/app/build/intermediates/merged_res/debug/drawable-hdpi_list_yellow_down.9.png.flat differ
diff --git a/src/Notes-master3/Notes-master3/app/build/intermediates/merged_res/debug/drawable-hdpi_list_yellow_middle.9.png.flat b/src/Notes-master3/Notes-master3/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/src/Notes-master3/Notes-master3/app/build/intermediates/merged_res/debug/drawable-hdpi_list_yellow_middle.9.png.flat differ
diff --git a/src/Notes-master3/Notes-master3/app/build/intermediates/merged_res/debug/drawable-hdpi_list_yellow_single.9.png.flat b/src/Notes-master3/Notes-master3/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/src/Notes-master3/Notes-master3/app/build/intermediates/merged_res/debug/drawable-hdpi_list_yellow_single.9.png.flat differ
diff --git a/src/Notes-master3/Notes-master3/app/build/intermediates/merged_res/debug/drawable-hdpi_list_yellow_up.9.png.flat b/src/Notes-master3/Notes-master3/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/src/Notes-master3/Notes-master3/app/build/intermediates/merged_res/debug/drawable-hdpi_list_yellow_up.9.png.flat differ
diff --git a/src/Notes-master3/Notes-master3/app/build/intermediates/merged_res/debug/drawable-hdpi_menu_delete.png.flat b/src/Notes-master3/Notes-master3/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/src/Notes-master3/Notes-master3/app/build/intermediates/merged_res/debug/drawable-hdpi_menu_delete.png.flat differ
diff --git a/src/Notes-master3/Notes-master3/app/build/intermediates/merged_res/debug/drawable-hdpi_menu_move.png.flat b/src/Notes-master3/Notes-master3/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/src/Notes-master3/Notes-master3/app/build/intermediates/merged_res/debug/drawable-hdpi_menu_move.png.flat differ
diff --git a/src/Notes-master3/Notes-master3/app/build/intermediates/merged_res/debug/drawable-hdpi_new_note_normal.png.flat b/src/Notes-master3/Notes-master3/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/src/Notes-master3/Notes-master3/app/build/intermediates/merged_res/debug/drawable-hdpi_new_note_normal.png.flat differ
diff --git a/src/Notes-master3/Notes-master3/app/build/intermediates/merged_res/debug/drawable-hdpi_new_note_pressed.png.flat b/src/Notes-master3/Notes-master3/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/src/Notes-master3/Notes-master3/app/build/intermediates/merged_res/debug/drawable-hdpi_new_note_pressed.png.flat differ
diff --git a/src/Notes-master3/Notes-master3/app/build/intermediates/merged_res/debug/drawable-hdpi_note_edit_color_selector_panel.png.flat b/src/Notes-master3/Notes-master3/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/src/Notes-master3/Notes-master3/app/build/intermediates/merged_res/debug/drawable-hdpi_note_edit_color_selector_panel.png.flat differ
diff --git a/src/Notes-master3/Notes-master3/app/build/intermediates/merged_res/debug/drawable-hdpi_notification.png.flat b/src/Notes-master3/Notes-master3/app/build/intermediates/merged_res/debug/drawable-hdpi_notification.png.flat
new file mode 100644
index 0000000..dbeee0b
Binary files /dev/null and b/src/Notes-master3/Notes-master3/app/build/intermediates/merged_res/debug/drawable-hdpi_notification.png.flat differ
diff --git a/src/Notes-master3/Notes-master3/app/build/intermediates/merged_res/debug/drawable-hdpi_search_result.png.flat b/src/Notes-master3/Notes-master3/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/src/Notes-master3/Notes-master3/app/build/intermediates/merged_res/debug/drawable-hdpi_search_result.png.flat differ
diff --git a/src/Notes-master3/Notes-master3/app/build/intermediates/merged_res/debug/drawable-hdpi_selected.png.flat b/src/Notes-master3/Notes-master3/app/build/intermediates/merged_res/debug/drawable-hdpi_selected.png.flat
new file mode 100644
index 0000000..be2aedd
Binary files /dev/null and b/src/Notes-master3/Notes-master3/app/build/intermediates/merged_res/debug/drawable-hdpi_selected.png.flat differ
diff --git a/src/Notes-master3/Notes-master3/app/build/intermediates/merged_res/debug/drawable-hdpi_title_alert.png.flat b/src/Notes-master3/Notes-master3/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/src/Notes-master3/Notes-master3/app/build/intermediates/merged_res/debug/drawable-hdpi_title_alert.png.flat differ
diff --git a/src/Notes-master3/Notes-master3/app/build/intermediates/merged_res/debug/drawable-hdpi_title_bar_bg.9.png.flat b/src/Notes-master3/Notes-master3/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/src/Notes-master3/Notes-master3/app/build/intermediates/merged_res/debug/drawable-hdpi_title_bar_bg.9.png.flat differ
diff --git a/src/Notes-master3/Notes-master3/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_2x_blue.png.flat b/src/Notes-master3/Notes-master3/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/src/Notes-master3/Notes-master3/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_2x_blue.png.flat differ
diff --git a/src/Notes-master3/Notes-master3/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_2x_green.png.flat b/src/Notes-master3/Notes-master3/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/src/Notes-master3/Notes-master3/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_2x_green.png.flat differ
diff --git a/src/Notes-master3/Notes-master3/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_2x_red.png.flat b/src/Notes-master3/Notes-master3/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/src/Notes-master3/Notes-master3/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_2x_red.png.flat differ
diff --git a/src/Notes-master3/Notes-master3/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_2x_white.png.flat b/src/Notes-master3/Notes-master3/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/src/Notes-master3/Notes-master3/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_2x_white.png.flat differ
diff --git a/src/Notes-master3/Notes-master3/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_2x_yellow.png.flat b/src/Notes-master3/Notes-master3/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/src/Notes-master3/Notes-master3/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_2x_yellow.png.flat differ
diff --git a/src/Notes-master3/Notes-master3/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_4x_blue.png.flat b/src/Notes-master3/Notes-master3/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/src/Notes-master3/Notes-master3/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_4x_blue.png.flat differ
diff --git a/src/Notes-master3/Notes-master3/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_4x_green.png.flat b/src/Notes-master3/Notes-master3/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/src/Notes-master3/Notes-master3/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_4x_green.png.flat differ
diff --git a/src/Notes-master3/Notes-master3/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_4x_red.png.flat b/src/Notes-master3/Notes-master3/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/src/Notes-master3/Notes-master3/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_4x_red.png.flat differ
diff --git a/src/Notes-master3/Notes-master3/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_4x_white.png.flat b/src/Notes-master3/Notes-master3/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/src/Notes-master3/Notes-master3/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_4x_white.png.flat differ
diff --git a/src/Notes-master3/Notes-master3/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_4x_yellow.png.flat b/src/Notes-master3/Notes-master3/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/src/Notes-master3/Notes-master3/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_4x_yellow.png.flat differ
diff --git a/src/Notes-master3/Notes-master3/app/build/intermediates/merged_res/debug/drawable_new_note.xml.flat b/src/Notes-master3/Notes-master3/app/build/intermediates/merged_res/debug/drawable_new_note.xml.flat
new file mode 100644
index 0000000..8b4b3a5
Binary files /dev/null and b/src/Notes-master3/Notes-master3/app/build/intermediates/merged_res/debug/drawable_new_note.xml.flat differ
diff --git a/src/Notes-master3/Notes-master3/app/build/intermediates/merged_res/debug/layout_account_dialog_title.xml.flat b/src/Notes-master3/Notes-master3/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/src/Notes-master3/Notes-master3/app/build/intermediates/merged_res/debug/layout_account_dialog_title.xml.flat differ
diff --git a/src/Notes-master3/Notes-master3/app/build/intermediates/merged_res/debug/layout_activity_login.xml.flat b/src/Notes-master3/Notes-master3/app/build/intermediates/merged_res/debug/layout_activity_login.xml.flat
new file mode 100644
index 0000000..8eedfaa
Binary files /dev/null and b/src/Notes-master3/Notes-master3/app/build/intermediates/merged_res/debug/layout_activity_login.xml.flat differ
diff --git a/src/Notes-master3/Notes-master3/app/build/intermediates/merged_res/debug/layout_add_account_text.xml.flat b/src/Notes-master3/Notes-master3/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/src/Notes-master3/Notes-master3/app/build/intermediates/merged_res/debug/layout_add_account_text.xml.flat differ
diff --git a/src/Notes-master3/Notes-master3/app/build/intermediates/merged_res/debug/layout_datetime_picker.xml.flat b/src/Notes-master3/Notes-master3/app/build/intermediates/merged_res/debug/layout_datetime_picker.xml.flat
new file mode 100644
index 0000000..16cf2ef
Binary files /dev/null and b/src/Notes-master3/Notes-master3/app/build/intermediates/merged_res/debug/layout_datetime_picker.xml.flat differ
diff --git a/src/Notes-master3/Notes-master3/app/build/intermediates/merged_res/debug/layout_dialog_edit_text.xml.flat b/src/Notes-master3/Notes-master3/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/src/Notes-master3/Notes-master3/app/build/intermediates/merged_res/debug/layout_dialog_edit_text.xml.flat differ
diff --git a/src/Notes-master3/Notes-master3/app/build/intermediates/merged_res/debug/layout_folder_list_item.xml.flat b/src/Notes-master3/Notes-master3/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/src/Notes-master3/Notes-master3/app/build/intermediates/merged_res/debug/layout_folder_list_item.xml.flat differ
diff --git a/src/Notes-master3/Notes-master3/app/build/intermediates/merged_res/debug/layout_note_edit.xml.flat b/src/Notes-master3/Notes-master3/app/build/intermediates/merged_res/debug/layout_note_edit.xml.flat
new file mode 100644
index 0000000..951dd2f
Binary files /dev/null and b/src/Notes-master3/Notes-master3/app/build/intermediates/merged_res/debug/layout_note_edit.xml.flat differ
diff --git a/src/Notes-master3/Notes-master3/app/build/intermediates/merged_res/debug/layout_note_edit_list_item.xml.flat b/src/Notes-master3/Notes-master3/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/src/Notes-master3/Notes-master3/app/build/intermediates/merged_res/debug/layout_note_edit_list_item.xml.flat differ
diff --git a/src/Notes-master3/Notes-master3/app/build/intermediates/merged_res/debug/layout_note_item.xml.flat b/src/Notes-master3/Notes-master3/app/build/intermediates/merged_res/debug/layout_note_item.xml.flat
new file mode 100644
index 0000000..2ae3d38
Binary files /dev/null and b/src/Notes-master3/Notes-master3/app/build/intermediates/merged_res/debug/layout_note_item.xml.flat differ
diff --git a/src/Notes-master3/Notes-master3/app/build/intermediates/merged_res/debug/layout_note_list.xml.flat b/src/Notes-master3/Notes-master3/app/build/intermediates/merged_res/debug/layout_note_list.xml.flat
new file mode 100644
index 0000000..3f497d8
Binary files /dev/null and b/src/Notes-master3/Notes-master3/app/build/intermediates/merged_res/debug/layout_note_list.xml.flat differ
diff --git a/src/Notes-master3/Notes-master3/app/build/intermediates/merged_res/debug/layout_note_list_dropdown_menu.xml.flat b/src/Notes-master3/Notes-master3/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/src/Notes-master3/Notes-master3/app/build/intermediates/merged_res/debug/layout_note_list_dropdown_menu.xml.flat differ
diff --git a/src/Notes-master3/Notes-master3/app/build/intermediates/merged_res/debug/layout_note_list_footer.xml.flat b/src/Notes-master3/Notes-master3/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/src/Notes-master3/Notes-master3/app/build/intermediates/merged_res/debug/layout_note_list_footer.xml.flat differ
diff --git a/src/Notes-master3/Notes-master3/app/build/intermediates/merged_res/debug/layout_settings_header.xml.flat b/src/Notes-master3/Notes-master3/app/build/intermediates/merged_res/debug/layout_settings_header.xml.flat
new file mode 100644
index 0000000..4b1a1cd
Binary files /dev/null and b/src/Notes-master3/Notes-master3/app/build/intermediates/merged_res/debug/layout_settings_header.xml.flat differ
diff --git a/src/Notes-master3/Notes-master3/app/build/intermediates/merged_res/debug/layout_widget_2x.xml.flat b/src/Notes-master3/Notes-master3/app/build/intermediates/merged_res/debug/layout_widget_2x.xml.flat
new file mode 100644
index 0000000..c923e71
Binary files /dev/null and b/src/Notes-master3/Notes-master3/app/build/intermediates/merged_res/debug/layout_widget_2x.xml.flat differ
diff --git a/src/Notes-master3/Notes-master3/app/build/intermediates/merged_res/debug/layout_widget_4x.xml.flat b/src/Notes-master3/Notes-master3/app/build/intermediates/merged_res/debug/layout_widget_4x.xml.flat
new file mode 100644
index 0000000..bd9974e
Binary files /dev/null and b/src/Notes-master3/Notes-master3/app/build/intermediates/merged_res/debug/layout_widget_4x.xml.flat differ
diff --git a/src/Notes-master3/Notes-master3/app/build/intermediates/merged_res/debug/menu_call_note_edit.xml.flat b/src/Notes-master3/Notes-master3/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/src/Notes-master3/Notes-master3/app/build/intermediates/merged_res/debug/menu_call_note_edit.xml.flat differ
diff --git a/src/Notes-master3/Notes-master3/app/build/intermediates/merged_res/debug/menu_call_record_folder.xml.flat b/src/Notes-master3/Notes-master3/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/src/Notes-master3/Notes-master3/app/build/intermediates/merged_res/debug/menu_call_record_folder.xml.flat differ
diff --git a/src/Notes-master3/Notes-master3/app/build/intermediates/merged_res/debug/menu_note_edit.xml.flat b/src/Notes-master3/Notes-master3/app/build/intermediates/merged_res/debug/menu_note_edit.xml.flat
new file mode 100644
index 0000000..c2c61cc
Binary files /dev/null and b/src/Notes-master3/Notes-master3/app/build/intermediates/merged_res/debug/menu_note_edit.xml.flat differ
diff --git a/src/Notes-master3/Notes-master3/app/build/intermediates/merged_res/debug/menu_note_list.xml.flat b/src/Notes-master3/Notes-master3/app/build/intermediates/merged_res/debug/menu_note_list.xml.flat
new file mode 100644
index 0000000..fadc4eb
Binary files /dev/null and b/src/Notes-master3/Notes-master3/app/build/intermediates/merged_res/debug/menu_note_list.xml.flat differ
diff --git a/src/Notes-master3/Notes-master3/app/build/intermediates/merged_res/debug/menu_note_list_dropdown.xml.flat b/src/Notes-master3/Notes-master3/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/src/Notes-master3/Notes-master3/app/build/intermediates/merged_res/debug/menu_note_list_dropdown.xml.flat differ
diff --git a/src/Notes-master3/Notes-master3/app/build/intermediates/merged_res/debug/menu_note_list_options.xml.flat b/src/Notes-master3/Notes-master3/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/src/Notes-master3/Notes-master3/app/build/intermediates/merged_res/debug/menu_note_list_options.xml.flat differ
diff --git a/src/Notes-master3/Notes-master3/app/build/intermediates/merged_res/debug/menu_sub_folder.xml.flat b/src/Notes-master3/Notes-master3/app/build/intermediates/merged_res/debug/menu_sub_folder.xml.flat
new file mode 100644
index 0000000..4e4f099
Binary files /dev/null and b/src/Notes-master3/Notes-master3/app/build/intermediates/merged_res/debug/menu_sub_folder.xml.flat differ
diff --git a/src/Notes-master3/Notes-master3/app/build/intermediates/merged_res/debug/raw-zh-rCN_introduction.flat b/src/Notes-master3/Notes-master3/app/build/intermediates/merged_res/debug/raw-zh-rCN_introduction.flat
new file mode 100644
index 0000000..17cb018
Binary files /dev/null and b/src/Notes-master3/Notes-master3/app/build/intermediates/merged_res/debug/raw-zh-rCN_introduction.flat differ
diff --git a/src/Notes-master3/Notes-master3/app/build/intermediates/merged_res/debug/raw_introduction.flat b/src/Notes-master3/Notes-master3/app/build/intermediates/merged_res/debug/raw_introduction.flat
new file mode 100644
index 0000000..608c6fd
Binary files /dev/null and b/src/Notes-master3/Notes-master3/app/build/intermediates/merged_res/debug/raw_introduction.flat differ
diff --git a/src/Notes-master3/Notes-master3/app/build/intermediates/merged_res/debug/values-zh-rCN_values-zh-rCN.arsc.flat b/src/Notes-master3/Notes-master3/app/build/intermediates/merged_res/debug/values-zh-rCN_values-zh-rCN.arsc.flat
new file mode 100644
index 0000000..816b1bb
Binary files /dev/null and b/src/Notes-master3/Notes-master3/app/build/intermediates/merged_res/debug/values-zh-rCN_values-zh-rCN.arsc.flat differ
diff --git a/src/Notes-master3/Notes-master3/app/build/intermediates/merged_res/debug/values-zh-rTW_values-zh-rTW.arsc.flat b/src/Notes-master3/Notes-master3/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/src/Notes-master3/Notes-master3/app/build/intermediates/merged_res/debug/values-zh-rTW_values-zh-rTW.arsc.flat differ
diff --git a/src/Notes-master3/Notes-master3/app/build/intermediates/merged_res/debug/values_values.arsc.flat b/src/Notes-master3/Notes-master3/app/build/intermediates/merged_res/debug/values_values.arsc.flat
new file mode 100644
index 0000000..41d8048
Binary files /dev/null and b/src/Notes-master3/Notes-master3/app/build/intermediates/merged_res/debug/values_values.arsc.flat differ
diff --git a/src/Notes-master3/Notes-master3/app/build/intermediates/merged_res/debug/xml_preferences.xml.flat b/src/Notes-master3/Notes-master3/app/build/intermediates/merged_res/debug/xml_preferences.xml.flat
new file mode 100644
index 0000000..e36a338
Binary files /dev/null and b/src/Notes-master3/Notes-master3/app/build/intermediates/merged_res/debug/xml_preferences.xml.flat differ
diff --git a/src/Notes-master3/Notes-master3/app/build/intermediates/merged_res/debug/xml_searchable.xml.flat b/src/Notes-master3/Notes-master3/app/build/intermediates/merged_res/debug/xml_searchable.xml.flat
new file mode 100644
index 0000000..c4dc076
Binary files /dev/null and b/src/Notes-master3/Notes-master3/app/build/intermediates/merged_res/debug/xml_searchable.xml.flat differ
diff --git a/src/Notes-master3/Notes-master3/app/build/intermediates/merged_res/debug/xml_widget_2x_info.xml.flat b/src/Notes-master3/Notes-master3/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/src/Notes-master3/Notes-master3/app/build/intermediates/merged_res/debug/xml_widget_2x_info.xml.flat differ
diff --git a/src/Notes-master3/Notes-master3/app/build/intermediates/merged_res/debug/xml_widget_4x_info.xml.flat b/src/Notes-master3/Notes-master3/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/src/Notes-master3/Notes-master3/app/build/intermediates/merged_res/debug/xml_widget_4x_info.xml.flat differ
diff --git a/src/Notes-master3/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/debug.json b/src/Notes-master3/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/debug.json
new file mode 100644
index 0000000..eed9551
--- /dev/null
+++ b/src/Notes-master3/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/debug.json
@@ -0,0 +1,186 @@
+{
+    "logs": [
+        {
+            "outputFile": "net.micode.notes.app-merged_res-5:/values-zh-rCN_values-zh-rCN.arsc.flat",
+            "map": [
+                {
+                    "source": "C:\\Users\\13293\\Desktop\\Notes-master3\\Notes-master3\\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"
+                    }
+                },
+                {
+                    "source": "C:\\Users\\13293\\Desktop\\Notes-master3\\Notes-master3\\app\\src\\main\\res\\values-zh-rCN\\strings.xml",
+                    "from": {
+                        "startLines": "125,75,74,73,72,19,20,21,116,117,124,123,26,81,82,80,79,78,94,93,92,84,64,29,30,85,76,118,71,67,42,48,53,43,63,62,61,57,56,54,55,58,41,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,103,115,108,107,109,110,112,111,102,106,104,105,99,113,114,122,120,119,121,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",
+                        "startOffsets": "6617,3580,3514,3441,3391,827,867,915,6168,6213,6563,6513,1199,3946,4014,3887,3822,3759,4677,4617,4554,4146,2962,1369,1422,4200,3653,6270,3332,3119,1883,2164,2410,1936,2902,2849,2798,2603,2555,2461,2509,2649,1818,2696,2207,3273,2746,3162,2121,2363,2307,2252,3064,2077,3022,1986,2027,3214,1318,1623,1719,1576,1672,1529,1484,1148,1095,5052,4993,5193,6094,5504,5435,5568,5646,5829,5756,5127,5380,5250,5315,4944,5933,6016,6475,6368,6320,6413,1261,4091,4495,4790,4732,4857,4447,4402,4354,4303,963,1029",
+                        "endLines": "127,75,74,73,72,19,20,21,116,117,124,123,26,81,82,80,79,78,94,93,92,84,64,29,30,85,76,118,71,67,42,48,53,43,63,62,61,57,56,54,55,58,41,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,103,115,108,107,109,110,112,111,102,106,104,105,99,113,114,122,120,119,121,27,83,91,96,95,97,90,89,88,87,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,64,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": "6789,3648,3575,3509,3436,862,910,958,6208,6265,6612,6558,1256,4009,4086,3941,3882,3817,4727,4672,4612,4195,3017,1417,1479,4280,3729,6315,3386,3157,1931,2202,2456,1981,2957,2897,2844,2644,2598,2504,2550,2691,1878,2741,2247,3327,2793,3209,2159,2405,2358,2302,3114,2116,3059,2022,2072,3268,1364,1667,1763,1618,1714,1571,1524,1194,1143,5122,5047,5245,6163,5563,5499,5641,5751,5928,5824,5188,5430,5310,5375,4988,6011,6089,6508,6408,6363,6470,1313,4141,4549,4852,4785,4914,4490,4442,4397,4349,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,107",
+                        "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",
+                        "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,2768,2818,2863,2922,2974,3026,3069,3116,3172,3227,3282,3326,3368,3409,3459,3518,3569,3618,3667,3714,3761,3808,3853,3904,3957,4032,4091,4148,4222,4286,4355,4433,4543,4647,4720,4786,4841,4906,4971,5020,5103,5181,5219,5264,5312,5374,5431,5486,5545,5612,5670,5732,5780,5825,5873,5924,5990",
+                        "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,107",
+                        "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,64,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,2763,2813,2858,2917,2969,3021,3064,3111,3167,3222,3277,3321,3363,3404,3454,3513,3564,3613,3662,3709,3756,3803,3848,3899,3952,4027,4086,4143,4217,4281,4350,4428,4538,4642,4715,4781,4836,4901,4966,5015,5098,5176,5214,5259,5307,5369,5426,5481,5540,5607,5665,5727,5775,5820,5868,5919,5985,6051"
+                    }
+                }
+            ]
+        },
+        {
+            "outputFile": "net.micode.notes.app-merged_res-5:/values_values.arsc.flat",
+            "map": [
+                {
+                    "source": "C:\\Users\\13293\\Desktop\\Notes-master3\\Notes-master3\\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": "150,345",
+                        "endLines": "7,11",
+                        "endColumns": "19,19",
+                        "endOffsets": "340,460"
+                    }
+                },
+                {
+                    "source": "C:\\Users\\13293\\Desktop\\Notes-master3\\Notes-master3\\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,2846,2634,1073,1258,1443,1647,1854,890,2056"
+                    },
+                    "to": {
+                        "startLines": "134,138,142,146,149,153,157,161,165,169,173",
+                        "startColumns": "4,4,4,4,4,4,4,4,4,4,4",
+                        "startOffsets": "8783,8987,9198,9408,9568,9751,9936,10121,10324,10530,10713",
+                        "endLines": "137,141,145,148,152,156,160,164,168,172,176",
+                        "endColumns": "12,12,12,12,12,12,12,12,12,12,12",
+                        "endOffsets": "8982,9193,9403,9563,9746,9931,10116,10319,10525,10708,10909"
+                    }
+                },
+                {
+                    "source": "C:\\Users\\13293\\Desktop\\Notes-master3\\Notes-master3\\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": "522,574,627,680,732",
+                        "endColumns": "51,52,52,51,51",
+                        "endOffsets": "569,622,675,727,779"
+                    }
+                },
+                {
+                    "source": "C:\\Users\\13293\\Desktop\\Notes-master3\\Notes-master3\\app\\src\\main\\res\\values\\strings.xml",
+                    "from": {
+                        "startLines": "141,138,78,81,80,79,140,19,20,21,124,125,137,133,132,26,87,88,86,85,84,100,99,98,90,39,38,70,29,30,91,47,82,126,77,139,73,44,48,54,59,49,69,68,67,63,62,60,61,64,43,65,55,76,66,74,53,58,57,56,72,52,71,50,51,75,28,34,36,33,35,32,31,25,24,107,106,110,122,115,114,116,117,119,118,108,109,113,111,112,105,120,121,134,136,135,131,129,128,130,27,89,97,102,101,103,96,95,94,93,22,23",
+                        "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
+                        "startOffsets": "8700,8488,4093,4354,4258,4189,8617,881,924,976,7701,7750,8429,8145,8094,1336,4808,4902,4737,4653,4570,5769,5686,5584,5078,2058,2007,3592,1540,1593,5139,2292,4437,7813,4022,8555,3777,2235,2351,2666,2967,2409,3521,3460,3403,3181,3129,3026,3079,3231,2170,3281,2713,3956,3341,3826,2619,2912,2824,2766,3715,2569,3670,2466,2509,3889,1485,1804,1912,1757,1859,1701,1653,1281,1228,6225,6158,6466,7604,6830,6749,6904,6993,7235,7156,6309,6384,6690,6530,6610,6103,7379,7501,8229,8364,8296,8053,7926,7869,7979,1420,5010,5498,5904,5835,5984,5439,5384,5322,5262,1028,1138",
+                        "endLines": "145,138,78,81,80,79,140,19,20,21,124,125,137,133,132,26,87,88,86,85,84,100,99,98,90,39,38,70,29,30,91,47,82,126,77,139,73,44,48,54,59,49,69,68,67,63,62,60,61,64,43,65,55,76,66,74,53,58,57,56,72,52,71,50,51,75,28,34,36,33,35,32,31,25,24,107,106,110,122,115,114,116,117,119,118,108,109,113,111,112,105,120,121,134,136,135,131,129,128,130,27,89,97,102,101,103,96,95,94,93,22,23",
+                        "endColumns": "14,66,95,82,95,68,82,42,51,51,48,62,58,83,50,83,93,107,70,83,82,65,82,101,60,61,50,77,52,59,104,58,101,54,70,61,48,54,57,46,58,56,70,60,56,49,51,52,49,49,64,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,66,64,67,40,52,56,73,64,67,85,79,68,93,58,54,61,59,109,89",
+                        "endOffsets": "9103,8550,4184,4432,4349,4253,8695,919,971,1023,7745,7808,8483,8224,8140,1415,4897,5005,4803,4732,4648,5830,5764,5681,5134,2115,2053,3665,1588,1648,5239,2346,4534,7863,4088,8612,3821,2285,2404,2708,3021,2461,3587,3516,3455,3226,3176,3074,3124,3276,2230,3336,2761,4017,3398,3884,2661,2962,2907,2819,3772,2614,3710,2504,2564,3951,1535,1854,1960,1799,1907,1752,1696,1331,1276,6304,6220,6525,7695,6899,6825,6988,7151,7374,7230,6379,6461,6744,6605,6685,6153,7496,7599,8291,8424,8359,8089,7974,7921,8048,1480,5073,5579,5979,5899,6073,5493,5434,5379,5317,1133,1223"
+                    },
+                    "to": {
+                        "startLines": "18,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125,126,127,128,129,130,131,132,133",
+                        "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
+                        "startOffsets": "784,1136,1203,1299,1382,1478,1547,1630,1673,1725,1777,1826,1889,1948,2030,2081,2165,2259,2367,2438,2522,2605,2671,2754,2856,2917,2979,3030,3108,3161,3221,3326,3385,3487,3542,3613,3675,3724,3779,3837,3884,3943,4000,4071,4132,4189,4239,4291,4344,4394,4444,4509,4569,4622,4688,4750,4813,4860,4915,5003,5061,5123,5173,5218,5261,5321,5388,5443,5498,5551,5598,5651,5707,5755,5810,5863,5947,6014,6078,6174,6248,6329,6418,6581,6725,6804,6879,6961,7020,7100,7180,7235,7357,7460,7527,7592,7660,7701,7754,7811,7885,7950,8018,8104,8184,8253,8347,8406,8461,8523,8583,8693",
+                        "endLines": "22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125,126,127,128,129,130,131,132,133",
+                        "endColumns": "14,66,95,82,95,68,82,42,51,51,48,62,58,81,50,83,93,107,70,83,82,65,82,101,60,61,50,77,52,59,104,58,101,54,70,61,48,54,57,46,58,56,70,60,56,49,51,52,49,49,64,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,66,64,67,40,52,56,73,64,67,85,79,68,93,58,54,61,59,109,89",
+                        "endOffsets": "1131,1198,1294,1377,1473,1542,1625,1668,1720,1772,1821,1884,1943,2025,2076,2160,2254,2362,2433,2517,2600,2666,2749,2851,2912,2974,3025,3103,3156,3216,3321,3380,3482,3537,3608,3670,3719,3774,3832,3879,3938,3995,4066,4127,4184,4234,4286,4339,4389,4439,4504,4564,4617,4683,4745,4808,4855,4910,4998,5056,5118,5168,5213,5256,5316,5383,5438,5493,5546,5593,5646,5702,5750,5805,5858,5942,6009,6073,6169,6243,6324,6413,6576,6720,6799,6874,6956,7015,7095,7175,7230,7352,7455,7522,7587,7655,7696,7749,7806,7880,7945,8013,8099,8179,8248,8342,8401,8456,8518,8578,8688,8778"
+                    }
+                },
+                {
+                    "source": "C:\\Users\\13293\\Desktop\\Notes-master3\\Notes-master3\\app\\src\\main\\res\\values\\colors.xml",
+                    "from": {
+                        "startLines": "18",
+                        "startColumns": "4",
+                        "startOffsets": "712",
+                        "endColumns": "56",
+                        "endOffsets": "764"
+                    },
+                    "to": {
+                        "startLines": "12",
+                        "startColumns": "4",
+                        "startOffsets": "465",
+                        "endColumns": "56",
+                        "endOffsets": "517"
+                    }
+                }
+            ]
+        },
+        {
+            "outputFile": "net.micode.notes.app-merged_res-5:/values-zh-rTW_values-zh-rTW.arsc.flat",
+            "map": [
+                {
+                    "source": "C:\\Users\\13293\\Desktop\\Notes-master3\\Notes-master3\\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": "C:\\Users\\13293\\Desktop\\Notes-master3\\Notes-master3\\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/src/Notes-master3/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rCN.json b/src/Notes-master3/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rCN.json
new file mode 100644
index 0000000..b25ccd3
--- /dev/null
+++ b/src/Notes-master3/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rCN.json
@@ -0,0 +1,47 @@
+{
+    "logs": [
+        {
+            "outputFile": "net.micode.notes.app-mergeDebugResources-3:/values-zh-rCN/values-zh-rCN.xml",
+            "map": [
+                {
+                    "source": "C:\\Users\\13293\\Desktop\\Notes-master3\\Notes-master3\\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"
+                    }
+                },
+                {
+                    "source": "C:\\Users\\13293\\Desktop\\Notes-master3\\Notes-master3\\app\\src\\main\\res\\values-zh-rCN\\strings.xml",
+                    "from": {
+                        "startLines": "125,75,74,73,72,19,20,21,116,117,124,123,26,81,82,80,79,78,94,93,92,84,64,29,30,85,76,118,71,67,42,48,53,43,63,62,61,57,56,54,55,58,41,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,103,115,108,107,109,110,112,111,102,106,104,105,99,113,114,122,120,119,121,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",
+                        "startOffsets": "6617,3580,3514,3441,3391,827,867,915,6168,6213,6563,6513,1199,3946,4014,3887,3822,3759,4677,4617,4554,4146,2962,1369,1422,4200,3653,6270,3332,3119,1883,2164,2410,1936,2902,2849,2798,2603,2555,2461,2509,2649,1818,2696,2207,3273,2746,3162,2121,2363,2307,2252,3064,2077,3022,1986,2027,3214,1318,1623,1719,1576,1672,1529,1484,1148,1095,5052,4993,5193,6094,5504,5435,5568,5646,5829,5756,5127,5380,5250,5315,4944,5933,6016,6475,6368,6320,6413,1261,4091,4495,4790,4732,4857,4447,4402,4354,4303,963,1029",
+                        "endLines": "127,75,74,73,72,19,20,21,116,117,124,123,26,81,82,80,79,78,94,93,92,84,64,29,30,85,76,118,71,67,42,48,53,43,63,62,61,57,56,54,55,58,41,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,103,115,108,107,109,110,112,111,102,106,104,105,99,113,114,122,120,119,121,27,83,91,96,95,97,90,89,88,87,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,64,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": "6789,3648,3575,3509,3436,862,910,958,6208,6265,6612,6558,1256,4009,4086,3941,3882,3817,4727,4672,4612,4195,3017,1417,1479,4280,3729,6315,3386,3157,1931,2202,2456,1981,2957,2897,2844,2644,2598,2504,2550,2691,1878,2741,2247,3327,2793,3209,2159,2405,2358,2302,3114,2116,3059,2022,2072,3268,1364,1667,1763,1618,1714,1571,1524,1194,1143,5122,5047,5245,6163,5563,5499,5641,5751,5928,5824,5188,5430,5310,5375,4988,6011,6089,6508,6408,6363,6470,1313,4141,4549,4852,4785,4914,4490,4442,4397,4349,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,107",
+                        "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",
+                        "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,2768,2818,2863,2922,2974,3026,3069,3116,3172,3227,3282,3326,3368,3409,3459,3518,3569,3618,3667,3714,3761,3808,3853,3904,3957,4032,4091,4148,4222,4286,4355,4433,4543,4647,4720,4786,4841,4906,4971,5020,5103,5181,5219,5264,5312,5374,5431,5486,5545,5612,5670,5732,5780,5825,5873,5924,5990",
+                        "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,107",
+                        "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,64,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,2763,2813,2858,2917,2969,3021,3064,3111,3167,3222,3277,3321,3363,3404,3454,3513,3564,3613,3662,3709,3756,3803,3848,3899,3952,4027,4086,4143,4217,4281,4350,4428,4538,4642,4715,4781,4836,4901,4966,5015,5098,5176,5214,5259,5307,5369,5426,5481,5540,5607,5665,5727,5775,5820,5868,5919,5985,6051"
+                    }
+                }
+            ]
+        }
+    ]
+}
\ No newline at end of file
diff --git a/src/Notes-master3/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rTW.json b/src/Notes-master3/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rTW.json
new file mode 100644
index 0000000..2e37847
--- /dev/null
+++ b/src/Notes-master3/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rTW.json
@@ -0,0 +1,47 @@
+{
+    "logs": [
+        {
+            "outputFile": "net.micode.notes.app-mergeDebugResources-3:/values-zh-rTW/values-zh-rTW.xml",
+            "map": [
+                {
+                    "source": "C:\\Users\\13293\\Desktop\\Notes-master3\\Notes-master3\\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": "C:\\Users\\13293\\Desktop\\Notes-master3\\Notes-master3\\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/src/Notes-master3/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values.json b/src/Notes-master3/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values.json
new file mode 100644
index 0000000..ad71993
--- /dev/null
+++ b/src/Notes-master3/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values.json
@@ -0,0 +1,100 @@
+{
+    "logs": [
+        {
+            "outputFile": "net.micode.notes.app-mergeDebugResources-3:/values/values.xml",
+            "map": [
+                {
+                    "source": "C:\\Users\\13293\\Desktop\\Notes-master3\\Notes-master3\\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": "150,345",
+                        "endLines": "7,11",
+                        "endColumns": "19,19",
+                        "endOffsets": "340,460"
+                    }
+                },
+                {
+                    "source": "C:\\Users\\13293\\Desktop\\Notes-master3\\Notes-master3\\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,2846,2634,1073,1258,1443,1647,1854,890,2056"
+                    },
+                    "to": {
+                        "startLines": "134,138,142,146,149,153,157,161,165,169,173",
+                        "startColumns": "4,4,4,4,4,4,4,4,4,4,4",
+                        "startOffsets": "8783,8987,9198,9408,9568,9751,9936,10121,10324,10530,10713",
+                        "endLines": "137,141,145,148,152,156,160,164,168,172,176",
+                        "endColumns": "12,12,12,12,12,12,12,12,12,12,12",
+                        "endOffsets": "8982,9193,9403,9563,9746,9931,10116,10319,10525,10708,10909"
+                    }
+                },
+                {
+                    "source": "C:\\Users\\13293\\Desktop\\Notes-master3\\Notes-master3\\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": "522,574,627,680,732",
+                        "endColumns": "51,52,52,51,51",
+                        "endOffsets": "569,622,675,727,779"
+                    }
+                },
+                {
+                    "source": "C:\\Users\\13293\\Desktop\\Notes-master3\\Notes-master3\\app\\src\\main\\res\\values\\strings.xml",
+                    "from": {
+                        "startLines": "141,138,78,81,80,79,140,19,20,21,124,125,137,133,132,26,87,88,86,85,84,100,99,98,90,39,38,70,29,30,91,47,82,126,77,139,73,44,48,54,59,49,69,68,67,63,62,60,61,64,43,65,55,76,66,74,53,58,57,56,72,52,71,50,51,75,28,34,36,33,35,32,31,25,24,107,106,110,122,115,114,116,117,119,118,108,109,113,111,112,105,120,121,134,136,135,131,129,128,130,27,89,97,102,101,103,96,95,94,93,22,23",
+                        "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
+                        "startOffsets": "8700,8488,4093,4354,4258,4189,8617,881,924,976,7701,7750,8429,8145,8094,1336,4808,4902,4737,4653,4570,5769,5686,5584,5078,2058,2007,3592,1540,1593,5139,2292,4437,7813,4022,8555,3777,2235,2351,2666,2967,2409,3521,3460,3403,3181,3129,3026,3079,3231,2170,3281,2713,3956,3341,3826,2619,2912,2824,2766,3715,2569,3670,2466,2509,3889,1485,1804,1912,1757,1859,1701,1653,1281,1228,6225,6158,6466,7604,6830,6749,6904,6993,7235,7156,6309,6384,6690,6530,6610,6103,7379,7501,8229,8364,8296,8053,7926,7869,7979,1420,5010,5498,5904,5835,5984,5439,5384,5322,5262,1028,1138",
+                        "endLines": "145,138,78,81,80,79,140,19,20,21,124,125,137,133,132,26,87,88,86,85,84,100,99,98,90,39,38,70,29,30,91,47,82,126,77,139,73,44,48,54,59,49,69,68,67,63,62,60,61,64,43,65,55,76,66,74,53,58,57,56,72,52,71,50,51,75,28,34,36,33,35,32,31,25,24,107,106,110,122,115,114,116,117,119,118,108,109,113,111,112,105,120,121,134,136,135,131,129,128,130,27,89,97,102,101,103,96,95,94,93,22,23",
+                        "endColumns": "14,66,95,82,95,68,82,42,51,51,48,62,58,83,50,83,93,107,70,83,82,65,82,101,60,61,50,77,52,59,104,58,101,54,70,61,48,54,57,46,58,56,70,60,56,49,51,52,49,49,64,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,66,64,67,40,52,56,73,64,67,85,79,68,93,58,54,61,59,109,89",
+                        "endOffsets": "9103,8550,4184,4432,4349,4253,8695,919,971,1023,7745,7808,8483,8224,8140,1415,4897,5005,4803,4732,4648,5830,5764,5681,5134,2115,2053,3665,1588,1648,5239,2346,4534,7863,4088,8612,3821,2285,2404,2708,3021,2461,3587,3516,3455,3226,3176,3074,3124,3276,2230,3336,2761,4017,3398,3884,2661,2962,2907,2819,3772,2614,3710,2504,2564,3951,1535,1854,1960,1799,1907,1752,1696,1331,1276,6304,6220,6525,7695,6899,6825,6988,7151,7374,7230,6379,6461,6744,6605,6685,6153,7496,7599,8291,8424,8359,8089,7974,7921,8048,1480,5073,5579,5979,5899,6073,5493,5434,5379,5317,1133,1223"
+                    },
+                    "to": {
+                        "startLines": "18,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125,126,127,128,129,130,131,132,133",
+                        "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
+                        "startOffsets": "784,1136,1203,1299,1382,1478,1547,1630,1673,1725,1777,1826,1889,1948,2030,2081,2165,2259,2367,2438,2522,2605,2671,2754,2856,2917,2979,3030,3108,3161,3221,3326,3385,3487,3542,3613,3675,3724,3779,3837,3884,3943,4000,4071,4132,4189,4239,4291,4344,4394,4444,4509,4569,4622,4688,4750,4813,4860,4915,5003,5061,5123,5173,5218,5261,5321,5388,5443,5498,5551,5598,5651,5707,5755,5810,5863,5947,6014,6078,6174,6248,6329,6418,6581,6725,6804,6879,6961,7020,7100,7180,7235,7357,7460,7527,7592,7660,7701,7754,7811,7885,7950,8018,8104,8184,8253,8347,8406,8461,8523,8583,8693",
+                        "endLines": "22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125,126,127,128,129,130,131,132,133",
+                        "endColumns": "14,66,95,82,95,68,82,42,51,51,48,62,58,81,50,83,93,107,70,83,82,65,82,101,60,61,50,77,52,59,104,58,101,54,70,61,48,54,57,46,58,56,70,60,56,49,51,52,49,49,64,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,66,64,67,40,52,56,73,64,67,85,79,68,93,58,54,61,59,109,89",
+                        "endOffsets": "1131,1198,1294,1377,1473,1542,1625,1668,1720,1772,1821,1884,1943,2025,2076,2160,2254,2362,2433,2517,2600,2666,2749,2851,2912,2974,3025,3103,3156,3216,3321,3380,3482,3537,3608,3670,3719,3774,3832,3879,3938,3995,4066,4127,4184,4234,4286,4339,4389,4439,4504,4564,4617,4683,4745,4808,4855,4910,4998,5056,5118,5168,5213,5256,5316,5383,5438,5493,5546,5593,5646,5702,5750,5805,5858,5942,6009,6073,6169,6243,6324,6413,6576,6720,6799,6874,6956,7015,7095,7175,7230,7352,7455,7522,7587,7655,7696,7749,7806,7880,7945,8013,8099,8179,8248,8342,8401,8456,8518,8578,8688,8778"
+                    }
+                },
+                {
+                    "source": "C:\\Users\\13293\\Desktop\\Notes-master3\\Notes-master3\\app\\src\\main\\res\\values\\colors.xml",
+                    "from": {
+                        "startLines": "18",
+                        "startColumns": "4",
+                        "startOffsets": "712",
+                        "endColumns": "56",
+                        "endOffsets": "764"
+                    },
+                    "to": {
+                        "startLines": "12",
+                        "startColumns": "4",
+                        "startOffsets": "465",
+                        "endColumns": "56",
+                        "endOffsets": "517"
+                    }
+                }
+            ]
+        }
+    ]
+}
\ No newline at end of file
diff --git a/src/Notes-master3/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/single/debug.json b/src/Notes-master3/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/single/debug.json
new file mode 100644
index 0000000..9ca175a
--- /dev/null
+++ b/src/Notes-master3/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/single/debug.json
@@ -0,0 +1,398 @@
+[
+    {
+        "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_red_middle.9.png.flat",
+        "source": "net.micode.notes.app-main-7:/drawable-hdpi/list_red_middle.9.png"
+    },
+    {
+        "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_title_bar_bg.9.png.flat",
+        "source": "net.micode.notes.app-main-7:/drawable-hdpi/title_bar_bg.9.png"
+    },
+    {
+        "merged": "net.micode.notes.app-merged_res-5:/layout_note_list_dropdown_menu.xml.flat",
+        "source": "net.micode.notes.app-main-7:/layout/note_list_dropdown_menu.xml"
+    },
+    {
+        "merged": "net.micode.notes.app-merged_res-5:/layout_folder_list_item.xml.flat",
+        "source": "net.micode.notes.app-main-7:/layout/folder_list_item.xml"
+    },
+    {
+        "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_selected.png.flat",
+        "source": "net.micode.notes.app-main-7:/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-7:/drawable-hdpi/edit_title_yellow.9.png"
+    },
+    {
+        "merged": "net.micode.notes.app-merged_res-5:/menu_sub_folder.xml.flat",
+        "source": "net.micode.notes.app-main-7:/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-7:/drawable-hdpi/list_footer_bg.9.png"
+    },
+    {
+        "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_cauc.png.flat",
+        "source": "net.micode.notes.app-main-7:/drawable-hdpi/cauc.png"
+    },
+    {
+        "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_clock.png.flat",
+        "source": "net.micode.notes.app-main-7:/drawable-hdpi/clock.png"
+    },
+    {
+        "merged": "net.micode.notes.app-merged_res-5:/raw_introduction.flat",
+        "source": "net.micode.notes.app-main-7:/raw/introduction"
+    },
+    {
+        "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_widget_4x_yellow.png.flat",
+        "source": "net.micode.notes.app-main-7:/drawable-hdpi/widget_4x_yellow.png"
+    },
+    {
+        "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_white_up.9.png.flat",
+        "source": "net.micode.notes.app-main-7:/drawable-hdpi/list_white_up.9.png"
+    },
+    {
+        "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_widget_4x_blue.png.flat",
+        "source": "net.micode.notes.app-main-7:/drawable-hdpi/widget_4x_blue.png"
+    },
+    {
+        "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_widget_2x_green.png.flat",
+        "source": "net.micode.notes.app-main-7:/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-7:/drawable/new_note.xml"
+    },
+    {
+        "merged": "net.micode.notes.app-merged_res-5:/layout_widget_2x.xml.flat",
+        "source": "net.micode.notes.app-main-7:/layout/widget_2x.xml"
+    },
+    {
+        "merged": "net.micode.notes.app-merged_res-5:/xml_widget_2x_info.xml.flat",
+        "source": "net.micode.notes.app-main-7:/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-7:/menu/call_record_folder.xml"
+    },
+    {
+        "merged": "net.micode.notes.app-merged_res-5:/xml_preferences.xml.flat",
+        "source": "net.micode.notes.app-main-7:/xml/preferences.xml"
+    },
+    {
+        "merged": "net.micode.notes.app-merged_res-5:/layout_dialog_edit_text.xml.flat",
+        "source": "net.micode.notes.app-main-7:/layout/dialog_edit_text.xml"
+    },
+    {
+        "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_edit_title_blue.9.png.flat",
+        "source": "net.micode.notes.app-main-7:/drawable-hdpi/edit_title_blue.9.png"
+    },
+    {
+        "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_yellow_single.9.png.flat",
+        "source": "net.micode.notes.app-main-7:/drawable-hdpi/list_yellow_single.9.png"
+    },
+    {
+        "merged": "net.micode.notes.app-merged_res-5:/color_secondary_text_dark.xml.flat",
+        "source": "net.micode.notes.app-main-7:/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-7:/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-7:/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-7:/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-7:/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-7:/drawable-hdpi/edit_yellow.9.png"
+    },
+    {
+        "merged": "net.micode.notes.app-merged_res-5:/layout_note_edit.xml.flat",
+        "source": "net.micode.notes.app-main-7:/layout/note_edit.xml"
+    },
+    {
+        "merged": "net.micode.notes.app-merged_res-5:/layout_widget_4x.xml.flat",
+        "source": "net.micode.notes.app-main-7:/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-7:/drawable-hdpi/edit_title_green.9.png"
+    },
+    {
+        "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_menu_delete.png.flat",
+        "source": "net.micode.notes.app-main-7:/drawable-hdpi/menu_delete.png"
+    },
+    {
+        "merged": "net.micode.notes.app-merged_res-5:/layout_note_list.xml.flat",
+        "source": "net.micode.notes.app-main-7:/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-7:/drawable-hdpi/list_green_down.9.png"
+    },
+    {
+        "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_icon_app.png.flat",
+        "source": "net.micode.notes.app-main-7:/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-7:/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-7:/drawable-hdpi/bg_btn_set_color.png"
+    },
+    {
+        "merged": "net.micode.notes.app-merged_res-5:/menu_note_list.xml.flat",
+        "source": "net.micode.notes.app-main-7:/menu/note_list.xml"
+    },
+    {
+        "merged": "net.micode.notes.app-merged_res-5:/layout_note_list_footer.xml.flat",
+        "source": "net.micode.notes.app-main-7:/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-7:/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-7:/drawable-hdpi/bg_color_btn_mask.png"
+    },
+    {
+        "merged": "net.micode.notes.app-merged_res-5:/layout_add_account_text.xml.flat",
+        "source": "net.micode.notes.app-main-7:/layout/add_account_text.xml"
+    },
+    {
+        "merged": "net.micode.notes.app-merged_res-5:/layout_datetime_picker.xml.flat",
+        "source": "net.micode.notes.app-main-7:/layout/datetime_picker.xml"
+    },
+    {
+        "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_font_super.png.flat",
+        "source": "net.micode.notes.app-main-7:/drawable-hdpi/font_super.png"
+    },
+    {
+        "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_blue_single.9.png.flat",
+        "source": "net.micode.notes.app-main-7:/drawable-hdpi/list_blue_single.9.png"
+    },
+    {
+        "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_widget_2x_yellow.png.flat",
+        "source": "net.micode.notes.app-main-7:/drawable-hdpi/widget_2x_yellow.png"
+    },
+    {
+        "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_delete.png.flat",
+        "source": "net.micode.notes.app-main-7:/drawable-hdpi/delete.png"
+    },
+    {
+        "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_ikun.png.flat",
+        "source": "net.micode.notes.app-main-7:/drawable-hdpi/ikun.png"
+    },
+    {
+        "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_edit_green.9.png.flat",
+        "source": "net.micode.notes.app-main-7:/drawable-hdpi/edit_green.9.png"
+    },
+    {
+        "merged": "net.micode.notes.app-merged_res-5:/menu_note_edit.xml.flat",
+        "source": "net.micode.notes.app-main-7:/menu/note_edit.xml"
+    },
+    {
+        "merged": "net.micode.notes.app-merged_res-5:/layout_account_dialog_title.xml.flat",
+        "source": "net.micode.notes.app-main-7:/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-7:/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-7:/drawable-hdpi/list_green_up.9.png"
+    },
+    {
+        "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_folder.9.png.flat",
+        "source": "net.micode.notes.app-main-7:/drawable-hdpi/list_folder.9.png"
+    },
+    {
+        "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_red_single.9.png.flat",
+        "source": "net.micode.notes.app-main-7:/drawable-hdpi/list_red_single.9.png"
+    },
+    {
+        "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_notification.png.flat",
+        "source": "net.micode.notes.app-main-7:/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-7:/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-7:/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-7:/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-7:/layout/note_item.xml"
+    },
+    {
+        "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_grassland.jpg.flat",
+        "source": "net.micode.notes.app-main-7:/drawable-hdpi/grassland.jpg"
+    },
+    {
+        "merged": "net.micode.notes.app-merged_res-5:/layout_settings_header.xml.flat",
+        "source": "net.micode.notes.app-main-7:/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-7:/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-7:/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-7:/drawable-hdpi/widget_4x_red.png"
+    },
+    {
+        "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_font_large.png.flat",
+        "source": "net.micode.notes.app-main-7:/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-7:/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-7:/drawable-hdpi/widget_2x_blue.png"
+    },
+    {
+        "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_red_up.9.png.flat",
+        "source": "net.micode.notes.app-main-7:/drawable-hdpi/list_red_up.9.png"
+    },
+    {
+        "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_widget_4x_white.png.flat",
+        "source": "net.micode.notes.app-main-7:/drawable-hdpi/widget_4x_white.png"
+    },
+    {
+        "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_yellow_up.9.png.flat",
+        "source": "net.micode.notes.app-main-7:/drawable-hdpi/list_yellow_up.9.png"
+    },
+    {
+        "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_widget_2x_white.png.flat",
+        "source": "net.micode.notes.app-main-7:/drawable-hdpi/widget_2x_white.png"
+    },
+    {
+        "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_edit_title_white.9.png.flat",
+        "source": "net.micode.notes.app-main-7:/drawable-hdpi/edit_title_white.9.png"
+    },
+    {
+        "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_yellow_down.9.png.flat",
+        "source": "net.micode.notes.app-main-7:/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-7:/raw-zh-rCN/introduction"
+    },
+    {
+        "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_background.png.flat",
+        "source": "net.micode.notes.app-main-7:/drawable-hdpi/list_background.png"
+    },
+    {
+        "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_search_result.png.flat",
+        "source": "net.micode.notes.app-main-7:/drawable-hdpi/search_result.png"
+    },
+    {
+        "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_widget_4x_green.png.flat",
+        "source": "net.micode.notes.app-main-7:/drawable-hdpi/widget_4x_green.png"
+    },
+    {
+        "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_edit_red.9.png.flat",
+        "source": "net.micode.notes.app-main-7:/drawable-hdpi/edit_red.9.png"
+    },
+    {
+        "merged": "net.micode.notes.app-merged_res-5:/xml_searchable.xml.flat",
+        "source": "net.micode.notes.app-main-7:/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-7:/drawable-hdpi/list_green_middle.9.png"
+    },
+    {
+        "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_font_normal.png.flat",
+        "source": "net.micode.notes.app-main-7:/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-7:/drawable-hdpi/list_yellow_middle.9.png"
+    },
+    {
+        "merged": "net.micode.notes.app-merged_res-5:/menu_note_list_dropdown.xml.flat",
+        "source": "net.micode.notes.app-main-7:/menu/note_list_dropdown.xml"
+    },
+    {
+        "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_new_note_normal.png.flat",
+        "source": "net.micode.notes.app-main-7:/drawable-hdpi/new_note_normal.png"
+    },
+    {
+        "merged": "net.micode.notes.app-merged_res-5:/layout_note_edit_list_item.xml.flat",
+        "source": "net.micode.notes.app-main-7:/layout/note_edit_list_item.xml"
+    },
+    {
+        "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_blue_down.9.png.flat",
+        "source": "net.micode.notes.app-main-7:/drawable-hdpi/list_blue_down.9.png"
+    },
+    {
+        "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_font_size_selector_bg.9.png.flat",
+        "source": "net.micode.notes.app-main-7:/drawable-hdpi/font_size_selector_bg.9.png"
+    },
+    {
+        "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_edit_title_red.9.png.flat",
+        "source": "net.micode.notes.app-main-7:/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-7:/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-7:/menu/note_list_options.xml"
+    },
+    {
+        "merged": "net.micode.notes.app-merged_res-5:/menu_call_note_edit.xml.flat",
+        "source": "net.micode.notes.app-main-7:/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-7:/drawable-hdpi/list_green_single.9.png"
+    },
+    {
+        "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_widget_2x_red.png.flat",
+        "source": "net.micode.notes.app-main-7:/drawable-hdpi/widget_2x_red.png"
+    },
+    {
+        "merged": "net.micode.notes.app-merged_res-5:/color_primary_text_dark.xml.flat",
+        "source": "net.micode.notes.app-main-7:/color/primary_text_dark.xml"
+    },
+    {
+        "merged": "net.micode.notes.app-merged_res-5:/layout_activity_login.xml.flat",
+        "source": "net.micode.notes.app-main-7:/layout/activity_login.xml"
+    },
+    {
+        "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_white_down.9.png.flat",
+        "source": "net.micode.notes.app-main-7:/drawable-hdpi/list_white_down.9.png"
+    },
+    {
+        "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_font_small.png.flat",
+        "source": "net.micode.notes.app-main-7:/drawable-hdpi/font_small.png"
+    }
+]
\ No newline at end of file
diff --git a/src/Notes-master3/app/build/intermediates/navigation_json/debug/navigation.json b/src/Notes-master3/Notes-master3/app/build/intermediates/navigation_json/debug/navigation.json
similarity index 100%
rename from src/Notes-master3/app/build/intermediates/navigation_json/debug/navigation.json
rename to src/Notes-master3/Notes-master3/app/build/intermediates/navigation_json/debug/navigation.json
diff --git a/src/Notes-master3/app/build/intermediates/packaged_manifests/debug/AndroidManifest.xml b/src/Notes-master3/Notes-master3/app/build/intermediates/packaged_manifests/debug/AndroidManifest.xml
similarity index 93%
rename from src/Notes-master3/app/build/intermediates/packaged_manifests/debug/AndroidManifest.xml
rename to src/Notes-master3/Notes-master3/app/build/intermediates/packaged_manifests/debug/AndroidManifest.xml
index 4ce9215..4953700 100644
--- a/src/Notes-master3/app/build/intermediates/packaged_manifests/debug/AndroidManifest.xml
+++ b/src/Notes-master3/Notes-master3/app/build/intermediates/packaged_manifests/debug/AndroidManifest.xml
@@ -36,7 +36,18 @@
     <application
         android:debuggable="true"
         android:icon="@drawable/icon_app"
-        android:label="@string/app_name" >
+        android:label="@string/app_name"
+        android:testOnly="true" >
+        <activity
+            android:name="net.micode.notes.ui.LoginActivity"
+            android:exported="true"
+            android:theme="@style/NoteTheme" >
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+        </activity>
         <activity
             android:name="net.micode.notes.ui.NotesListActivity"
             android:configChanges="keyboardHidden|orientation|screenSize"
@@ -48,7 +59,7 @@
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 
-                <category android:name="android.intent.category.LAUNCHER" />
+                <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
         </activity>
         <activity
diff --git a/src/Notes-master3/app/build/intermediates/packaged_manifests/debug/output-metadata.json b/src/Notes-master3/Notes-master3/app/build/intermediates/packaged_manifests/debug/output-metadata.json
similarity index 100%
rename from src/Notes-master3/app/build/intermediates/packaged_manifests/debug/output-metadata.json
rename to src/Notes-master3/Notes-master3/app/build/intermediates/packaged_manifests/debug/output-metadata.json
diff --git a/src/Notes-master3/app/build/intermediates/processed_res/debug/out/output-metadata.json b/src/Notes-master3/Notes-master3/app/build/intermediates/processed_res/debug/out/output-metadata.json
similarity index 100%
rename from src/Notes-master3/app/build/intermediates/processed_res/debug/out/output-metadata.json
rename to src/Notes-master3/Notes-master3/app/build/intermediates/processed_res/debug/out/output-metadata.json
diff --git a/src/Notes-master3/Notes-master3/app/build/intermediates/processed_res/debug/out/resources-debug.ap_ b/src/Notes-master3/Notes-master3/app/build/intermediates/processed_res/debug/out/resources-debug.ap_
new file mode 100644
index 0000000..a293b34
Binary files /dev/null and b/src/Notes-master3/Notes-master3/app/build/intermediates/processed_res/debug/out/resources-debug.ap_ differ
diff --git a/src/Notes-master3/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/5f8d09fad9167c9ab9728614ce73198f5abf60f2f52b2b3a82047d3ac52cb3cc_1.jar b/src/Notes-master3/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/5f8d09fad9167c9ab9728614ce73198f5abf60f2f52b2b3a82047d3ac52cb3cc_1.jar
new file mode 100644
index 0000000..79786e5
Binary files /dev/null and b/src/Notes-master3/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/5f8d09fad9167c9ab9728614ce73198f5abf60f2f52b2b3a82047d3ac52cb3cc_1.jar differ
diff --git a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/BuildConfig.dex b/src/Notes-master3/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/BuildConfig.dex
similarity index 62%
rename from src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/BuildConfig.dex
rename to src/Notes-master3/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/BuildConfig.dex
index f29c886..ebf79ba 100644
Binary files a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/BuildConfig.dex and b/src/Notes-master3/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/BuildConfig.dex differ
diff --git a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Contact.dex b/src/Notes-master3/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Contact.dex
similarity index 66%
rename from src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Contact.dex
rename to src/Notes-master3/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Contact.dex
index 141cd42..2e27fe3 100644
Binary files a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Contact.dex and b/src/Notes-master3/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Contact.dex differ
diff --git a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$CallNote.dex b/src/Notes-master3/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$CallNote.dex
similarity index 65%
rename from src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$CallNote.dex
rename to src/Notes-master3/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$CallNote.dex
index d8ec2c4..a2b0525 100644
Binary files a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$CallNote.dex and b/src/Notes-master3/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$CallNote.dex differ
diff --git a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$DataColumns.dex b/src/Notes-master3/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$DataColumns.dex
similarity index 55%
rename from src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$DataColumns.dex
rename to src/Notes-master3/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$DataColumns.dex
index 983f364..2fbf54b 100644
Binary files a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$DataColumns.dex and b/src/Notes-master3/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$DataColumns.dex differ
diff --git a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$DataConstants.dex b/src/Notes-master3/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$DataConstants.dex
similarity index 55%
rename from src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$DataConstants.dex
rename to src/Notes-master3/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$DataConstants.dex
index eceecda..bec0b42 100644
Binary files a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$DataConstants.dex and b/src/Notes-master3/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$DataConstants.dex differ
diff --git a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$NoteColumns.dex b/src/Notes-master3/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$NoteColumns.dex
similarity index 71%
rename from src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$NoteColumns.dex
rename to src/Notes-master3/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$NoteColumns.dex
index e32f11d..7302df1 100644
Binary files a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$NoteColumns.dex and b/src/Notes-master3/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$NoteColumns.dex differ
diff --git a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$TextNote.dex b/src/Notes-master3/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$TextNote.dex
similarity index 77%
rename from src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$TextNote.dex
rename to src/Notes-master3/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$TextNote.dex
index 2f5ecfb..55c07e3 100644
Binary files a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$TextNote.dex and b/src/Notes-master3/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$TextNote.dex differ
diff --git a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes.dex b/src/Notes-master3/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes.dex
similarity index 78%
rename from src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes.dex
rename to src/Notes-master3/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes.dex
index e9e44c0..55990a0 100644
Binary files a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes.dex and b/src/Notes-master3/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes.dex differ
diff --git a/src/Notes-master3/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/NotesDatabaseHelper$TABLE.dex b/src/Notes-master3/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/NotesDatabaseHelper$TABLE.dex
new file mode 100644
index 0000000..0138acd
Binary files /dev/null and b/src/Notes-master3/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/NotesDatabaseHelper$TABLE.dex differ
diff --git a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/NotesDatabaseHelper.dex b/src/Notes-master3/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/NotesDatabaseHelper.dex
similarity index 94%
rename from src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/NotesDatabaseHelper.dex
rename to src/Notes-master3/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/NotesDatabaseHelper.dex
index 85011a3..f4f3c91 100644
Binary files a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/NotesDatabaseHelper.dex and b/src/Notes-master3/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/NotesDatabaseHelper.dex differ
diff --git a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/NotesProvider.dex b/src/Notes-master3/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/NotesProvider.dex
similarity index 93%
rename from src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/NotesProvider.dex
rename to src/Notes-master3/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/NotesProvider.dex
index 876f298..4cdfa44 100644
Binary files a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/NotesProvider.dex and b/src/Notes-master3/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/NotesProvider.dex differ
diff --git a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/MetaData.dex b/src/Notes-master3/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/MetaData.dex
similarity index 85%
rename from src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/MetaData.dex
rename to src/Notes-master3/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/MetaData.dex
index 9240589..a946a1e 100644
Binary files a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/MetaData.dex and b/src/Notes-master3/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/MetaData.dex differ
diff --git a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/Node.dex b/src/Notes-master3/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/Node.dex
similarity index 84%
rename from src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/Node.dex
rename to src/Notes-master3/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/Node.dex
index 1c5583b..486bfe5 100644
Binary files a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/Node.dex and b/src/Notes-master3/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/Node.dex differ
diff --git a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/SqlData.dex b/src/Notes-master3/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/SqlData.dex
similarity index 56%
rename from src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/SqlData.dex
rename to src/Notes-master3/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/SqlData.dex
index 9b3fcbe..d43b7fe 100644
Binary files a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/SqlData.dex and b/src/Notes-master3/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/SqlData.dex differ
diff --git a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/SqlNote.dex b/src/Notes-master3/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/SqlNote.dex
similarity index 67%
rename from src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/SqlNote.dex
rename to src/Notes-master3/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/SqlNote.dex
index 39dbd34..5829858 100644
Binary files a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/SqlNote.dex and b/src/Notes-master3/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/SqlNote.dex differ
diff --git a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/Task.dex b/src/Notes-master3/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/Task.dex
similarity index 94%
rename from src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/Task.dex
rename to src/Notes-master3/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/Task.dex
index 97e54ac..792282b 100644
Binary files a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/Task.dex and b/src/Notes-master3/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/Task.dex differ
diff --git a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/TaskList.dex b/src/Notes-master3/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/TaskList.dex
similarity index 88%
rename from src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/TaskList.dex
rename to src/Notes-master3/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/TaskList.dex
index d7a560a..97d1d67 100644
Binary files a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/TaskList.dex and b/src/Notes-master3/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/TaskList.dex differ
diff --git a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/exception/ActionFailureException.dex b/src/Notes-master3/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/exception/ActionFailureException.dex
similarity index 60%
rename from src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/exception/ActionFailureException.dex
rename to src/Notes-master3/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/exception/ActionFailureException.dex
index 95fc8be..a529ddf 100644
Binary files a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/exception/ActionFailureException.dex and b/src/Notes-master3/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/exception/ActionFailureException.dex differ
diff --git a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/exception/NetworkFailureException.dex b/src/Notes-master3/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/exception/NetworkFailureException.dex
similarity index 60%
rename from src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/exception/NetworkFailureException.dex
rename to src/Notes-master3/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/exception/NetworkFailureException.dex
index 05a4c06..f2b258d 100644
Binary files a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/exception/NetworkFailureException.dex and b/src/Notes-master3/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/exception/NetworkFailureException.dex differ
diff --git a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskASyncTask$1.dex b/src/Notes-master3/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskASyncTask$1.dex
similarity index 64%
rename from src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskASyncTask$1.dex
rename to src/Notes-master3/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskASyncTask$1.dex
index 876254e..9fa2537 100644
Binary files a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskASyncTask$1.dex and b/src/Notes-master3/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskASyncTask$1.dex differ
diff --git a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskASyncTask$OnCompleteListener.dex b/src/Notes-master3/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskASyncTask$OnCompleteListener.dex
similarity index 54%
rename from src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskASyncTask$OnCompleteListener.dex
rename to src/Notes-master3/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskASyncTask$OnCompleteListener.dex
index 3229f07..6b5778b 100644
Binary files a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskASyncTask$OnCompleteListener.dex and b/src/Notes-master3/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskASyncTask$OnCompleteListener.dex differ
diff --git a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskASyncTask.dex b/src/Notes-master3/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskASyncTask.dex
similarity index 83%
rename from src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskASyncTask.dex
rename to src/Notes-master3/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskASyncTask.dex
index cacd9ba..f2fd30a 100644
Binary files a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskASyncTask.dex and b/src/Notes-master3/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskASyncTask.dex differ
diff --git a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskClient.dex b/src/Notes-master3/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskClient.dex
similarity index 68%
rename from src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskClient.dex
rename to src/Notes-master3/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskClient.dex
index ed04369..1f99410 100644
Binary files a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskClient.dex and b/src/Notes-master3/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskClient.dex differ
diff --git a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskManager.dex b/src/Notes-master3/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskManager.dex
similarity index 74%
rename from src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskManager.dex
rename to src/Notes-master3/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskManager.dex
index 79a4ac6..50aaea1 100644
Binary files a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskManager.dex and b/src/Notes-master3/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskManager.dex differ
diff --git a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskSyncService$1.dex b/src/Notes-master3/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskSyncService$1.dex
similarity index 65%
rename from src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskSyncService$1.dex
rename to src/Notes-master3/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskSyncService$1.dex
index 738d834..e1bff2d 100644
Binary files a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskSyncService$1.dex and b/src/Notes-master3/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskSyncService$1.dex differ
diff --git a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskSyncService.dex b/src/Notes-master3/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskSyncService.dex
similarity index 89%
rename from src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskSyncService.dex
rename to src/Notes-master3/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskSyncService.dex
index 8bce670..244ea26 100644
Binary files a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskSyncService.dex and b/src/Notes-master3/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskSyncService.dex differ
diff --git a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/Note$NoteData.dex b/src/Notes-master3/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/Note$NoteData.dex
similarity index 90%
rename from src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/Note$NoteData.dex
rename to src/Notes-master3/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/Note$NoteData.dex
index 3d83623..ded141d 100644
Binary files a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/Note$NoteData.dex and b/src/Notes-master3/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/Note$NoteData.dex differ
diff --git a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/Note.dex b/src/Notes-master3/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/Note.dex
similarity index 90%
rename from src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/Note.dex
rename to src/Notes-master3/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/Note.dex
index a65b062..7246930 100644
Binary files a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/Note.dex and b/src/Notes-master3/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/Note.dex differ
diff --git a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/WorkingNote$NoteSettingChangedListener.dex b/src/Notes-master3/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/WorkingNote$NoteSettingChangedListener.dex
similarity index 62%
rename from src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/WorkingNote$NoteSettingChangedListener.dex
rename to src/Notes-master3/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/WorkingNote$NoteSettingChangedListener.dex
index 2115569..6f5252f 100644
Binary files a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/WorkingNote$NoteSettingChangedListener.dex and b/src/Notes-master3/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/WorkingNote$NoteSettingChangedListener.dex differ
diff --git a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/WorkingNote.dex b/src/Notes-master3/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/WorkingNote.dex
similarity index 57%
rename from src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/WorkingNote.dex
rename to src/Notes-master3/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/WorkingNote.dex
index fea966f..0072ba9 100644
Binary files a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/WorkingNote.dex and b/src/Notes-master3/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/WorkingNote.dex differ
diff --git a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/BackupUtils$TextExport.dex b/src/Notes-master3/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/BackupUtils$TextExport.dex
similarity index 61%
rename from src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/BackupUtils$TextExport.dex
rename to src/Notes-master3/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/BackupUtils$TextExport.dex
index 2b85968..75e2cb8 100644
Binary files a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/BackupUtils$TextExport.dex and b/src/Notes-master3/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/BackupUtils$TextExport.dex differ
diff --git a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/BackupUtils.dex b/src/Notes-master3/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/BackupUtils.dex
similarity index 82%
rename from src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/BackupUtils.dex
rename to src/Notes-master3/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/BackupUtils.dex
index 7f9fa34..82285bd 100644
Binary files a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/BackupUtils.dex and b/src/Notes-master3/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/BackupUtils.dex differ
diff --git a/src/Notes-master3/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/DataUtils.dex b/src/Notes-master3/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/DataUtils.dex
new file mode 100644
index 0000000..680f1d1
Binary files /dev/null and b/src/Notes-master3/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/DataUtils.dex differ
diff --git a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/GTaskStringUtils.dex b/src/Notes-master3/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/GTaskStringUtils.dex
similarity index 85%
rename from src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/GTaskStringUtils.dex
rename to src/Notes-master3/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/GTaskStringUtils.dex
index 144cf9c..a2b58c1 100644
Binary files a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/GTaskStringUtils.dex and b/src/Notes-master3/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/GTaskStringUtils.dex differ
diff --git a/src/Notes-master3/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser$NoteBgResources.dex b/src/Notes-master3/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser$NoteBgResources.dex
new file mode 100644
index 0000000..d0cd71a
Binary files /dev/null and b/src/Notes-master3/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser$NoteBgResources.dex differ
diff --git a/src/Notes-master3/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser$NoteItemBgResources.dex b/src/Notes-master3/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser$NoteItemBgResources.dex
new file mode 100644
index 0000000..a1080db
Binary files /dev/null and b/src/Notes-master3/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser$NoteItemBgResources.dex differ
diff --git a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser$TextAppearanceResources.dex b/src/Notes-master3/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser$TextAppearanceResources.dex
similarity index 56%
rename from src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser$TextAppearanceResources.dex
rename to src/Notes-master3/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser$TextAppearanceResources.dex
index ae6e2a4..e485039 100644
Binary files a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser$TextAppearanceResources.dex and b/src/Notes-master3/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser$TextAppearanceResources.dex differ
diff --git a/src/Notes-master3/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser$WidgetBgResources.dex b/src/Notes-master3/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser$WidgetBgResources.dex
new file mode 100644
index 0000000..ec67e16
Binary files /dev/null and b/src/Notes-master3/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser$WidgetBgResources.dex differ
diff --git a/src/Notes-master3/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser.dex b/src/Notes-master3/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser.dex
new file mode 100644
index 0000000..3769690
Binary files /dev/null and b/src/Notes-master3/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser.dex differ
diff --git a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/AlarmAlertActivity.dex b/src/Notes-master3/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/AlarmAlertActivity.dex
similarity index 57%
rename from src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/AlarmAlertActivity.dex
rename to src/Notes-master3/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/AlarmAlertActivity.dex
index c1b64ec..09c34a0 100644
Binary files a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/AlarmAlertActivity.dex and b/src/Notes-master3/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/AlarmAlertActivity.dex differ
diff --git a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/AlarmInitReceiver.dex b/src/Notes-master3/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/AlarmInitReceiver.dex
similarity index 53%
rename from src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/AlarmInitReceiver.dex
rename to src/Notes-master3/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/AlarmInitReceiver.dex
index 25a62a7..92cb64b 100644
Binary files a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/AlarmInitReceiver.dex and b/src/Notes-master3/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/AlarmInitReceiver.dex differ
diff --git a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/AlarmReceiver.dex b/src/Notes-master3/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/AlarmReceiver.dex
similarity index 65%
rename from src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/AlarmReceiver.dex
rename to src/Notes-master3/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/AlarmReceiver.dex
index 261b9bc..c6e8fd8 100644
Binary files a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/AlarmReceiver.dex and b/src/Notes-master3/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/AlarmReceiver.dex differ
diff --git a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$1.dex b/src/Notes-master3/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$1.dex
similarity index 74%
rename from src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$1.dex
rename to src/Notes-master3/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$1.dex
index 7822adc..c38244b 100644
Binary files a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$1.dex and b/src/Notes-master3/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$1.dex differ
diff --git a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$2.dex b/src/Notes-master3/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$2.dex
similarity index 84%
rename from src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$2.dex
rename to src/Notes-master3/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$2.dex
index bb825ba..b7482d9 100644
Binary files a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$2.dex and b/src/Notes-master3/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$2.dex differ
diff --git a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$3.dex b/src/Notes-master3/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$3.dex
similarity index 82%
rename from src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$3.dex
rename to src/Notes-master3/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$3.dex
index bf17cb1..2d3dad9 100644
Binary files a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$3.dex and b/src/Notes-master3/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$3.dex differ
diff --git a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$4.dex b/src/Notes-master3/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$4.dex
similarity index 68%
rename from src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$4.dex
rename to src/Notes-master3/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$4.dex
index b3346ee..288c6fd 100644
Binary files a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$4.dex and b/src/Notes-master3/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$4.dex differ
diff --git a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$OnDateTimeChangedListener.dex b/src/Notes-master3/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$OnDateTimeChangedListener.dex
similarity index 53%
rename from src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$OnDateTimeChangedListener.dex
rename to src/Notes-master3/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$OnDateTimeChangedListener.dex
index 5d89d10..c129c9e 100644
Binary files a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$OnDateTimeChangedListener.dex and b/src/Notes-master3/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$OnDateTimeChangedListener.dex differ
diff --git a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker.dex b/src/Notes-master3/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker.dex
similarity index 90%
rename from src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker.dex
rename to src/Notes-master3/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker.dex
index d79f719..27bdf02 100644
Binary files a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker.dex and b/src/Notes-master3/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker.dex differ
diff --git a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePickerDialog$1.dex b/src/Notes-master3/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePickerDialog$1.dex
similarity index 65%
rename from src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePickerDialog$1.dex
rename to src/Notes-master3/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePickerDialog$1.dex
index eaa7650..e0ab5bb 100644
Binary files a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePickerDialog$1.dex and b/src/Notes-master3/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePickerDialog$1.dex differ
diff --git a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePickerDialog$OnDateTimeSetListener.dex b/src/Notes-master3/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePickerDialog$OnDateTimeSetListener.dex
similarity index 51%
rename from src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePickerDialog$OnDateTimeSetListener.dex
rename to src/Notes-master3/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePickerDialog$OnDateTimeSetListener.dex
index fea922e..7201f1d 100644
Binary files a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePickerDialog$OnDateTimeSetListener.dex and b/src/Notes-master3/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePickerDialog$OnDateTimeSetListener.dex differ
diff --git a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePickerDialog.dex b/src/Notes-master3/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePickerDialog.dex
similarity index 82%
rename from src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePickerDialog.dex
rename to src/Notes-master3/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePickerDialog.dex
index 5f69d8d..28c6c03 100644
Binary files a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePickerDialog.dex and b/src/Notes-master3/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePickerDialog.dex differ
diff --git a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DropdownMenu$1.dex b/src/Notes-master3/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DropdownMenu$1.dex
similarity index 57%
rename from src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DropdownMenu$1.dex
rename to src/Notes-master3/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DropdownMenu$1.dex
index 8f6696d..557d718 100644
Binary files a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DropdownMenu$1.dex and b/src/Notes-master3/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DropdownMenu$1.dex differ
diff --git a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DropdownMenu.dex b/src/Notes-master3/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DropdownMenu.dex
similarity index 77%
rename from src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DropdownMenu.dex
rename to src/Notes-master3/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DropdownMenu.dex
index 63acb0d..1994d42 100644
Binary files a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DropdownMenu.dex and b/src/Notes-master3/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DropdownMenu.dex differ
diff --git a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/FoldersListAdapter$FolderListItem.dex b/src/Notes-master3/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/FoldersListAdapter$FolderListItem.dex
similarity index 55%
rename from src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/FoldersListAdapter$FolderListItem.dex
rename to src/Notes-master3/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/FoldersListAdapter$FolderListItem.dex
index dca62bf..c2a47ef 100644
Binary files a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/FoldersListAdapter$FolderListItem.dex and b/src/Notes-master3/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/FoldersListAdapter$FolderListItem.dex differ
diff --git a/src/Notes-master3/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/FoldersListAdapter.dex b/src/Notes-master3/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/FoldersListAdapter.dex
new file mode 100644
index 0000000..f4ad5dd
Binary files /dev/null and b/src/Notes-master3/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/FoldersListAdapter.dex differ
diff --git a/src/Notes-master3/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/LoginActivity$1.dex b/src/Notes-master3/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/LoginActivity$1.dex
new file mode 100644
index 0000000..e0e3226
Binary files /dev/null and b/src/Notes-master3/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/LoginActivity$1.dex differ
diff --git a/src/Notes-master3/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/LoginActivity$2.dex b/src/Notes-master3/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/LoginActivity$2.dex
new file mode 100644
index 0000000..88a5b8d
Binary files /dev/null and b/src/Notes-master3/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/LoginActivity$2.dex differ
diff --git a/src/Notes-master3/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/LoginActivity.dex b/src/Notes-master3/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/LoginActivity.dex
new file mode 100644
index 0000000..f17f974
Binary files /dev/null and b/src/Notes-master3/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/LoginActivity.dex differ
diff --git a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$1.dex b/src/Notes-master3/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$1.dex
similarity index 57%
rename from src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$1.dex
rename to src/Notes-master3/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$1.dex
index 4d23f7e..eb3f6cd 100644
Binary files a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$1.dex and b/src/Notes-master3/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$1.dex differ
diff --git a/src/Notes-master3/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$2.dex b/src/Notes-master3/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$2.dex
new file mode 100644
index 0000000..1c324a6
Binary files /dev/null and b/src/Notes-master3/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$2.dex differ
diff --git a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$3.dex b/src/Notes-master3/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$3.dex
similarity index 51%
rename from src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$3.dex
rename to src/Notes-master3/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$3.dex
index 91b250c..e6d8495 100644
Binary files a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$3.dex and b/src/Notes-master3/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$3.dex differ
diff --git a/src/Notes-master3/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$HeadViewHolder.dex b/src/Notes-master3/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$HeadViewHolder.dex
new file mode 100644
index 0000000..7373ed3
Binary files /dev/null and b/src/Notes-master3/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$HeadViewHolder.dex differ
diff --git a/src/Notes-master3/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity.dex b/src/Notes-master3/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity.dex
new file mode 100644
index 0000000..2c02ebe
Binary files /dev/null and b/src/Notes-master3/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity.dex differ
diff --git a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditText$1.dex b/src/Notes-master3/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditText$1.dex
similarity index 65%
rename from src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditText$1.dex
rename to src/Notes-master3/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditText$1.dex
index d2b4e3e..6f0d01c 100644
Binary files a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditText$1.dex and b/src/Notes-master3/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditText$1.dex differ
diff --git a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditText$OnTextViewChangeListener.dex b/src/Notes-master3/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditText$OnTextViewChangeListener.dex
similarity index 56%
rename from src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditText$OnTextViewChangeListener.dex
rename to src/Notes-master3/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditText$OnTextViewChangeListener.dex
index c5e6113..312fbad 100644
Binary files a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditText$OnTextViewChangeListener.dex and b/src/Notes-master3/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditText$OnTextViewChangeListener.dex differ
diff --git a/src/Notes-master3/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditText.dex b/src/Notes-master3/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditText.dex
new file mode 100644
index 0000000..e6a8e3d
Binary files /dev/null and b/src/Notes-master3/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditText.dex differ
diff --git a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteItemData.dex b/src/Notes-master3/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteItemData.dex
similarity index 50%
rename from src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteItemData.dex
rename to src/Notes-master3/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteItemData.dex
index 5e2cb53..895e716 100644
Binary files a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteItemData.dex and b/src/Notes-master3/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteItemData.dex differ
diff --git a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$1.dex b/src/Notes-master3/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$1.dex
similarity index 75%
rename from src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$1.dex
rename to src/Notes-master3/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$1.dex
index 0ab3929..94ca601 100644
Binary files a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$1.dex and b/src/Notes-master3/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$1.dex differ
diff --git a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$2.dex b/src/Notes-master3/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$2.dex
similarity index 80%
rename from src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$2.dex
rename to src/Notes-master3/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$2.dex
index 365df96..508912e 100644
Binary files a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$2.dex and b/src/Notes-master3/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$2.dex differ
diff --git a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$3.dex b/src/Notes-master3/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$3.dex
similarity index 54%
rename from src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$3.dex
rename to src/Notes-master3/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$3.dex
index 6097354..649b73b 100644
Binary files a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$3.dex and b/src/Notes-master3/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$3.dex differ
diff --git a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$4.dex b/src/Notes-master3/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$4.dex
similarity index 79%
rename from src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$4.dex
rename to src/Notes-master3/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$4.dex
index 77e20f3..3f273d2 100644
Binary files a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$4.dex and b/src/Notes-master3/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$4.dex differ
diff --git a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$5.dex b/src/Notes-master3/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$5.dex
similarity index 69%
rename from src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$5.dex
rename to src/Notes-master3/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$5.dex
index 47d633a..33fc134 100644
Binary files a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$5.dex and b/src/Notes-master3/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$5.dex differ
diff --git a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$6.dex b/src/Notes-master3/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$6.dex
similarity index 52%
rename from src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$6.dex
rename to src/Notes-master3/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$6.dex
index b8b111d..38f22e6 100644
Binary files a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$6.dex and b/src/Notes-master3/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$6.dex differ
diff --git a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$7.dex b/src/Notes-master3/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$7.dex
similarity index 56%
rename from src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$7.dex
rename to src/Notes-master3/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$7.dex
index 2e073fb..3949ef3 100644
Binary files a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$7.dex and b/src/Notes-master3/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$7.dex differ
diff --git a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$8.dex b/src/Notes-master3/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$8.dex
similarity index 70%
rename from src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$8.dex
rename to src/Notes-master3/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$8.dex
index 92c61e8..cc6a86c 100644
Binary files a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$8.dex and b/src/Notes-master3/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$8.dex differ
diff --git a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$9.dex b/src/Notes-master3/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$9.dex
similarity index 60%
rename from src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$9.dex
rename to src/Notes-master3/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$9.dex
index d68f9e3..da8d10a 100644
Binary files a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$9.dex and b/src/Notes-master3/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$9.dex differ
diff --git a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$BackgroundQueryHandler.dex b/src/Notes-master3/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$BackgroundQueryHandler.dex
similarity index 60%
rename from src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$BackgroundQueryHandler.dex
rename to src/Notes-master3/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$BackgroundQueryHandler.dex
index e0ad6d1..34cd0cc 100644
Binary files a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$BackgroundQueryHandler.dex and b/src/Notes-master3/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$BackgroundQueryHandler.dex differ
diff --git a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ListEditState.dex b/src/Notes-master3/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ListEditState.dex
similarity index 60%
rename from src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ListEditState.dex
rename to src/Notes-master3/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ListEditState.dex
index 64869cd..f6b3b83 100644
Binary files a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ListEditState.dex and b/src/Notes-master3/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ListEditState.dex differ
diff --git a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback$1.dex b/src/Notes-master3/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback$1.dex
similarity index 63%
rename from src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback$1.dex
rename to src/Notes-master3/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback$1.dex
index 36c7db6..dcda72d 100644
Binary files a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback$1.dex and b/src/Notes-master3/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback$1.dex differ
diff --git a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback$2.dex b/src/Notes-master3/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback$2.dex
similarity index 59%
rename from src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback$2.dex
rename to src/Notes-master3/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback$2.dex
index f236198..9ef9d17 100644
Binary files a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback$2.dex and b/src/Notes-master3/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback$2.dex differ
diff --git a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback.dex b/src/Notes-master3/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback.dex
similarity index 76%
rename from src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback.dex
rename to src/Notes-master3/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback.dex
index 6120b31..188fa2d 100644
Binary files a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback.dex and b/src/Notes-master3/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback.dex differ
diff --git a/src/Notes-master3/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$NewNoteOnTouchListener.dex b/src/Notes-master3/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$NewNoteOnTouchListener.dex
new file mode 100644
index 0000000..5645d63
Binary files /dev/null and b/src/Notes-master3/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$NewNoteOnTouchListener.dex differ
diff --git a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.dex b/src/Notes-master3/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.dex
similarity index 84%
rename from src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.dex
rename to src/Notes-master3/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.dex
index 2e6e07d..7f13b6c 100644
Binary files a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.dex and b/src/Notes-master3/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.dex differ
diff --git a/src/Notes-master3/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity.dex b/src/Notes-master3/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity.dex
new file mode 100644
index 0000000..4143f2e
Binary files /dev/null and b/src/Notes-master3/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity.dex differ
diff --git a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListAdapter$AppWidgetAttribute.dex b/src/Notes-master3/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListAdapter$AppWidgetAttribute.dex
similarity index 53%
rename from src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListAdapter$AppWidgetAttribute.dex
rename to src/Notes-master3/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListAdapter$AppWidgetAttribute.dex
index 9653d4c..90c5bf7 100644
Binary files a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListAdapter$AppWidgetAttribute.dex and b/src/Notes-master3/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListAdapter$AppWidgetAttribute.dex differ
diff --git a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListAdapter.dex b/src/Notes-master3/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListAdapter.dex
similarity index 89%
rename from src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListAdapter.dex
rename to src/Notes-master3/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListAdapter.dex
index 32e433a..67516a2 100644
Binary files a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListAdapter.dex and b/src/Notes-master3/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListAdapter.dex differ
diff --git a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListItem.dex b/src/Notes-master3/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListItem.dex
similarity index 70%
rename from src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListItem.dex
rename to src/Notes-master3/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListItem.dex
index c3a81d6..1192a05 100644
Binary files a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListItem.dex and b/src/Notes-master3/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListItem.dex differ
diff --git a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$1.dex b/src/Notes-master3/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$1.dex
similarity index 68%
rename from src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$1.dex
rename to src/Notes-master3/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$1.dex
index 6252d17..45b18d5 100644
Binary files a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$1.dex and b/src/Notes-master3/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$1.dex differ
diff --git a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$2.dex b/src/Notes-master3/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$2.dex
similarity index 76%
rename from src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$2.dex
rename to src/Notes-master3/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$2.dex
index 2988e52..e0de879 100644
Binary files a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$2.dex and b/src/Notes-master3/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$2.dex differ
diff --git a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$3.dex b/src/Notes-master3/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$3.dex
similarity index 75%
rename from src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$3.dex
rename to src/Notes-master3/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$3.dex
index 4f65cdc..10d74a1 100644
Binary files a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$3.dex and b/src/Notes-master3/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$3.dex differ
diff --git a/src/Notes-master3/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$4.dex b/src/Notes-master3/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$4.dex
new file mode 100644
index 0000000..d234ab7
Binary files /dev/null and b/src/Notes-master3/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$4.dex differ
diff --git a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$5.dex b/src/Notes-master3/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$5.dex
similarity index 63%
rename from src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$5.dex
rename to src/Notes-master3/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$5.dex
index eabb89d..0569355 100644
Binary files a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$5.dex and b/src/Notes-master3/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$5.dex differ
diff --git a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$6.dex b/src/Notes-master3/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$6.dex
similarity index 66%
rename from src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$6.dex
rename to src/Notes-master3/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$6.dex
index 354c8aa..ac91b10 100644
Binary files a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$6.dex and b/src/Notes-master3/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$6.dex differ
diff --git a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$7.dex b/src/Notes-master3/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$7.dex
similarity index 73%
rename from src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$7.dex
rename to src/Notes-master3/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$7.dex
index 4e2daec..776ea3e 100644
Binary files a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$7.dex and b/src/Notes-master3/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$7.dex differ
diff --git a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$8.dex b/src/Notes-master3/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$8.dex
similarity index 75%
rename from src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$8.dex
rename to src/Notes-master3/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$8.dex
index f5f3814..24ddb14 100644
Binary files a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$8.dex and b/src/Notes-master3/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$8.dex differ
diff --git a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$GTaskReceiver.dex b/src/Notes-master3/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$GTaskReceiver.dex
similarity index 67%
rename from src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$GTaskReceiver.dex
rename to src/Notes-master3/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$GTaskReceiver.dex
index c5b1a58..e120e02 100644
Binary files a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$GTaskReceiver.dex and b/src/Notes-master3/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$GTaskReceiver.dex differ
diff --git a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity.dex b/src/Notes-master3/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity.dex
similarity index 58%
rename from src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity.dex
rename to src/Notes-master3/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity.dex
index 5ec3825..75f5e0c 100644
Binary files a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity.dex and b/src/Notes-master3/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity.dex differ
diff --git a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/widget/NoteWidgetProvider.dex b/src/Notes-master3/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/widget/NoteWidgetProvider.dex
similarity index 61%
rename from src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/widget/NoteWidgetProvider.dex
rename to src/Notes-master3/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/widget/NoteWidgetProvider.dex
index aaf7e5c..d193b1b 100644
Binary files a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/widget/NoteWidgetProvider.dex and b/src/Notes-master3/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/widget/NoteWidgetProvider.dex differ
diff --git a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/widget/NoteWidgetProvider_2x.dex b/src/Notes-master3/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/widget/NoteWidgetProvider_2x.dex
similarity index 59%
rename from src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/widget/NoteWidgetProvider_2x.dex
rename to src/Notes-master3/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/widget/NoteWidgetProvider_2x.dex
index effaab0..5c85abd 100644
Binary files a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/widget/NoteWidgetProvider_2x.dex and b/src/Notes-master3/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/widget/NoteWidgetProvider_2x.dex differ
diff --git a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/widget/NoteWidgetProvider_4x.dex b/src/Notes-master3/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/widget/NoteWidgetProvider_4x.dex
similarity index 59%
rename from src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/widget/NoteWidgetProvider_4x.dex
rename to src/Notes-master3/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/widget/NoteWidgetProvider_4x.dex
index 73f6100..f14f76a 100644
Binary files a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/widget/NoteWidgetProvider_4x.dex and b/src/Notes-master3/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/widget/NoteWidgetProvider_4x.dex differ
diff --git a/src/Notes-master3/Notes-master3/app/build/intermediates/runtime_symbol_list/debug/R.txt b/src/Notes-master3/Notes-master3/app/build/intermediates/runtime_symbol_list/debug/R.txt
new file mode 100644
index 0000000..29e3a74
--- /dev/null
+++ b/src/Notes-master3/Notes-master3/app/build/intermediates/runtime_symbol_list/debug/R.txt
@@ -0,0 +1,302 @@
+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 cauc 0x7f040003
+int drawable clock 0x7f040004
+int drawable delete 0x7f040005
+int drawable dropdown_icon 0x7f040006
+int drawable edit_blue 0x7f040007
+int drawable edit_green 0x7f040008
+int drawable edit_red 0x7f040009
+int drawable edit_title_blue 0x7f04000a
+int drawable edit_title_green 0x7f04000b
+int drawable edit_title_red 0x7f04000c
+int drawable edit_title_white 0x7f04000d
+int drawable edit_title_yellow 0x7f04000e
+int drawable edit_white 0x7f04000f
+int drawable edit_yellow 0x7f040010
+int drawable font_large 0x7f040011
+int drawable font_normal 0x7f040012
+int drawable font_size_selector_bg 0x7f040013
+int drawable font_small 0x7f040014
+int drawable font_super 0x7f040015
+int drawable grassland 0x7f040016
+int drawable icon_app 0x7f040017
+int drawable ikun 0x7f040018
+int drawable list_background 0x7f040019
+int drawable list_blue_down 0x7f04001a
+int drawable list_blue_middle 0x7f04001b
+int drawable list_blue_single 0x7f04001c
+int drawable list_blue_up 0x7f04001d
+int drawable list_folder 0x7f04001e
+int drawable list_footer_bg 0x7f04001f
+int drawable list_green_down 0x7f040020
+int drawable list_green_middle 0x7f040021
+int drawable list_green_single 0x7f040022
+int drawable list_green_up 0x7f040023
+int drawable list_red_down 0x7f040024
+int drawable list_red_middle 0x7f040025
+int drawable list_red_single 0x7f040026
+int drawable list_red_up 0x7f040027
+int drawable list_white_down 0x7f040028
+int drawable list_white_middle 0x7f040029
+int drawable list_white_single 0x7f04002a
+int drawable list_white_up 0x7f04002b
+int drawable list_yellow_down 0x7f04002c
+int drawable list_yellow_middle 0x7f04002d
+int drawable list_yellow_single 0x7f04002e
+int drawable list_yellow_up 0x7f04002f
+int drawable menu_delete 0x7f040030
+int drawable menu_move 0x7f040031
+int drawable new_note 0x7f040032
+int drawable new_note_normal 0x7f040033
+int drawable new_note_pressed 0x7f040034
+int drawable note_edit_color_selector_panel 0x7f040035
+int drawable notification 0x7f040036
+int drawable search_result 0x7f040037
+int drawable selected 0x7f040038
+int drawable title_alert 0x7f040039
+int drawable title_bar_bg 0x7f04003a
+int drawable widget_2x_blue 0x7f04003b
+int drawable widget_2x_green 0x7f04003c
+int drawable widget_2x_red 0x7f04003d
+int drawable widget_2x_white 0x7f04003e
+int drawable widget_2x_yellow 0x7f04003f
+int drawable widget_4x_blue 0x7f040040
+int drawable widget_4x_green 0x7f040041
+int drawable widget_4x_red 0x7f040042
+int drawable widget_4x_white 0x7f040043
+int drawable widget_4x_yellow 0x7f040044
+int id account 0x7f050000
+int id account_dialog_subtitle 0x7f050001
+int id account_dialog_title 0x7f050002
+int id action_select_all 0x7f050003
+int id amPm 0x7f050004
+int id btn_new_note 0x7f050005
+int id btn_set_bg_color 0x7f050006
+int id cancel 0x7f050007
+int id cb_edit_item 0x7f050008
+int id date 0x7f050009
+int id delete 0x7f05000a
+int id et_edit_text 0x7f05000b
+int id et_foler_name 0x7f05000c
+int id font_size_selector 0x7f05000d
+int id hour 0x7f05000e
+int id iv_alert_icon 0x7f05000f
+int id iv_bg_blue 0x7f050010
+int id iv_bg_blue_select 0x7f050011
+int id iv_bg_green 0x7f050012
+int id iv_bg_green_select 0x7f050013
+int id iv_bg_red 0x7f050014
+int id iv_bg_red_select 0x7f050015
+int id iv_bg_white 0x7f050016
+int id iv_bg_white_select 0x7f050017
+int id iv_bg_yellow 0x7f050018
+int id iv_bg_yellow_select 0x7f050019
+int id iv_large_select 0x7f05001a
+int id iv_medium_select 0x7f05001b
+int id iv_small_select 0x7f05001c
+int id iv_super_select 0x7f05001d
+int id ll_font_large 0x7f05001e
+int id ll_font_normal 0x7f05001f
+int id ll_font_small 0x7f050020
+int id ll_font_super 0x7f050021
+int id login 0x7f050022
+int id menu_alert 0x7f050023
+int id menu_cauc 0x7f050024
+int id menu_delete 0x7f050025
+int id menu_delete_remind 0x7f050026
+int id menu_export_text 0x7f050027
+int id menu_font_size 0x7f050028
+int id menu_grassland 0x7f050029
+int id menu_list_mode 0x7f05002a
+int id menu_new_folder 0x7f05002b
+int id menu_new_note 0x7f05002c
+int id menu_search 0x7f05002d
+int id menu_send_to_desktop 0x7f05002e
+int id menu_setting 0x7f05002f
+int id menu_share 0x7f050030
+int id menu_sync 0x7f050031
+int id minute 0x7f050032
+int id move 0x7f050033
+int id navigation_bar 0x7f050034
+int id note_bg_color_selector 0x7f050035
+int id note_edit_list 0x7f050036
+int id note_edit_view 0x7f050037
+int id note_item 0x7f050038
+int id note_title 0x7f050039
+int id notes_list 0x7f05003a
+int id password 0x7f05003b
+int id prefenerece_sync_status_textview 0x7f05003c
+int id preference_sync_button 0x7f05003d
+int id selection_menu 0x7f05003e
+int id sv_note_edit 0x7f05003f
+int id tv_alert_date 0x7f050040
+int id tv_folder_name 0x7f050041
+int id tv_modified_date 0x7f050042
+int id tv_name 0x7f050043
+int id tv_time 0x7f050044
+int id tv_title 0x7f050045
+int id tv_title_bar 0x7f050046
+int id widget_bg_image 0x7f050047
+int id widget_text 0x7f050048
+int layout account_dialog_title 0x7f060000
+int layout activity_login 0x7f060001
+int layout add_account_text 0x7f060002
+int layout datetime_picker 0x7f060003
+int layout dialog_edit_text 0x7f060004
+int layout folder_list_item 0x7f060005
+int layout note_edit 0x7f060006
+int layout note_edit_list_item 0x7f060007
+int layout note_item 0x7f060008
+int layout note_list 0x7f060009
+int layout note_list_dropdown_menu 0x7f06000a
+int layout note_list_footer 0x7f06000b
+int layout settings_header 0x7f06000c
+int layout widget_2x 0x7f06000d
+int layout widget_4x 0x7f06000e
+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 Loading 0x7f0a0000
+int string alert_message_delete_folder 0x7f0a0001
+int string alert_message_delete_note 0x7f0a0002
+int string alert_message_delete_notes 0x7f0a0003
+int string alert_title_delete 0x7f0a0004
+int string app_already_quit 0x7f0a0005
+int string app_name 0x7f0a0006
+int string app_widget2x2 0x7f0a0007
+int string app_widget4x4 0x7f0a0008
+int string button_delete 0x7f0a0009
+int string call_record_folder_name 0x7f0a000a
+int string cancel 0x7f0a000b
+int string datetime_dialog_cancel 0x7f0a000c
+int string datetime_dialog_ok 0x7f0a000d
+int string delete_remind_time_message 0x7f0a000e
+int string error_note_empty_for_clock 0x7f0a000f
+int string error_note_empty_for_send_to_desktop 0x7f0a0010
+int string error_note_not_exist 0x7f0a0011
+int string error_sdcard_export 0x7f0a0012
+int string error_sdcard_unmounted 0x7f0a0013
+int string error_sync_cancelled 0x7f0a0014
+int string error_sync_internal 0x7f0a0015
+int string error_sync_network 0x7f0a0016
+int string failed_sdcard_export 0x7f0a0017
+int string file_name_txt_format 0x7f0a0018
+int string file_path 0x7f0a0019
+int string folder_exist 0x7f0a001a
+int string format_date_ymd 0x7f0a001b
+int string format_datetime_mdhm 0x7f0a001c
+int string format_exported_file_location 0x7f0a001d
+int string format_folder_files_count 0x7f0a001e
+int string format_move_notes_to_folder 0x7f0a001f
+int string hint_foler_name 0x7f0a0020
+int string info_note_enter_desktop 0x7f0a0021
+int string invalid 0x7f0a0022
+int string menu_alert 0x7f0a0023
+int string menu_cauc 0x7f0a0024
+int string menu_create_folder 0x7f0a0025
+int string menu_delete 0x7f0a0026
+int string menu_deselect_all 0x7f0a0027
+int string menu_export_text 0x7f0a0028
+int string menu_folder_change_name 0x7f0a0029
+int string menu_folder_delete 0x7f0a002a
+int string menu_folder_view 0x7f0a002b
+int string menu_font_large 0x7f0a002c
+int string menu_font_normal 0x7f0a002d
+int string menu_font_size 0x7f0a002e
+int string menu_font_small 0x7f0a002f
+int string menu_font_super 0x7f0a0030
+int string menu_grassland 0x7f0a0031
+int string menu_list_mode 0x7f0a0032
+int string menu_move 0x7f0a0033
+int string menu_move_parent_folder 0x7f0a0034
+int string menu_normal_mode 0x7f0a0035
+int string menu_remove_remind 0x7f0a0036
+int string menu_search 0x7f0a0037
+int string menu_select_all 0x7f0a0038
+int string menu_select_none 0x7f0a0039
+int string menu_select_title 0x7f0a003a
+int string menu_send_to_desktop 0x7f0a003b
+int string menu_setting 0x7f0a003c
+int string menu_share 0x7f0a003d
+int string menu_sync 0x7f0a003e
+int string menu_sync_cancel 0x7f0a003f
+int string menu_title_select_folder 0x7f0a0040
+int string note_alert_expired 0x7f0a0041
+int string note_link_email 0x7f0a0042
+int string note_link_other 0x7f0a0043
+int string note_link_tel 0x7f0a0044
+int string note_link_web 0x7f0a0045
+int string notealert_enter 0x7f0a0046
+int string notealert_ok 0x7f0a0047
+int string notelist_menu_new 0x7f0a0048
+int string notelist_string_info 0x7f0a0049
+int string preferences_account_summary 0x7f0a004a
+int string preferences_account_title 0x7f0a004b
+int string preferences_add_account 0x7f0a004c
+int string preferences_bg_random_appear_title 0x7f0a004d
+int string preferences_button_sync_cancel 0x7f0a004e
+int string preferences_button_sync_immediately 0x7f0a004f
+int string preferences_dialog_change_account_title 0x7f0a0050
+int string preferences_dialog_change_account_warn_msg 0x7f0a0051
+int string preferences_dialog_select_account_tips 0x7f0a0052
+int string preferences_dialog_select_account_title 0x7f0a0053
+int string preferences_last_sync_time 0x7f0a0054
+int string preferences_last_sync_time_format 0x7f0a0055
+int string preferences_menu_cancel 0x7f0a0056
+int string preferences_menu_change_account 0x7f0a0057
+int string preferences_menu_remove_account 0x7f0a0058
+int string preferences_title 0x7f0a0059
+int string preferences_toast_cannot_change_account 0x7f0a005a
+int string preferences_toast_success_set_accout 0x7f0a005b
+int string prompt_account 0x7f0a005c
+int string prompt_login 0x7f0a005d
+int string prompt_password 0x7f0a005e
+int string search 0x7f0a005f
+int string search_hint 0x7f0a0060
+int string search_label 0x7f0a0061
+int string search_setting_description 0x7f0a0062
+int string set_remind_time_message 0x7f0a0063
+int string success_sdcard_export 0x7f0a0064
+int string success_sync_account 0x7f0a0065
+int string sync_progress_init_list 0x7f0a0066
+int string sync_progress_login 0x7f0a0067
+int string sync_progress_syncing 0x7f0a0068
+int string ticker_cancel 0x7f0a0069
+int string ticker_fail 0x7f0a006a
+int string ticker_success 0x7f0a006b
+int string ticker_syncing 0x7f0a006c
+int string widget_havenot_content 0x7f0a006d
+int string widget_under_visit_mode 0x7f0a006e
+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/src/Notes-master3/Notes-master3/app/build/intermediates/signing_config_versions/debug/signing-config-versions.json b/src/Notes-master3/Notes-master3/app/build/intermediates/signing_config_versions/debug/signing-config-versions.json
new file mode 100644
index 0000000..51f6368
--- /dev/null
+++ b/src/Notes-master3/Notes-master3/app/build/intermediates/signing_config_versions/debug/signing-config-versions.json
@@ -0,0 +1 @@
+{"enableV1Signing":false,"enableV2Signing":true,"enableV3Signing":false,"enableV4Signing":false}
\ No newline at end of file
diff --git a/src/Notes-master3/Notes-master3/app/build/intermediates/source_set_path_map/debug/file-map.txt b/src/Notes-master3/Notes-master3/app/build/intermediates/source_set_path_map/debug/file-map.txt
new file mode 100644
index 0000000..5c6af27
--- /dev/null
+++ b/src/Notes-master3/Notes-master3/app/build/intermediates/source_set_path_map/debug/file-map.txt
@@ -0,0 +1,8 @@
+net.micode.notes.app-pngs-0 C:\Users\13293\Desktop\Notes-master3\Notes-master3\app\build\generated\res\pngs\debug
+net.micode.notes.app-resValues-1 C:\Users\13293\Desktop\Notes-master3\Notes-master3\app\build\generated\res\resValues\debug
+net.micode.notes.app-rs-2 C:\Users\13293\Desktop\Notes-master3\Notes-master3\app\build\generated\res\rs\debug
+net.micode.notes.app-mergeDebugResources-3 C:\Users\13293\Desktop\Notes-master3\Notes-master3\app\build\intermediates\incremental\debug\mergeDebugResources\merged.dir
+net.micode.notes.app-mergeDebugResources-4 C:\Users\13293\Desktop\Notes-master3\Notes-master3\app\build\intermediates\incremental\debug\mergeDebugResources\stripped.dir
+net.micode.notes.app-merged_res-5 C:\Users\13293\Desktop\Notes-master3\Notes-master3\app\build\intermediates\merged_res\debug
+net.micode.notes.app-debug-6 C:\Users\13293\Desktop\Notes-master3\Notes-master3\app\src\debug\res
+net.micode.notes.app-main-7 C:\Users\13293\Desktop\Notes-master3\Notes-master3\app\src\main\res
diff --git a/src/Notes-master3/Notes-master3/app/build/intermediates/stable_resource_ids_file/debug/stableIds.txt b/src/Notes-master3/Notes-master3/app/build/intermediates/stable_resource_ids_file/debug/stableIds.txt
new file mode 100644
index 0000000..b324aa3
--- /dev/null
+++ b/src/Notes-master3/Notes-master3/app/build/intermediates/stable_resource_ids_file/debug/stableIds.txt
@@ -0,0 +1,302 @@
+net.micode.notes:xml/widget_4x_info = 0x7f0c0003
+net.micode.notes:xml/preferences = 0x7f0c0000
+net.micode.notes:style/TextAppearanceSecondaryItem = 0x7f0b0008
+net.micode.notes:style/TextAppearanceNormal = 0x7f0b0006
+net.micode.notes:style/TextAppearanceLarge = 0x7f0b0004
+net.micode.notes:style/HighlightTextAppearancePrimary = 0x7f0b0000
+net.micode.notes:string/widget_havenot_content = 0x7f0a006d
+net.micode.notes:string/ticker_syncing = 0x7f0a006c
+net.micode.notes:string/ticker_success = 0x7f0a006b
+net.micode.notes:style/HighlightTextAppearanceSecondary = 0x7f0b0001
+net.micode.notes:string/ticker_cancel = 0x7f0a0069
+net.micode.notes:string/sync_progress_syncing = 0x7f0a0068
+net.micode.notes:string/sync_progress_init_list = 0x7f0a0066
+net.micode.notes:string/search_label = 0x7f0a0061
+net.micode.notes:string/prompt_password = 0x7f0a005e
+net.micode.notes:string/preferences_toast_success_set_accout = 0x7f0a005b
+net.micode.notes:string/preferences_toast_cannot_change_account = 0x7f0a005a
+net.micode.notes:string/preferences_title = 0x7f0a0059
+net.micode.notes:string/preferences_menu_remove_account = 0x7f0a0058
+net.micode.notes:style/NoteActionBarStyle = 0x7f0b0002
+net.micode.notes:string/preferences_menu_change_account = 0x7f0a0057
+net.micode.notes:string/preferences_menu_cancel = 0x7f0a0056
+net.micode.notes:string/preferences_last_sync_time = 0x7f0a0054
+net.micode.notes:string/preferences_dialog_select_account_title = 0x7f0a0053
+net.micode.notes:string/preferences_dialog_change_account_warn_msg = 0x7f0a0051
+net.micode.notes:string/preferences_button_sync_immediately = 0x7f0a004f
+net.micode.notes:string/preferences_button_sync_cancel = 0x7f0a004e
+net.micode.notes:string/preferences_account_summary = 0x7f0a004a
+net.micode.notes:string/success_sdcard_export = 0x7f0a0064
+net.micode.notes:string/notelist_string_info = 0x7f0a0049
+net.micode.notes:string/prompt_account = 0x7f0a005c
+net.micode.notes:string/notelist_menu_new = 0x7f0a0048
+net.micode.notes:string/notealert_ok = 0x7f0a0047
+net.micode.notes:string/notealert_enter = 0x7f0a0046
+net.micode.notes:string/note_link_tel = 0x7f0a0044
+net.micode.notes:string/note_link_other = 0x7f0a0043
+net.micode.notes:string/note_link_email = 0x7f0a0042
+net.micode.notes:string/note_alert_expired = 0x7f0a0041
+net.micode.notes:string/menu_sync_cancel = 0x7f0a003f
+net.micode.notes:string/menu_share = 0x7f0a003d
+net.micode.notes:string/menu_select_title = 0x7f0a003a
+net.micode.notes:style/TextAppearanceMedium = 0x7f0b0005
+net.micode.notes:string/menu_select_none = 0x7f0a0039
+net.micode.notes:string/menu_title_select_folder = 0x7f0a0040
+net.micode.notes:string/menu_select_all = 0x7f0a0038
+net.micode.notes:string/menu_search = 0x7f0a0037
+net.micode.notes:string/menu_remove_remind = 0x7f0a0036
+net.micode.notes:string/menu_normal_mode = 0x7f0a0035
+net.micode.notes:string/menu_move_parent_folder = 0x7f0a0034
+net.micode.notes:string/menu_move = 0x7f0a0033
+net.micode.notes:string/menu_list_mode = 0x7f0a0032
+net.micode.notes:string/menu_font_super = 0x7f0a0030
+net.micode.notes:string/menu_font_small = 0x7f0a002f
+net.micode.notes:string/menu_folder_change_name = 0x7f0a0029
+net.micode.notes:string/menu_export_text = 0x7f0a0028
+net.micode.notes:string/menu_deselect_all = 0x7f0a0027
+net.micode.notes:string/menu_create_folder = 0x7f0a0025
+net.micode.notes:string/menu_cauc = 0x7f0a0024
+net.micode.notes:string/invalid = 0x7f0a0022
+net.micode.notes:string/info_note_enter_desktop = 0x7f0a0021
+net.micode.notes:string/format_move_notes_to_folder = 0x7f0a001f
+net.micode.notes:string/format_folder_files_count = 0x7f0a001e
+net.micode.notes:string/format_datetime_mdhm = 0x7f0a001c
+net.micode.notes:string/format_date_ymd = 0x7f0a001b
+net.micode.notes:style/TextAppearancePrimaryItem = 0x7f0b0007
+net.micode.notes:string/hint_foler_name = 0x7f0a0020
+net.micode.notes:string/folder_exist = 0x7f0a001a
+net.micode.notes:string/file_path = 0x7f0a0019
+net.micode.notes:string/ticker_fail = 0x7f0a006a
+net.micode.notes:string/file_name_txt_format = 0x7f0a0018
+net.micode.notes:string/failed_sdcard_export = 0x7f0a0017
+net.micode.notes:string/set_remind_time_message = 0x7f0a0063
+net.micode.notes:string/error_sync_network = 0x7f0a0016
+net.micode.notes:string/error_sdcard_unmounted = 0x7f0a0013
+net.micode.notes:string/datetime_dialog_ok = 0x7f0a000d
+net.micode.notes:string/prompt_login = 0x7f0a005d
+net.micode.notes:string/datetime_dialog_cancel = 0x7f0a000c
+net.micode.notes:drawable/list_green_up = 0x7f040023
+net.micode.notes:string/call_record_folder_name = 0x7f0a000a
+net.micode.notes:drawable/new_note_normal = 0x7f040033
+net.micode.notes:string/button_delete = 0x7f0a0009
+net.micode.notes:string/app_widget2x2 = 0x7f0a0007
+net.micode.notes:string/note_link_web = 0x7f0a0045
+net.micode.notes:string/Loading = 0x7f0a0000
+net.micode.notes:string/menu_font_normal = 0x7f0a002d
+net.micode.notes:string/format_exported_file_location = 0x7f0a001d
+net.micode.notes:raw/introduction = 0x7f090000
+net.micode.notes:string/delete_remind_time_message = 0x7f0a000e
+net.micode.notes:dimen/text_font_size_super = 0x7f030004
+net.micode.notes:drawable/selected = 0x7f040038
+net.micode.notes:plurals/search_results_title = 0x7f080000
+net.micode.notes:menu/sub_folder = 0x7f070006
+net.micode.notes:menu/note_edit = 0x7f070002
+net.micode.notes:style/TextAppearanceSuper = 0x7f0b0009
+net.micode.notes:color/secondary_text_dark = 0x7f020001
+net.micode.notes:id/move = 0x7f050033
+net.micode.notes:id/iv_bg_yellow_select = 0x7f050019
+net.micode.notes:menu/call_note_edit = 0x7f070000
+net.micode.notes:drawable/new_note_pressed = 0x7f040034
+net.micode.notes:id/iv_bg_blue = 0x7f050010
+net.micode.notes:layout/settings_header = 0x7f06000c
+net.micode.notes:layout/note_list = 0x7f060009
+net.micode.notes:drawable/list_white_single = 0x7f04002a
+net.micode.notes:layout/note_item = 0x7f060008
+net.micode.notes:xml/widget_2x_info = 0x7f0c0002
+net.micode.notes:string/alert_message_delete_folder = 0x7f0a0001
+net.micode.notes:layout/datetime_picker = 0x7f060003
+net.micode.notes:id/btn_new_note = 0x7f050005
+net.micode.notes:layout/note_list_footer = 0x7f06000b
+net.micode.notes:id/widget_text = 0x7f050048
+net.micode.notes:id/tv_title_bar = 0x7f050046
+net.micode.notes:drawable/widget_2x_blue = 0x7f04003b
+net.micode.notes:id/tv_time = 0x7f050044
+net.micode.notes:id/tv_name = 0x7f050043
+net.micode.notes:drawable/new_note = 0x7f040032
+net.micode.notes:id/sv_note_edit = 0x7f05003f
+net.micode.notes:id/selection_menu = 0x7f05003e
+net.micode.notes:string/error_sdcard_export = 0x7f0a0012
+net.micode.notes:id/preference_sync_button = 0x7f05003d
+net.micode.notes:layout/activity_login = 0x7f060001
+net.micode.notes:dimen/text_font_size_large = 0x7f030000
+net.micode.notes:id/tv_alert_date = 0x7f050040
+net.micode.notes:id/password = 0x7f05003b
+net.micode.notes:layout/note_edit = 0x7f060006
+net.micode.notes:id/notes_list = 0x7f05003a
+net.micode.notes:string/alert_message_delete_notes = 0x7f0a0003
+net.micode.notes:drawable/title_alert = 0x7f040039
+net.micode.notes:id/note_title = 0x7f050039
+net.micode.notes:string/preferences_last_sync_time_format = 0x7f0a0055
+net.micode.notes:id/note_edit_view = 0x7f050037
+net.micode.notes:id/navigation_bar = 0x7f050034
+net.micode.notes:string/app_widget4x4 = 0x7f0a0008
+net.micode.notes:drawable/font_normal = 0x7f040012
+net.micode.notes:id/minute = 0x7f050032
+net.micode.notes:drawable/font_super = 0x7f040015
+net.micode.notes:id/menu_sync = 0x7f050031
+net.micode.notes:id/menu_share = 0x7f050030
+net.micode.notes:id/menu_setting = 0x7f05002f
+net.micode.notes:string/widget_under_visit_mode = 0x7f0a006e
+net.micode.notes:id/account = 0x7f050000
+net.micode.notes:id/menu_send_to_desktop = 0x7f05002e
+net.micode.notes:id/menu_search = 0x7f05002d
+net.micode.notes:drawable/list_green_down = 0x7f040020
+net.micode.notes:id/menu_new_note = 0x7f05002c
+net.micode.notes:string/error_note_not_exist = 0x7f0a0011
+net.micode.notes:id/menu_new_folder = 0x7f05002b
+net.micode.notes:id/menu_list_mode = 0x7f05002a
+net.micode.notes:id/menu_grassland = 0x7f050029
+net.micode.notes:id/iv_medium_select = 0x7f05001b
+net.micode.notes:id/menu_export_text = 0x7f050027
+net.micode.notes:string/menu_folder_view = 0x7f0a002b
+net.micode.notes:id/menu_delete = 0x7f050025
+net.micode.notes:id/menu_cauc = 0x7f050024
+net.micode.notes:drawable/edit_blue = 0x7f040007
+net.micode.notes:id/prefenerece_sync_status_textview = 0x7f05003c
+net.micode.notes:string/menu_font_size = 0x7f0a002e
+net.micode.notes:string/menu_alert = 0x7f0a0023
+net.micode.notes:drawable/edit_title_yellow = 0x7f04000e
+net.micode.notes:id/menu_alert = 0x7f050023
+net.micode.notes:id/login = 0x7f050022
+net.micode.notes:string/success_sync_account = 0x7f0a0065
+net.micode.notes:id/ll_font_super = 0x7f050021
+net.micode.notes:id/ll_font_small = 0x7f050020
+net.micode.notes:menu/call_record_folder = 0x7f070001
+net.micode.notes:id/ll_font_normal = 0x7f05001f
+net.micode.notes:id/ll_font_large = 0x7f05001e
+net.micode.notes:id/note_bg_color_selector = 0x7f050035
+net.micode.notes:drawable/search_result = 0x7f040037
+net.micode.notes:id/iv_super_select = 0x7f05001d
+net.micode.notes:id/iv_bg_yellow = 0x7f050018
+net.micode.notes:string/error_sync_cancelled = 0x7f0a0014
+net.micode.notes:id/iv_bg_white_select = 0x7f050017
+net.micode.notes:dimen/text_font_size_small = 0x7f030003
+net.micode.notes:string/cancel = 0x7f0a000b
+net.micode.notes:id/iv_bg_white = 0x7f050016
+net.micode.notes:string/menu_font_large = 0x7f0a002c
+net.micode.notes:drawable/widget_4x_blue = 0x7f040040
+net.micode.notes:id/iv_large_select = 0x7f05001a
+net.micode.notes:id/widget_bg_image = 0x7f050047
+net.micode.notes:id/iv_bg_green_select = 0x7f050013
+net.micode.notes:id/amPm = 0x7f050004
+net.micode.notes:id/iv_bg_green = 0x7f050012
+net.micode.notes:string/error_note_empty_for_clock = 0x7f0a000f
+net.micode.notes:string/preferences_dialog_change_account_title = 0x7f0a0050
+net.micode.notes:drawable/menu_move = 0x7f040031
+net.micode.notes:drawable/widget_4x_white = 0x7f040043
+net.micode.notes:id/iv_bg_blue_select = 0x7f050011
+net.micode.notes:string/preferences_dialog_select_account_tips = 0x7f0a0052
+net.micode.notes:id/font_size_selector = 0x7f05000d
+net.micode.notes:id/et_edit_text = 0x7f05000b
+net.micode.notes:drawable/list_green_middle = 0x7f040021
+net.micode.notes:id/cancel = 0x7f050007
+net.micode.notes:id/et_foler_name = 0x7f05000c
+net.micode.notes:drawable/edit_green = 0x7f040008
+net.micode.notes:layout/widget_4x = 0x7f06000e
+net.micode.notes:string/search = 0x7f0a005f
+net.micode.notes:id/cb_edit_item = 0x7f050008
+net.micode.notes:id/btn_set_bg_color = 0x7f050006
+net.micode.notes:id/account_dialog_subtitle = 0x7f050001
+net.micode.notes:menu/note_list = 0x7f070003
+net.micode.notes:id/account_dialog_title = 0x7f050002
+net.micode.notes:drawable/widget_4x_green = 0x7f040041
+net.micode.notes:string/menu_grassland = 0x7f0a0031
+net.micode.notes:drawable/edit_red = 0x7f040009
+net.micode.notes:id/iv_alert_icon = 0x7f05000f
+net.micode.notes:drawable/ikun = 0x7f040018
+net.micode.notes:style/NoteTheme = 0x7f0b0003
+net.micode.notes:id/hour = 0x7f05000e
+net.micode.notes:drawable/note_edit_color_selector_panel = 0x7f040035
+net.micode.notes:drawable/widget_2x_yellow = 0x7f04003f
+net.micode.notes:drawable/widget_2x_red = 0x7f04003d
+net.micode.notes:style/TextAppearanceUnderMenuIcon = 0x7f0b000a
+net.micode.notes:id/delete = 0x7f05000a
+net.micode.notes:drawable/widget_2x_green = 0x7f04003c
+net.micode.notes:drawable/title_bar_bg = 0x7f04003a
+net.micode.notes:id/iv_bg_red = 0x7f050014
+net.micode.notes:drawable/notification = 0x7f040036
+net.micode.notes:drawable/list_green_single = 0x7f040022
+net.micode.notes:string/alert_message_delete_note = 0x7f0a0002
+net.micode.notes:id/tv_modified_date = 0x7f050042
+net.micode.notes:drawable/list_blue_middle = 0x7f04001b
+net.micode.notes:id/iv_small_select = 0x7f05001c
+net.micode.notes:menu/note_list_options = 0x7f070005
+net.micode.notes:xml/searchable = 0x7f0c0001
+net.micode.notes:string/menu_folder_delete = 0x7f0a002a
+net.micode.notes:drawable/dropdown_icon = 0x7f040006
+net.micode.notes:id/date = 0x7f050009
+net.micode.notes:drawable/list_yellow_single = 0x7f04002e
+net.micode.notes:drawable/list_red_up = 0x7f040027
+net.micode.notes:drawable/widget_4x_yellow = 0x7f040044
+net.micode.notes:drawable/list_yellow_middle = 0x7f04002d
+net.micode.notes:id/tv_folder_name = 0x7f050041
+net.micode.notes:drawable/list_yellow_down = 0x7f04002c
+net.micode.notes:drawable/clock = 0x7f040004
+net.micode.notes:drawable/list_white_up = 0x7f04002b
+net.micode.notes:drawable/edit_title_blue = 0x7f04000a
+net.micode.notes:layout/dialog_edit_text = 0x7f060004
+net.micode.notes:string/preferences_account_title = 0x7f0a004b
+net.micode.notes:drawable/edit_white = 0x7f04000f
+net.micode.notes:drawable/list_white_middle = 0x7f040029
+net.micode.notes:color/user_query_highlight = 0x7f020002
+net.micode.notes:drawable/list_white_down = 0x7f040028
+net.micode.notes:drawable/widget_4x_red = 0x7f040042
+net.micode.notes:string/menu_sync = 0x7f0a003e
+net.micode.notes:string/app_already_quit = 0x7f0a0005
+net.micode.notes:id/menu_delete_remind = 0x7f050026
+net.micode.notes:drawable/list_red_down = 0x7f040024
+net.micode.notes:drawable/list_red_middle = 0x7f040025
+net.micode.notes:string/error_note_empty_for_send_to_desktop = 0x7f0a0010
+net.micode.notes:layout/note_list_dropdown_menu = 0x7f06000a
+net.micode.notes:drawable/list_blue_down = 0x7f04001a
+net.micode.notes:string/sync_progress_login = 0x7f0a0067
+net.micode.notes:array/menu_share_ways = 0x7f010001
+net.micode.notes:drawable/widget_2x_white = 0x7f04003e
+net.micode.notes:drawable/list_blue_up = 0x7f04001d
+net.micode.notes:drawable/grassland = 0x7f040016
+net.micode.notes:drawable/cauc = 0x7f040003
+net.micode.notes:id/action_select_all = 0x7f050003
+net.micode.notes:string/menu_send_to_desktop = 0x7f0a003b
+net.micode.notes:drawable/list_red_single = 0x7f040026
+net.micode.notes:string/preferences_add_account = 0x7f0a004c
+net.micode.notes:drawable/bg_btn_set_color = 0x7f040000
+net.micode.notes:string/preferences_bg_random_appear_title = 0x7f0a004d
+net.micode.notes:layout/widget_2x = 0x7f06000d
+net.micode.notes:drawable/list_footer_bg = 0x7f04001f
+net.micode.notes:string/alert_title_delete = 0x7f0a0004
+net.micode.notes:drawable/edit_title_green = 0x7f04000b
+net.micode.notes:drawable/icon_app = 0x7f040017
+net.micode.notes:drawable/font_small = 0x7f040014
+net.micode.notes:layout/folder_list_item = 0x7f060005
+net.micode.notes:layout/add_account_text = 0x7f060002
+net.micode.notes:id/tv_title = 0x7f050045
+net.micode.notes:color/primary_text_dark = 0x7f020000
+net.micode.notes:drawable/font_size_selector_bg = 0x7f040013
+net.micode.notes:string/search_setting_description = 0x7f0a0062
+net.micode.notes:drawable/list_blue_single = 0x7f04001c
+net.micode.notes:drawable/font_large = 0x7f040011
+net.micode.notes:drawable/delete = 0x7f040005
+net.micode.notes:drawable/edit_yellow = 0x7f040010
+net.micode.notes:id/note_item = 0x7f050038
+net.micode.notes:drawable/edit_title_white = 0x7f04000d
+net.micode.notes:id/note_edit_list = 0x7f050036
+net.micode.notes:drawable/edit_title_red = 0x7f04000c
+net.micode.notes:string/menu_delete = 0x7f0a0026
+net.micode.notes:drawable/list_folder = 0x7f04001e
+net.micode.notes:drawable/call_record = 0x7f040002
+net.micode.notes:string/error_sync_internal = 0x7f0a0015
+net.micode.notes:drawable/menu_delete = 0x7f040030
+net.micode.notes:string/search_hint = 0x7f0a0060
+net.micode.notes:id/menu_font_size = 0x7f050028
+net.micode.notes:drawable/bg_color_btn_mask = 0x7f040001
+net.micode.notes:drawable/list_yellow_up = 0x7f04002f
+net.micode.notes:id/iv_bg_red_select = 0x7f050015
+net.micode.notes:dimen/text_font_size_normal = 0x7f030002
+net.micode.notes:drawable/list_background = 0x7f040019
+net.micode.notes:string/app_name = 0x7f0a0006
+net.micode.notes:menu/note_list_dropdown = 0x7f070004
+net.micode.notes:string/menu_setting = 0x7f0a003c
+net.micode.notes:dimen/text_font_size_medium = 0x7f030001
+net.micode.notes:layout/note_edit_list_item = 0x7f060007
+net.micode.notes:layout/account_dialog_title = 0x7f060000
+net.micode.notes:array/format_for_exported_note = 0x7f010000
diff --git a/src/Notes-master3/app/build/intermediates/variant_model/debug/variant_model.json b/src/Notes-master3/Notes-master3/app/build/intermediates/variant_model/debug/variant_model.json
similarity index 100%
rename from src/Notes-master3/app/build/intermediates/variant_model/debug/variant_model.json
rename to src/Notes-master3/Notes-master3/app/build/intermediates/variant_model/debug/variant_model.json
diff --git a/src/Notes-master3/Notes-master3/app/build/outputs/apk/debug/app-debug.apk b/src/Notes-master3/Notes-master3/app/build/outputs/apk/debug/app-debug.apk
new file mode 100644
index 0000000..ba3cc15
Binary files /dev/null and b/src/Notes-master3/Notes-master3/app/build/outputs/apk/debug/app-debug.apk differ
diff --git a/src/Notes-master3/Notes-master3/app/build/outputs/apk/debug/output-metadata.json b/src/Notes-master3/Notes-master3/app/build/outputs/apk/debug/output-metadata.json
new file mode 100644
index 0000000..b2231b9
--- /dev/null
+++ b/src/Notes-master3/Notes-master3/app/build/outputs/apk/debug/output-metadata.json
@@ -0,0 +1,20 @@
+{
+  "version": 3,
+  "artifactType": {
+    "type": "APK",
+    "kind": "Directory"
+  },
+  "applicationId": "net.micode.notes",
+  "variantName": "debug",
+  "elements": [
+    {
+      "type": "SINGLE",
+      "filters": [],
+      "attributes": [],
+      "versionCode": 1,
+      "versionName": "0.1",
+      "outputFile": "app-debug.apk"
+    }
+  ],
+  "elementType": "File"
+}
\ No newline at end of file
diff --git a/src/Notes-master3/Notes-master3/app/build/outputs/logs/manifest-merger-debug-report.txt b/src/Notes-master3/Notes-master3/app/build/outputs/logs/manifest-merger-debug-report.txt
new file mode 100644
index 0000000..96fcd0d
--- /dev/null
+++ b/src/Notes-master3/Notes-master3/app/build/outputs/logs/manifest-merger-debug-report.txt
@@ -0,0 +1,267 @@
+-- Merging decision tree log ---
+manifest
+ADDED from C:\Users\13293\Desktop\Notes-master3\Notes-master3\app\src\main\AndroidManifest.xml:18:1-171:12
+INJECTED from C:\Users\13293\Desktop\Notes-master3\Notes-master3\app\src\main\AndroidManifest.xml:18:1-171:12
+INJECTED from C:\Users\13293\Desktop\Notes-master3\Notes-master3\app\src\main\AndroidManifest.xml:18:1-171:12
+INJECTED from C:\Users\13293\Desktop\Notes-master3\Notes-master3\app\src\main\AndroidManifest.xml:18:1-171:12
+INJECTED from C:\Users\13293\Desktop\Notes-master3\Notes-master3\app\src\main\AndroidManifest.xml:18:1-171:12
+INJECTED from C:\Users\13293\Desktop\Notes-master3\Notes-master3\app\src\main\AndroidManifest.xml:18:1-171:12
+INJECTED from C:\Users\13293\Desktop\Notes-master3\Notes-master3\app\src\main\AndroidManifest.xml:18:1-171:12
+	package
+		ADDED from C:\Users\13293\Desktop\Notes-master3\Notes-master3\app\src\main\AndroidManifest.xml:20:5-31
+		INJECTED from C:\Users\13293\Desktop\Notes-master3\Notes-master3\app\src\main\AndroidManifest.xml
+		INJECTED from C:\Users\13293\Desktop\Notes-master3\Notes-master3\app\src\main\AndroidManifest.xml
+	android:versionName
+		ADDED from C:\Users\13293\Desktop\Notes-master3\Notes-master3\app\src\main\AndroidManifest.xml:22:5-30
+		INJECTED from C:\Users\13293\Desktop\Notes-master3\Notes-master3\app\src\main\AndroidManifest.xml
+		INJECTED from C:\Users\13293\Desktop\Notes-master3\Notes-master3\app\src\main\AndroidManifest.xml
+	xmlns:tools
+		ADDED from C:\Users\13293\Desktop\Notes-master3\Notes-master3\app\src\main\AndroidManifest.xml:19:5-51
+	xmlns:android
+		ADDED from C:\Users\13293\Desktop\Notes-master3\Notes-master3\app\src\main\AndroidManifest.xml:18:11-69
+	android:versionCode
+		ADDED from C:\Users\13293\Desktop\Notes-master3\Notes-master3\app\src\main\AndroidManifest.xml:21:5-28
+		INJECTED from C:\Users\13293\Desktop\Notes-master3\Notes-master3\app\src\main\AndroidManifest.xml
+		INJECTED from C:\Users\13293\Desktop\Notes-master3\Notes-master3\app\src\main\AndroidManifest.xml
+uses-sdk
+ADDED from C:\Users\13293\Desktop\Notes-master3\Notes-master3\app\src\main\AndroidManifest.xml:24:5-25:42
+INJECTED from C:\Users\13293\Desktop\Notes-master3\Notes-master3\app\src\main\AndroidManifest.xml:24:5-25:42
+INJECTED from C:\Users\13293\Desktop\Notes-master3\Notes-master3\app\src\main\AndroidManifest.xml:24:5-25:42
+INJECTED from C:\Users\13293\Desktop\Notes-master3\Notes-master3\app\src\main\AndroidManifest.xml:24:5-25:42
+INJECTED from C:\Users\13293\Desktop\Notes-master3\Notes-master3\app\src\main\AndroidManifest.xml:24:5-25:42
+	android:targetSdkVersion
+		INJECTED from C:\Users\13293\Desktop\Notes-master3\Notes-master3\app\src\main\AndroidManifest.xml
+		ADDED from C:\Users\13293\Desktop\Notes-master3\Notes-master3\app\src\main\AndroidManifest.xml:24:5-25:42
+		INJECTED from C:\Users\13293\Desktop\Notes-master3\Notes-master3\app\src\main\AndroidManifest.xml
+	tools:ignore
+		ADDED from C:\Users\13293\Desktop\Notes-master3\Notes-master3\app\src\main\AndroidManifest.xml:25:9-39
+	android:minSdkVersion
+		ADDED from C:\Users\13293\Desktop\Notes-master3\Notes-master3\app\src\main\AndroidManifest.xml:24:15-41
+		INJECTED from C:\Users\13293\Desktop\Notes-master3\Notes-master3\app\src\main\AndroidManifest.xml
+		INJECTED from C:\Users\13293\Desktop\Notes-master3\Notes-master3\app\src\main\AndroidManifest.xml
+uses-permission#android.permission.WRITE_EXTERNAL_STORAGE
+ADDED from C:\Users\13293\Desktop\Notes-master3\Notes-master3\app\src\main\AndroidManifest.xml:27:5-81
+	android:name
+		ADDED from C:\Users\13293\Desktop\Notes-master3\Notes-master3\app\src\main\AndroidManifest.xml:27:22-78
+uses-permission#com.android.launcher.permission.INSTALL_SHORTCUT
+ADDED from C:\Users\13293\Desktop\Notes-master3\Notes-master3\app\src\main\AndroidManifest.xml:28:5-88
+	android:name
+		ADDED from C:\Users\13293\Desktop\Notes-master3\Notes-master3\app\src\main\AndroidManifest.xml:28:22-85
+uses-permission#android.permission.INTERNET
+ADDED from C:\Users\13293\Desktop\Notes-master3\Notes-master3\app\src\main\AndroidManifest.xml:29:5-67
+	android:name
+		ADDED from C:\Users\13293\Desktop\Notes-master3\Notes-master3\app\src\main\AndroidManifest.xml:29:22-64
+uses-permission#android.permission.READ_CONTACTS
+ADDED from C:\Users\13293\Desktop\Notes-master3\Notes-master3\app\src\main\AndroidManifest.xml:30:5-72
+	android:name
+		ADDED from C:\Users\13293\Desktop\Notes-master3\Notes-master3\app\src\main\AndroidManifest.xml:30:22-69
+uses-permission#android.permission.MANAGE_ACCOUNTS
+ADDED from C:\Users\13293\Desktop\Notes-master3\Notes-master3\app\src\main\AndroidManifest.xml:31:5-74
+	android:name
+		ADDED from C:\Users\13293\Desktop\Notes-master3\Notes-master3\app\src\main\AndroidManifest.xml:31:22-71
+uses-permission#android.permission.AUTHENTICATE_ACCOUNTS
+ADDED from C:\Users\13293\Desktop\Notes-master3\Notes-master3\app\src\main\AndroidManifest.xml:32:5-80
+	android:name
+		ADDED from C:\Users\13293\Desktop\Notes-master3\Notes-master3\app\src\main\AndroidManifest.xml:32:22-77
+uses-permission#android.permission.GET_ACCOUNTS
+ADDED from C:\Users\13293\Desktop\Notes-master3\Notes-master3\app\src\main\AndroidManifest.xml:33:5-71
+	android:name
+		ADDED from C:\Users\13293\Desktop\Notes-master3\Notes-master3\app\src\main\AndroidManifest.xml:33:22-68
+uses-permission#android.permission.USE_CREDENTIALS
+ADDED from C:\Users\13293\Desktop\Notes-master3\Notes-master3\app\src\main\AndroidManifest.xml:34:5-74
+	android:name
+		ADDED from C:\Users\13293\Desktop\Notes-master3\Notes-master3\app\src\main\AndroidManifest.xml:34:22-71
+uses-permission#android.permission.RECEIVE_BOOT_COMPLETED
+ADDED from C:\Users\13293\Desktop\Notes-master3\Notes-master3\app\src\main\AndroidManifest.xml:35:5-81
+	android:name
+		ADDED from C:\Users\13293\Desktop\Notes-master3\Notes-master3\app\src\main\AndroidManifest.xml:35:22-78
+application
+ADDED from C:\Users\13293\Desktop\Notes-master3\Notes-master3\app\src\main\AndroidManifest.xml:37:5-170:19
+	android:label
+		ADDED from C:\Users\13293\Desktop\Notes-master3\Notes-master3\app\src\main\AndroidManifest.xml:39:13-45
+	android:icon
+		ADDED from C:\Users\13293\Desktop\Notes-master3\Notes-master3\app\src\main\AndroidManifest.xml:38:13-46
+activity#net.micode.notes.ui.LoginActivity
+ADDED from C:\Users\13293\Desktop\Notes-master3\Notes-master3\app\src\main\AndroidManifest.xml:40:9-50:20
+	android:exported
+		ADDED from C:\Users\13293\Desktop\Notes-master3\Notes-master3\app\src\main\AndroidManifest.xml:42:17-40
+	tools:ignore
+		ADDED from C:\Users\13293\Desktop\Notes-master3\Notes-master3\app\src\main\AndroidManifest.xml:44:17-43
+	android:theme
+		ADDED from C:\Users\13293\Desktop\Notes-master3\Notes-master3\app\src\main\AndroidManifest.xml:43:17-51
+	android:name
+		ADDED from C:\Users\13293\Desktop\Notes-master3\Notes-master3\app\src\main\AndroidManifest.xml:41:17-49
+intent-filter#action:name:android.intent.action.MAIN+category:name:android.intent.category.LAUNCHER
+ADDED from C:\Users\13293\Desktop\Notes-master3\Notes-master3\app\src\main\AndroidManifest.xml:46:13-49:29
+action#android.intent.action.MAIN
+ADDED from C:\Users\13293\Desktop\Notes-master3\Notes-master3\app\src\main\AndroidManifest.xml:47:17-69
+	android:name
+		ADDED from C:\Users\13293\Desktop\Notes-master3\Notes-master3\app\src\main\AndroidManifest.xml:47:25-66
+category#android.intent.category.LAUNCHER
+ADDED from C:\Users\13293\Desktop\Notes-master3\Notes-master3\app\src\main\AndroidManifest.xml:48:17-77
+	android:name
+		ADDED from C:\Users\13293\Desktop\Notes-master3\Notes-master3\app\src\main\AndroidManifest.xml:48:27-74
+activity#net.micode.notes.ui.NotesListActivity
+ADDED from C:\Users\13293\Desktop\Notes-master3\Notes-master3\app\src\main\AndroidManifest.xml:52:9-65:20
+	android:launchMode
+		ADDED from C:\Users\13293\Desktop\Notes-master3\Notes-master3\app\src\main\AndroidManifest.xml:56:13-43
+	android:windowSoftInputMode
+		ADDED from C:\Users\13293\Desktop\Notes-master3\Notes-master3\app\src\main\AndroidManifest.xml:59:13-52
+	android:exported
+		ADDED from C:\Users\13293\Desktop\Notes-master3\Notes-master3\app\src\main\AndroidManifest.xml:55:13-36
+	android:uiOptions
+		ADDED from C:\Users\13293\Desktop\Notes-master3\Notes-master3\app\src\main\AndroidManifest.xml:58:13-57
+	android:configChanges
+		ADDED from C:\Users\13293\Desktop\Notes-master3\Notes-master3\app\src\main\AndroidManifest.xml:54:13-74
+	android:theme
+		ADDED from C:\Users\13293\Desktop\Notes-master3\Notes-master3\app\src\main\AndroidManifest.xml:57:13-45
+	android:name
+		ADDED from C:\Users\13293\Desktop\Notes-master3\Notes-master3\app\src\main\AndroidManifest.xml:53:13-49
+intent-filter#action:name:android.intent.action.MAIN+category:name:android.intent.category.DEFAULT
+ADDED from C:\Users\13293\Desktop\Notes-master3\Notes-master3\app\src\main\AndroidManifest.xml:61:13-64:29
+category#android.intent.category.DEFAULT
+ADDED from C:\Users\13293\Desktop\Notes-master3\Notes-master3\app\src\main\AndroidManifest.xml:63:17-76
+	android:name
+		ADDED from C:\Users\13293\Desktop\Notes-master3\Notes-master3\app\src\main\AndroidManifest.xml:63:27-73
+activity#net.micode.notes.ui.NoteEditActivity
+ADDED from C:\Users\13293\Desktop\Notes-master3\Notes-master3\app\src\main\AndroidManifest.xml:67:9-97:20
+	android:launchMode
+		ADDED from C:\Users\13293\Desktop\Notes-master3\Notes-master3\app\src\main\AndroidManifest.xml:70:13-43
+	android:exported
+		ADDED from C:\Users\13293\Desktop\Notes-master3\Notes-master3\app\src\main\AndroidManifest.xml:72:13-36
+	android:configChanges
+		ADDED from C:\Users\13293\Desktop\Notes-master3\Notes-master3\app\src\main\AndroidManifest.xml:69:13-74
+	android:theme
+		ADDED from C:\Users\13293\Desktop\Notes-master3\Notes-master3\app\src\main\AndroidManifest.xml:71:13-45
+	android:name
+		ADDED from C:\Users\13293\Desktop\Notes-master3\Notes-master3\app\src\main\AndroidManifest.xml:68: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 C:\Users\13293\Desktop\Notes-master3\Notes-master3\app\src\main\AndroidManifest.xml:74:13-80:29
+	android:scheme
+		ADDED from C:\Users\13293\Desktop\Notes-master3\Notes-master3\app\src\main\AndroidManifest.xml:74:28-49
+	tools:ignore
+		ADDED from C:\Users\13293\Desktop\Notes-master3\Notes-master3\app\src\main\AndroidManifest.xml:75:17-47
+action#android.intent.action.VIEW
+ADDED from C:\Users\13293\Desktop\Notes-master3\Notes-master3\app\src\main\AndroidManifest.xml:76:17-69
+	android:name
+		ADDED from C:\Users\13293\Desktop\Notes-master3\Notes-master3\app\src\main\AndroidManifest.xml:76:25-66
+data
+ADDED from C:\Users\13293\Desktop\Notes-master3\Notes-master3\app\src\main\AndroidManifest.xml:78:17-78
+	android:mimeType
+		ADDED from C:\Users\13293\Desktop\Notes-master3\Notes-master3\app\src\main\AndroidManifest.xml:78: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 C:\Users\13293\Desktop\Notes-master3\Notes-master3\app\src\main\AndroidManifest.xml:82:13-87:29
+action#android.intent.action.INSERT_OR_EDIT
+ADDED from C:\Users\13293\Desktop\Notes-master3\Notes-master3\app\src\main\AndroidManifest.xml:83:17-79
+	android:name
+		ADDED from C:\Users\13293\Desktop\Notes-master3\Notes-master3\app\src\main\AndroidManifest.xml:83:25-76
+intent-filter#action:name:android.intent.action.SEARCH+category:name:android.intent.category.DEFAULT
+ADDED from C:\Users\13293\Desktop\Notes-master3\Notes-master3\app\src\main\AndroidManifest.xml:89:13-92:29
+action#android.intent.action.SEARCH
+ADDED from C:\Users\13293\Desktop\Notes-master3\Notes-master3\app\src\main\AndroidManifest.xml:90:17-71
+	android:name
+		ADDED from C:\Users\13293\Desktop\Notes-master3\Notes-master3\app\src\main\AndroidManifest.xml:90:25-68
+meta-data#android.app.searchable
+ADDED from C:\Users\13293\Desktop\Notes-master3\Notes-master3\app\src\main\AndroidManifest.xml:94:13-96:54
+	android:resource
+		ADDED from C:\Users\13293\Desktop\Notes-master3\Notes-master3\app\src\main\AndroidManifest.xml:96:17-51
+	android:name
+		ADDED from C:\Users\13293\Desktop\Notes-master3\Notes-master3\app\src\main\AndroidManifest.xml:95:17-54
+provider#net.micode.notes.data.NotesProvider
+ADDED from C:\Users\13293\Desktop\Notes-master3\Notes-master3\app\src\main\AndroidManifest.xml:99:9-103:40
+	android:authorities
+		ADDED from C:\Users\13293\Desktop\Notes-master3\Notes-master3\app\src\main\AndroidManifest.xml:101:13-47
+	android:multiprocess
+		ADDED from C:\Users\13293\Desktop\Notes-master3\Notes-master3\app\src\main\AndroidManifest.xml:102:13-40
+	android:exported
+		ADDED from C:\Users\13293\Desktop\Notes-master3\Notes-master3\app\src\main\AndroidManifest.xml:103:13-37
+	android:name
+		ADDED from C:\Users\13293\Desktop\Notes-master3\Notes-master3\app\src\main\AndroidManifest.xml:100:13-63
+receiver#net.micode.notes.widget.NoteWidgetProvider_2x
+ADDED from C:\Users\13293\Desktop\Notes-master3\Notes-master3\app\src\main\AndroidManifest.xml:105:9-118:20
+	android:label
+		ADDED from C:\Users\13293\Desktop\Notes-master3\Notes-master3\app\src\main\AndroidManifest.xml:107:13-50
+	android:exported
+		ADDED from C:\Users\13293\Desktop\Notes-master3\Notes-master3\app\src\main\AndroidManifest.xml:108:13-36
+	android:name
+		ADDED from C:\Users\13293\Desktop\Notes-master3\Notes-master3\app\src\main\AndroidManifest.xml:106: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 C:\Users\13293\Desktop\Notes-master3\Notes-master3\app\src\main\AndroidManifest.xml:109:13-113:29
+action#android.appwidget.action.APPWIDGET_UPDATE
+ADDED from C:\Users\13293\Desktop\Notes-master3\Notes-master3\app\src\main\AndroidManifest.xml:110:17-84
+	android:name
+		ADDED from C:\Users\13293\Desktop\Notes-master3\Notes-master3\app\src\main\AndroidManifest.xml:110:25-81
+action#android.appwidget.action.APPWIDGET_DELETED
+ADDED from C:\Users\13293\Desktop\Notes-master3\Notes-master3\app\src\main\AndroidManifest.xml:111:17-85
+	android:name
+		ADDED from C:\Users\13293\Desktop\Notes-master3\Notes-master3\app\src\main\AndroidManifest.xml:111:25-82
+action#android.intent.action.PRIVACY_MODE_CHANGED
+ADDED from C:\Users\13293\Desktop\Notes-master3\Notes-master3\app\src\main\AndroidManifest.xml:112:17-85
+	android:name
+		ADDED from C:\Users\13293\Desktop\Notes-master3\Notes-master3\app\src\main\AndroidManifest.xml:112:25-82
+meta-data#android.appwidget.provider
+ADDED from C:\Users\13293\Desktop\Notes-master3\Notes-master3\app\src\main\AndroidManifest.xml:115:13-117:58
+	android:resource
+		ADDED from C:\Users\13293\Desktop\Notes-master3\Notes-master3\app\src\main\AndroidManifest.xml:117:17-55
+	android:name
+		ADDED from C:\Users\13293\Desktop\Notes-master3\Notes-master3\app\src\main\AndroidManifest.xml:116:17-58
+receiver#net.micode.notes.widget.NoteWidgetProvider_4x
+ADDED from C:\Users\13293\Desktop\Notes-master3\Notes-master3\app\src\main\AndroidManifest.xml:119:9-133:20
+	android:label
+		ADDED from C:\Users\13293\Desktop\Notes-master3\Notes-master3\app\src\main\AndroidManifest.xml:121:13-50
+	android:exported
+		ADDED from C:\Users\13293\Desktop\Notes-master3\Notes-master3\app\src\main\AndroidManifest.xml:122:13-36
+	android:name
+		ADDED from C:\Users\13293\Desktop\Notes-master3\Notes-master3\app\src\main\AndroidManifest.xml:120:13-57
+receiver#net.micode.notes.ui.AlarmInitReceiver
+ADDED from C:\Users\13293\Desktop\Notes-master3\Notes-master3\app\src\main\AndroidManifest.xml:135:9-140:20
+	android:exported
+		ADDED from C:\Users\13293\Desktop\Notes-master3\Notes-master3\app\src\main\AndroidManifest.xml:136:13-36
+	android:name
+		ADDED from C:\Users\13293\Desktop\Notes-master3\Notes-master3\app\src\main\AndroidManifest.xml:135:19-55
+intent-filter#action:name:android.intent.action.BOOT_COMPLETED
+ADDED from C:\Users\13293\Desktop\Notes-master3\Notes-master3\app\src\main\AndroidManifest.xml:137:13-139:29
+action#android.intent.action.BOOT_COMPLETED
+ADDED from C:\Users\13293\Desktop\Notes-master3\Notes-master3\app\src\main\AndroidManifest.xml:138:17-79
+	android:name
+		ADDED from C:\Users\13293\Desktop\Notes-master3\Notes-master3\app\src\main\AndroidManifest.xml:138:25-76
+receiver#net.micode.notes.ui.AlarmReceiver
+ADDED from C:\Users\13293\Desktop\Notes-master3\Notes-master3\app\src\main\AndroidManifest.xml:142:9-145:20
+	android:process
+		ADDED from C:\Users\13293\Desktop\Notes-master3\Notes-master3\app\src\main\AndroidManifest.xml:144:13-38
+	android:name
+		ADDED from C:\Users\13293\Desktop\Notes-master3\Notes-master3\app\src\main\AndroidManifest.xml:143:13-61
+activity#net.micode.notes.ui.AlarmAlertActivity
+ADDED from C:\Users\13293\Desktop\Notes-master3\Notes-master3\app\src\main\AndroidManifest.xml:147:9-153:20
+	android:label
+		ADDED from C:\Users\13293\Desktop\Notes-master3\Notes-master3\app\src\main\AndroidManifest.xml:149:13-45
+	android:launchMode
+		ADDED from C:\Users\13293\Desktop\Notes-master3\Notes-master3\app\src\main\AndroidManifest.xml:150:13-48
+	tools:ignore
+		ADDED from C:\Users\13293\Desktop\Notes-master3\Notes-master3\app\src\main\AndroidManifest.xml:152:13-42
+	android:theme
+		ADDED from C:\Users\13293\Desktop\Notes-master3\Notes-master3\app\src\main\AndroidManifest.xml:151:13-75
+	android:name
+		ADDED from C:\Users\13293\Desktop\Notes-master3\Notes-master3\app\src\main\AndroidManifest.xml:148:13-50
+activity#net.micode.notes.ui.NotesPreferenceActivity
+ADDED from C:\Users\13293\Desktop\Notes-master3\Notes-master3\app\src\main\AndroidManifest.xml:155:9-160:20
+	android:label
+		ADDED from C:\Users\13293\Desktop\Notes-master3\Notes-master3\app\src\main\AndroidManifest.xml:157:13-54
+	android:launchMode
+		ADDED from C:\Users\13293\Desktop\Notes-master3\Notes-master3\app\src\main\AndroidManifest.xml:158:13-43
+	android:theme
+		ADDED from C:\Users\13293\Desktop\Notes-master3\Notes-master3\app\src\main\AndroidManifest.xml:159:13-60
+	android:name
+		ADDED from C:\Users\13293\Desktop\Notes-master3\Notes-master3\app\src\main\AndroidManifest.xml:156:13-71
+service#net.micode.notes.gtask.remote.GTaskSyncService
+ADDED from C:\Users\13293\Desktop\Notes-master3\Notes-master3\app\src\main\AndroidManifest.xml:162:9-165:19
+	android:exported
+		ADDED from C:\Users\13293\Desktop\Notes-master3\Notes-master3\app\src\main\AndroidManifest.xml:164:13-37
+	android:name
+		ADDED from C:\Users\13293\Desktop\Notes-master3\Notes-master3\app\src\main\AndroidManifest.xml:163:13-74
+meta-data#android.app.default_searchable
+ADDED from C:\Users\13293\Desktop\Notes-master3\Notes-master3\app\src\main\AndroidManifest.xml:167:9-169:52
+	android:value
+		ADDED from C:\Users\13293\Desktop\Notes-master3\Notes-master3\app\src\main\AndroidManifest.xml:169:13-49
+	android:name
+		ADDED from C:\Users\13293\Desktop\Notes-master3\Notes-master3\app\src\main\AndroidManifest.xml:168:13-58
diff --git a/src/Notes-master3/Notes-master3/app/build/tmp/compileDebugJavaWithJavac/previous-compilation-data.bin b/src/Notes-master3/Notes-master3/app/build/tmp/compileDebugJavaWithJavac/previous-compilation-data.bin
new file mode 100644
index 0000000..9699758
Binary files /dev/null and b/src/Notes-master3/Notes-master3/app/build/tmp/compileDebugJavaWithJavac/previous-compilation-data.bin differ
diff --git a/src/Notes-master3/app/src/main/AndroidManifest.xml b/src/Notes-master3/Notes-master3/app/src/main/AndroidManifest.xml
similarity index 92%
rename from src/Notes-master3/app/src/main/AndroidManifest.xml
rename to src/Notes-master3/Notes-master3/app/src/main/AndroidManifest.xml
index c733892..e199cb6 100644
--- a/src/Notes-master3/app/src/main/AndroidManifest.xml
+++ b/src/Notes-master3/Notes-master3/app/src/main/AndroidManifest.xml
@@ -35,8 +35,20 @@
     <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
 
     <application
-        android:icon="@drawable/icon_app"
-        android:label="@string/app_name" >
+            android:icon="@drawable/icon_app"
+            android:label="@string/app_name" >
+        <activity
+                android:name=".ui.LoginActivity"
+                android:exported="true"
+                android:theme = "@style/NoteTheme"
+                tools:ignore = "ExtraText">
+
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+        </activity>
+
         <activity
             android:name=".ui.NotesListActivity"
             android:configChanges="keyboardHidden|orientation|screenSize"
@@ -48,7 +60,7 @@
 
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.LAUNCHER" />
+                <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
         </activity>
 
diff --git a/src/Notes-master3/app/src/main/java/net/micode/notes/data/Contact.java b/src/Notes-master3/Notes-master3/app/src/main/java/net/micode/notes/data/Contact.java
similarity index 100%
rename from src/Notes-master3/app/src/main/java/net/micode/notes/data/Contact.java
rename to src/Notes-master3/Notes-master3/app/src/main/java/net/micode/notes/data/Contact.java
diff --git a/src/Notes-master3/app/src/main/java/net/micode/notes/data/Notes.java b/src/Notes-master3/Notes-master3/app/src/main/java/net/micode/notes/data/Notes.java
similarity index 100%
rename from src/Notes-master3/app/src/main/java/net/micode/notes/data/Notes.java
rename to src/Notes-master3/Notes-master3/app/src/main/java/net/micode/notes/data/Notes.java
diff --git a/src/Notes-master3/app/src/main/java/net/micode/notes/data/NotesDatabaseHelper.java b/src/Notes-master3/Notes-master3/app/src/main/java/net/micode/notes/data/NotesDatabaseHelper.java
similarity index 100%
rename from src/Notes-master3/app/src/main/java/net/micode/notes/data/NotesDatabaseHelper.java
rename to src/Notes-master3/Notes-master3/app/src/main/java/net/micode/notes/data/NotesDatabaseHelper.java
diff --git a/src/Notes-master3/app/src/main/java/net/micode/notes/data/NotesProvider.java b/src/Notes-master3/Notes-master3/app/src/main/java/net/micode/notes/data/NotesProvider.java
similarity index 100%
rename from src/Notes-master3/app/src/main/java/net/micode/notes/data/NotesProvider.java
rename to src/Notes-master3/Notes-master3/app/src/main/java/net/micode/notes/data/NotesProvider.java
diff --git a/src/Notes-master3/app/src/main/java/net/micode/notes/gtask/data/MetaData.java b/src/Notes-master3/Notes-master3/app/src/main/java/net/micode/notes/gtask/data/MetaData.java
similarity index 100%
rename from src/Notes-master3/app/src/main/java/net/micode/notes/gtask/data/MetaData.java
rename to src/Notes-master3/Notes-master3/app/src/main/java/net/micode/notes/gtask/data/MetaData.java
diff --git a/src/Notes-master3/app/src/main/java/net/micode/notes/gtask/data/Node.java b/src/Notes-master3/Notes-master3/app/src/main/java/net/micode/notes/gtask/data/Node.java
similarity index 100%
rename from src/Notes-master3/app/src/main/java/net/micode/notes/gtask/data/Node.java
rename to src/Notes-master3/Notes-master3/app/src/main/java/net/micode/notes/gtask/data/Node.java
diff --git a/src/Notes-master3/app/src/main/java/net/micode/notes/gtask/data/SqlData.java b/src/Notes-master3/Notes-master3/app/src/main/java/net/micode/notes/gtask/data/SqlData.java
similarity index 100%
rename from src/Notes-master3/app/src/main/java/net/micode/notes/gtask/data/SqlData.java
rename to src/Notes-master3/Notes-master3/app/src/main/java/net/micode/notes/gtask/data/SqlData.java
diff --git a/src/Notes-master3/app/src/main/java/net/micode/notes/gtask/data/SqlNote.java b/src/Notes-master3/Notes-master3/app/src/main/java/net/micode/notes/gtask/data/SqlNote.java
similarity index 100%
rename from src/Notes-master3/app/src/main/java/net/micode/notes/gtask/data/SqlNote.java
rename to src/Notes-master3/Notes-master3/app/src/main/java/net/micode/notes/gtask/data/SqlNote.java
diff --git a/src/Notes-master3/app/src/main/java/net/micode/notes/gtask/data/Task.java b/src/Notes-master3/Notes-master3/app/src/main/java/net/micode/notes/gtask/data/Task.java
similarity index 100%
rename from src/Notes-master3/app/src/main/java/net/micode/notes/gtask/data/Task.java
rename to src/Notes-master3/Notes-master3/app/src/main/java/net/micode/notes/gtask/data/Task.java
diff --git a/src/Notes-master3/app/src/main/java/net/micode/notes/gtask/data/TaskList.java b/src/Notes-master3/Notes-master3/app/src/main/java/net/micode/notes/gtask/data/TaskList.java
similarity index 100%
rename from src/Notes-master3/app/src/main/java/net/micode/notes/gtask/data/TaskList.java
rename to src/Notes-master3/Notes-master3/app/src/main/java/net/micode/notes/gtask/data/TaskList.java
diff --git a/src/Notes-master3/app/src/main/java/net/micode/notes/gtask/exception/ActionFailureException.java b/src/Notes-master3/Notes-master3/app/src/main/java/net/micode/notes/gtask/exception/ActionFailureException.java
similarity index 100%
rename from src/Notes-master3/app/src/main/java/net/micode/notes/gtask/exception/ActionFailureException.java
rename to src/Notes-master3/Notes-master3/app/src/main/java/net/micode/notes/gtask/exception/ActionFailureException.java
diff --git a/src/Notes-master3/app/src/main/java/net/micode/notes/gtask/exception/NetworkFailureException.java b/src/Notes-master3/Notes-master3/app/src/main/java/net/micode/notes/gtask/exception/NetworkFailureException.java
similarity index 100%
rename from src/Notes-master3/app/src/main/java/net/micode/notes/gtask/exception/NetworkFailureException.java
rename to src/Notes-master3/Notes-master3/app/src/main/java/net/micode/notes/gtask/exception/NetworkFailureException.java
diff --git a/src/Notes-master3/app/src/main/java/net/micode/notes/gtask/remote/GTaskASyncTask.java b/src/Notes-master3/Notes-master3/app/src/main/java/net/micode/notes/gtask/remote/GTaskASyncTask.java
similarity index 100%
rename from src/Notes-master3/app/src/main/java/net/micode/notes/gtask/remote/GTaskASyncTask.java
rename to src/Notes-master3/Notes-master3/app/src/main/java/net/micode/notes/gtask/remote/GTaskASyncTask.java
diff --git a/src/Notes-master3/app/src/main/java/net/micode/notes/gtask/remote/GTaskClient.java b/src/Notes-master3/Notes-master3/app/src/main/java/net/micode/notes/gtask/remote/GTaskClient.java
similarity index 100%
rename from src/Notes-master3/app/src/main/java/net/micode/notes/gtask/remote/GTaskClient.java
rename to src/Notes-master3/Notes-master3/app/src/main/java/net/micode/notes/gtask/remote/GTaskClient.java
diff --git a/src/Notes-master3/app/src/main/java/net/micode/notes/gtask/remote/GTaskManager.java b/src/Notes-master3/Notes-master3/app/src/main/java/net/micode/notes/gtask/remote/GTaskManager.java
similarity index 100%
rename from src/Notes-master3/app/src/main/java/net/micode/notes/gtask/remote/GTaskManager.java
rename to src/Notes-master3/Notes-master3/app/src/main/java/net/micode/notes/gtask/remote/GTaskManager.java
diff --git a/src/Notes-master3/app/src/main/java/net/micode/notes/gtask/remote/GTaskSyncService.java b/src/Notes-master3/Notes-master3/app/src/main/java/net/micode/notes/gtask/remote/GTaskSyncService.java
similarity index 100%
rename from src/Notes-master3/app/src/main/java/net/micode/notes/gtask/remote/GTaskSyncService.java
rename to src/Notes-master3/Notes-master3/app/src/main/java/net/micode/notes/gtask/remote/GTaskSyncService.java
diff --git a/src/Notes-master3/app/src/main/java/net/micode/notes/model/Note.java b/src/Notes-master3/Notes-master3/app/src/main/java/net/micode/notes/model/Note.java
similarity index 100%
rename from src/Notes-master3/app/src/main/java/net/micode/notes/model/Note.java
rename to src/Notes-master3/Notes-master3/app/src/main/java/net/micode/notes/model/Note.java
diff --git a/src/Notes-master3/app/src/main/java/net/micode/notes/model/WorkingNote.java b/src/Notes-master3/Notes-master3/app/src/main/java/net/micode/notes/model/WorkingNote.java
similarity index 100%
rename from src/Notes-master3/app/src/main/java/net/micode/notes/model/WorkingNote.java
rename to src/Notes-master3/Notes-master3/app/src/main/java/net/micode/notes/model/WorkingNote.java
diff --git a/src/Notes-master3/app/src/main/java/net/micode/notes/tool/BackupUtils.java b/src/Notes-master3/Notes-master3/app/src/main/java/net/micode/notes/tool/BackupUtils.java
similarity index 100%
rename from src/Notes-master3/app/src/main/java/net/micode/notes/tool/BackupUtils.java
rename to src/Notes-master3/Notes-master3/app/src/main/java/net/micode/notes/tool/BackupUtils.java
diff --git a/src/Notes-master3/app/src/main/java/net/micode/notes/tool/DataUtils.java b/src/Notes-master3/Notes-master3/app/src/main/java/net/micode/notes/tool/DataUtils.java
similarity index 97%
rename from src/Notes-master3/app/src/main/java/net/micode/notes/tool/DataUtils.java
rename to src/Notes-master3/Notes-master3/app/src/main/java/net/micode/notes/tool/DataUtils.java
index 2a14982..4cb4f63 100644
--- a/src/Notes-master3/app/src/main/java/net/micode/notes/tool/DataUtils.java
+++ b/src/Notes-master3/Notes-master3/app/src/main/java/net/micode/notes/tool/DataUtils.java
@@ -59,6 +59,8 @@ public class DataUtils {
         }
         try {
             ContentProviderResult[] results = resolver.applyBatch(Notes.AUTHORITY, operationList);
+            //数据库事务，数据库事务是由一组数据库操作序列组成，事务作为一个整体被执行
+
             if (results == null || results.length == 0 || results[0] == null) {
                 Log.d(TAG, "delete notes failed, ids:" + ids.toString());
                 return false;
@@ -95,7 +97,7 @@ public class DataUtils {
             builder.withValue(NoteColumns.LOCAL_MODIFIED, 1);
             operationList.add(builder.build());
         }
-
+//将ids里包含的每一列的数据逐次加入到operationList中，等待最后的批量处理
         try {
             ContentProviderResult[] results = resolver.applyBatch(Notes.AUTHORITY, operationList);
             if (results == null || results.length == 0 || results[0] == null) {
@@ -250,7 +252,7 @@ public class DataUtils {
                 + CallNote.PHONE_NUMBER + ",?)",
                 new String [] { String.valueOf(callDate), CallNote.CONTENT_ITEM_TYPE, phoneNumber },
                 null);
-
+        //通过数据库操作，查询条件是（callDate和phoneNumber匹配传入参数的值）
         if (cursor != null) {
             if (cursor.moveToFirst()) {
                 try {
diff --git a/src/Notes-master3/app/src/main/java/net/micode/notes/tool/GTaskStringUtils.java b/src/Notes-master3/Notes-master3/app/src/main/java/net/micode/notes/tool/GTaskStringUtils.java
similarity index 83%
rename from src/Notes-master3/app/src/main/java/net/micode/notes/tool/GTaskStringUtils.java
rename to src/Notes-master3/Notes-master3/app/src/main/java/net/micode/notes/tool/GTaskStringUtils.java
index 666b729..727d8ca 100644
--- a/src/Notes-master3/app/src/main/java/net/micode/notes/tool/GTaskStringUtils.java
+++ b/src/Notes-master3/Notes-master3/app/src/main/java/net/micode/notes/tool/GTaskStringUtils.java
@@ -1,18 +1,4 @@
-/*
- * 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.
- */
+//简介：定义了很多的静态字符串，目的就是为了提供jsonObject中相应字符串的"key"。把这些静态的定义单独写到了一个类里面，这是非常好的编程规范
 
 package net.micode.notes.tool;
 
diff --git a/src/Notes-master3/app/src/main/java/net/micode/notes/tool/ResourceParser.java b/src/Notes-master3/Notes-master3/app/src/main/java/net/micode/notes/tool/ResourceParser.java
similarity index 88%
rename from src/Notes-master3/app/src/main/java/net/micode/notes/tool/ResourceParser.java
rename to src/Notes-master3/Notes-master3/app/src/main/java/net/micode/notes/tool/ResourceParser.java
index 1ad3ad6..0467d90 100644
--- a/src/Notes-master3/app/src/main/java/net/micode/notes/tool/ResourceParser.java
+++ b/src/Notes-master3/Notes-master3/app/src/main/java/net/micode/notes/tool/ResourceParser.java
@@ -1,21 +1,20 @@
-/*
- * 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.tool;
 
+/*简介：字面意义是资源分析器，实际上就是获取资源并且在程序中使用，比如颜色图片等
+ * 实现方法：主要利用R.java这个类，其中包括
+ * R.id      组件资源引用
+ * R.drawable  图片资源 （被使用）
+ * R.layout  布局资源
+ * R.menu   菜单资源
+ * R.String  文字资源
+ * R.style    主题资源 （被使用）
+ * 在按顺序设置好相应的id后，就可以编写简单的getXXX函数获取需要的资源
+ *
+ * 特殊的变量 ：
+ * @BG_DEFAULT_COLOR 默认背景颜色（黄）
+ * BG_DEFAULT_FONT_SIZE 默认文本大小（中）
+ */
 import android.content.Context;
 import android.preference.PreferenceManager;
 
@@ -161,7 +160,7 @@ public class ResourceParser {
             R.style.TextAppearanceLarge,
             R.style.TextAppearanceSuper
         };
-
+        //这里有一个容错的函数，防止输入的id大于资源总量，若如此，则自动返回默认的设置结果
         public static int getTexAppearanceResource(int id) {
             /**
              * HACKME: Fix bug of store the resource id in shared preference.
diff --git a/src/Notes-master3/app/src/main/java/net/micode/notes/ui/AlarmAlertActivity.java b/src/Notes-master3/Notes-master3/app/src/main/java/net/micode/notes/ui/AlarmAlertActivity.java
similarity index 64%
rename from src/Notes-master3/app/src/main/java/net/micode/notes/ui/AlarmAlertActivity.java
rename to src/Notes-master3/Notes-master3/app/src/main/java/net/micode/notes/ui/AlarmAlertActivity.java
index 85723be..5bf372d 100644
--- a/src/Notes-master3/app/src/main/java/net/micode/notes/ui/AlarmAlertActivity.java
+++ b/src/Notes-master3/Notes-master3/app/src/main/java/net/micode/notes/ui/AlarmAlertActivity.java
@@ -1,19 +1,3 @@
-/*
- * Copyright (c) 2010-2011, The MiCode Open Source Community (www.micode.net)
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
 package net.micode.notes.ui;
 
 import android.app.Activity;
@@ -39,58 +23,81 @@ import net.micode.notes.tool.DataUtils;
 
 import java.io.IOException;
 
-
 public class AlarmAlertActivity extends Activity implements OnClickListener, OnDismissListener {
-    private long mNoteId;
-    private String mSnippet;
+    private long mNoteId;      //文本在数据库存储中的ID号 
+    private String mSnippet;   //闹钟提示时出现的文本片段
     private static final int SNIPPET_PREW_MAX_LEN = 60;
     MediaPlayer mPlayer;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
+        //Bundle类型的数据与Map类型的数据相似，都是以key-value的形式存储数据的
+        //onsaveInstanceState方法是用来保存Activity的状态的
+        //能从onCreate的参数savedInsanceState中获得状态数据
         requestWindowFeature(Window.FEATURE_NO_TITLE);
+        //界面显示——无标题
 
         final Window win = getWindow();
         win.addFlags(WindowManager.LayoutParams.FLAG_SHOW_WHEN_LOCKED);
 
         if (!isScreenOn()) {
             win.addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON
+                    //保持窗体点亮
                     | WindowManager.LayoutParams.FLAG_TURN_SCREEN_ON
+                    //将窗体点亮
                     | WindowManager.LayoutParams.FLAG_ALLOW_LOCK_WHILE_SCREEN_ON
+                    //允许窗体点亮时锁屏
                     | WindowManager.LayoutParams.FLAG_LAYOUT_INSET_DECOR);
-        }
+        }//在手机锁屏后如果到了闹钟提示时间，点亮屏幕
 
         Intent intent = getIntent();
 
         try {
             mNoteId = Long.valueOf(intent.getData().getPathSegments().get(1));
             mSnippet = DataUtils.getSnippetById(this.getContentResolver(), mNoteId);
+            //根据ID从数据库中获取标签的内容；
+            //getContentResolver（）是实现数据共享，实例存储。
             mSnippet = mSnippet.length() > SNIPPET_PREW_MAX_LEN ? mSnippet.substring(0,
                     SNIPPET_PREW_MAX_LEN) + getResources().getString(R.string.notelist_string_info)
                     : mSnippet;
+            //判断标签片段是否达到符合长度
         } catch (IllegalArgumentException e) {
             e.printStackTrace();
             return;
         }
-
+        /*
+        try
+        {
+        	// 代码区
+        }
+        catch(Exception e)
+        {
+        	// 异常处理
+        }
+                     代码区如果有错误，就会返回所写异常的处理。*/
         mPlayer = new MediaPlayer();
         if (DataUtils.visibleInNoteDatabase(getContentResolver(), mNoteId, Notes.TYPE_NOTE)) {
             showActionDialog();
+            //弹出对话框
             playAlarmSound();
+            //闹钟提示音激发
         } else {
             finish();
+            //完成闹钟动作
         }
     }
 
     private boolean isScreenOn() {
+        //判断屏幕是否锁屏，调用系统函数判断，最后返回值是布尔类型
         PowerManager pm = (PowerManager) getSystemService(Context.POWER_SERVICE);
         return pm.isScreenOn();
     }
 
     private void playAlarmSound() {
+        //闹钟提示音激发
         Uri url = RingtoneManager.getActualDefaultRingtoneUri(this, RingtoneManager.TYPE_ALARM);
-
+        //调用系统的铃声管理URI，得到闹钟提示音
         int silentModeStreams = Settings.System.getInt(getContentResolver(),
                 Settings.System.MODE_RINGER_STREAMS_AFFECTED, 0);
 
@@ -101,12 +108,19 @@ public class AlarmAlertActivity extends Activity implements OnClickListener, OnD
         }
         try {
             mPlayer.setDataSource(this, url);
+            //方法：setDataSource(Context context, Uri uri) 
+            //解释：无返回值，设置多媒体数据来源【根据 Uri】
             mPlayer.prepare();
+            //准备同步
             mPlayer.setLooping(true);
+            //设置是否循环播放
             mPlayer.start();
+            //开始播放
         } catch (IllegalArgumentException e) {
             // TODO Auto-generated catch block
             e.printStackTrace();
+            //e.printStackTrace()函数功能是抛出异常， 还将显示出更深的调用信息
+            //System.out.println(e)，这个方法打印出异常，并且输出在哪里出现的异常
         } catch (SecurityException e) {
             // TODO Auto-generated catch block
             e.printStackTrace();
@@ -121,38 +135,58 @@ public class AlarmAlertActivity extends Activity implements OnClickListener, OnD
 
     private void showActionDialog() {
         AlertDialog.Builder dialog = new AlertDialog.Builder(this);
+        //AlertDialog的构造方法全部是Protected的
+        //所以不能直接通过new一个AlertDialog来创建出一个AlertDialog。
+        //要创建一个AlertDialog，就要用到AlertDialog.Builder中的create()方法
+        //如这里的dialog就是新建了一个AlertDialog
         dialog.setTitle(R.string.app_name);
+        //为对话框设置标题
         dialog.setMessage(mSnippet);
+        //为对话框设置内容
         dialog.setPositiveButton(R.string.notealert_ok, this);
+        //给对话框添加"Yes"按钮
         if (isScreenOn()) {
             dialog.setNegativeButton(R.string.notealert_enter, this);
-        }
+        }//对话框添加"No"按钮
         dialog.show().setOnDismissListener(this);
     }
 
     public void onClick(DialogInterface dialog, int which) {
         switch (which) {
+            //用which来选择click后下一步的操作
             case DialogInterface.BUTTON_NEGATIVE:
+                //这是取消操作
                 Intent intent = new Intent(this, NoteEditActivity.class);
+                //实现两个类间的数据传输
                 intent.setAction(Intent.ACTION_VIEW);
+                //设置动作属性
                 intent.putExtra(Intent.EXTRA_UID, mNoteId);
+                //实现key-value对
+                //EXTRA_UID为key；mNoteId为键
                 startActivity(intent);
+                //开始动作
                 break;
             default:
+                //这是确定操作
                 break;
         }
     }
 
     public void onDismiss(DialogInterface dialog) {
+        //忽略
         stopAlarmSound();
+        //停止闹钟声音
         finish();
+        //完成该动作
     }
 
     private void stopAlarmSound() {
         if (mPlayer != null) {
             mPlayer.stop();
+            //停止播放
             mPlayer.release();
+            //释放MediaPlayer对象
             mPlayer = null;
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/Notes-master3/app/src/main/java/net/micode/notes/ui/AlarmInitReceiver.java b/src/Notes-master3/Notes-master3/app/src/main/java/net/micode/notes/ui/AlarmInitReceiver.java
similarity index 71%
rename from src/Notes-master3/app/src/main/java/net/micode/notes/ui/AlarmInitReceiver.java
rename to src/Notes-master3/Notes-master3/app/src/main/java/net/micode/notes/ui/AlarmInitReceiver.java
index f221202..4163ccd 100644
--- a/src/Notes-master3/app/src/main/java/net/micode/notes/ui/AlarmInitReceiver.java
+++ b/src/Notes-master3/Notes-master3/app/src/main/java/net/micode/notes/ui/AlarmInitReceiver.java
@@ -1,19 +1,3 @@
-/*
- * Copyright (c) 2010-2011, The MiCode Open Source Community (www.micode.net)
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
 package net.micode.notes.ui;
 
 import android.app.AlarmManager;
@@ -31,21 +15,25 @@ import net.micode.notes.data.Notes.NoteColumns;
 public class AlarmInitReceiver extends BroadcastReceiver {
 
     private static final String [] PROJECTION = new String [] {
-        NoteColumns.ID,
-        NoteColumns.ALERTED_DATE
+            NoteColumns.ID,
+            NoteColumns.ALERTED_DATE
     };
-
+    //对数据库的操作，调用标签ID和闹钟时间
     private static final int COLUMN_ID                = 0;
     private static final int COLUMN_ALERTED_DATE      = 1;
 
     @Override
     public void onReceive(Context context, Intent intent) {
         long currentDate = System.currentTimeMillis();
+        //System.currentTimeMillis()产生一个当前的毫秒
+        //这个毫秒其实就是自1970年1月1日0时起的毫秒数
         Cursor c = context.getContentResolver().query(Notes.CONTENT_NOTE_URI,
                 PROJECTION,
                 NoteColumns.ALERTED_DATE + ">? AND " + NoteColumns.TYPE + "=" + Notes.TYPE_NOTE,
                 new String[] { String.valueOf(currentDate) },
+                //将long变量currentDate转化为字符串
                 null);
+        //Cursor在这里的作用是通过查找数据库中的标签内容，找到和当前系统时间相等的标签
 
         if (c != null) {
             if (c.moveToFirst()) {
@@ -61,5 +49,8 @@ public class AlarmInitReceiver extends BroadcastReceiver {
             }
             c.close();
         }
+        //然而通过网上查找资料发现，对于闹钟机制的启动，通常需要上面的几个步骤
+        //如新建Intent、PendingIntent以及AlarmManager等
+        //这里就是根据数据库里的闹钟时间创建一个闹钟机制
     }
-}
+}
\ No newline at end of file
diff --git a/src/Notes-master3/app/src/main/java/net/micode/notes/ui/AlarmReceiver.java b/src/Notes-master3/Notes-master3/app/src/main/java/net/micode/notes/ui/AlarmReceiver.java
similarity index 88%
rename from src/Notes-master3/app/src/main/java/net/micode/notes/ui/AlarmReceiver.java
rename to src/Notes-master3/Notes-master3/app/src/main/java/net/micode/notes/ui/AlarmReceiver.java
index 54e503b..037119f 100644
--- a/src/Notes-master3/app/src/main/java/net/micode/notes/ui/AlarmReceiver.java
+++ b/src/Notes-master3/Notes-master3/app/src/main/java/net/micode/notes/ui/AlarmReceiver.java
@@ -28,3 +28,5 @@ public class AlarmReceiver extends BroadcastReceiver {
         context.startActivity(intent);
     }
 }
+//这是实现alarm这个功能最接近用户层的包，基于上面的两个包，
+//作用还需要深究但是对于setClass和addFlags的
diff --git a/src/Notes-master3/app/src/main/java/net/micode/notes/ui/DateTimePicker.java b/src/Notes-master3/Notes-master3/app/src/main/java/net/micode/notes/ui/DateTimePicker.java
similarity index 100%
rename from src/Notes-master3/app/src/main/java/net/micode/notes/ui/DateTimePicker.java
rename to src/Notes-master3/Notes-master3/app/src/main/java/net/micode/notes/ui/DateTimePicker.java
diff --git a/src/Notes-master3/app/src/main/java/net/micode/notes/ui/DateTimePickerDialog.java b/src/Notes-master3/Notes-master3/app/src/main/java/net/micode/notes/ui/DateTimePickerDialog.java
similarity index 68%
rename from src/Notes-master3/app/src/main/java/net/micode/notes/ui/DateTimePickerDialog.java
rename to src/Notes-master3/Notes-master3/app/src/main/java/net/micode/notes/ui/DateTimePickerDialog.java
index 2c47ba4..d6ad95e 100644
--- a/src/Notes-master3/app/src/main/java/net/micode/notes/ui/DateTimePickerDialog.java
+++ b/src/Notes-master3/Notes-master3/app/src/main/java/net/micode/notes/ui/DateTimePickerDialog.java
@@ -1,19 +1,3 @@
-/*
- * Copyright (c) 2010-2011, The MiCode Open Source Community (www.micode.net)
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
 package net.micode.notes.ui;
 
 import java.util.Calendar;
@@ -32,35 +16,47 @@ import android.text.format.DateUtils;
 public class DateTimePickerDialog extends AlertDialog implements OnClickListener {
 
     private Calendar mDate = Calendar.getInstance();
+    //创建一个Calendar类型的变量 mDate，方便时间的操作
     private boolean mIs24HourView;
     private OnDateTimeSetListener mOnDateTimeSetListener;
+    //声明一个时间日期滚动选择控件 mOnDateTimeSetListener
     private DateTimePicker mDateTimePicker;
+    //DateTimePicker控件，控件一般用于让用户可以从日期列表中选择单个值。
+    //运行时，单击控件边上的下拉箭头，会显示为两个部分：一个下拉列表，一个用于选择日期的
 
     public interface OnDateTimeSetListener {
         void OnDateTimeSet(AlertDialog dialog, long date);
     }
 
     public DateTimePickerDialog(Context context, long date) {
+        //对该界面对话框的实例化
         super(context);
+        //对数据库的操作
         mDateTimePicker = new DateTimePicker(context);
         setView(mDateTimePicker);
+        //添加一个子视图
         mDateTimePicker.setOnDateTimeChangedListener(new OnDateTimeChangedListener() {
             public void onDateTimeChanged(DateTimePicker view, int year, int month,
-                    int dayOfMonth, int hourOfDay, int minute) {
+                                          int dayOfMonth, int hourOfDay, int minute) {
                 mDate.set(Calendar.YEAR, year);
                 mDate.set(Calendar.MONTH, month);
                 mDate.set(Calendar.DAY_OF_MONTH, dayOfMonth);
                 mDate.set(Calendar.HOUR_OF_DAY, hourOfDay);
                 mDate.set(Calendar.MINUTE, minute);
+                //将视图中的各选项设置为系统当前时间
                 updateTitle(mDate.getTimeInMillis());
             }
         });
         mDate.setTimeInMillis(date);
+        //得到系统时间
         mDate.set(Calendar.SECOND, 0);
+        //将秒数设置为0
         mDateTimePicker.setCurrentDate(mDate.getTimeInMillis());
         setButton(context.getString(R.string.datetime_dialog_ok), this);
         setButton2(context.getString(R.string.datetime_dialog_cancel), (OnClickListener)null);
+        //设置按钮
         set24HourView(DateFormat.is24HourFormat(this.getContext()));
+        //时间标准化打印
         updateTitle(mDate.getTimeInMillis());
     }
 
@@ -70,21 +66,22 @@ public class DateTimePickerDialog extends AlertDialog implements OnClickListener
 
     public void setOnDateTimeSetListener(OnDateTimeSetListener callBack) {
         mOnDateTimeSetListener = callBack;
-    }
+    }//将时间日期滚动选择控件实例化
 
     private void updateTitle(long date) {
         int flag =
-            DateUtils.FORMAT_SHOW_YEAR |
-            DateUtils.FORMAT_SHOW_DATE |
-            DateUtils.FORMAT_SHOW_TIME;
+                DateUtils.FORMAT_SHOW_YEAR |
+                        DateUtils.FORMAT_SHOW_DATE |
+                        DateUtils.FORMAT_SHOW_TIME;
         flag |= mIs24HourView ? DateUtils.FORMAT_24HOUR : DateUtils.FORMAT_24HOUR;
         setTitle(DateUtils.formatDateTime(this.getContext(), date, flag));
-    }
+    }//android开发中常见日期管理工具类（API）——DateUtils：按照上下午显示时间
 
     public void onClick(DialogInterface arg0, int arg1) {
         if (mOnDateTimeSetListener != null) {
             mOnDateTimeSetListener.OnDateTimeSet(this, mDate.getTimeInMillis());
         }
-    }
+    }//第一个参数arg0是接收到点击事件的对话框
+    //第二个参数arg1是该对话框上的按钮
 
 }
\ No newline at end of file
diff --git a/src/Notes-master3/app/src/main/java/net/micode/notes/ui/DropdownMenu.java b/src/Notes-master3/Notes-master3/app/src/main/java/net/micode/notes/ui/DropdownMenu.java
similarity index 65%
rename from src/Notes-master3/app/src/main/java/net/micode/notes/ui/DropdownMenu.java
rename to src/Notes-master3/Notes-master3/app/src/main/java/net/micode/notes/ui/DropdownMenu.java
index 613dc74..c831a9b 100644
--- a/src/Notes-master3/app/src/main/java/net/micode/notes/ui/DropdownMenu.java
+++ b/src/Notes-master3/Notes-master3/app/src/main/java/net/micode/notes/ui/DropdownMenu.java
@@ -1,19 +1,3 @@
-/*
- * Copyright (c) 2010-2011, The MiCode Open Source Community (www.micode.net)
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
 package net.micode.notes.ui;
 
 import android.content.Context;
@@ -30,14 +14,18 @@ import net.micode.notes.R;
 public class DropdownMenu {
     private Button mButton;
     private PopupMenu mPopupMenu;
+    //声明一个下拉菜单
     private Menu mMenu;
 
     public DropdownMenu(Context context, Button button, int menuId) {
         mButton = button;
         mButton.setBackgroundResource(R.drawable.dropdown_icon);
+        //设置这个view的背景
         mPopupMenu = new PopupMenu(context, mButton);
         mMenu = mPopupMenu.getMenu();
         mPopupMenu.getMenuInflater().inflate(menuId, mMenu);
+        //MenuInflater是用来实例化Menu目录下的Menu布局文件
+        //根据ID来确认menu的内容选项
         mButton.setOnClickListener(new OnClickListener() {
             public void onClick(View v) {
                 mPopupMenu.show();
@@ -48,14 +36,14 @@ public class DropdownMenu {
     public void setOnDropdownMenuItemClickListener(OnMenuItemClickListener listener) {
         if (mPopupMenu != null) {
             mPopupMenu.setOnMenuItemClickListener(listener);
-        }
+        }//设置菜单的监听
     }
 
     public MenuItem findItem(int id) {
         return mMenu.findItem(id);
-    }
+    }//对于菜单选项的初始化，根据索引搜索菜单需要的选项
 
     public void setTitle(CharSequence title) {
         mButton.setText(title);
-    }
-}
+    }//布局文件，设置标题
+}
\ No newline at end of file
diff --git a/src/Notes-master3/app/src/main/java/net/micode/notes/ui/FoldersListAdapter.java b/src/Notes-master3/Notes-master3/app/src/main/java/net/micode/notes/ui/FoldersListAdapter.java
similarity index 72%
rename from src/Notes-master3/app/src/main/java/net/micode/notes/ui/FoldersListAdapter.java
rename to src/Notes-master3/Notes-master3/app/src/main/java/net/micode/notes/ui/FoldersListAdapter.java
index 96b77da..b6867fb 100644
--- a/src/Notes-master3/app/src/main/java/net/micode/notes/ui/FoldersListAdapter.java
+++ b/src/Notes-master3/Notes-master3/app/src/main/java/net/micode/notes/ui/FoldersListAdapter.java
@@ -1,19 +1,3 @@
-/*
- * Copyright (c) 2010-2011, The MiCode Open Source Community (www.micode.net)
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
 package net.micode.notes.ui;
 
 import android.content.Context;
@@ -30,10 +14,14 @@ import net.micode.notes.data.Notes.NoteColumns;
 
 
 public class FoldersListAdapter extends CursorAdapter {
+    //CursorAdapter是Cursor和ListView的接口
+    //FoldersListAdapter继承了CursorAdapter的类
+    //主要作用是便签数据库和用户的交互
+    //这里就是用folder（文件夹）的形式展现给用户
     public static final String [] PROJECTION = {
-        NoteColumns.ID,
-        NoteColumns.SNIPPET
-    };
+            NoteColumns.ID,
+            NoteColumns.SNIPPET
+    };//调用数据库中便签的ID和片段
 
     public static final int ID_COLUMN   = 0;
     public static final int NAME_COLUMN = 1;
@@ -41,12 +29,13 @@ public class FoldersListAdapter extends CursorAdapter {
     public FoldersListAdapter(Context context, Cursor c) {
         super(context, c);
         // TODO Auto-generated constructor stub
-    }
+    }//数据库操作
 
     @Override
     public View newView(Context context, Cursor cursor, ViewGroup parent) {
+        //ViewGroup是容器
         return new FolderListItem(context);
-    }
+    }//创建一个文件夹，对于各文件夹中子标签的初始化
 
     @Override
     public void bindView(View view, Context context, Cursor cursor) {
@@ -55,20 +44,22 @@ public class FoldersListAdapter extends CursorAdapter {
                     .getString(R.string.menu_move_parent_folder) : cursor.getString(NAME_COLUMN);
             ((FolderListItem) view).bind(folderName);
         }
-    }
+    }//将各个布局文件绑定起来
 
     public String getFolderName(Context context, int position) {
         Cursor cursor = (Cursor) getItem(position);
         return (cursor.getLong(ID_COLUMN) == Notes.ID_ROOT_FOLDER) ? context
                 .getString(R.string.menu_move_parent_folder) : cursor.getString(NAME_COLUMN);
-    }
+    }//根据数据库中标签的ID得到标签的各项内容
 
     private class FolderListItem extends LinearLayout {
         private TextView mName;
 
         public FolderListItem(Context context) {
             super(context);
+            //操作数据库
             inflate(context, R.layout.folder_list_item, this);
+            //根据布局文件的名字等信息将其找出来
             mName = (TextView) findViewById(R.id.tv_folder_name);
         }
 
@@ -77,4 +68,4 @@ public class FoldersListAdapter extends CursorAdapter {
         }
     }
 
-}
+}
\ No newline at end of file
diff --git a/src/Notes-master3/Notes-master3/app/src/main/java/net/micode/notes/ui/LoginActivity.java b/src/Notes-master3/Notes-master3/app/src/main/java/net/micode/notes/ui/LoginActivity.java
new file mode 100644
index 0000000..097f902
--- /dev/null
+++ b/src/Notes-master3/Notes-master3/app/src/main/java/net/micode/notes/ui/LoginActivity.java
@@ -0,0 +1,61 @@
+package net.micode.notes.ui;
+
+import java.util.*;
+import android.app.Activity;
+import android.app.ProgressDialog;
+import android.content.Intent;
+import android.view.View;
+import android.widget.EditText;
+import android.widget.Button;
+import android.os.Bundle;
+import android.widget.Toast;
+import net.micode.notes.R;
+
+public class LoginActivity extends Activity{
+    private EditText accountEdit;
+    private EditText passwordEdit;
+    private Button login;
+    private  Button cancel;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState){
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_login);
+        accountEdit = (EditText) findViewById(R.id.account);
+        passwordEdit = (EditText) findViewById(R.id.password);
+        login = (Button) findViewById(R.id.login);
+        cancel = (Button) findViewById(R.id.cancel);
+        cancel.setOnClickListener(new View.OnClickListener() {
+                                      @Override
+                                      public void onClick(View v) {
+                                          Toast.makeText(LoginActivity.this,R.string  .app_already_quit ,Toast.LENGTH_LONG).show();
+                                          finish();
+                                      }
+
+                                  }
+        );
+        login.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                String account = accountEdit.getText().toString();
+                String password = passwordEdit.getText().toString();
+
+
+                if(account.equals("xcy") && password.equals("123456")){
+                    ProgressDialog progressDialog = new ProgressDialog(LoginActivity.this);
+                    progressDialog.setTitle(R.string.Loading);
+                    progressDialog.setMessage("Loading...");
+                    progressDialog.setCancelable(true);
+                    progressDialog.show();;
+                    Intent intent = new Intent(LoginActivity.this,NotesListActivity.class);
+                    startActivity(intent);
+                    finish();
+                }else {
+                    Toast.makeText(LoginActivity.this, R.string.invalid,Toast.LENGTH_SHORT).show();
+                }
+            }
+        });
+    }
+
+
+}
diff --git a/src/Notes-master3/app/src/main/java/net/micode/notes/ui/NoteEditActivity.java b/src/Notes-master3/Notes-master3/app/src/main/java/net/micode/notes/ui/NoteEditActivity.java
similarity index 76%
rename from src/Notes-master3/app/src/main/java/net/micode/notes/ui/NoteEditActivity.java
rename to src/Notes-master3/Notes-master3/app/src/main/java/net/micode/notes/ui/NoteEditActivity.java
index a674d7a..0faa62e 100644
--- a/src/Notes-master3/app/src/main/java/net/micode/notes/ui/NoteEditActivity.java
+++ b/src/Notes-master3/Notes-master3/app/src/main/java/net/micode/notes/ui/NoteEditActivity.java
@@ -1,19 +1,3 @@
-/*
- * Copyright (c) 2010-2011, The MiCode Open Source Community (www.micode.net)
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
 package net.micode.notes.ui;
 
 import android.app.Activity;
@@ -74,6 +58,8 @@ import java.util.regex.Pattern;
 
 public class NoteEditActivity extends Activity implements OnClickListener,
         NoteSettingChangedListener, OnTextViewChangeListener {
+    //该类主要是针对标签的编辑
+    //继承了系统内部许多和监听有关的类
     private class HeadViewHolder {
         public TextView tvModified;
 
@@ -83,7 +69,7 @@ public class NoteEditActivity extends Activity implements OnClickListener,
 
         public ImageView ibSetBgColor;
     }
-
+    //使用Map实现数据存储
     private static final Map<Integer, Integer> sBgSelectorBtnsMap = new HashMap<Integer, Integer>();
     static {
         sBgSelectorBtnsMap.put(R.id.iv_bg_yellow, ResourceParser.YELLOW);
@@ -91,6 +77,7 @@ public class NoteEditActivity extends Activity implements OnClickListener,
         sBgSelectorBtnsMap.put(R.id.iv_bg_blue, ResourceParser.BLUE);
         sBgSelectorBtnsMap.put(R.id.iv_bg_green, ResourceParser.GREEN);
         sBgSelectorBtnsMap.put(R.id.iv_bg_white, ResourceParser.WHITE);
+        //put函数是将指定值和指定键相连
     }
 
     private static final Map<Integer, Integer> sBgSelectorSelectionMap = new HashMap<Integer, Integer>();
@@ -100,6 +87,7 @@ public class NoteEditActivity extends Activity implements OnClickListener,
         sBgSelectorSelectionMap.put(ResourceParser.BLUE, R.id.iv_bg_blue_select);
         sBgSelectorSelectionMap.put(ResourceParser.GREEN, R.id.iv_bg_green_select);
         sBgSelectorSelectionMap.put(ResourceParser.WHITE, R.id.iv_bg_white_select);
+        //put函数是将指定值和指定键相连
     }
 
     private static final Map<Integer, Integer> sFontSizeBtnsMap = new HashMap<Integer, Integer>();
@@ -108,6 +96,7 @@ public class NoteEditActivity extends Activity implements OnClickListener,
         sFontSizeBtnsMap.put(R.id.ll_font_small, ResourceParser.TEXT_SMALL);
         sFontSizeBtnsMap.put(R.id.ll_font_normal, ResourceParser.TEXT_MEDIUM);
         sFontSizeBtnsMap.put(R.id.ll_font_super, ResourceParser.TEXT_SUPER);
+        //put函数是将指定值和指定键相连
     }
 
     private static final Map<Integer, Integer> sFontSelectorSelectionMap = new HashMap<Integer, Integer>();
@@ -116,6 +105,7 @@ public class NoteEditActivity extends Activity implements OnClickListener,
         sFontSelectorSelectionMap.put(ResourceParser.TEXT_SMALL, R.id.iv_small_select);
         sFontSelectorSelectionMap.put(ResourceParser.TEXT_MEDIUM, R.id.iv_medium_select);
         sFontSelectorSelectionMap.put(ResourceParser.TEXT_SUPER, R.id.iv_super_select);
+        //put函数是将指定值和指定键相连
     }
 
     private static final String TAG = "NoteEditActivity";
@@ -123,20 +113,23 @@ public class NoteEditActivity extends Activity implements OnClickListener,
     private HeadViewHolder mNoteHeaderHolder;
 
     private View mHeadViewPanel;
-
+    //私有化一个界面操作mHeadViewPanel，对表头的操作
     private View mNoteBgColorSelector;
-
+    //私有化一个界面操作mNoteBgColorSelector，对背景颜色的操作
     private View mFontSizeSelector;
-
+    //私有化一个界面操作mFontSizeSelector，对标签字体的操作
     private EditText mNoteEditor;
-
+    //声明编辑控件，对文本操作
     private View mNoteEditorPanel;
-
-    private WorkingNote mWorkingNote;
-
+    //私有化一个界面操作mNoteEditorPanel，文本编辑的控制板
+    //private WorkingNote mWorkingNote;
+    public WorkingNote mWorkingNote;
+    //对模板WorkingNote的初始化
     private SharedPreferences mSharedPrefs;
+    //私有化SharedPreferences的数据存储方式
+    //它的本质是基于XML文件存储key-value键值对数据
     private int mFontSizeId;
-
+    //用于操作字体的大小
     private static final String PREFERENCE_FONT_SIZE = "pref_font_size";
 
     private static final int SHORTCUT_ICON_TITLE_MAX_LEN = 10;
@@ -145,7 +138,7 @@ public class NoteEditActivity extends Activity implements OnClickListener,
     public static final String TAG_UNCHECKED = String.valueOf('\u25A1');
 
     private LinearLayout mEditTextList;
-
+    //线性布局
     private String mUserQuery;
     private Pattern mPattern;
 
@@ -153,7 +146,7 @@ public class NoteEditActivity extends Activity implements OnClickListener,
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         this.setContentView(R.layout.note_edit);
-
+        //对数据库的访问操作
         if (savedInstanceState == null && !initActivityState(getIntent())) {
             finish();
             return;
@@ -176,7 +169,7 @@ public class NoteEditActivity extends Activity implements OnClickListener,
                 return;
             }
             Log.d(TAG, "Restoring from killed activity");
-        }
+        }//为防止内存不足时程序的终止，在这里有一个保存现场的函数
     }
 
     private boolean initActivityState(Intent intent) {
@@ -188,34 +181,42 @@ public class NoteEditActivity extends Activity implements OnClickListener,
         if (TextUtils.equals(Intent.ACTION_VIEW, intent.getAction())) {
             long noteId = intent.getLongExtra(Intent.EXTRA_UID, 0);
             mUserQuery = "";
-
+            //如果用户实例化标签时，系统并未给出标签ID
             /**
              * Starting from the searched result
              */
+            //根据键值查找ID
             if (intent.hasExtra(SearchManager.EXTRA_DATA_KEY)) {
                 noteId = Long.parseLong(intent.getStringExtra(SearchManager.EXTRA_DATA_KEY));
                 mUserQuery = intent.getStringExtra(SearchManager.USER_QUERY);
             }
-
+            //如果ID在数据库中未找到
             if (!DataUtils.visibleInNoteDatabase(getContentResolver(), noteId, Notes.TYPE_NOTE)) {
                 Intent jump = new Intent(this, NotesListActivity.class);
                 startActivity(jump);
+                //程序将跳转到上面声明的intent——jump
                 showToast(R.string.error_note_not_exist);
                 finish();
                 return false;
-            } else {
+            }
+            //ID在数据库中找到
+            else {
                 mWorkingNote = WorkingNote.load(this, noteId);
                 if (mWorkingNote == null) {
                     Log.e(TAG, "load note failed with note id" + noteId);
+                    //打印出红色的错误信息
                     finish();
                     return false;
                 }
             }
+            //setSoftInputMode——软键盘输入模式
             getWindow().setSoftInputMode(
                     WindowManager.LayoutParams.SOFT_INPUT_STATE_HIDDEN
                             | WindowManager.LayoutParams.SOFT_INPUT_ADJUST_RESIZE);
         } else if(TextUtils.equals(Intent.ACTION_INSERT_OR_EDIT, intent.getAction())) {
-            // New note
+            // intent.getAction()
+            // 大多用于broadcast发送广播时给机制（intent）设置一个action，就是一个字符串
+            // 用户可以通过receive（接受）intent，通过 getAction得到的字符串，来决定做什么
             long folderId = intent.getLongExtra(Notes.INTENT_EXTRA_FOLDER_ID, 0);
             int widgetId = intent.getIntExtra(Notes.INTENT_EXTRA_WIDGET_ID,
                     AppWidgetManager.INVALID_APPWIDGET_ID);
@@ -223,7 +224,7 @@ public class NoteEditActivity extends Activity implements OnClickListener,
                     Notes.TYPE_WIDGET_INVALIDE);
             int bgResId = intent.getIntExtra(Notes.INTENT_EXTRA_BACKGROUND_ID,
                     ResourceParser.getDefaultBgId(this));
-
+            // intent.getInt（Long、String）Extra是对各变量的语法分析
             // Parse call-record note
             String phoneNumber = intent.getStringExtra(Intent.EXTRA_PHONE_NUMBER);
             long callDate = intent.getLongExtra(Notes.INTENT_EXTRA_CALL_DATE, 0);
@@ -240,15 +241,17 @@ public class NoteEditActivity extends Activity implements OnClickListener,
                         finish();
                         return false;
                     }
+                    //将电话号码与手机的号码簿相关
                 } else {
                     mWorkingNote = WorkingNote.createEmptyNote(this, folderId, widgetId,
                             widgetType, bgResId);
                     mWorkingNote.convertToCallNote(phoneNumber, callDate);
+                    //
                 }
             } else {
                 mWorkingNote = WorkingNote.createEmptyNote(this, folderId, widgetId, widgetType,
                         bgResId);
-            }
+            }//创建一个新的WorkingNote
 
             getWindow().setSoftInputMode(
                     WindowManager.LayoutParams.SOFT_INPUT_ADJUST_RESIZE
@@ -269,8 +272,10 @@ public class NoteEditActivity extends Activity implements OnClickListener,
     }
 
     private void initNoteScreen() {
+        //对界面的初始化操作
         mNoteEditor.setTextAppearance(this, TextAppearanceResources
                 .getTexAppearanceResource(mFontSizeId));
+        //设置外观
         if (mWorkingNote.getCheckListMode() == TextNote.MODE_CHECK_LIST) {
             switchToListMode(mWorkingNote.getContent());
         } else {
@@ -294,18 +299,21 @@ public class NoteEditActivity extends Activity implements OnClickListener,
          */
         showAlertHeader();
     }
-
+    //设置闹钟的显示
     private void showAlertHeader() {
         if (mWorkingNote.hasClockAlert()) {
             long time = System.currentTimeMillis();
             if (time > mWorkingNote.getAlertDate()) {
                 mNoteHeaderHolder.tvAlertDate.setText(R.string.note_alert_expired);
-            } else {
+            }
+            //如果系统时间大于了闹钟设置的时间，那么闹钟失效
+            else {
                 mNoteHeaderHolder.tvAlertDate.setText(DateUtils.getRelativeTimeSpanString(
                         mWorkingNote.getAlertDate(), time, DateUtils.MINUTE_IN_MILLIS));
             }
             mNoteHeaderHolder.tvAlertDate.setVisibility(View.VISIBLE);
             mNoteHeaderHolder.ivAlertIcon.setVisibility(View.VISIBLE);
+            //显示闹钟开启的图标
         } else {
             mNoteHeaderHolder.tvAlertDate.setVisibility(View.GONE);
             mNoteHeaderHolder.ivAlertIcon.setVisibility(View.GONE);
@@ -329,26 +337,29 @@ public class NoteEditActivity extends Activity implements OnClickListener,
         if (!mWorkingNote.existInDatabase()) {
             saveNote();
         }
+        //在创建一个新的标签时，先在数据库中匹配
+        //如果不存在，那么先在数据库中存储
         outState.putLong(Intent.EXTRA_UID, mWorkingNote.getNoteId());
         Log.d(TAG, "Save working note id: " + mWorkingNote.getNoteId() + " onSaveInstanceState");
     }
 
     @Override
+    //MotionEvent是对屏幕触控的传递机制
     public boolean dispatchTouchEvent(MotionEvent ev) {
         if (mNoteBgColorSelector.getVisibility() == View.VISIBLE
                 && !inRangeOfView(mNoteBgColorSelector, ev)) {
             mNoteBgColorSelector.setVisibility(View.GONE);
             return true;
-        }
+        }//颜色选择器在屏幕上可见
 
         if (mFontSizeSelector.getVisibility() == View.VISIBLE
                 && !inRangeOfView(mFontSizeSelector, ev)) {
             mFontSizeSelector.setVisibility(View.GONE);
             return true;
-        }
+        }//字体大小选择器在屏幕上可见
         return super.dispatchTouchEvent(ev);
     }
-
+    //对屏幕触控的坐标进行操作
     private boolean inRangeOfView(View view, MotionEvent ev) {
         int []location = new int[2];
         view.getLocationOnScreen(location);
@@ -357,9 +368,11 @@ public class NoteEditActivity extends Activity implements OnClickListener,
         if (ev.getX() < x
                 || ev.getX() > (x + view.getWidth())
                 || ev.getY() < y
-                || ev.getY() > (y + view.getHeight())) {
-                    return false;
-                }
+                || ev.getY() > (y + view.getHeight()))
+        //如果触控的位置超出了给定的范围，返回false
+        {
+            return false;
+        }
         return true;
     }
 
@@ -377,13 +390,13 @@ public class NoteEditActivity extends Activity implements OnClickListener,
         for (int id : sBgSelectorBtnsMap.keySet()) {
             ImageView iv = (ImageView) findViewById(id);
             iv.setOnClickListener(this);
-        }
+        }//对标签各项属性内容的初始化
 
         mFontSizeSelector = findViewById(R.id.font_size_selector);
         for (int id : sFontSizeBtnsMap.keySet()) {
             View view = findViewById(id);
             view.setOnClickListener(this);
-        };
+        };//对字体大小的选择
         mSharedPrefs = PreferenceManager.getDefaultSharedPreferences(this);
         mFontSizeId = mSharedPrefs.getInt(PREFERENCE_FONT_SIZE, ResourceParser.BG_DEFAULT_FONT_SIZE);
         /**
@@ -405,7 +418,7 @@ public class NoteEditActivity extends Activity implements OnClickListener,
         }
         clearSettingState();
     }
-
+    //和桌面小工具的同步
     private void updateWidget() {
         Intent intent = new Intent(AppWidgetManager.ACTION_APPWIDGET_UPDATE);
         if (mWorkingNote.getWidgetType() == Notes.TYPE_WIDGET_2X) {
@@ -418,7 +431,7 @@ public class NoteEditActivity extends Activity implements OnClickListener,
         }
 
         intent.putExtra(AppWidgetManager.EXTRA_APPWIDGET_IDS, new int[] {
-            mWorkingNote.getWidgetId()
+                mWorkingNote.getWidgetId()
         });
 
         sendBroadcast(intent);
@@ -430,7 +443,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);
@@ -450,7 +463,7 @@ public class NoteEditActivity extends Activity implements OnClickListener,
             }
             mFontSizeSelector.setVisibility(View.GONE);
         }
-    }
+    }//************************存在问题
 
     @Override
     public void onBackPressed() {
@@ -481,6 +494,7 @@ public class NoteEditActivity extends Activity implements OnClickListener,
     }
 
     @Override
+    //对选择菜单的准备
     public boolean onPrepareOptionsMenu(Menu menu) {
         if (isFinishing()) {
             return true;
@@ -489,6 +503,7 @@ public class NoteEditActivity extends Activity implements OnClickListener,
         menu.clear();
         if (mWorkingNote.getFolderId() == Notes.ID_CALL_RECORD_FOLDER) {
             getMenuInflater().inflate(R.menu.call_note_edit, menu);
+            // MenuInflater是用来实例化Menu目录下的Menu布局文件的
         } else {
             getMenuInflater().inflate(R.menu.note_edit, menu);
         }
@@ -506,45 +521,71 @@ public class NoteEditActivity extends Activity implements OnClickListener,
     }
 
     @Override
+    /*
+     * 函数功能：动态改变菜单选项内容
+     * 函数实现：如下注释
+     */
     public boolean onOptionsItemSelected(MenuItem item) {
         switch (item.getItemId()) {
+            //根据菜单的id来编剧相关项目
             case R.id.menu_new_note:
+                //创建一个新的便签
                 createNewNote();
                 break;
             case R.id.menu_delete:
+                //删除便签
                 AlertDialog.Builder builder = new AlertDialog.Builder(this);
+                //创建关于删除操作的对话框
                 builder.setTitle(getString(R.string.alert_title_delete));
+                // 设置标签的标题为alert_title_delete
                 builder.setIcon(android.R.drawable.ic_dialog_alert);
+                //设置对话框图标
                 builder.setMessage(getString(R.string.alert_message_delete_note));
+                //设置对话框内容
                 builder.setPositiveButton(android.R.string.ok,
                         new DialogInterface.OnClickListener() {
+                            //建立按键监听器
                             public void onClick(DialogInterface dialog, int which) {
+                                //点击所触发事件
                                 deleteCurrentNote();
+                                //  删除单签便签
                                 finish();
                             }
                         });
+                //添加“YES”按钮
                 builder.setNegativeButton(android.R.string.cancel, null);
+                //添加“NO”的按钮
                 builder.show();
+                //显示对话框
                 break;
             case R.id.menu_font_size:
+                //字体大小的编辑
                 mFontSizeSelector.setVisibility(View.VISIBLE);
+                // 将字体选择器置为可见
                 findViewById(sFontSelectorSelectionMap.get(mFontSizeId)).setVisibility(View.VISIBLE);
+                // 通过id找到相应的大小
                 break;
             case R.id.menu_list_mode:
+                //选择列表模式
                 mWorkingNote.setCheckListMode(mWorkingNote.getCheckListMode() == 0 ?
                         TextNote.MODE_CHECK_LIST : 0);
                 break;
             case R.id.menu_share:
+                //菜单共享
                 getWorkingText();
                 sendTo(this, mWorkingNote.getContent());
+                // 用sendto函数将运行文本发送到遍历的本文内
                 break;
             case R.id.menu_send_to_desktop:
+                //发送到桌面
                 sendToDesktop();
                 break;
             case R.id.menu_alert:
+                //创建提醒器
                 setReminder();
                 break;
             case R.id.menu_delete_remind:
+                //删除日期提醒
                 mWorkingNote.setAlertDate(0, false);
                 break;
             default:
@@ -553,111 +594,170 @@ public class NoteEditActivity extends Activity implements OnClickListener,
         return true;
     }
 
+    /*
+     * 函数功能：建立事件提醒器
+     * 函数实现：如下注释
+     */
     private void setReminder() {
         DateTimePickerDialog d = new DateTimePickerDialog(this, System.currentTimeMillis());
+        // 建立修改时间日期的对话框
         d.setOnDateTimeSetListener(new OnDateTimeSetListener() {
             public void OnDateTimeSet(AlertDialog dialog, long date) {
                 mWorkingNote.setAlertDate(date	, true);
+                //选择提醒的日期
             }
         });
+        //建立时间日期的监听器
         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链接选项
         intent.putExtra(Intent.EXTRA_TEXT, info);
+        //将需要传递的便签信息放入text文件中
         intent.setType("text/plain");
+        //编辑连接器的类型
         context.startActivity(intent);
+        //在acti中进行链接
     }
 
+    /*
+     * 函数功能：创建一个新的便签
+     * 函数实现：如下注释
+     */
     private void createNewNote() {
         // Firstly, save current editing notes
+        //保存当前便签
         saveNote();
 
         // For safety, start a new NoteEditActivity
         finish();
         Intent intent = new Intent(this, NoteEditActivity.class);
+        //设置链接器
         intent.setAction(Intent.ACTION_INSERT_OR_EDIT);
+        //该活动定义为创建或编辑
         intent.putExtra(Notes.INTENT_EXTRA_FOLDER_ID, mWorkingNote.getFolderId());
+        //将运行便签的id添加到INTENT_EXTRA_FOLDER_ID标记中
         startActivity(intent);
+        //开始activity并链接
     }
 
+    /*
+     * 函数功能：删除当前便签
+     * 函数实现：如下注释
+     */
     private void deleteCurrentNote() {
         if (mWorkingNote.existInDatabase()) {
+            //假如当前运行的便签内存有数据
             HashSet<Long> ids = new HashSet<Long>();
             long id = mWorkingNote.getNoteId();
             if (id != Notes.ID_ROOT_FOLDER) {
                 ids.add(id);
+                //如果不是头文件夹建立一个hash表把便签id存起来
             } else {
                 Log.d(TAG, "Wrong note id, should not happen");
+                //否则报错
             }
             if (!isSyncMode()) {
+                //在非同步模式情况下
+                //删除操作
                 if (!DataUtils.batchDeleteNotes(getContentResolver(), ids)) {
                     Log.e(TAG, "Delete Note error");
                 }
             } else {
+                //同步模式
+                //移动至垃圾文件夹的操作
                 if (!DataUtils.batchMoveToFolder(getContentResolver(), ids, Notes.ID_TRASH_FOLER)) {
                     Log.e(TAG, "Move notes to trash folder error, should not happens");
                 }
             }
         }
         mWorkingNote.markDeleted(true);
+        //将这些标签的删除标记置为true
     }
 
+    /*
+     * 函数功能：判断是否为同步模式
+     * 函数实现：直接看NotesPreferenceActivity中同步名称是否为空
+     */
     private boolean isSyncMode() {
         return NotesPreferenceActivity.getSyncAccountName(this).trim().length() > 0;
     }
 
+    /*
+     * 函数功能：设置提醒时间
+     * 函数实现：如下注释
+     */
     public void onClockAlertChanged(long date, boolean set) {
         /**
          * User could set clock to an unsaved note, so before setting the
          * alert clock, we should save the note first
          */
         if (!mWorkingNote.existInDatabase()) {
+            //首先保存已有的便签
             saveNote();
         }
         if (mWorkingNote.getNoteId() > 0) {
             Intent intent = new Intent(this, AlarmReceiver.class);
             intent.setData(ContentUris.withAppendedId(Notes.CONTENT_NOTE_URI, mWorkingNote.getNoteId()));
+            //若有有运行的便签就是建立一个链接器将标签id都存在uri中
             PendingIntent pendingIntent = PendingIntent.getBroadcast(this, 0, intent, 0);
             AlarmManager alarmManager = ((AlarmManager) getSystemService(ALARM_SERVICE));
+            //设置提醒管理器
             showAlertHeader();
             if(!set) {
                 alarmManager.cancel(pendingIntent);
             } else {
                 alarmManager.set(AlarmManager.RTC_WAKEUP, date, pendingIntent);
             }
+            //如果用户设置了时间，就通过提醒管理器设置一个监听事项
         } else {
             /**
              * There is the condition that user has input nothing (the note is
              * not worthy saving), we have no note id, remind the user that he
              * should input something
              */
+            //没有运行的便签就报错
             Log.e(TAG, "Clock alert setting error");
             showToast(R.string.error_note_empty_for_clock);
         }
     }
 
+    /*
+     * 函数功能：Widget发生改变的所触发的事件
+     */
     public void onWidgetChanged() {
-        updateWidget();
+        updateWidget();//更新Widget
     }
 
+    /*
+     * 函数功能： 删除编辑文本框所触发的事件
+     * 函数实现：如下注释
+     */
     public void onEditTextDelete(int index, String text) {
         int childCount = mEditTextList.getChildCount();
         if (childCount == 1) {
             return;
         }
-
+        //没有编辑框的话直接返回
         for (int i = index + 1; i < childCount; i++) {
             ((NoteEditText) mEditTextList.getChildAt(i).findViewById(R.id.et_edit_text))
                     .setIndex(i - 1);
+            //通过id把编辑框存在便签编辑框中
         }
 
         mEditTextList.removeViewAt(index);
+        //删除特定位置的视图
         NoteEditText edit = null;
         if(index == 0) {
             edit = (NoteEditText) mEditTextList.getChildAt(0).findViewById(
@@ -666,69 +766,101 @@ public class NoteEditActivity extends Activity implements OnClickListener,
             edit = (NoteEditText) mEditTextList.getChildAt(index - 1).findViewById(
                     R.id.et_edit_text);
         }
+        //通过id把编辑框存在空的NoteEditText中
         int length = edit.length();
         edit.append(text);
-        edit.requestFocus();
-        edit.setSelection(length);
+        edit.requestFocus();//请求优先完成该此 编辑
+        edit.setSelection(length);//定位到length位置处的条目
     }
 
+    /*
+     * 函数功能：进入编辑文本框所触发的事件
+     * 函数实现：如下注释
+     */
     public void onEditTextEnter(int index, String text) {
         /**
          * Should not happen, check for debug
          */
         if(index > mEditTextList.getChildCount()) {
             Log.e(TAG, "Index out of mEditTextList boundrary, should not happen");
+            //越界把偶偶
         }
 
         View view = getListItem(text, index);
         mEditTextList.addView(view, index);
+        //建立一个新的视图并添加到编辑文本框内
         NoteEditText edit = (NoteEditText) view.findViewById(R.id.et_edit_text);
-        edit.requestFocus();
-        edit.setSelection(0);
+        edit.requestFocus();//请求优先操作
+        edit.setSelection(0);//定位到起始位置
         for (int i = index + 1; i < mEditTextList.getChildCount(); i++) {
             ((NoteEditText) mEditTextList.getChildAt(i).findViewById(R.id.et_edit_text))
                     .setIndex(i);
+            //遍历子文本框并设置对应对下标
         }
     }
 
+    /*
+     * 函数功能：切换至列表模式
+     * 函数实现：如下注释
+     */
     private void switchToListMode(String text) {
         mEditTextList.removeAllViews();
         String[] items = text.split("\n");
         int index = 0;
+        //清空所有视图，初始化下标
         for (String item : items) {
             if(!TextUtils.isEmpty(item)) {
                 mEditTextList.addView(getListItem(item, index));
                 index++;
+                //遍历所有文本单元并添加到文本框中
             }
         }
         mEditTextList.addView(getListItem("", index));
         mEditTextList.getChildAt(index).findViewById(R.id.et_edit_text).requestFocus();
+        //优先请求此操作
 
         mNoteEditor.setVisibility(View.GONE);
+        //便签编辑器不可见
         mEditTextList.setVisibility(View.VISIBLE);
+        //将文本编辑框置为可见
     }
 
+    /*
+     * 函数功能：获取高亮效果的反馈情况
+     * 函数实现：如下注释
+     */
     private Spannable getHighlightQueryResult(String fullText, String userQuery) {
         SpannableString spannable = new SpannableString(fullText == null ? "" : fullText);
+        //新建一个效果选项
         if (!TextUtils.isEmpty(userQuery)) {
             mPattern = Pattern.compile(userQuery);
+            //将用户的询问进行解析
             Matcher m = mPattern.matcher(fullText);
+            //建立一个状态机检查Pattern并进行匹配
             int start = 0;
             while (m.find(start)) {
                 spannable.setSpan(
                         new BackgroundColorSpan(this.getResources().getColor(
                                 R.color.user_query_highlight)), m.start(), m.end(),
                         Spannable.SPAN_INCLUSIVE_EXCLUSIVE);
+                //设置背景颜色
                 start = m.end();
+                //跟新起始位置
             }
         }
         return spannable;
     }
 
+    /*
+     * 函数功能：获取列表项
+     * 函数实现：如下注释
+     */
     private View getListItem(String item, int index) {
         View view = LayoutInflater.from(this).inflate(R.layout.note_edit_list_item, null);
+        //创建一个视图
         final NoteEditText edit = (NoteEditText) view.findViewById(R.id.et_edit_text);
         edit.setTextAppearance(this, TextAppearanceResources.getTexAppearanceResource(mFontSizeId));
+        //创建一个文本编辑框并设置可见性
         CheckBox cb = ((CheckBox) view.findViewById(R.id.cb_edit_item));
         cb.setOnCheckedChangeListener(new OnCheckedChangeListener() {
             public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
@@ -739,12 +871,15 @@ public class NoteEditActivity extends Activity implements OnClickListener,
                 }
             }
         });
+        //建立一个打钩框并设置监听器
 
         if (item.startsWith(TAG_CHECKED)) {
+            //选择勾选
             cb.setChecked(true);
             edit.setPaintFlags(edit.getPaintFlags() | Paint.STRIKE_THRU_TEXT_FLAG);
             item = item.substring(TAG_CHECKED.length(), item.length()).trim();
         } else if (item.startsWith(TAG_UNCHECKED)) {
+            //选择不勾选
             cb.setChecked(false);
             edit.setPaintFlags(Paint.ANTI_ALIAS_FLAG | Paint.DEV_KERN_TEXT_FLAG);
             item = item.substring(TAG_UNCHECKED.length(), item.length()).trim();
@@ -753,61 +888,94 @@ public class NoteEditActivity extends Activity implements OnClickListener,
         edit.setOnTextViewChangeListener(this);
         edit.setIndex(index);
         edit.setText(getHighlightQueryResult(item, mUserQuery));
+        //运行编辑框的监听器对该行为作出反应，并设置下标及文本内容
         return view;
     }
 
+    /*
+     * 函数功能：便签内容发生改变所 触发的事件
+     * 函数实现：如下注释
+     */
     public void onTextChange(int index, boolean hasText) {
         if (index >= mEditTextList.getChildCount()) {
             Log.e(TAG, "Wrong index, should not happen");
             return;
+            //越界报错
         }
         if(hasText) {
             mEditTextList.getChildAt(index).findViewById(R.id.cb_edit_item).setVisibility(View.VISIBLE);
         } else {
             mEditTextList.getChildAt(index).findViewById(R.id.cb_edit_item).setVisibility(View.GONE);
         }
+        //如果内容不为空则将其子编辑框可见性置为可见，否则不可见
     }
 
+    /*
+     * 函数功能：检查模式和列表模式的切换
+     * 函数实现：如下注释
+     */
     public void onCheckListModeChanged(int oldMode, int newMode) {
         if (newMode == TextNote.MODE_CHECK_LIST) {
             switchToListMode(mNoteEditor.getText().toString());
+            //检查模式切换到列表模式
         } else {
             if (!getWorkingText()) {
                 mWorkingNote.setWorkingText(mWorkingNote.getContent().replace(TAG_UNCHECKED + " ",
                         ""));
             }
+            //若是获取到文本就改变其检查标记
             mNoteEditor.setText(getHighlightQueryResult(mWorkingNote.getContent(), mUserQuery));
             mEditTextList.setVisibility(View.GONE);
             mNoteEditor.setVisibility(View.VISIBLE);
+            //修改文本编辑器的内容和可见性
         }
     }
 
+    /*
+     * 函数功能：设置勾选选项表并返回是否勾选的标记
+     * 函数实现：如下注释
+     */
     private boolean getWorkingText() {
         boolean hasChecked = false;
+        //初始化check标记
         if (mWorkingNote.getCheckListMode() == TextNote.MODE_CHECK_LIST) {
+            // 若模式为CHECK_LIST
             StringBuilder sb = new StringBuilder();
+            //创建可变字符串
             for (int i = 0; i < mEditTextList.getChildCount(); i++) {
                 View view = mEditTextList.getChildAt(i);
+                //遍历所有子编辑框的视图 
                 NoteEditText edit = (NoteEditText) view.findViewById(R.id.et_edit_text);
                 if (!TextUtils.isEmpty(edit.getText())) {
+                    //若文本不为空
                     if (((CheckBox) view.findViewById(R.id.cb_edit_item)).isChecked()) {
+                        //该选项框已打钩
                         sb.append(TAG_CHECKED).append(" ").append(edit.getText()).append("\n");
                         hasChecked = true;
+                        //扩展字符串为已打钩并把标记置true
                     } else {
                         sb.append(TAG_UNCHECKED).append(" ").append(edit.getText()).append("\n");
+                        //扩展字符串添加未打钩
                     }
                 }
             }
             mWorkingNote.setWorkingText(sb.toString());
+            //利用编辑好的字符串设置运行便签的内容
         } else {
             mWorkingNote.setWorkingText(mNoteEditor.getText().toString());
+            // 若不是该模式直接用编辑器中的内容设置运行中标签的内容
         }
         return hasChecked;
     }
 
+    /*
+     * 函数功能：保存便签
+     * 函数实现：如下注释
+     */
     private boolean saveNote() {
         getWorkingText();
         boolean saved = mWorkingNote.saveNote();
+        //运行 getWorkingText()之后保存
         if (saved) {
             /**
              * There are two modes from List view to edit view, open one note,
@@ -816,11 +984,16 @@ public class NoteEditActivity extends Activity implements OnClickListener,
              * new node requires to the top of the list. This code
              * {@link #RESULT_OK} is used to identify the create/edit state
              */
+            //如英文注释所说链接RESULT_OK是为了识别保存的2种情况，一是创建后保存，二是修改后保存
             setResult(RESULT_OK);
         }
         return saved;
     }
 
+    /*
+     * 函数功能：将便签发送至桌面
+     * 函数实现：如下注释
+     */
     private void sendToDesktop() {
         /**
          * Before send message to home, we should make sure that current
@@ -829,12 +1002,16 @@ public class NoteEditActivity extends Activity implements OnClickListener,
          */
         if (!mWorkingNote.existInDatabase()) {
             saveNote();
+            //若不存在数据也就是新的标签就保存起来先
         }
 
         if (mWorkingNote.getNoteId() > 0) {
+            //若是有内容
             Intent sender = new Intent();
             Intent shortcutIntent = new Intent(this, NoteEditActivity.class);
+            //建立发送到桌面的连接器
             shortcutIntent.setAction(Intent.ACTION_VIEW);
+            //链接为一个视图
             shortcutIntent.putExtra(Intent.EXTRA_UID, mWorkingNote.getNoteId());
             sender.putExtra(Intent.EXTRA_SHORTCUT_INTENT, shortcutIntent);
             sender.putExtra(Intent.EXTRA_SHORTCUT_NAME,
@@ -842,9 +1019,12 @@ public class NoteEditActivity extends Activity implements OnClickListener,
             sender.putExtra(Intent.EXTRA_SHORTCUT_ICON_RESOURCE,
                     Intent.ShortcutIconResource.fromContext(this, R.drawable.icon_app));
             sender.putExtra("duplicate", true);
+            //将便签的相关信息都添加到要发送的文件里
             sender.setAction("com.android.launcher.action.INSTALL_SHORTCUT");
+            //设置sneder的行为是发送
             showToast(R.string.info_note_enter_desktop);
             sendBroadcast(sender);
+            //显示到桌面
         } else {
             /**
              * There is the condition that user has input nothing (the note is
@@ -853,21 +1033,35 @@ public class NoteEditActivity extends Activity implements OnClickListener,
              */
             Log.e(TAG, "Send to desktop error");
             showToast(R.string.error_note_empty_for_send_to_desktop);
+            //空便签直接报错
         }
     }
 
+    /*
+     * 函数功能：编辑小图标的标题
+     * 函数实现：如下注释
+     */
     private String makeShortcutIconTitle(String content) {
         content = content.replace(TAG_CHECKED, "");
         content = content.replace(TAG_UNCHECKED, "");
         return content.length() > SHORTCUT_ICON_TITLE_MAX_LEN ? content.substring(0,
                 SHORTCUT_ICON_TITLE_MAX_LEN) : content;
+        //直接设置为content中的内容并返回，有勾选和未勾选2种
     }
 
+    /*
+     * 函数功能：显示提示的视图
+     * 函数实现：根据下标显示对应的提示
+     */
     private void showToast(int resId) {
         showToast(resId, Toast.LENGTH_SHORT);
     }
 
+    /*
+     * 函数功能：持续显示提示的视图
+     * 函数实现：根据下标和持续的时间（duration）编辑提示视图并显示
+     */
     private void showToast(int resId, int duration) {
         Toast.makeText(this, resId, duration).show();
     }
-}
+}
\ No newline at end of file
diff --git a/src/Notes-master3/app/src/main/java/net/micode/notes/ui/NoteEditText.java b/src/Notes-master3/Notes-master3/app/src/main/java/net/micode/notes/ui/NoteEditText.java
similarity index 100%
rename from src/Notes-master3/app/src/main/java/net/micode/notes/ui/NoteEditText.java
rename to src/Notes-master3/Notes-master3/app/src/main/java/net/micode/notes/ui/NoteEditText.java
diff --git a/src/Notes-master3/app/src/main/java/net/micode/notes/ui/NoteItemData.java b/src/Notes-master3/Notes-master3/app/src/main/java/net/micode/notes/ui/NoteItemData.java
similarity index 74%
rename from src/Notes-master3/app/src/main/java/net/micode/notes/ui/NoteItemData.java
rename to src/Notes-master3/Notes-master3/app/src/main/java/net/micode/notes/ui/NoteItemData.java
index 0f5a878..9dde13c 100644
--- a/src/Notes-master3/app/src/main/java/net/micode/notes/ui/NoteItemData.java
+++ b/src/Notes-master3/Notes-master3/app/src/main/java/net/micode/notes/ui/NoteItemData.java
@@ -1,19 +1,3 @@
-/*
- * Copyright (c) 2010-2011, The MiCode Open Source Community (www.micode.net)
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
 package net.micode.notes.ui;
 
 import android.content.Context;
@@ -28,20 +12,20 @@ import net.micode.notes.tool.DataUtils;
 
 public class NoteItemData {
     static final String [] PROJECTION = new String [] {
-        NoteColumns.ID,
-        NoteColumns.ALERTED_DATE,
-        NoteColumns.BG_COLOR_ID,
-        NoteColumns.CREATED_DATE,
-        NoteColumns.HAS_ATTACHMENT,
-        NoteColumns.MODIFIED_DATE,
-        NoteColumns.NOTES_COUNT,
-        NoteColumns.PARENT_ID,
-        NoteColumns.SNIPPET,
-        NoteColumns.TYPE,
-        NoteColumns.WIDGET_ID,
-        NoteColumns.WIDGET_TYPE,
+            NoteColumns.ID,
+            NoteColumns.ALERTED_DATE,
+            NoteColumns.BG_COLOR_ID,
+            NoteColumns.CREATED_DATE,
+            NoteColumns.HAS_ATTACHMENT,
+            NoteColumns.MODIFIED_DATE,
+            NoteColumns.NOTES_COUNT,
+            NoteColumns.PARENT_ID,
+            NoteColumns.SNIPPET,
+            NoteColumns.TYPE,
+            NoteColumns.WIDGET_ID,
+            NoteColumns.WIDGET_TYPE,
     };
-
+    //常量标记和数据就不一一标记了，意义翻译基本就知道
     private static final int ID_COLUMN                    = 0;
     private static final int ALERTED_DATE_COLUMN          = 1;
     private static final int BG_COLOR_ID_COLUMN           = 2;
@@ -75,8 +59,9 @@ public class NoteItemData {
     private boolean mIsOnlyOneItem;
     private boolean mIsOneNoteFollowingFolder;
     private boolean mIsMultiNotesFollowingFolder;
-
-    public NoteItemData(Context context, Cursor cursor) {
+    //初始化NoteItemData，主要利用光标cursor获取的东西
+    public NoteItemData(Context context, Cursor  cursor) {
+        //getxxx为转换格式
         mId = cursor.getLong(ID_COLUMN);
         mAlertDate = cursor.getLong(ALERTED_DATE_COLUMN);
         mBgColorId = cursor.getInt(BG_COLOR_ID_COLUMN);
@@ -92,10 +77,11 @@ public class NoteItemData {
         mWidgetId = cursor.getInt(WIDGET_ID_COLUMN);
         mWidgetType = cursor.getInt(WIDGET_TYPE_COLUMN);
 
+        //初始化电话号码的信息
         mPhoneNumber = "";
         if (mParentId == Notes.ID_CALL_RECORD_FOLDER) {
             mPhoneNumber = DataUtils.getCallNumberByNoteId(context.getContentResolver(), mId);
-            if (!TextUtils.isEmpty(mPhoneNumber)) {
+            if (!TextUtils.isEmpty(mPhoneNumber)) {//mphonenumber里有符合字符串，则用contart功能连接
                 mName = Contact.getContact(context, mPhoneNumber);
                 if (mName == null) {
                     mName = mPhoneNumber;
@@ -108,32 +94,35 @@ public class NoteItemData {
         }
         checkPostion(cursor);
     }
-
+    ///根据鼠标的位置设置标记，和位置
     private void checkPostion(Cursor cursor) {
+        //初始化几个标记，cursor具体功能笔记中已提到，不一一叙述
         mIsLastItem = cursor.isLast() ? true : false;
         mIsFirstItem = cursor.isFirst() ? true : false;
         mIsOnlyOneItem = (cursor.getCount() == 1);
+        //初始化“多重子文件”“单一子文件”2个标记
         mIsMultiNotesFollowingFolder = false;
         mIsOneNoteFollowingFolder = false;
 
-        if (mType == Notes.TYPE_NOTE && !mIsFirstItem) {
+        //主要是设置上诉2标记
+        if (mType == Notes.TYPE_NOTE && !mIsFirstItem) {//若是note格式并且不是第一个元素
             int position = cursor.getPosition();
-            if (cursor.moveToPrevious()) {
+            if (cursor.moveToPrevious()) {//获取光标位置后看上一行
                 if (cursor.getInt(TYPE_COLUMN) == Notes.TYPE_FOLDER
-                        || cursor.getInt(TYPE_COLUMN) == Notes.TYPE_SYSTEM) {
+                        || cursor.getInt(TYPE_COLUMN) == Notes.TYPE_SYSTEM) {//若光标满足系统或note格式
                     if (cursor.getCount() > (position + 1)) {
-                        mIsMultiNotesFollowingFolder = true;
+                        mIsMultiNotesFollowingFolder = true;//若是数据行数大于但前位置+1则设置成正确
                     } else {
-                        mIsOneNoteFollowingFolder = true;
+                        mIsOneNoteFollowingFolder = true;//否则单一文件夹标记为true
                     }
                 }
-                if (!cursor.moveToNext()) {
+                if (!cursor.moveToNext()) {//若不能再往下走则报错
                     throw new IllegalStateException("cursor move to previous but can't move back");
                 }
             }
         }
     }
-
+    ///以下都是获取标记没什么好说的，不过倒数第二个需要说明下，很具体看下面
     public boolean isOneFollowingFolder() {
         return mIsOneNoteFollowingFolder;
     }
@@ -214,6 +203,7 @@ public class NoteItemData {
         return (mAlertDate > 0);
     }
 
+    //若数据父id为保存至文件夹模式的id且满足电话号码单元不为空，则isCallRecord为true
     public boolean isCallRecord() {
         return (mParentId == Notes.ID_CALL_RECORD_FOLDER && !TextUtils.isEmpty(mPhoneNumber));
     }
@@ -221,4 +211,4 @@ public class NoteItemData {
     public static int getNoteType(Cursor cursor) {
         return cursor.getInt(TYPE_COLUMN);
     }
-}
+}
\ No newline at end of file
diff --git a/src/Notes-master3/app/src/main/java/net/micode/notes/ui/NotesListActivity.java b/src/Notes-master3/Notes-master3/app/src/main/java/net/micode/notes/ui/NotesListActivity.java
similarity index 98%
rename from src/Notes-master3/app/src/main/java/net/micode/notes/ui/NotesListActivity.java
rename to src/Notes-master3/Notes-master3/app/src/main/java/net/micode/notes/ui/NotesListActivity.java
index 3a1639d..1bd02be 100644
--- a/src/Notes-master3/app/src/main/java/net/micode/notes/ui/NotesListActivity.java
+++ b/src/Notes-master3/Notes-master3/app/src/main/java/net/micode/notes/ui/NotesListActivity.java
@@ -69,6 +69,8 @@ import java.util.HashSet;
 public class NotesListActivity extends Activity implements OnClickListener, OnItemLongClickListener {   //没有用特定的标签加注释。。。感觉没有什么用
     private static final int FOLDER_NOTE_LIST_QUERY_TOKEN = 0;
 
+    private  int mode=-1; /*首页背景切换*/
+
     private static final int FOLDER_LIST_QUERY_TOKEN      = 1;
 
     private static final int MENU_FOLDER_DELETE = 0;
@@ -132,6 +134,7 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt
         //final不能用于修饰构造方法。
         super.onCreate(savedInstanceState); // 调用父类的onCreate函数
         setContentView(R.layout.note_list);
+        getWindow().setBackgroundDrawableResource(R.drawable.grassland);
         initResources();
 
         /**
@@ -796,12 +799,25 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt
         } else {
             Log.e(TAG, "Wrong state:" + mState);
         }
+        if(mode==-1)
+            menu.findItem(R.id.menu_grassland).setVisible(false);
         return true;
     }
 
     @Override
     public boolean onOptionsItemSelected(MenuItem item) {
         switch (item.getItemId()) {
+            case R.id.menu_grassland:{
+                mode=-1;
+                getWindow().setBackgroundDrawableResource(R.drawable.grassland);
+                break;
+            }
+            case R.id.menu_cauc:{
+                mode=1;
+                getWindow().setBackgroundDrawableResource(R.drawable.cauc);
+                break;
+            }
+
             case R.id.menu_new_folder: {
                 showCreateOrModifyFolderDialog(true);
                 break;
diff --git a/src/Notes-master3/app/src/main/java/net/micode/notes/ui/NotesListAdapter.java b/src/Notes-master3/Notes-master3/app/src/main/java/net/micode/notes/ui/NotesListAdapter.java
similarity index 100%
rename from src/Notes-master3/app/src/main/java/net/micode/notes/ui/NotesListAdapter.java
rename to src/Notes-master3/Notes-master3/app/src/main/java/net/micode/notes/ui/NotesListAdapter.java
diff --git a/src/Notes-master3/app/src/main/java/net/micode/notes/ui/NotesListItem.java b/src/Notes-master3/Notes-master3/app/src/main/java/net/micode/notes/ui/NotesListItem.java
similarity index 100%
rename from src/Notes-master3/app/src/main/java/net/micode/notes/ui/NotesListItem.java
rename to src/Notes-master3/Notes-master3/app/src/main/java/net/micode/notes/ui/NotesListItem.java
diff --git a/src/Notes-master3/app/src/main/java/net/micode/notes/ui/NotesPreferenceActivity.java b/src/Notes-master3/Notes-master3/app/src/main/java/net/micode/notes/ui/NotesPreferenceActivity.java
similarity index 100%
rename from src/Notes-master3/app/src/main/java/net/micode/notes/ui/NotesPreferenceActivity.java
rename to src/Notes-master3/Notes-master3/app/src/main/java/net/micode/notes/ui/NotesPreferenceActivity.java
diff --git a/src/Notes-master3/app/src/main/java/net/micode/notes/widget/NoteWidgetProvider.java b/src/Notes-master3/Notes-master3/app/src/main/java/net/micode/notes/widget/NoteWidgetProvider.java
similarity index 100%
rename from src/Notes-master3/app/src/main/java/net/micode/notes/widget/NoteWidgetProvider.java
rename to src/Notes-master3/Notes-master3/app/src/main/java/net/micode/notes/widget/NoteWidgetProvider.java
diff --git a/src/Notes-master3/app/src/main/java/net/micode/notes/widget/NoteWidgetProvider_2x.java b/src/Notes-master3/Notes-master3/app/src/main/java/net/micode/notes/widget/NoteWidgetProvider_2x.java
similarity index 95%
rename from src/Notes-master3/app/src/main/java/net/micode/notes/widget/NoteWidgetProvider_2x.java
rename to src/Notes-master3/Notes-master3/app/src/main/java/net/micode/notes/widget/NoteWidgetProvider_2x.java
index e7d7933..722e8fc 100644
--- a/src/Notes-master3/app/src/main/java/net/micode/notes/widget/NoteWidgetProvider_2x.java
+++ b/src/Notes-master3/Notes-master3/app/src/main/java/net/micode/notes/widget/NoteWidgetProvider_2x.java
@@ -27,10 +27,11 @@ import net.micode.notes.tool.ResourceParser;
 //2倍大小的插件
 public class NoteWidgetProvider_2x extends NoteWidgetProvider {
     @Override
+    //重写更新方法
     public void onUpdate(Context context, AppWidgetManager appWidgetManager, int[] appWidgetIds) {
         super.update(context, appWidgetManager, appWidgetIds);
     }
-
+    //重写刷新Id方法
     @Override
     protected int getLayoutId() {
         return R.layout.widget_2x;
@@ -40,7 +41,7 @@ public class NoteWidgetProvider_2x extends NoteWidgetProvider {
     protected int getBgResourceId(int bgId) {
         return ResourceParser.WidgetBgResources.getWidget2xBgResource(bgId);
     }
-
+    //重写插件方法
     @Override
     protected int getWidgetType() {
         return Notes.TYPE_WIDGET_2X;
diff --git a/src/Notes-master3/app/src/main/java/net/micode/notes/widget/NoteWidgetProvider_4x.java b/src/Notes-master3/Notes-master3/app/src/main/java/net/micode/notes/widget/NoteWidgetProvider_4x.java
similarity index 98%
rename from src/Notes-master3/app/src/main/java/net/micode/notes/widget/NoteWidgetProvider_4x.java
rename to src/Notes-master3/Notes-master3/app/src/main/java/net/micode/notes/widget/NoteWidgetProvider_4x.java
index adfb6e1..de4fe2c 100644
--- a/src/Notes-master3/app/src/main/java/net/micode/notes/widget/NoteWidgetProvider_4x.java
+++ b/src/Notes-master3/Notes-master3/app/src/main/java/net/micode/notes/widget/NoteWidgetProvider_4x.java
@@ -25,6 +25,7 @@ import net.micode.notes.tool.ResourceParser;
 
 //4倍大小的插件
 public class NoteWidgetProvider_4x extends NoteWidgetProvider {
+    //重写更新方法
     @Override
     public void onUpdate(Context context, AppWidgetManager appWidgetManager, int[] appWidgetIds) {
         super.update(context, appWidgetManager, appWidgetIds);
diff --git a/src/Notes-master3/app/src/main/res/color/primary_text_dark.xml b/src/Notes-master3/Notes-master3/app/src/main/res/color/primary_text_dark.xml
similarity index 100%
rename from src/Notes-master3/app/src/main/res/color/primary_text_dark.xml
rename to src/Notes-master3/Notes-master3/app/src/main/res/color/primary_text_dark.xml
diff --git a/src/Notes-master3/app/src/main/res/color/secondary_text_dark.xml b/src/Notes-master3/Notes-master3/app/src/main/res/color/secondary_text_dark.xml
similarity index 100%
rename from src/Notes-master3/app/src/main/res/color/secondary_text_dark.xml
rename to src/Notes-master3/Notes-master3/app/src/main/res/color/secondary_text_dark.xml
diff --git a/src/Notes-master3/app/src/main/res/drawable-hdpi/bg_btn_set_color.png b/src/Notes-master3/Notes-master3/app/src/main/res/drawable-hdpi/bg_btn_set_color.png
similarity index 100%
rename from src/Notes-master3/app/src/main/res/drawable-hdpi/bg_btn_set_color.png
rename to src/Notes-master3/Notes-master3/app/src/main/res/drawable-hdpi/bg_btn_set_color.png
diff --git a/src/Notes-master3/app/src/main/res/drawable-hdpi/bg_color_btn_mask.png b/src/Notes-master3/Notes-master3/app/src/main/res/drawable-hdpi/bg_color_btn_mask.png
similarity index 100%
rename from src/Notes-master3/app/src/main/res/drawable-hdpi/bg_color_btn_mask.png
rename to src/Notes-master3/Notes-master3/app/src/main/res/drawable-hdpi/bg_color_btn_mask.png
diff --git a/src/Notes-master3/app/src/main/res/drawable-hdpi/call_record.png b/src/Notes-master3/Notes-master3/app/src/main/res/drawable-hdpi/call_record.png
similarity index 100%
rename from src/Notes-master3/app/src/main/res/drawable-hdpi/call_record.png
rename to src/Notes-master3/Notes-master3/app/src/main/res/drawable-hdpi/call_record.png
diff --git a/src/Notes-master3/Notes-master3/app/src/main/res/drawable-hdpi/cauc.png b/src/Notes-master3/Notes-master3/app/src/main/res/drawable-hdpi/cauc.png
new file mode 100644
index 0000000..c521cd4
Binary files /dev/null and b/src/Notes-master3/Notes-master3/app/src/main/res/drawable-hdpi/cauc.png differ
diff --git a/src/Notes-master3/app/src/main/res/drawable-hdpi/clock.png b/src/Notes-master3/Notes-master3/app/src/main/res/drawable-hdpi/clock.png
similarity index 100%
rename from src/Notes-master3/app/src/main/res/drawable-hdpi/clock.png
rename to src/Notes-master3/Notes-master3/app/src/main/res/drawable-hdpi/clock.png
diff --git a/src/Notes-master3/app/src/main/res/drawable-hdpi/delete.png b/src/Notes-master3/Notes-master3/app/src/main/res/drawable-hdpi/delete.png
similarity index 100%
rename from src/Notes-master3/app/src/main/res/drawable-hdpi/delete.png
rename to src/Notes-master3/Notes-master3/app/src/main/res/drawable-hdpi/delete.png
diff --git a/src/Notes-master3/app/src/main/res/drawable-hdpi/dropdown_icon.9.png b/src/Notes-master3/Notes-master3/app/src/main/res/drawable-hdpi/dropdown_icon.9.png
similarity index 100%
rename from src/Notes-master3/app/src/main/res/drawable-hdpi/dropdown_icon.9.png
rename to src/Notes-master3/Notes-master3/app/src/main/res/drawable-hdpi/dropdown_icon.9.png
diff --git a/src/Notes-master3/app/src/main/res/drawable-hdpi/edit_blue.9.png b/src/Notes-master3/Notes-master3/app/src/main/res/drawable-hdpi/edit_blue.9.png
similarity index 100%
rename from src/Notes-master3/app/src/main/res/drawable-hdpi/edit_blue.9.png
rename to src/Notes-master3/Notes-master3/app/src/main/res/drawable-hdpi/edit_blue.9.png
diff --git a/src/Notes-master3/app/src/main/res/drawable-hdpi/edit_green.9.png b/src/Notes-master3/Notes-master3/app/src/main/res/drawable-hdpi/edit_green.9.png
similarity index 100%
rename from src/Notes-master3/app/src/main/res/drawable-hdpi/edit_green.9.png
rename to src/Notes-master3/Notes-master3/app/src/main/res/drawable-hdpi/edit_green.9.png
diff --git a/src/Notes-master3/app/src/main/res/drawable-hdpi/edit_red.9.png b/src/Notes-master3/Notes-master3/app/src/main/res/drawable-hdpi/edit_red.9.png
similarity index 100%
rename from src/Notes-master3/app/src/main/res/drawable-hdpi/edit_red.9.png
rename to src/Notes-master3/Notes-master3/app/src/main/res/drawable-hdpi/edit_red.9.png
diff --git a/src/Notes-master3/app/src/main/res/drawable-hdpi/edit_title_blue.9.png b/src/Notes-master3/Notes-master3/app/src/main/res/drawable-hdpi/edit_title_blue.9.png
similarity index 100%
rename from src/Notes-master3/app/src/main/res/drawable-hdpi/edit_title_blue.9.png
rename to src/Notes-master3/Notes-master3/app/src/main/res/drawable-hdpi/edit_title_blue.9.png
diff --git a/src/Notes-master3/app/src/main/res/drawable-hdpi/edit_title_green.9.png b/src/Notes-master3/Notes-master3/app/src/main/res/drawable-hdpi/edit_title_green.9.png
similarity index 100%
rename from src/Notes-master3/app/src/main/res/drawable-hdpi/edit_title_green.9.png
rename to src/Notes-master3/Notes-master3/app/src/main/res/drawable-hdpi/edit_title_green.9.png
diff --git a/src/Notes-master3/app/src/main/res/drawable-hdpi/edit_title_red.9.png b/src/Notes-master3/Notes-master3/app/src/main/res/drawable-hdpi/edit_title_red.9.png
similarity index 100%
rename from src/Notes-master3/app/src/main/res/drawable-hdpi/edit_title_red.9.png
rename to src/Notes-master3/Notes-master3/app/src/main/res/drawable-hdpi/edit_title_red.9.png
diff --git a/src/Notes-master3/app/src/main/res/drawable-hdpi/edit_title_white.9.png b/src/Notes-master3/Notes-master3/app/src/main/res/drawable-hdpi/edit_title_white.9.png
similarity index 100%
rename from src/Notes-master3/app/src/main/res/drawable-hdpi/edit_title_white.9.png
rename to src/Notes-master3/Notes-master3/app/src/main/res/drawable-hdpi/edit_title_white.9.png
diff --git a/src/Notes-master3/app/src/main/res/drawable-hdpi/edit_title_yellow.9.png b/src/Notes-master3/Notes-master3/app/src/main/res/drawable-hdpi/edit_title_yellow.9.png
similarity index 100%
rename from src/Notes-master3/app/src/main/res/drawable-hdpi/edit_title_yellow.9.png
rename to src/Notes-master3/Notes-master3/app/src/main/res/drawable-hdpi/edit_title_yellow.9.png
diff --git a/src/Notes-master3/app/src/main/res/drawable-hdpi/edit_white.9.png b/src/Notes-master3/Notes-master3/app/src/main/res/drawable-hdpi/edit_white.9.png
similarity index 100%
rename from src/Notes-master3/app/src/main/res/drawable-hdpi/edit_white.9.png
rename to src/Notes-master3/Notes-master3/app/src/main/res/drawable-hdpi/edit_white.9.png
diff --git a/src/Notes-master3/app/src/main/res/drawable-hdpi/edit_yellow.9.png b/src/Notes-master3/Notes-master3/app/src/main/res/drawable-hdpi/edit_yellow.9.png
similarity index 100%
rename from src/Notes-master3/app/src/main/res/drawable-hdpi/edit_yellow.9.png
rename to src/Notes-master3/Notes-master3/app/src/main/res/drawable-hdpi/edit_yellow.9.png
diff --git a/src/Notes-master3/app/src/main/res/drawable-hdpi/font_large.png b/src/Notes-master3/Notes-master3/app/src/main/res/drawable-hdpi/font_large.png
similarity index 100%
rename from src/Notes-master3/app/src/main/res/drawable-hdpi/font_large.png
rename to src/Notes-master3/Notes-master3/app/src/main/res/drawable-hdpi/font_large.png
diff --git a/src/Notes-master3/app/src/main/res/drawable-hdpi/font_normal.png b/src/Notes-master3/Notes-master3/app/src/main/res/drawable-hdpi/font_normal.png
similarity index 100%
rename from src/Notes-master3/app/src/main/res/drawable-hdpi/font_normal.png
rename to src/Notes-master3/Notes-master3/app/src/main/res/drawable-hdpi/font_normal.png
diff --git a/src/Notes-master3/app/src/main/res/drawable-hdpi/font_size_selector_bg.9.png b/src/Notes-master3/Notes-master3/app/src/main/res/drawable-hdpi/font_size_selector_bg.9.png
similarity index 100%
rename from src/Notes-master3/app/src/main/res/drawable-hdpi/font_size_selector_bg.9.png
rename to src/Notes-master3/Notes-master3/app/src/main/res/drawable-hdpi/font_size_selector_bg.9.png
diff --git a/src/Notes-master3/app/src/main/res/drawable-hdpi/font_small.png b/src/Notes-master3/Notes-master3/app/src/main/res/drawable-hdpi/font_small.png
similarity index 100%
rename from src/Notes-master3/app/src/main/res/drawable-hdpi/font_small.png
rename to src/Notes-master3/Notes-master3/app/src/main/res/drawable-hdpi/font_small.png
diff --git a/src/Notes-master3/app/src/main/res/drawable-hdpi/font_super.png b/src/Notes-master3/Notes-master3/app/src/main/res/drawable-hdpi/font_super.png
similarity index 100%
rename from src/Notes-master3/app/src/main/res/drawable-hdpi/font_super.png
rename to src/Notes-master3/Notes-master3/app/src/main/res/drawable-hdpi/font_super.png
diff --git a/src/Notes-master3/Notes-master3/app/src/main/res/drawable-hdpi/grassland.jpg b/src/Notes-master3/Notes-master3/app/src/main/res/drawable-hdpi/grassland.jpg
new file mode 100644
index 0000000..7eb2c50
Binary files /dev/null and b/src/Notes-master3/Notes-master3/app/src/main/res/drawable-hdpi/grassland.jpg differ
diff --git a/src/Notes-master3/app/src/main/res/drawable-hdpi/icon_app.png b/src/Notes-master3/Notes-master3/app/src/main/res/drawable-hdpi/icon_app.png
similarity index 100%
rename from src/Notes-master3/app/src/main/res/drawable-hdpi/icon_app.png
rename to src/Notes-master3/Notes-master3/app/src/main/res/drawable-hdpi/icon_app.png
diff --git a/src/Notes-master3/Notes-master3/app/src/main/res/drawable-hdpi/ikun.png b/src/Notes-master3/Notes-master3/app/src/main/res/drawable-hdpi/ikun.png
new file mode 100644
index 0000000..316b7ef
Binary files /dev/null and b/src/Notes-master3/Notes-master3/app/src/main/res/drawable-hdpi/ikun.png differ
diff --git a/src/Notes-master3/app/src/main/res/drawable-hdpi/list_background.png b/src/Notes-master3/Notes-master3/app/src/main/res/drawable-hdpi/list_background.png
similarity index 100%
rename from src/Notes-master3/app/src/main/res/drawable-hdpi/list_background.png
rename to src/Notes-master3/Notes-master3/app/src/main/res/drawable-hdpi/list_background.png
diff --git a/src/Notes-master3/app/src/main/res/drawable-hdpi/list_blue_down.9.png b/src/Notes-master3/Notes-master3/app/src/main/res/drawable-hdpi/list_blue_down.9.png
similarity index 100%
rename from src/Notes-master3/app/src/main/res/drawable-hdpi/list_blue_down.9.png
rename to src/Notes-master3/Notes-master3/app/src/main/res/drawable-hdpi/list_blue_down.9.png
diff --git a/src/Notes-master3/app/src/main/res/drawable-hdpi/list_blue_middle.9.png b/src/Notes-master3/Notes-master3/app/src/main/res/drawable-hdpi/list_blue_middle.9.png
similarity index 100%
rename from src/Notes-master3/app/src/main/res/drawable-hdpi/list_blue_middle.9.png
rename to src/Notes-master3/Notes-master3/app/src/main/res/drawable-hdpi/list_blue_middle.9.png
diff --git a/src/Notes-master3/app/src/main/res/drawable-hdpi/list_blue_single.9.png b/src/Notes-master3/Notes-master3/app/src/main/res/drawable-hdpi/list_blue_single.9.png
similarity index 100%
rename from src/Notes-master3/app/src/main/res/drawable-hdpi/list_blue_single.9.png
rename to src/Notes-master3/Notes-master3/app/src/main/res/drawable-hdpi/list_blue_single.9.png
diff --git a/src/Notes-master3/app/src/main/res/drawable-hdpi/list_blue_up.9.png b/src/Notes-master3/Notes-master3/app/src/main/res/drawable-hdpi/list_blue_up.9.png
similarity index 100%
rename from src/Notes-master3/app/src/main/res/drawable-hdpi/list_blue_up.9.png
rename to src/Notes-master3/Notes-master3/app/src/main/res/drawable-hdpi/list_blue_up.9.png
diff --git a/src/Notes-master3/app/src/main/res/drawable-hdpi/list_folder.9.png b/src/Notes-master3/Notes-master3/app/src/main/res/drawable-hdpi/list_folder.9.png
similarity index 100%
rename from src/Notes-master3/app/src/main/res/drawable-hdpi/list_folder.9.png
rename to src/Notes-master3/Notes-master3/app/src/main/res/drawable-hdpi/list_folder.9.png
diff --git a/src/Notes-master3/app/src/main/res/drawable-hdpi/list_footer_bg.9.png b/src/Notes-master3/Notes-master3/app/src/main/res/drawable-hdpi/list_footer_bg.9.png
similarity index 100%
rename from src/Notes-master3/app/src/main/res/drawable-hdpi/list_footer_bg.9.png
rename to src/Notes-master3/Notes-master3/app/src/main/res/drawable-hdpi/list_footer_bg.9.png
diff --git a/src/Notes-master3/app/src/main/res/drawable-hdpi/list_green_down.9.png b/src/Notes-master3/Notes-master3/app/src/main/res/drawable-hdpi/list_green_down.9.png
similarity index 100%
rename from src/Notes-master3/app/src/main/res/drawable-hdpi/list_green_down.9.png
rename to src/Notes-master3/Notes-master3/app/src/main/res/drawable-hdpi/list_green_down.9.png
diff --git a/src/Notes-master3/app/src/main/res/drawable-hdpi/list_green_middle.9.png b/src/Notes-master3/Notes-master3/app/src/main/res/drawable-hdpi/list_green_middle.9.png
similarity index 100%
rename from src/Notes-master3/app/src/main/res/drawable-hdpi/list_green_middle.9.png
rename to src/Notes-master3/Notes-master3/app/src/main/res/drawable-hdpi/list_green_middle.9.png
diff --git a/src/Notes-master3/app/src/main/res/drawable-hdpi/list_green_single.9.png b/src/Notes-master3/Notes-master3/app/src/main/res/drawable-hdpi/list_green_single.9.png
similarity index 100%
rename from src/Notes-master3/app/src/main/res/drawable-hdpi/list_green_single.9.png
rename to src/Notes-master3/Notes-master3/app/src/main/res/drawable-hdpi/list_green_single.9.png
diff --git a/src/Notes-master3/app/src/main/res/drawable-hdpi/list_green_up.9.png b/src/Notes-master3/Notes-master3/app/src/main/res/drawable-hdpi/list_green_up.9.png
similarity index 100%
rename from src/Notes-master3/app/src/main/res/drawable-hdpi/list_green_up.9.png
rename to src/Notes-master3/Notes-master3/app/src/main/res/drawable-hdpi/list_green_up.9.png
diff --git a/src/Notes-master3/app/src/main/res/drawable-hdpi/list_red_down.9.png b/src/Notes-master3/Notes-master3/app/src/main/res/drawable-hdpi/list_red_down.9.png
similarity index 100%
rename from src/Notes-master3/app/src/main/res/drawable-hdpi/list_red_down.9.png
rename to src/Notes-master3/Notes-master3/app/src/main/res/drawable-hdpi/list_red_down.9.png
diff --git a/src/Notes-master3/app/src/main/res/drawable-hdpi/list_red_middle.9.png b/src/Notes-master3/Notes-master3/app/src/main/res/drawable-hdpi/list_red_middle.9.png
similarity index 100%
rename from src/Notes-master3/app/src/main/res/drawable-hdpi/list_red_middle.9.png
rename to src/Notes-master3/Notes-master3/app/src/main/res/drawable-hdpi/list_red_middle.9.png
diff --git a/src/Notes-master3/app/src/main/res/drawable-hdpi/list_red_single.9.png b/src/Notes-master3/Notes-master3/app/src/main/res/drawable-hdpi/list_red_single.9.png
similarity index 100%
rename from src/Notes-master3/app/src/main/res/drawable-hdpi/list_red_single.9.png
rename to src/Notes-master3/Notes-master3/app/src/main/res/drawable-hdpi/list_red_single.9.png
diff --git a/src/Notes-master3/app/src/main/res/drawable-hdpi/list_red_up.9.png b/src/Notes-master3/Notes-master3/app/src/main/res/drawable-hdpi/list_red_up.9.png
similarity index 100%
rename from src/Notes-master3/app/src/main/res/drawable-hdpi/list_red_up.9.png
rename to src/Notes-master3/Notes-master3/app/src/main/res/drawable-hdpi/list_red_up.9.png
diff --git a/src/Notes-master3/app/src/main/res/drawable-hdpi/list_white_down.9.png b/src/Notes-master3/Notes-master3/app/src/main/res/drawable-hdpi/list_white_down.9.png
similarity index 100%
rename from src/Notes-master3/app/src/main/res/drawable-hdpi/list_white_down.9.png
rename to src/Notes-master3/Notes-master3/app/src/main/res/drawable-hdpi/list_white_down.9.png
diff --git a/src/Notes-master3/app/src/main/res/drawable-hdpi/list_white_middle.9.png b/src/Notes-master3/Notes-master3/app/src/main/res/drawable-hdpi/list_white_middle.9.png
similarity index 100%
rename from src/Notes-master3/app/src/main/res/drawable-hdpi/list_white_middle.9.png
rename to src/Notes-master3/Notes-master3/app/src/main/res/drawable-hdpi/list_white_middle.9.png
diff --git a/src/Notes-master3/app/src/main/res/drawable-hdpi/list_white_single.9.png b/src/Notes-master3/Notes-master3/app/src/main/res/drawable-hdpi/list_white_single.9.png
similarity index 100%
rename from src/Notes-master3/app/src/main/res/drawable-hdpi/list_white_single.9.png
rename to src/Notes-master3/Notes-master3/app/src/main/res/drawable-hdpi/list_white_single.9.png
diff --git a/src/Notes-master3/app/src/main/res/drawable-hdpi/list_white_up.9.png b/src/Notes-master3/Notes-master3/app/src/main/res/drawable-hdpi/list_white_up.9.png
similarity index 100%
rename from src/Notes-master3/app/src/main/res/drawable-hdpi/list_white_up.9.png
rename to src/Notes-master3/Notes-master3/app/src/main/res/drawable-hdpi/list_white_up.9.png
diff --git a/src/Notes-master3/app/src/main/res/drawable-hdpi/list_yellow_down.9.png b/src/Notes-master3/Notes-master3/app/src/main/res/drawable-hdpi/list_yellow_down.9.png
similarity index 100%
rename from src/Notes-master3/app/src/main/res/drawable-hdpi/list_yellow_down.9.png
rename to src/Notes-master3/Notes-master3/app/src/main/res/drawable-hdpi/list_yellow_down.9.png
diff --git a/src/Notes-master3/app/src/main/res/drawable-hdpi/list_yellow_middle.9.png b/src/Notes-master3/Notes-master3/app/src/main/res/drawable-hdpi/list_yellow_middle.9.png
similarity index 100%
rename from src/Notes-master3/app/src/main/res/drawable-hdpi/list_yellow_middle.9.png
rename to src/Notes-master3/Notes-master3/app/src/main/res/drawable-hdpi/list_yellow_middle.9.png
diff --git a/src/Notes-master3/app/src/main/res/drawable-hdpi/list_yellow_single.9.png b/src/Notes-master3/Notes-master3/app/src/main/res/drawable-hdpi/list_yellow_single.9.png
similarity index 100%
rename from src/Notes-master3/app/src/main/res/drawable-hdpi/list_yellow_single.9.png
rename to src/Notes-master3/Notes-master3/app/src/main/res/drawable-hdpi/list_yellow_single.9.png
diff --git a/src/Notes-master3/app/src/main/res/drawable-hdpi/list_yellow_up.9.png b/src/Notes-master3/Notes-master3/app/src/main/res/drawable-hdpi/list_yellow_up.9.png
similarity index 100%
rename from src/Notes-master3/app/src/main/res/drawable-hdpi/list_yellow_up.9.png
rename to src/Notes-master3/Notes-master3/app/src/main/res/drawable-hdpi/list_yellow_up.9.png
diff --git a/src/Notes-master3/app/src/main/res/drawable-hdpi/menu_delete.png b/src/Notes-master3/Notes-master3/app/src/main/res/drawable-hdpi/menu_delete.png
similarity index 100%
rename from src/Notes-master3/app/src/main/res/drawable-hdpi/menu_delete.png
rename to src/Notes-master3/Notes-master3/app/src/main/res/drawable-hdpi/menu_delete.png
diff --git a/src/Notes-master3/app/src/main/res/drawable-hdpi/menu_move.png b/src/Notes-master3/Notes-master3/app/src/main/res/drawable-hdpi/menu_move.png
similarity index 100%
rename from src/Notes-master3/app/src/main/res/drawable-hdpi/menu_move.png
rename to src/Notes-master3/Notes-master3/app/src/main/res/drawable-hdpi/menu_move.png
diff --git a/src/Notes-master3/app/src/main/res/drawable-hdpi/new_note_normal.png b/src/Notes-master3/Notes-master3/app/src/main/res/drawable-hdpi/new_note_normal.png
similarity index 100%
rename from src/Notes-master3/app/src/main/res/drawable-hdpi/new_note_normal.png
rename to src/Notes-master3/Notes-master3/app/src/main/res/drawable-hdpi/new_note_normal.png
diff --git a/src/Notes-master3/app/src/main/res/drawable-hdpi/new_note_pressed.png b/src/Notes-master3/Notes-master3/app/src/main/res/drawable-hdpi/new_note_pressed.png
similarity index 100%
rename from src/Notes-master3/app/src/main/res/drawable-hdpi/new_note_pressed.png
rename to src/Notes-master3/Notes-master3/app/src/main/res/drawable-hdpi/new_note_pressed.png
diff --git a/src/Notes-master3/app/src/main/res/drawable-hdpi/note_edit_color_selector_panel.png b/src/Notes-master3/Notes-master3/app/src/main/res/drawable-hdpi/note_edit_color_selector_panel.png
similarity index 100%
rename from src/Notes-master3/app/src/main/res/drawable-hdpi/note_edit_color_selector_panel.png
rename to src/Notes-master3/Notes-master3/app/src/main/res/drawable-hdpi/note_edit_color_selector_panel.png
diff --git a/src/Notes-master3/app/src/main/res/drawable-hdpi/notification.png b/src/Notes-master3/Notes-master3/app/src/main/res/drawable-hdpi/notification.png
similarity index 100%
rename from src/Notes-master3/app/src/main/res/drawable-hdpi/notification.png
rename to src/Notes-master3/Notes-master3/app/src/main/res/drawable-hdpi/notification.png
diff --git a/src/Notes-master3/app/src/main/res/drawable-hdpi/search_result.png b/src/Notes-master3/Notes-master3/app/src/main/res/drawable-hdpi/search_result.png
similarity index 100%
rename from src/Notes-master3/app/src/main/res/drawable-hdpi/search_result.png
rename to src/Notes-master3/Notes-master3/app/src/main/res/drawable-hdpi/search_result.png
diff --git a/src/Notes-master3/app/src/main/res/drawable-hdpi/selected.png b/src/Notes-master3/Notes-master3/app/src/main/res/drawable-hdpi/selected.png
similarity index 100%
rename from src/Notes-master3/app/src/main/res/drawable-hdpi/selected.png
rename to src/Notes-master3/Notes-master3/app/src/main/res/drawable-hdpi/selected.png
diff --git a/src/Notes-master3/app/src/main/res/drawable-hdpi/title_alert.png b/src/Notes-master3/Notes-master3/app/src/main/res/drawable-hdpi/title_alert.png
similarity index 100%
rename from src/Notes-master3/app/src/main/res/drawable-hdpi/title_alert.png
rename to src/Notes-master3/Notes-master3/app/src/main/res/drawable-hdpi/title_alert.png
diff --git a/src/Notes-master3/app/src/main/res/drawable-hdpi/title_bar_bg.9.png b/src/Notes-master3/Notes-master3/app/src/main/res/drawable-hdpi/title_bar_bg.9.png
similarity index 100%
rename from src/Notes-master3/app/src/main/res/drawable-hdpi/title_bar_bg.9.png
rename to src/Notes-master3/Notes-master3/app/src/main/res/drawable-hdpi/title_bar_bg.9.png
diff --git a/src/Notes-master3/app/src/main/res/drawable-hdpi/widget_2x_blue.png b/src/Notes-master3/Notes-master3/app/src/main/res/drawable-hdpi/widget_2x_blue.png
similarity index 100%
rename from src/Notes-master3/app/src/main/res/drawable-hdpi/widget_2x_blue.png
rename to src/Notes-master3/Notes-master3/app/src/main/res/drawable-hdpi/widget_2x_blue.png
diff --git a/src/Notes-master3/app/src/main/res/drawable-hdpi/widget_2x_green.png b/src/Notes-master3/Notes-master3/app/src/main/res/drawable-hdpi/widget_2x_green.png
similarity index 100%
rename from src/Notes-master3/app/src/main/res/drawable-hdpi/widget_2x_green.png
rename to src/Notes-master3/Notes-master3/app/src/main/res/drawable-hdpi/widget_2x_green.png
diff --git a/src/Notes-master3/app/src/main/res/drawable-hdpi/widget_2x_red.png b/src/Notes-master3/Notes-master3/app/src/main/res/drawable-hdpi/widget_2x_red.png
similarity index 100%
rename from src/Notes-master3/app/src/main/res/drawable-hdpi/widget_2x_red.png
rename to src/Notes-master3/Notes-master3/app/src/main/res/drawable-hdpi/widget_2x_red.png
diff --git a/src/Notes-master3/app/src/main/res/drawable-hdpi/widget_2x_white.png b/src/Notes-master3/Notes-master3/app/src/main/res/drawable-hdpi/widget_2x_white.png
similarity index 100%
rename from src/Notes-master3/app/src/main/res/drawable-hdpi/widget_2x_white.png
rename to src/Notes-master3/Notes-master3/app/src/main/res/drawable-hdpi/widget_2x_white.png
diff --git a/src/Notes-master3/app/src/main/res/drawable-hdpi/widget_2x_yellow.png b/src/Notes-master3/Notes-master3/app/src/main/res/drawable-hdpi/widget_2x_yellow.png
similarity index 100%
rename from src/Notes-master3/app/src/main/res/drawable-hdpi/widget_2x_yellow.png
rename to src/Notes-master3/Notes-master3/app/src/main/res/drawable-hdpi/widget_2x_yellow.png
diff --git a/src/Notes-master3/app/src/main/res/drawable-hdpi/widget_4x_blue.png b/src/Notes-master3/Notes-master3/app/src/main/res/drawable-hdpi/widget_4x_blue.png
similarity index 100%
rename from src/Notes-master3/app/src/main/res/drawable-hdpi/widget_4x_blue.png
rename to src/Notes-master3/Notes-master3/app/src/main/res/drawable-hdpi/widget_4x_blue.png
diff --git a/src/Notes-master3/app/src/main/res/drawable-hdpi/widget_4x_green.png b/src/Notes-master3/Notes-master3/app/src/main/res/drawable-hdpi/widget_4x_green.png
similarity index 100%
rename from src/Notes-master3/app/src/main/res/drawable-hdpi/widget_4x_green.png
rename to src/Notes-master3/Notes-master3/app/src/main/res/drawable-hdpi/widget_4x_green.png
diff --git a/src/Notes-master3/app/src/main/res/drawable-hdpi/widget_4x_red.png b/src/Notes-master3/Notes-master3/app/src/main/res/drawable-hdpi/widget_4x_red.png
similarity index 100%
rename from src/Notes-master3/app/src/main/res/drawable-hdpi/widget_4x_red.png
rename to src/Notes-master3/Notes-master3/app/src/main/res/drawable-hdpi/widget_4x_red.png
diff --git a/src/Notes-master3/app/src/main/res/drawable-hdpi/widget_4x_white.png b/src/Notes-master3/Notes-master3/app/src/main/res/drawable-hdpi/widget_4x_white.png
similarity index 100%
rename from src/Notes-master3/app/src/main/res/drawable-hdpi/widget_4x_white.png
rename to src/Notes-master3/Notes-master3/app/src/main/res/drawable-hdpi/widget_4x_white.png
diff --git a/src/Notes-master3/app/src/main/res/drawable-hdpi/widget_4x_yellow.png b/src/Notes-master3/Notes-master3/app/src/main/res/drawable-hdpi/widget_4x_yellow.png
similarity index 100%
rename from src/Notes-master3/app/src/main/res/drawable-hdpi/widget_4x_yellow.png
rename to src/Notes-master3/Notes-master3/app/src/main/res/drawable-hdpi/widget_4x_yellow.png
diff --git a/src/Notes-master3/app/src/main/res/drawable/new_note.xml b/src/Notes-master3/Notes-master3/app/src/main/res/drawable/new_note.xml
similarity index 100%
rename from src/Notes-master3/app/src/main/res/drawable/new_note.xml
rename to src/Notes-master3/Notes-master3/app/src/main/res/drawable/new_note.xml
diff --git a/src/Notes-master3/app/src/main/res/layout/account_dialog_title.xml b/src/Notes-master3/Notes-master3/app/src/main/res/layout/account_dialog_title.xml
similarity index 100%
rename from src/Notes-master3/app/src/main/res/layout/account_dialog_title.xml
rename to src/Notes-master3/Notes-master3/app/src/main/res/layout/account_dialog_title.xml
diff --git a/src/Notes-master3/Notes-master3/app/src/main/res/layout/activity_login.xml b/src/Notes-master3/Notes-master3/app/src/main/res/layout/activity_login.xml
new file mode 100644
index 0000000..0a3d4b8
--- /dev/null
+++ b/src/Notes-master3/Notes-master3/app/src/main/res/layout/activity_login.xml
@@ -0,0 +1,76 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+              xmlns:app="http://schemas.android.com/apk/res-auto"
+              xmlns:tools="http://schemas.android.com/tools"
+              android:layout_width="match_parent"
+              android:layout_height="match_parent"
+              tools:context=".ui.LoginActivity"
+              android:orientation="vertical">
+
+    <LinearLayout
+            android:orientation="horizontal"
+            android:layout_width="match_parent"
+            android:layout_height="60dp"
+            android:layout_gravity="center">
+        <TextView
+                android:layout_width="90dp"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_vertical"
+                android:textSize="18sp"
+                android:text="@string/prompt_account" />
+
+        <EditText
+                android:id="@+id/account"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:layout_gravity="center_vertical" />
+
+    </LinearLayout>
+
+    <LinearLayout
+            android:orientation="horizontal"
+            android:layout_width="match_parent"
+            android:layout_height="60dp"
+            android:layout_gravity="center">
+
+        <TextView
+                android:layout_width="90dp"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_vertical"
+                android:text="@string/prompt_password"
+                android:textSize="18sp" />
+
+        <EditText
+                android:id="@+id/password"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:layout_gravity="center_vertical"
+                android:inputType="textPassword" />
+
+    </LinearLayout>
+
+
+    <LinearLayout
+            android:orientation="horizontal"
+            android:layout_width="match_parent"
+            android:layout_height="60dp"
+            android:layout_gravity="center">
+
+        <Button
+                android:id="@+id/login"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:text="@string/prompt_login" />
+        <Button
+                android:id="@+id/cancel"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:text="@string/cancel" />
+    </LinearLayout>
+
+
+</LinearLayout>
\ No newline at end of file
diff --git a/src/Notes-master3/app/src/main/res/layout/add_account_text.xml b/src/Notes-master3/Notes-master3/app/src/main/res/layout/add_account_text.xml
similarity index 100%
rename from src/Notes-master3/app/src/main/res/layout/add_account_text.xml
rename to src/Notes-master3/Notes-master3/app/src/main/res/layout/add_account_text.xml
diff --git a/src/Notes-master3/app/src/main/res/layout/datetime_picker.xml b/src/Notes-master3/Notes-master3/app/src/main/res/layout/datetime_picker.xml
similarity index 100%
rename from src/Notes-master3/app/src/main/res/layout/datetime_picker.xml
rename to src/Notes-master3/Notes-master3/app/src/main/res/layout/datetime_picker.xml
diff --git a/src/Notes-master3/app/src/main/res/layout/dialog_edit_text.xml b/src/Notes-master3/Notes-master3/app/src/main/res/layout/dialog_edit_text.xml
similarity index 100%
rename from src/Notes-master3/app/src/main/res/layout/dialog_edit_text.xml
rename to src/Notes-master3/Notes-master3/app/src/main/res/layout/dialog_edit_text.xml
diff --git a/src/Notes-master3/app/src/main/res/layout/folder_list_item.xml b/src/Notes-master3/Notes-master3/app/src/main/res/layout/folder_list_item.xml
similarity index 100%
rename from src/Notes-master3/app/src/main/res/layout/folder_list_item.xml
rename to src/Notes-master3/Notes-master3/app/src/main/res/layout/folder_list_item.xml
diff --git a/src/Notes-master3/app/src/main/res/layout/note_edit.xml b/src/Notes-master3/Notes-master3/app/src/main/res/layout/note_edit.xml
similarity index 100%
rename from src/Notes-master3/app/src/main/res/layout/note_edit.xml
rename to src/Notes-master3/Notes-master3/app/src/main/res/layout/note_edit.xml
diff --git a/src/Notes-master3/app/src/main/res/layout/note_edit_list_item.xml b/src/Notes-master3/Notes-master3/app/src/main/res/layout/note_edit_list_item.xml
similarity index 100%
rename from src/Notes-master3/app/src/main/res/layout/note_edit_list_item.xml
rename to src/Notes-master3/Notes-master3/app/src/main/res/layout/note_edit_list_item.xml
diff --git a/src/Notes-master3/app/src/main/res/layout/note_item.xml b/src/Notes-master3/Notes-master3/app/src/main/res/layout/note_item.xml
similarity index 100%
rename from src/Notes-master3/app/src/main/res/layout/note_item.xml
rename to src/Notes-master3/Notes-master3/app/src/main/res/layout/note_item.xml
diff --git a/src/Notes-master3/app/src/main/res/layout/note_list.xml b/src/Notes-master3/Notes-master3/app/src/main/res/layout/note_list.xml
similarity index 95%
rename from src/Notes-master3/app/src/main/res/layout/note_list.xml
rename to src/Notes-master3/Notes-master3/app/src/main/res/layout/note_list.xml
index 6b25d38..82f4bb5 100644
--- a/src/Notes-master3/app/src/main/res/layout/note_list.xml
+++ b/src/Notes-master3/Notes-master3/app/src/main/res/layout/note_list.xml
@@ -18,8 +18,9 @@
 <FrameLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="fill_parent"
-    android:layout_height="fill_parent"
-    android:background="@drawable/list_background">
+    android:layout_height="fill_parent">
+
+<!--    android:background="@drawable/list_background">-->
 
     <LinearLayout
         android:layout_width="fill_parent"
diff --git a/src/Notes-master3/app/src/main/res/layout/note_list_dropdown_menu.xml b/src/Notes-master3/Notes-master3/app/src/main/res/layout/note_list_dropdown_menu.xml
similarity index 100%
rename from src/Notes-master3/app/src/main/res/layout/note_list_dropdown_menu.xml
rename to src/Notes-master3/Notes-master3/app/src/main/res/layout/note_list_dropdown_menu.xml
diff --git a/src/Notes-master3/app/src/main/res/layout/note_list_footer.xml b/src/Notes-master3/Notes-master3/app/src/main/res/layout/note_list_footer.xml
similarity index 100%
rename from src/Notes-master3/app/src/main/res/layout/note_list_footer.xml
rename to src/Notes-master3/Notes-master3/app/src/main/res/layout/note_list_footer.xml
diff --git a/src/Notes-master3/app/src/main/res/layout/settings_header.xml b/src/Notes-master3/Notes-master3/app/src/main/res/layout/settings_header.xml
similarity index 100%
rename from src/Notes-master3/app/src/main/res/layout/settings_header.xml
rename to src/Notes-master3/Notes-master3/app/src/main/res/layout/settings_header.xml
diff --git a/src/Notes-master3/app/src/main/res/layout/widget_2x.xml b/src/Notes-master3/Notes-master3/app/src/main/res/layout/widget_2x.xml
similarity index 100%
rename from src/Notes-master3/app/src/main/res/layout/widget_2x.xml
rename to src/Notes-master3/Notes-master3/app/src/main/res/layout/widget_2x.xml
diff --git a/src/Notes-master3/app/src/main/res/layout/widget_4x.xml b/src/Notes-master3/Notes-master3/app/src/main/res/layout/widget_4x.xml
similarity index 100%
rename from src/Notes-master3/app/src/main/res/layout/widget_4x.xml
rename to src/Notes-master3/Notes-master3/app/src/main/res/layout/widget_4x.xml
diff --git a/src/Notes-master3/app/src/main/res/menu/call_note_edit.xml b/src/Notes-master3/Notes-master3/app/src/main/res/menu/call_note_edit.xml
similarity index 100%
rename from src/Notes-master3/app/src/main/res/menu/call_note_edit.xml
rename to src/Notes-master3/Notes-master3/app/src/main/res/menu/call_note_edit.xml
diff --git a/src/Notes-master3/app/src/main/res/menu/call_record_folder.xml b/src/Notes-master3/Notes-master3/app/src/main/res/menu/call_record_folder.xml
similarity index 100%
rename from src/Notes-master3/app/src/main/res/menu/call_record_folder.xml
rename to src/Notes-master3/Notes-master3/app/src/main/res/menu/call_record_folder.xml
diff --git a/src/Notes-master3/app/src/main/res/menu/note_edit.xml b/src/Notes-master3/Notes-master3/app/src/main/res/menu/note_edit.xml
similarity index 100%
rename from src/Notes-master3/app/src/main/res/menu/note_edit.xml
rename to src/Notes-master3/Notes-master3/app/src/main/res/menu/note_edit.xml
diff --git a/src/Notes-master3/app/src/main/res/menu/note_list.xml b/src/Notes-master3/Notes-master3/app/src/main/res/menu/note_list.xml
similarity index 86%
rename from src/Notes-master3/app/src/main/res/menu/note_list.xml
rename to src/Notes-master3/Notes-master3/app/src/main/res/menu/note_list.xml
index 42ea736..2120c54 100644
--- a/src/Notes-master3/app/src/main/res/menu/note_list.xml
+++ b/src/Notes-master3/Notes-master3/app/src/main/res/menu/note_list.xml
@@ -36,4 +36,11 @@
     <item
         android:id="@+id/menu_search"
         android:title="@string/menu_search"/>
+    <item
+        android:id="@+id/menu_grassland"
+        android:title="@string/menu_grassland"/>
+
+    <item
+        android:id="@+id/menu_cauc"
+        android:title="@string/menu_cauc"/>
 </menu>
diff --git a/src/Notes-master3/app/src/main/res/menu/note_list_dropdown.xml b/src/Notes-master3/Notes-master3/app/src/main/res/menu/note_list_dropdown.xml
similarity index 100%
rename from src/Notes-master3/app/src/main/res/menu/note_list_dropdown.xml
rename to src/Notes-master3/Notes-master3/app/src/main/res/menu/note_list_dropdown.xml
diff --git a/src/Notes-master3/app/src/main/res/menu/note_list_options.xml b/src/Notes-master3/Notes-master3/app/src/main/res/menu/note_list_options.xml
similarity index 100%
rename from src/Notes-master3/app/src/main/res/menu/note_list_options.xml
rename to src/Notes-master3/Notes-master3/app/src/main/res/menu/note_list_options.xml
diff --git a/src/Notes-master3/app/src/main/res/menu/sub_folder.xml b/src/Notes-master3/Notes-master3/app/src/main/res/menu/sub_folder.xml
similarity index 100%
rename from src/Notes-master3/app/src/main/res/menu/sub_folder.xml
rename to src/Notes-master3/Notes-master3/app/src/main/res/menu/sub_folder.xml
diff --git a/src/Notes-master3/app/src/main/res/raw-zh-rCN/introduction b/src/Notes-master3/Notes-master3/app/src/main/res/raw-zh-rCN/introduction
similarity index 100%
rename from src/Notes-master3/app/src/main/res/raw-zh-rCN/introduction
rename to src/Notes-master3/Notes-master3/app/src/main/res/raw-zh-rCN/introduction
diff --git a/src/Notes-master3/app/src/main/res/raw/introduction b/src/Notes-master3/Notes-master3/app/src/main/res/raw/introduction
similarity index 100%
rename from src/Notes-master3/app/src/main/res/raw/introduction
rename to src/Notes-master3/Notes-master3/app/src/main/res/raw/introduction
diff --git a/src/Notes-master3/app/src/main/res/values-zh-rCN/arrays.xml b/src/Notes-master3/Notes-master3/app/src/main/res/values-zh-rCN/arrays.xml
similarity index 100%
rename from src/Notes-master3/app/src/main/res/values-zh-rCN/arrays.xml
rename to src/Notes-master3/Notes-master3/app/src/main/res/values-zh-rCN/arrays.xml
diff --git a/src/Notes-master3/app/src/main/res/values-zh-rCN/strings.xml b/src/Notes-master3/Notes-master3/app/src/main/res/values-zh-rCN/strings.xml
similarity index 98%
rename from src/Notes-master3/app/src/main/res/values-zh-rCN/strings.xml
rename to src/Notes-master3/Notes-master3/app/src/main/res/values-zh-rCN/strings.xml
index 09f75ed..bde2f67 100644
--- a/src/Notes-master3/app/src/main/res/values-zh-rCN/strings.xml
+++ b/src/Notes-master3/Notes-master3/app/src/main/res/values-zh-rCN/strings.xml
@@ -36,6 +36,10 @@
     <string name="note_link_web">浏览网页</string>
     <string name="note_link_other">打开地图</string>
     <!-- note list string -->
+
+    <!-- 背景切换 -->
+
+    <string name="menu_grassland">Background: grassland</string>
     <string name="menu_create_folder">新建文件夹</string>
     <string name="menu_export_text">导出文本</string>
     <string name="menu_sync">同步</string>
diff --git a/src/Notes-master3/app/src/main/res/values-zh-rTW/arrays.xml b/src/Notes-master3/Notes-master3/app/src/main/res/values-zh-rTW/arrays.xml
similarity index 100%
rename from src/Notes-master3/app/src/main/res/values-zh-rTW/arrays.xml
rename to src/Notes-master3/Notes-master3/app/src/main/res/values-zh-rTW/arrays.xml
diff --git a/src/Notes-master3/app/src/main/res/values-zh-rTW/strings.xml b/src/Notes-master3/Notes-master3/app/src/main/res/values-zh-rTW/strings.xml
similarity index 100%
rename from src/Notes-master3/app/src/main/res/values-zh-rTW/strings.xml
rename to src/Notes-master3/Notes-master3/app/src/main/res/values-zh-rTW/strings.xml
diff --git a/src/Notes-master3/app/src/main/res/values/arrays.xml b/src/Notes-master3/Notes-master3/app/src/main/res/values/arrays.xml
similarity index 100%
rename from src/Notes-master3/app/src/main/res/values/arrays.xml
rename to src/Notes-master3/Notes-master3/app/src/main/res/values/arrays.xml
diff --git a/src/Notes-master3/app/src/main/res/values/colors.xml b/src/Notes-master3/Notes-master3/app/src/main/res/values/colors.xml
similarity index 100%
rename from src/Notes-master3/app/src/main/res/values/colors.xml
rename to src/Notes-master3/Notes-master3/app/src/main/res/values/colors.xml
diff --git a/src/Notes-master3/app/src/main/res/values/dimens.xml b/src/Notes-master3/Notes-master3/app/src/main/res/values/dimens.xml
similarity index 100%
rename from src/Notes-master3/app/src/main/res/values/dimens.xml
rename to src/Notes-master3/Notes-master3/app/src/main/res/values/dimens.xml
diff --git a/src/Notes-master3/app/src/main/res/values/strings.xml b/src/Notes-master3/Notes-master3/app/src/main/res/values/strings.xml
similarity index 89%
rename from src/Notes-master3/app/src/main/res/values/strings.xml
rename to src/Notes-master3/Notes-master3/app/src/main/res/values/strings.xml
index 55df868..fb4c936 100644
--- a/src/Notes-master3/app/src/main/res/values/strings.xml
+++ b/src/Notes-master3/Notes-master3/app/src/main/res/values/strings.xml
@@ -16,7 +16,7 @@
 -->
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+           xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2" xmlns:tools="http://schemas.android.com/tools">
     <string name="app_name">Notes</string>
     <string name="app_widget2x2">Notes 2x2</string>
     <string name="app_widget4x4">Notes 4x4</string>
@@ -39,6 +39,12 @@
     <string name="file_path">/MIUI/notes/</string>
     <string name="file_name_txt_format">notes_%s.txt</string>
     <!-- notes list string -->
+
+    <!-- 背景切换 -->
+    <string name="menu_grassland">Background: grassland</string>
+    <string name="menu_cauc">Background: cauc</string>
+
+
     <string name="format_folder_files_count">(%d)</string>
     <string name="menu_create_folder">New Folder</string>
     <string name="menu_export_text">Export text</string>
@@ -125,9 +131,16 @@
     <string name="search_setting_description">Text in your notes</string>
     <string name="search">Notes</string>
     <string name="datetime_dialog_ok">set</string>
-    <string name="datetime_dialog_cancel">cancel</string>
+    <string name="datetime_dialog_cancel" tools:ignore="ButtonCase">cancel</string>
+    <string name="prompt_account" translatable="false">账户</string>
+    <string name="prompt_password" translatable="false">密码</string>
+    <string name="prompt_login" translatable="false">登录</string>
+    <string name="cancel" translatable="false">取消</string>
+    <string name="Loading" translatable="false">正在登陆.....</string>
+    <string name="invalid" translatable="false">无效账号</string>
+    <string name="app_already_quit" translatable="false">app_already_quit</string>
     <plurals name="search_results_title">
-         <item quantity="one"><xliff:g id="number" example="1">%1$s</xliff:g> result for \"<xliff:g id="search" example="???">%2$s</xliff:g>\"</item>
+        <item quantity="one"><xliff:g id="number" example="1">%1$s</xliff:g> result for \"<xliff:g id="search" example="???">%2$s</xliff:g>\"</item>
         <!-- Case of 0 or 2 or more results. -->
         <item quantity="other"><xliff:g id="number" example="15">%1$s</xliff:g> results for \"<xliff:g id="search" example="???">%2$s</xliff:g>\"</item>
     </plurals>
diff --git a/src/Notes-master3/app/src/main/res/values/styles.xml b/src/Notes-master3/Notes-master3/app/src/main/res/values/styles.xml
similarity index 97%
rename from src/Notes-master3/app/src/main/res/values/styles.xml
rename to src/Notes-master3/Notes-master3/app/src/main/res/values/styles.xml
index d750e65..ad0d90d 100644
--- a/src/Notes-master3/app/src/main/res/values/styles.xml
+++ b/src/Notes-master3/Notes-master3/app/src/main/res/values/styles.xml
@@ -64,6 +64,6 @@
 
     <style name="NoteActionBarStyle" parent="@android:style/Widget.Holo.Light.ActionBar.Solid">
         <item name="android:displayOptions" />
-        <item name="android:visibility">gone</item>
+        <item name="android:visibility">visible</item>
     </style>
 </resources>
\ No newline at end of file
diff --git a/src/Notes-master3/app/src/main/res/xml/preferences.xml b/src/Notes-master3/Notes-master3/app/src/main/res/xml/preferences.xml
similarity index 100%
rename from src/Notes-master3/app/src/main/res/xml/preferences.xml
rename to src/Notes-master3/Notes-master3/app/src/main/res/xml/preferences.xml
diff --git a/src/Notes-master3/app/src/main/res/xml/searchable.xml b/src/Notes-master3/Notes-master3/app/src/main/res/xml/searchable.xml
similarity index 100%
rename from src/Notes-master3/app/src/main/res/xml/searchable.xml
rename to src/Notes-master3/Notes-master3/app/src/main/res/xml/searchable.xml
diff --git a/src/Notes-master3/app/src/main/res/xml/widget_2x_info.xml b/src/Notes-master3/Notes-master3/app/src/main/res/xml/widget_2x_info.xml
similarity index 100%
rename from src/Notes-master3/app/src/main/res/xml/widget_2x_info.xml
rename to src/Notes-master3/Notes-master3/app/src/main/res/xml/widget_2x_info.xml
diff --git a/src/Notes-master3/app/src/main/res/xml/widget_4x_info.xml b/src/Notes-master3/Notes-master3/app/src/main/res/xml/widget_4x_info.xml
similarity index 100%
rename from src/Notes-master3/app/src/main/res/xml/widget_4x_info.xml
rename to src/Notes-master3/Notes-master3/app/src/main/res/xml/widget_4x_info.xml
diff --git a/src/Notes-master3/build.gradle b/src/Notes-master3/Notes-master3/build.gradle
similarity index 100%
rename from src/Notes-master3/build.gradle
rename to src/Notes-master3/Notes-master3/build.gradle
diff --git a/src/Notes-master3/gradle/wrapper/gradle-wrapper.jar b/src/Notes-master3/Notes-master3/gradle/wrapper/gradle-wrapper.jar
similarity index 100%
rename from src/Notes-master3/gradle/wrapper/gradle-wrapper.jar
rename to src/Notes-master3/Notes-master3/gradle/wrapper/gradle-wrapper.jar
diff --git a/src/Notes-master3/gradle/wrapper/gradle-wrapper.properties b/src/Notes-master3/Notes-master3/gradle/wrapper/gradle-wrapper.properties
similarity index 100%
rename from src/Notes-master3/gradle/wrapper/gradle-wrapper.properties
rename to src/Notes-master3/Notes-master3/gradle/wrapper/gradle-wrapper.properties
diff --git a/src/Notes-master3/gradlew b/src/Notes-master3/Notes-master3/gradlew
similarity index 100%
rename from src/Notes-master3/gradlew
rename to src/Notes-master3/Notes-master3/gradlew
diff --git a/src/Notes-master3/gradlew.bat b/src/Notes-master3/Notes-master3/gradlew.bat
similarity index 100%
rename from src/Notes-master3/gradlew.bat
rename to src/Notes-master3/Notes-master3/gradlew.bat
diff --git a/src/Notes-master3/import-summary.txt b/src/Notes-master3/Notes-master3/import-summary.txt
similarity index 100%
rename from src/Notes-master3/import-summary.txt
rename to src/Notes-master3/Notes-master3/import-summary.txt
diff --git a/src/Notes-master3/local.properties b/src/Notes-master3/Notes-master3/local.properties
similarity index 91%
rename from src/Notes-master3/local.properties
rename to src/Notes-master3/Notes-master3/local.properties
index 52eeac6..250aa63 100644
--- a/src/Notes-master3/local.properties
+++ b/src/Notes-master3/Notes-master3/local.properties
@@ -4,5 +4,5 @@
 # Location of the SDK. This is only used by Gradle.
 # For customization when using a Version Control System, please read the
 # header note.
-#Fri Apr 21 16:03:21 CST 2023
+#Mon Jun 05 21:53:07 CST 2023
 sdk.dir=C\:\\Users\\13293\\AppData\\Local\\Android\\Sdk
diff --git a/src/Notes-master3/settings.gradle b/src/Notes-master3/Notes-master3/settings.gradle
similarity index 100%
rename from src/Notes-master3/settings.gradle
rename to src/Notes-master3/Notes-master3/settings.gradle
diff --git a/src/Notes-master3/app/build/intermediates/apk_ide_redirect_file/debug/redirect.txt b/src/Notes-master3/app/build/intermediates/apk_ide_redirect_file/debug/redirect.txt
deleted file mode 100644
index 66652a5..0000000
--- a/src/Notes-master3/app/build/intermediates/apk_ide_redirect_file/debug/redirect.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-#- File Locator -
-listingFile=../../../outputs/apk/debug/output-metadata.json
diff --git a/src/Notes-master3/app/build/intermediates/compile_and_runtime_not_namespaced_r_class_jar/debug/R.jar b/src/Notes-master3/app/build/intermediates/compile_and_runtime_not_namespaced_r_class_jar/debug/R.jar
deleted file mode 100644
index a54964f..0000000
Binary files a/src/Notes-master3/app/build/intermediates/compile_and_runtime_not_namespaced_r_class_jar/debug/R.jar and /dev/null differ
diff --git a/src/Notes-master3/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_0/graph.bin b/src/Notes-master3/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_0/graph.bin
deleted file mode 100644
index 2ae66eb..0000000
Binary files a/src/Notes-master3/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_0/graph.bin and /dev/null differ
diff --git a/src/Notes-master3/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_1/graph.bin b/src/Notes-master3/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_1/graph.bin
deleted file mode 100644
index 938c1e0..0000000
Binary files a/src/Notes-master3/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_1/graph.bin and /dev/null differ
diff --git a/src/Notes-master3/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_2/graph.bin b/src/Notes-master3/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_2/graph.bin
deleted file mode 100644
index 5a6f4bb..0000000
Binary files a/src/Notes-master3/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_2/graph.bin and /dev/null differ
diff --git a/src/Notes-master3/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_3/graph.bin b/src/Notes-master3/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_3/graph.bin
deleted file mode 100644
index a87e0a8..0000000
Binary files a/src/Notes-master3/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_3/graph.bin and /dev/null differ
diff --git a/src/Notes-master3/app/build/intermediates/dex/debug/mergeDexDebug/classes.dex b/src/Notes-master3/app/build/intermediates/dex/debug/mergeDexDebug/classes.dex
deleted file mode 100644
index a060762..0000000
Binary files a/src/Notes-master3/app/build/intermediates/dex/debug/mergeDexDebug/classes.dex and /dev/null differ
diff --git a/src/Notes-master3/app/build/intermediates/dex_archive_input_jar_hashes/debug/out b/src/Notes-master3/app/build/intermediates/dex_archive_input_jar_hashes/debug/out
deleted file mode 100644
index 3f0e0c6..0000000
Binary files a/src/Notes-master3/app/build/intermediates/dex_archive_input_jar_hashes/debug/out and /dev/null differ
diff --git a/src/Notes-master3/app/build/intermediates/incremental/mergeDebugAssets/merger.xml b/src/Notes-master3/app/build/intermediates/incremental/mergeDebugAssets/merger.xml
deleted file mode 100644
index c679f74..0000000
--- a/src/Notes-master3/app/build/intermediates/incremental/mergeDebugAssets/merger.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\assets"/><source path="C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\build\intermediates\shader_assets\debug\out"/></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\debug\assets"/></dataSet></merger>
\ No newline at end of file
diff --git a/src/Notes-master3/app/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml b/src/Notes-master3/app/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml
deleted file mode 100644
index 505788a..0000000
--- a/src/Notes-master3/app/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\jniLibs"/></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\debug\jniLibs"/></dataSet></merger>
\ No newline at end of file
diff --git a/src/Notes-master3/app/build/intermediates/incremental/mergeDebugShaders/merger.xml b/src/Notes-master3/app/build/intermediates/incremental/mergeDebugShaders/merger.xml
deleted file mode 100644
index a30015a..0000000
--- a/src/Notes-master3/app/build/intermediates/incremental/mergeDebugShaders/merger.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\shaders"/></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\debug\shaders"/></dataSet></merger>
\ No newline at end of file
diff --git a/src/Notes-master3/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt b/src/Notes-master3/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt
deleted file mode 100644
index 25a0bab..0000000
--- a/src/Notes-master3/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-#Fri May 19 14:20:05 CST 2023
-base.0=C\:\\Users\\13293\\Desktop\\Git\\gitProject\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\dex\\debug\\mergeDexDebug\\classes.dex
-renamed.0=classes.dex
-path.0=classes.dex
diff --git a/src/Notes-master3/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/androidResources b/src/Notes-master3/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/androidResources
deleted file mode 100644
index 3895627..0000000
Binary files a/src/Notes-master3/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/androidResources and /dev/null differ
diff --git a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$NoteBgResources.class b/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$NoteBgResources.class
deleted file mode 100644
index f1053bc..0000000
Binary files a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$NoteBgResources.class and /dev/null differ
diff --git a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity.class b/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity.class
deleted file mode 100644
index ad7cce4..0000000
Binary files a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity.class and /dev/null differ
diff --git a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity.class b/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity.class
deleted file mode 100644
index 95c7b5b..0000000
Binary files a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity.class and /dev/null differ
diff --git a/src/Notes-master3/app/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt b/src/Notes-master3/app/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt
deleted file mode 100644
index bc3dc32..0000000
--- a/src/Notes-master3/app/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt
+++ /dev/null
@@ -1,284 +0,0 @@
-1<?xml version="1.0" encoding="utf-8"?>
-2<!--
-3 Copyright (c) 2010-2011, The MiCode Open Source Community (www.micode.net)
-4
-5     Licensed under the Apache License, Version 2.0 (the "License");
-6     you may not use this file except in compliance with the License.
-7     You may obtain a copy of the License at
-8
-9          http://www.apache.org/licenses/LICENSE-2.0
-10
-11     Unless required by applicable law or agreed to in writing, software
-12     distributed under the License is distributed on an "AS IS" BASIS,
-13     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-14     See the License for the specific language governing permissions and
-15     limitations under the License.
-16-->
-17<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-18    package="net.micode.notes"
-19    android:versionCode="1"
-20    android:versionName="0.1" >
-21
-22    <uses-sdk
-22-->C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:24:5-25:42
-23        android:minSdkVersion="14"
-23-->C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:24:15-41
-24        android:targetSdkVersion="33" />
-24-->C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:24:5-25:42
-25
-26    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
-26-->C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:27:5-81
-26-->C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:27:22-78
-27    <uses-permission android:name="com.android.launcher.permission.INSTALL_SHORTCUT" />
-27-->C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:28:5-88
-27-->C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:28:22-85
-28    <uses-permission android:name="android.permission.INTERNET" />
-28-->C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:29:5-67
-28-->C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:29:22-64
-29    <uses-permission android:name="android.permission.READ_CONTACTS" />
-29-->C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:30:5-72
-29-->C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:30:22-69
-30    <uses-permission android:name="android.permission.MANAGE_ACCOUNTS" />
-30-->C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:31:5-74
-30-->C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:31:22-71
-31    <uses-permission android:name="android.permission.AUTHENTICATE_ACCOUNTS" />
-31-->C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:32:5-80
-31-->C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:32:22-77
-32    <uses-permission android:name="android.permission.GET_ACCOUNTS" />
-32-->C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:33:5-71
-32-->C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:33:22-68
-33    <uses-permission android:name="android.permission.USE_CREDENTIALS" />
-33-->C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:34:5-74
-33-->C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:34:22-71
-34    <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
-34-->C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:35:5-81
-34-->C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:35:22-78
-35
-36    <application
-36-->C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:37:5-158:19
-37        android:debuggable="true"
-38        android:icon="@drawable/icon_app"
-38-->C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:38:9-42
-39        android:label="@string/app_name" >
-39-->C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:39:9-41
-40        <activity
-40-->C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:40:9-53:20
-41            android:name="net.micode.notes.ui.NotesListActivity"
-41-->C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:41:13-49
-42            android:configChanges="keyboardHidden|orientation|screenSize"
-42-->C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:42:13-74
-43            android:exported="true"
-43-->C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:43:13-36
-44            android:launchMode="singleTop"
-44-->C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:44:13-43
-45            android:theme="@style/NoteTheme"
-45-->C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:45:13-45
-46            android:uiOptions="splitActionBarWhenNarrow"
-46-->C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:46:13-57
-47            android:windowSoftInputMode="adjustPan" >
-47-->C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:47:13-52
-48            <intent-filter>
-48-->C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:49:13-52:29
-49                <action android:name="android.intent.action.MAIN" />
-49-->C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:50:17-69
-49-->C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:50:25-66
-50
-51                <category android:name="android.intent.category.LAUNCHER" />
-51-->C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:51:17-77
-51-->C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:51:27-74
-52            </intent-filter>
-53        </activity>
-54        <activity
-54-->C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:55:9-85:20
-55            android:name="net.micode.notes.ui.NoteEditActivity"
-55-->C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:56:13-48
-56            android:configChanges="keyboardHidden|orientation|screenSize"
-56-->C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:57:13-74
-57            android:exported="true"
-57-->C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:60:13-36
-58            android:launchMode="singleTop"
-58-->C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:58:13-43
-59            android:theme="@style/NoteTheme" >
-59-->C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:59:13-45
-60            <intent-filter android:scheme="http" >
-60-->C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:62:13-68:29
-60-->C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:62:28-49
-61                <action android:name="android.intent.action.VIEW" />
-61-->C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:64:17-69
-61-->C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:64:25-66
-62
-63                <category android:name="android.intent.category.DEFAULT" />
-63-->C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:65:17-76
-63-->C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:65:27-73
-64
-65                <data android:mimeType="vnd.android.cursor.item/text_note" />
-65-->C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:66:17-78
-65-->C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:66:23-75
-66                <data android:mimeType="vnd.android.cursor.item/call_note" />
-66-->C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:66:17-78
-66-->C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:66:23-75
-67            </intent-filter>
-68            <intent-filter>
-68-->C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:70:13-75:29
-69                <action android:name="android.intent.action.INSERT_OR_EDIT" />
-69-->C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:71:17-79
-69-->C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:71:25-76
-70
-71                <category android:name="android.intent.category.DEFAULT" />
-71-->C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:65:17-76
-71-->C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:65:27-73
-72
-73                <data android:mimeType="vnd.android.cursor.item/text_note" />
-73-->C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:66:17-78
-73-->C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:66:23-75
-74                <data android:mimeType="vnd.android.cursor.item/call_note" />
-74-->C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:66:17-78
-74-->C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:66:23-75
-75            </intent-filter>
-76            <intent-filter>
-76-->C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:77:13-80:29
-77                <action android:name="android.intent.action.SEARCH" />
-77-->C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:78:17-71
-77-->C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:78:25-68
-78
-79                <category android:name="android.intent.category.DEFAULT" />
-79-->C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:65:17-76
-79-->C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:65:27-73
-80            </intent-filter>
-81
-82            <meta-data
-82-->C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:82:13-84:54
-83                android:name="android.app.searchable"
-83-->C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:83:17-54
-84                android:resource="@xml/searchable" />
-84-->C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:84:17-51
-85        </activity>
-86
-87        <provider
-87-->C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:87:9-91:40
-88            android:name="net.micode.notes.data.NotesProvider"
-88-->C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:88:13-63
-89            android:authorities="micode_notes"
-89-->C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:89:13-47
-90            android:exported="false"
-90-->C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:91:13-37
-91            android:multiprocess="true" />
-91-->C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:90:13-40
-92
-93        <receiver
-93-->C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:93:9-106:20
-94            android:name="net.micode.notes.widget.NoteWidgetProvider_2x"
-94-->C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:94:13-57
-95            android:exported="true"
-95-->C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:96:13-36
-96            android:label="@string/app_widget2x2" >
-96-->C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:95:13-50
-97            <intent-filter>
-97-->C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:97:13-101:29
-98                <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
-98-->C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:98:17-84
-98-->C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:98:25-81
-99                <action android:name="android.appwidget.action.APPWIDGET_DELETED" />
-99-->C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:99:17-85
-99-->C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:99:25-82
-100                <action android:name="android.intent.action.PRIVACY_MODE_CHANGED" />
-100-->C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:100:17-85
-100-->C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:100:25-82
-101            </intent-filter>
-102
-103            <meta-data
-103-->C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:103:13-105:58
-104                android:name="android.appwidget.provider"
-104-->C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:104:17-58
-105                android:resource="@xml/widget_2x_info" />
-105-->C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:105:17-55
-106        </receiver>
-107        <receiver
-107-->C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:107:9-121:20
-108            android:name="net.micode.notes.widget.NoteWidgetProvider_4x"
-108-->C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:108:13-57
-109            android:exported="true"
-109-->C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:110:13-36
-110            android:label="@string/app_widget4x4" >
-110-->C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:109:13-50
-111            <intent-filter>
-111-->C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:97:13-101:29
-112                <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
-112-->C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:98:17-84
-112-->C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:98:25-81
-113                <action android:name="android.appwidget.action.APPWIDGET_DELETED" />
-113-->C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:99:17-85
-113-->C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:99:25-82
-114                <action android:name="android.intent.action.PRIVACY_MODE_CHANGED" />
-114-->C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:100:17-85
-114-->C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:100:25-82
-115            </intent-filter>
-116
-117            <meta-data
-117-->C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:103:13-105:58
-118                android:name="android.appwidget.provider"
-118-->C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:104:17-58
-119                android:resource="@xml/widget_4x_info" />
-119-->C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:105:17-55
-120        </receiver>
-121        <receiver
-121-->C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:123:9-128:20
-122            android:name="net.micode.notes.ui.AlarmInitReceiver"
-122-->C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:123:19-55
-123            android:exported="true" >
-123-->C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:124:13-36
-124            <intent-filter>
-124-->C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:125:13-127:29
-125                <action android:name="android.intent.action.BOOT_COMPLETED" />
-125-->C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:126:17-79
-125-->C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:126:25-76
-126            </intent-filter>
-127        </receiver>
-128        <receiver
-128-->C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:130:9-133:20
-129            android:name="net.micode.notes.ui.AlarmReceiver"
-129-->C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:131:13-61
-130            android:process=":remote" >
-130-->C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:132:13-38
-131        </receiver>
-132
-133        <activity
-133-->C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:135:9-141:20
-134            android:name="net.micode.notes.ui.AlarmAlertActivity"
-134-->C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:136:13-50
-135            android:label="@string/app_name"
-135-->C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:137:13-45
-136            android:launchMode="singleInstance"
-136-->C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:138:13-48
-137            android:theme="@android:style/Theme.Holo.Wallpaper.NoTitleBar" >
-137-->C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:139:13-75
-138        </activity>
-139        <activity
-139-->C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:143:9-148:20
-140            android:name="net.micode.notes.ui.NotesPreferenceActivity"
-140-->C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:144:13-71
-141            android:label="@string/preferences_title"
-141-->C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:145:13-54
-142            android:launchMode="singleTop"
-142-->C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:146:13-43
-143            android:theme="@android:style/Theme.Holo.Light" >
-143-->C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:147:13-60
-144        </activity>
-145
-146        <service
-146-->C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:150:9-153:19
-147            android:name="net.micode.notes.gtask.remote.GTaskSyncService"
-147-->C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:151:13-74
-148            android:exported="false" >
-148-->C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:152:13-37
-149        </service>
-150
-151        <meta-data
-151-->C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:155:9-157:52
-152            android:name="android.app.default_searchable"
-152-->C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:156:13-58
-153            android:value=".ui.NoteEditActivity" />
-153-->C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:157:13-49
-154    </application>
-155
-156</manifest>
diff --git a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/3b39a0f8c9a74077ddf9126288e67b5aee0b290a2f74293e2d6f45ae0690b824_1.jar b/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/3b39a0f8c9a74077ddf9126288e67b5aee0b290a2f74293e2d6f45ae0690b824_1.jar
deleted file mode 100644
index 90fedfb..0000000
Binary files a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/3b39a0f8c9a74077ddf9126288e67b5aee0b290a2f74293e2d6f45ae0690b824_1.jar and /dev/null differ
diff --git a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/NotesDatabaseHelper$TABLE.dex b/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/NotesDatabaseHelper$TABLE.dex
deleted file mode 100644
index 3fe4a9b..0000000
Binary files a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/NotesDatabaseHelper$TABLE.dex and /dev/null differ
diff --git a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/DataUtils.dex b/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/DataUtils.dex
deleted file mode 100644
index 5ed9619..0000000
Binary files a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/DataUtils.dex and /dev/null differ
diff --git a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser$NoteBgResources.dex b/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser$NoteBgResources.dex
deleted file mode 100644
index ffbb9b0..0000000
Binary files a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser$NoteBgResources.dex and /dev/null differ
diff --git a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser$NoteItemBgResources.dex b/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser$NoteItemBgResources.dex
deleted file mode 100644
index b6a3528..0000000
Binary files a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser$NoteItemBgResources.dex and /dev/null differ
diff --git a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser$WidgetBgResources.dex b/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser$WidgetBgResources.dex
deleted file mode 100644
index 869e07c..0000000
Binary files a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser$WidgetBgResources.dex and /dev/null differ
diff --git a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser.dex b/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser.dex
deleted file mode 100644
index f67c640..0000000
Binary files a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser.dex and /dev/null differ
diff --git a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/FoldersListAdapter.dex b/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/FoldersListAdapter.dex
deleted file mode 100644
index d339f97..0000000
Binary files a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/FoldersListAdapter.dex and /dev/null differ
diff --git a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$2.dex b/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$2.dex
deleted file mode 100644
index 213abb6..0000000
Binary files a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$2.dex and /dev/null differ
diff --git a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$HeadViewHolder.dex b/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$HeadViewHolder.dex
deleted file mode 100644
index 60573ff..0000000
Binary files a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$HeadViewHolder.dex and /dev/null differ
diff --git a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity.dex b/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity.dex
deleted file mode 100644
index 14c1054..0000000
Binary files a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity.dex and /dev/null differ
diff --git a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditText.dex b/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditText.dex
deleted file mode 100644
index c94758c..0000000
Binary files a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditText.dex and /dev/null differ
diff --git a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$NewNoteOnTouchListener.dex b/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$NewNoteOnTouchListener.dex
deleted file mode 100644
index 82fff81..0000000
Binary files a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$NewNoteOnTouchListener.dex and /dev/null differ
diff --git a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity.dex b/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity.dex
deleted file mode 100644
index 1cec24d..0000000
Binary files a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity.dex and /dev/null differ
diff --git a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$4.dex b/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$4.dex
deleted file mode 100644
index dd33519..0000000
Binary files a/src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$4.dex and /dev/null differ
diff --git a/src/Notes-master3/app/build/intermediates/runtime_symbol_list/debug/R.txt b/src/Notes-master3/app/build/intermediates/runtime_symbol_list/debug/R.txt
deleted file mode 100644
index 00d6e91..0000000
--- a/src/Notes-master3/app/build/intermediates/runtime_symbol_list/debug/R.txt
+++ /dev/null
@@ -1,283 +0,0 @@
-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/src/Notes-master3/app/build/intermediates/signing_config_versions/debug/signing-config-versions.json b/src/Notes-master3/app/build/intermediates/signing_config_versions/debug/signing-config-versions.json
deleted file mode 100644
index bb4deaa..0000000
--- a/src/Notes-master3/app/build/intermediates/signing_config_versions/debug/signing-config-versions.json
+++ /dev/null
@@ -1 +0,0 @@
-{"enableV1Signing":true,"enableV2Signing":true,"enableV3Signing":false,"enableV4Signing":false}
\ No newline at end of file
diff --git a/src/Notes-master3/app/build/intermediates/source_set_path_map/debug/file-map.txt b/src/Notes-master3/app/build/intermediates/source_set_path_map/debug/file-map.txt
deleted file mode 100644
index 10df681..0000000
--- a/src/Notes-master3/app/build/intermediates/source_set_path_map/debug/file-map.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-net.micode.notes.app-pngs-0 C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\build\generated\res\pngs\debug
-net.micode.notes.app-resValues-1 C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\build\generated\res\resValues\debug
-net.micode.notes.app-rs-2 C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\build\generated\res\rs\debug
-net.micode.notes.app-mergeDebugResources-3 C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\build\intermediates\incremental\debug\mergeDebugResources\merged.dir
-net.micode.notes.app-mergeDebugResources-4 C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\build\intermediates\incremental\debug\mergeDebugResources\stripped.dir
-net.micode.notes.app-merged_res-5 C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\build\intermediates\merged_res\debug
-net.micode.notes.app-debug-6 C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\debug\res
-net.micode.notes.app-main-7 C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\res
diff --git a/src/Notes-master3/app/build/intermediates/stable_resource_ids_file/debug/stableIds.txt b/src/Notes-master3/app/build/intermediates/stable_resource_ids_file/debug/stableIds.txt
deleted file mode 100644
index 4461006..0000000
--- a/src/Notes-master3/app/build/intermediates/stable_resource_ids_file/debug/stableIds.txt
+++ /dev/null
@@ -1,283 +0,0 @@
-net.micode.notes:xml/widget_4x_info = 0x7f0c0003
-net.micode.notes:xml/preferences = 0x7f0c0000
-net.micode.notes:style/TextAppearanceSecondaryItem = 0x7f0b0008
-net.micode.notes:style/TextAppearanceNormal = 0x7f0b0006
-net.micode.notes:style/TextAppearanceLarge = 0x7f0b0004
-net.micode.notes:style/HighlightTextAppearancePrimary = 0x7f0b0000
-net.micode.notes:string/widget_havenot_content = 0x7f0a0064
-net.micode.notes:string/ticker_syncing = 0x7f0a0063
-net.micode.notes:string/ticker_success = 0x7f0a0062
-net.micode.notes:style/HighlightTextAppearanceSecondary = 0x7f0b0001
-net.micode.notes:string/ticker_cancel = 0x7f0a0060
-net.micode.notes:string/sync_progress_syncing = 0x7f0a005f
-net.micode.notes:string/sync_progress_init_list = 0x7f0a005d
-net.micode.notes:string/search_label = 0x7f0a0058
-net.micode.notes:string/preferences_toast_success_set_accout = 0x7f0a0055
-net.micode.notes:string/preferences_toast_cannot_change_account = 0x7f0a0054
-net.micode.notes:string/preferences_title = 0x7f0a0053
-net.micode.notes:string/preferences_menu_remove_account = 0x7f0a0052
-net.micode.notes:style/NoteActionBarStyle = 0x7f0b0002
-net.micode.notes:string/preferences_menu_change_account = 0x7f0a0051
-net.micode.notes:string/preferences_menu_cancel = 0x7f0a0050
-net.micode.notes:string/preferences_last_sync_time = 0x7f0a004e
-net.micode.notes:string/preferences_dialog_select_account_title = 0x7f0a004d
-net.micode.notes:string/preferences_dialog_change_account_warn_msg = 0x7f0a004b
-net.micode.notes:string/preferences_button_sync_immediately = 0x7f0a0049
-net.micode.notes:string/preferences_button_sync_cancel = 0x7f0a0048
-net.micode.notes:string/preferences_account_summary = 0x7f0a0044
-net.micode.notes:string/success_sdcard_export = 0x7f0a005b
-net.micode.notes:string/notelist_string_info = 0x7f0a0043
-net.micode.notes:string/notelist_menu_new = 0x7f0a0042
-net.micode.notes:string/notealert_ok = 0x7f0a0041
-net.micode.notes:string/notealert_enter = 0x7f0a0040
-net.micode.notes:string/note_link_web = 0x7f0a003f
-net.micode.notes:string/note_link_tel = 0x7f0a003e
-net.micode.notes:string/note_link_other = 0x7f0a003d
-net.micode.notes:string/note_link_email = 0x7f0a003c
-net.micode.notes:string/note_alert_expired = 0x7f0a003b
-net.micode.notes:string/menu_sync_cancel = 0x7f0a0039
-net.micode.notes:string/menu_sync = 0x7f0a0038
-net.micode.notes:string/menu_share = 0x7f0a0037
-net.micode.notes:string/menu_select_title = 0x7f0a0034
-net.micode.notes:style/TextAppearanceMedium = 0x7f0b0005
-net.micode.notes:string/menu_select_none = 0x7f0a0033
-net.micode.notes:string/menu_title_select_folder = 0x7f0a003a
-net.micode.notes:string/menu_select_all = 0x7f0a0032
-net.micode.notes:string/menu_search = 0x7f0a0031
-net.micode.notes:string/menu_remove_remind = 0x7f0a0030
-net.micode.notes:string/menu_normal_mode = 0x7f0a002f
-net.micode.notes:string/menu_move_parent_folder = 0x7f0a002e
-net.micode.notes:string/menu_move = 0x7f0a002d
-net.micode.notes:string/menu_list_mode = 0x7f0a002c
-net.micode.notes:string/menu_font_super = 0x7f0a002b
-net.micode.notes:string/menu_font_small = 0x7f0a002a
-net.micode.notes:string/menu_folder_change_name = 0x7f0a0024
-net.micode.notes:string/menu_export_text = 0x7f0a0023
-net.micode.notes:string/menu_deselect_all = 0x7f0a0022
-net.micode.notes:string/menu_create_folder = 0x7f0a0020
-net.micode.notes:style/TextAppearancePrimaryItem = 0x7f0b0007
-net.micode.notes:string/folder_exist = 0x7f0a0017
-net.micode.notes:string/hint_foler_name = 0x7f0a001d
-net.micode.notes:string/format_date_ymd = 0x7f0a0018
-net.micode.notes:string/file_path = 0x7f0a0016
-net.micode.notes:string/set_remind_time_message = 0x7f0a005a
-net.micode.notes:string/error_sync_network = 0x7f0a0013
-net.micode.notes:string/error_sdcard_unmounted = 0x7f0a0010
-net.micode.notes:string/datetime_dialog_ok = 0x7f0a000a
-net.micode.notes:string/datetime_dialog_cancel = 0x7f0a0009
-net.micode.notes:drawable/list_green_up = 0x7f040020
-net.micode.notes:string/call_record_folder_name = 0x7f0a0008
-net.micode.notes:drawable/new_note_normal = 0x7f040030
-net.micode.notes:string/button_delete = 0x7f0a0007
-net.micode.notes:string/app_widget2x2 = 0x7f0a0005
-net.micode.notes:string/menu_font_normal = 0x7f0a0028
-net.micode.notes:string/format_exported_file_location = 0x7f0a001a
-net.micode.notes:raw/introduction = 0x7f090000
-net.micode.notes:string/delete_remind_time_message = 0x7f0a000b
-net.micode.notes:dimen/text_font_size_super = 0x7f030004
-net.micode.notes:drawable/selected = 0x7f040035
-net.micode.notes:plurals/search_results_title = 0x7f080000
-net.micode.notes:menu/sub_folder = 0x7f070006
-net.micode.notes:menu/note_edit = 0x7f070002
-net.micode.notes:style/TextAppearanceSuper = 0x7f0b0009
-net.micode.notes:color/secondary_text_dark = 0x7f020001
-net.micode.notes:id/move = 0x7f05002e
-net.micode.notes:id/iv_bg_yellow_select = 0x7f050017
-net.micode.notes:menu/call_note_edit = 0x7f070000
-net.micode.notes:drawable/new_note_pressed = 0x7f040031
-net.micode.notes:id/iv_bg_blue = 0x7f05000e
-net.micode.notes:layout/settings_header = 0x7f06000b
-net.micode.notes:layout/note_list = 0x7f060008
-net.micode.notes:drawable/list_white_single = 0x7f040027
-net.micode.notes:layout/note_item = 0x7f060007
-net.micode.notes:xml/widget_2x_info = 0x7f0c0002
-net.micode.notes:string/alert_message_delete_folder = 0x7f0a0000
-net.micode.notes:layout/datetime_picker = 0x7f060002
-net.micode.notes:id/btn_new_note = 0x7f050004
-net.micode.notes:layout/note_list_footer = 0x7f06000a
-net.micode.notes:id/widget_text = 0x7f050042
-net.micode.notes:id/tv_title_bar = 0x7f050040
-net.micode.notes:drawable/widget_2x_blue = 0x7f040038
-net.micode.notes:id/tv_time = 0x7f05003e
-net.micode.notes:id/tv_name = 0x7f05003d
-net.micode.notes:drawable/new_note = 0x7f04002f
-net.micode.notes:id/sv_note_edit = 0x7f050039
-net.micode.notes:id/selection_menu = 0x7f050038
-net.micode.notes:string/error_sdcard_export = 0x7f0a000f
-net.micode.notes:id/preference_sync_button = 0x7f050037
-net.micode.notes:layout/note_edit = 0x7f060005
-net.micode.notes:id/notes_list = 0x7f050035
-net.micode.notes:string/alert_message_delete_notes = 0x7f0a0002
-net.micode.notes:drawable/title_alert = 0x7f040036
-net.micode.notes:id/note_title = 0x7f050034
-net.micode.notes:string/preferences_last_sync_time_format = 0x7f0a004f
-net.micode.notes:id/note_edit_view = 0x7f050032
-net.micode.notes:id/navigation_bar = 0x7f05002f
-net.micode.notes:string/app_widget4x4 = 0x7f0a0006
-net.micode.notes:drawable/font_normal = 0x7f040011
-net.micode.notes:id/minute = 0x7f05002d
-net.micode.notes:drawable/font_super = 0x7f040014
-net.micode.notes:id/menu_sync = 0x7f05002c
-net.micode.notes:string/info_note_enter_desktop = 0x7f0a001e
-net.micode.notes:id/menu_share = 0x7f05002b
-net.micode.notes:id/menu_setting = 0x7f05002a
-net.micode.notes:string/widget_under_visit_mode = 0x7f0a0065
-net.micode.notes:id/menu_send_to_desktop = 0x7f050029
-net.micode.notes:id/menu_search = 0x7f050028
-net.micode.notes:drawable/list_green_down = 0x7f04001d
-net.micode.notes:id/menu_new_note = 0x7f050027
-net.micode.notes:string/error_note_not_exist = 0x7f0a000e
-net.micode.notes:id/menu_new_folder = 0x7f050026
-net.micode.notes:id/menu_list_mode = 0x7f050025
-net.micode.notes:id/iv_medium_select = 0x7f050019
-net.micode.notes:id/menu_export_text = 0x7f050023
-net.micode.notes:string/menu_folder_view = 0x7f0a0026
-net.micode.notes:id/menu_delete = 0x7f050021
-net.micode.notes:string/ticker_fail = 0x7f0a0061
-net.micode.notes:string/file_name_txt_format = 0x7f0a0015
-net.micode.notes:drawable/edit_blue = 0x7f040006
-net.micode.notes:id/prefenerece_sync_status_textview = 0x7f050036
-net.micode.notes:string/menu_font_size = 0x7f0a0029
-net.micode.notes:string/menu_alert = 0x7f0a001f
-net.micode.notes:drawable/edit_title_yellow = 0x7f04000d
-net.micode.notes:id/menu_alert = 0x7f050020
-net.micode.notes:string/success_sync_account = 0x7f0a005c
-net.micode.notes:id/ll_font_super = 0x7f05001f
-net.micode.notes:id/ll_font_small = 0x7f05001e
-net.micode.notes:menu/call_record_folder = 0x7f070001
-net.micode.notes:id/ll_font_normal = 0x7f05001d
-net.micode.notes:id/ll_font_large = 0x7f05001c
-net.micode.notes:id/note_bg_color_selector = 0x7f050030
-net.micode.notes:drawable/search_result = 0x7f040034
-net.micode.notes:id/iv_super_select = 0x7f05001b
-net.micode.notes:id/iv_bg_yellow = 0x7f050016
-net.micode.notes:string/error_sync_cancelled = 0x7f0a0011
-net.micode.notes:id/iv_bg_white_select = 0x7f050015
-net.micode.notes:id/tv_alert_date = 0x7f05003a
-net.micode.notes:dimen/text_font_size_large = 0x7f030000
-net.micode.notes:drawable/notification = 0x7f040033
-net.micode.notes:id/iv_bg_red = 0x7f050012
-net.micode.notes:string/menu_font_large = 0x7f0a0027
-net.micode.notes:drawable/widget_4x_blue = 0x7f04003d
-net.micode.notes:id/iv_large_select = 0x7f050018
-net.micode.notes:id/widget_bg_image = 0x7f050041
-net.micode.notes:id/iv_bg_green_select = 0x7f050011
-net.micode.notes:string/error_note_empty_for_clock = 0x7f0a000c
-net.micode.notes:string/preferences_dialog_change_account_title = 0x7f0a004a
-net.micode.notes:drawable/menu_move = 0x7f04002e
-net.micode.notes:drawable/widget_4x_white = 0x7f040040
-net.micode.notes:id/iv_bg_blue_select = 0x7f05000f
-net.micode.notes:string/preferences_dialog_select_account_tips = 0x7f0a004c
-net.micode.notes:id/font_size_selector = 0x7f05000b
-net.micode.notes:id/et_edit_text = 0x7f050009
-net.micode.notes:id/et_foler_name = 0x7f05000a
-net.micode.notes:drawable/edit_green = 0x7f040007
-net.micode.notes:layout/widget_4x = 0x7f06000d
-net.micode.notes:string/search = 0x7f0a0056
-net.micode.notes:id/cb_edit_item = 0x7f050006
-net.micode.notes:id/btn_set_bg_color = 0x7f050005
-net.micode.notes:id/account_dialog_subtitle = 0x7f050000
-net.micode.notes:menu/note_list = 0x7f070003
-net.micode.notes:id/account_dialog_title = 0x7f050001
-net.micode.notes:id/iv_bg_green = 0x7f050010
-net.micode.notes:id/amPm = 0x7f050003
-net.micode.notes:drawable/widget_4x_green = 0x7f04003e
-net.micode.notes:style/NoteTheme = 0x7f0b0003
-net.micode.notes:id/hour = 0x7f05000c
-net.micode.notes:drawable/note_edit_color_selector_panel = 0x7f040032
-net.micode.notes:drawable/widget_2x_yellow = 0x7f04003c
-net.micode.notes:string/format_move_notes_to_folder = 0x7f0a001c
-net.micode.notes:drawable/widget_2x_red = 0x7f04003a
-net.micode.notes:style/TextAppearanceUnderMenuIcon = 0x7f0b000a
-net.micode.notes:id/delete = 0x7f050008
-net.micode.notes:drawable/widget_2x_green = 0x7f040039
-net.micode.notes:drawable/title_bar_bg = 0x7f040037
-net.micode.notes:drawable/menu_delete = 0x7f04002d
-net.micode.notes:string/error_sync_internal = 0x7f0a0012
-net.micode.notes:drawable/list_green_single = 0x7f04001f
-net.micode.notes:string/alert_message_delete_note = 0x7f0a0001
-net.micode.notes:id/tv_modified_date = 0x7f05003c
-net.micode.notes:drawable/list_blue_middle = 0x7f040018
-net.micode.notes:id/iv_small_select = 0x7f05001a
-net.micode.notes:menu/note_list_options = 0x7f070005
-net.micode.notes:xml/searchable = 0x7f0c0001
-net.micode.notes:string/menu_folder_delete = 0x7f0a0025
-net.micode.notes:drawable/dropdown_icon = 0x7f040005
-net.micode.notes:id/date = 0x7f050007
-net.micode.notes:drawable/list_yellow_single = 0x7f04002b
-net.micode.notes:drawable/list_red_up = 0x7f040024
-net.micode.notes:drawable/widget_4x_yellow = 0x7f040041
-net.micode.notes:drawable/list_yellow_middle = 0x7f04002a
-net.micode.notes:id/tv_folder_name = 0x7f05003b
-net.micode.notes:drawable/list_yellow_down = 0x7f040029
-net.micode.notes:string/format_folder_files_count = 0x7f0a001b
-net.micode.notes:drawable/clock = 0x7f040003
-net.micode.notes:drawable/list_white_up = 0x7f040028
-net.micode.notes:drawable/edit_title_blue = 0x7f040009
-net.micode.notes:drawable/edit_red = 0x7f040008
-net.micode.notes:id/iv_alert_icon = 0x7f05000d
-net.micode.notes:layout/dialog_edit_text = 0x7f060003
-net.micode.notes:string/preferences_account_title = 0x7f0a0045
-net.micode.notes:drawable/edit_white = 0x7f04000e
-net.micode.notes:drawable/list_white_middle = 0x7f040026
-net.micode.notes:color/user_query_highlight = 0x7f020002
-net.micode.notes:drawable/list_white_down = 0x7f040025
-net.micode.notes:string/preferences_add_account = 0x7f0a0046
-net.micode.notes:drawable/bg_btn_set_color = 0x7f040000
-net.micode.notes:string/preferences_bg_random_appear_title = 0x7f0a0047
-net.micode.notes:layout/widget_2x = 0x7f06000c
-net.micode.notes:drawable/list_footer_bg = 0x7f04001c
-net.micode.notes:string/alert_title_delete = 0x7f0a0003
-net.micode.notes:drawable/edit_title_green = 0x7f04000a
-net.micode.notes:drawable/icon_app = 0x7f040015
-net.micode.notes:string/menu_send_to_desktop = 0x7f0a0035
-net.micode.notes:drawable/list_red_single = 0x7f040023
-net.micode.notes:string/failed_sdcard_export = 0x7f0a0014
-net.micode.notes:drawable/widget_4x_red = 0x7f04003f
-net.micode.notes:id/menu_delete_remind = 0x7f050022
-net.micode.notes:drawable/list_red_down = 0x7f040021
-net.micode.notes:drawable/list_red_middle = 0x7f040022
-net.micode.notes:id/iv_bg_white = 0x7f050014
-net.micode.notes:id/iv_bg_red_select = 0x7f050013
-net.micode.notes:string/error_note_empty_for_send_to_desktop = 0x7f0a000d
-net.micode.notes:layout/note_list_dropdown_menu = 0x7f060009
-net.micode.notes:drawable/list_blue_down = 0x7f040017
-net.micode.notes:id/action_select_all = 0x7f050002
-net.micode.notes:string/format_datetime_mdhm = 0x7f0a0019
-net.micode.notes:drawable/font_small = 0x7f040013
-net.micode.notes:string/sync_progress_login = 0x7f0a005e
-net.micode.notes:array/menu_share_ways = 0x7f010001
-net.micode.notes:drawable/widget_2x_white = 0x7f04003b
-net.micode.notes:layout/folder_list_item = 0x7f060004
-net.micode.notes:layout/add_account_text = 0x7f060001
-net.micode.notes:id/tv_title = 0x7f05003f
-net.micode.notes:color/primary_text_dark = 0x7f020000
-net.micode.notes:drawable/font_size_selector_bg = 0x7f040012
-net.micode.notes:drawable/list_blue_up = 0x7f04001a
-net.micode.notes:string/search_setting_description = 0x7f0a0059
-net.micode.notes:drawable/list_blue_single = 0x7f040019
-net.micode.notes:drawable/font_large = 0x7f040010
-net.micode.notes:drawable/delete = 0x7f040004
-net.micode.notes:drawable/edit_yellow = 0x7f04000f
-net.micode.notes:id/note_item = 0x7f050033
-net.micode.notes:drawable/edit_title_white = 0x7f04000c
-net.micode.notes:id/note_edit_list = 0x7f050031
-net.micode.notes:drawable/edit_title_red = 0x7f04000b
-net.micode.notes:string/menu_delete = 0x7f0a0021
-net.micode.notes:drawable/list_folder = 0x7f04001b
-net.micode.notes:drawable/call_record = 0x7f040002
-net.micode.notes:string/search_hint = 0x7f0a0057
-net.micode.notes:id/menu_font_size = 0x7f050024
-net.micode.notes:drawable/bg_color_btn_mask = 0x7f040001
-net.micode.notes:drawable/list_yellow_up = 0x7f04002c
-net.micode.notes:dimen/text_font_size_small = 0x7f030003
-net.micode.notes:dimen/text_font_size_normal = 0x7f030002
-net.micode.notes:drawable/list_green_middle = 0x7f04001e
-net.micode.notes:drawable/list_background = 0x7f040016
-net.micode.notes:string/app_name = 0x7f0a0004
-net.micode.notes:menu/note_list_dropdown = 0x7f070004
-net.micode.notes:string/menu_setting = 0x7f0a0036
-net.micode.notes:dimen/text_font_size_medium = 0x7f030001
-net.micode.notes:layout/note_edit_list_item = 0x7f060006
-net.micode.notes:layout/account_dialog_title = 0x7f060000
-net.micode.notes:array/format_for_exported_note = 0x7f010000
diff --git a/src/Notes-master3/app/build/outputs/apk/debug/app-debug.apk b/src/Notes-master3/app/build/outputs/apk/debug/app-debug.apk
deleted file mode 100644
index a2c5b29..0000000
Binary files a/src/Notes-master3/app/build/outputs/apk/debug/app-debug.apk and /dev/null differ
diff --git a/src/Notes-master3/app/build/outputs/logs/manifest-merger-debug-report.txt b/src/Notes-master3/app/build/outputs/logs/manifest-merger-debug-report.txt
deleted file mode 100644
index ec1c77e..0000000
--- a/src/Notes-master3/app/build/outputs/logs/manifest-merger-debug-report.txt
+++ /dev/null
@@ -1,255 +0,0 @@
--- Merging decision tree log ---
-manifest
-ADDED from C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:18:1-159:12
-INJECTED from C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:18:1-159:12
-INJECTED from C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:18:1-159:12
-INJECTED from C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:18:1-159:12
-INJECTED from C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:18:1-159:12
-INJECTED from C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:18:1-159:12
-INJECTED from C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:18:1-159:12
-	package
-		ADDED from C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:20:5-31
-		INJECTED from C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml
-		INJECTED from C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml
-	android:versionName
-		ADDED from C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:22:5-30
-		INJECTED from C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml
-		INJECTED from C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml
-	xmlns:tools
-		ADDED from C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:19:5-51
-	xmlns:android
-		ADDED from C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:18:11-69
-	android:versionCode
-		ADDED from C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:21:5-28
-		INJECTED from C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml
-		INJECTED from C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml
-uses-sdk
-ADDED from C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:24:5-25:42
-INJECTED from C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:24:5-25:42
-INJECTED from C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:24:5-25:42
-INJECTED from C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:24:5-25:42
-INJECTED from C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:24:5-25:42
-	android:targetSdkVersion
-		INJECTED from C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml
-		ADDED from C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:24:5-25:42
-		INJECTED from C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml
-	tools:ignore
-		ADDED from C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:25:9-39
-	android:minSdkVersion
-		ADDED from C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:24:15-41
-		INJECTED from C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml
-		INJECTED from C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml
-uses-permission#android.permission.WRITE_EXTERNAL_STORAGE
-ADDED from C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:27:5-81
-	android:name
-		ADDED from C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:27:22-78
-uses-permission#com.android.launcher.permission.INSTALL_SHORTCUT
-ADDED from C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:28:5-88
-	android:name
-		ADDED from C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:28:22-85
-uses-permission#android.permission.INTERNET
-ADDED from C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:29:5-67
-	android:name
-		ADDED from C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:29:22-64
-uses-permission#android.permission.READ_CONTACTS
-ADDED from C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:30:5-72
-	android:name
-		ADDED from C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:30:22-69
-uses-permission#android.permission.MANAGE_ACCOUNTS
-ADDED from C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:31:5-74
-	android:name
-		ADDED from C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:31:22-71
-uses-permission#android.permission.AUTHENTICATE_ACCOUNTS
-ADDED from C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:32:5-80
-	android:name
-		ADDED from C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:32:22-77
-uses-permission#android.permission.GET_ACCOUNTS
-ADDED from C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:33:5-71
-	android:name
-		ADDED from C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:33:22-68
-uses-permission#android.permission.USE_CREDENTIALS
-ADDED from C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:34:5-74
-	android:name
-		ADDED from C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:34:22-71
-uses-permission#android.permission.RECEIVE_BOOT_COMPLETED
-ADDED from C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:35:5-81
-	android:name
-		ADDED from C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:35:22-78
-application
-ADDED from C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:37:5-158:19
-	android:label
-		ADDED from C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:39:9-41
-	android:icon
-		ADDED from C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:38:9-42
-activity#net.micode.notes.ui.NotesListActivity
-ADDED from C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:40:9-53:20
-	android:launchMode
-		ADDED from C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:44:13-43
-	android:windowSoftInputMode
-		ADDED from C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:47:13-52
-	android:exported
-		ADDED from C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:43:13-36
-	android:uiOptions
-		ADDED from C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:46:13-57
-	android:configChanges
-		ADDED from C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:42:13-74
-	android:theme
-		ADDED from C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:45:13-45
-	android:name
-		ADDED from C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:41:13-49
-intent-filter#action:name:android.intent.action.MAIN+category:name:android.intent.category.LAUNCHER
-ADDED from C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:49:13-52:29
-action#android.intent.action.MAIN
-ADDED from C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:50:17-69
-	android:name
-		ADDED from C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:50:25-66
-category#android.intent.category.LAUNCHER
-ADDED from C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:51:17-77
-	android:name
-		ADDED from C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:51:27-74
-activity#net.micode.notes.ui.NoteEditActivity
-ADDED from C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:55:9-85:20
-	android:launchMode
-		ADDED from C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:58:13-43
-	android:exported
-		ADDED from C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:60:13-36
-	android:configChanges
-		ADDED from C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:57:13-74
-	android:theme
-		ADDED from C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:59:13-45
-	android:name
-		ADDED from C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:56:13-48
-intent-filter#action:name:android.intent.action.VIEW+category:name:android.intent.category.DEFAULT+data:mimeType:vnd.android.cursor.item/call_note+data:mimeType:vnd.android.cursor.item/text_note
-ADDED from C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:62:13-68:29
-	android:scheme
-		ADDED from C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:62:28-49
-	tools:ignore
-		ADDED from C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:63:17-47
-action#android.intent.action.VIEW
-ADDED from C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:64:17-69
-	android:name
-		ADDED from C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:64:25-66
-category#android.intent.category.DEFAULT
-ADDED from C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:65:17-76
-	android:name
-		ADDED from C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:65:27-73
-data
-ADDED from C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:66:17-78
-	android:mimeType
-		ADDED from C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:66:23-75
-intent-filter#action:name:android.intent.action.INSERT_OR_EDIT+category:name:android.intent.category.DEFAULT+data:mimeType:vnd.android.cursor.item/call_note+data:mimeType:vnd.android.cursor.item/text_note
-ADDED from C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:70:13-75:29
-action#android.intent.action.INSERT_OR_EDIT
-ADDED from C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:71:17-79
-	android:name
-		ADDED from C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:71:25-76
-intent-filter#action:name:android.intent.action.SEARCH+category:name:android.intent.category.DEFAULT
-ADDED from C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:77:13-80:29
-action#android.intent.action.SEARCH
-ADDED from C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:78:17-71
-	android:name
-		ADDED from C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:78:25-68
-meta-data#android.app.searchable
-ADDED from C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:82:13-84:54
-	android:resource
-		ADDED from C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:84:17-51
-	android:name
-		ADDED from C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:83:17-54
-provider#net.micode.notes.data.NotesProvider
-ADDED from C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:87:9-91:40
-	android:authorities
-		ADDED from C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:89:13-47
-	android:multiprocess
-		ADDED from C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:90:13-40
-	android:exported
-		ADDED from C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:91:13-37
-	android:name
-		ADDED from C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:88:13-63
-receiver#net.micode.notes.widget.NoteWidgetProvider_2x
-ADDED from C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:93:9-106:20
-	android:label
-		ADDED from C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:95:13-50
-	android:exported
-		ADDED from C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:96:13-36
-	android:name
-		ADDED from C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:94:13-57
-intent-filter#action:name:android.appwidget.action.APPWIDGET_DELETED+action:name:android.appwidget.action.APPWIDGET_UPDATE+action:name:android.intent.action.PRIVACY_MODE_CHANGED
-ADDED from C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:97:13-101:29
-action#android.appwidget.action.APPWIDGET_UPDATE
-ADDED from C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:98:17-84
-	android:name
-		ADDED from C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:98:25-81
-action#android.appwidget.action.APPWIDGET_DELETED
-ADDED from C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:99:17-85
-	android:name
-		ADDED from C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:99:25-82
-action#android.intent.action.PRIVACY_MODE_CHANGED
-ADDED from C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:100:17-85
-	android:name
-		ADDED from C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:100:25-82
-meta-data#android.appwidget.provider
-ADDED from C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:103:13-105:58
-	android:resource
-		ADDED from C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:105:17-55
-	android:name
-		ADDED from C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:104:17-58
-receiver#net.micode.notes.widget.NoteWidgetProvider_4x
-ADDED from C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:107:9-121:20
-	android:label
-		ADDED from C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:109:13-50
-	android:exported
-		ADDED from C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:110:13-36
-	android:name
-		ADDED from C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:108:13-57
-receiver#net.micode.notes.ui.AlarmInitReceiver
-ADDED from C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:123:9-128:20
-	android:exported
-		ADDED from C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:124:13-36
-	android:name
-		ADDED from C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:123:19-55
-intent-filter#action:name:android.intent.action.BOOT_COMPLETED
-ADDED from C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:125:13-127:29
-action#android.intent.action.BOOT_COMPLETED
-ADDED from C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:126:17-79
-	android:name
-		ADDED from C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:126:25-76
-receiver#net.micode.notes.ui.AlarmReceiver
-ADDED from C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:130:9-133:20
-	android:process
-		ADDED from C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:132:13-38
-	android:name
-		ADDED from C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:131:13-61
-activity#net.micode.notes.ui.AlarmAlertActivity
-ADDED from C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:135:9-141:20
-	android:label
-		ADDED from C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:137:13-45
-	android:launchMode
-		ADDED from C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:138:13-48
-	tools:ignore
-		ADDED from C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:140:13-42
-	android:theme
-		ADDED from C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:139:13-75
-	android:name
-		ADDED from C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:136:13-50
-activity#net.micode.notes.ui.NotesPreferenceActivity
-ADDED from C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:143:9-148:20
-	android:label
-		ADDED from C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:145:13-54
-	android:launchMode
-		ADDED from C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:146:13-43
-	android:theme
-		ADDED from C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:147:13-60
-	android:name
-		ADDED from C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:144:13-71
-service#net.micode.notes.gtask.remote.GTaskSyncService
-ADDED from C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:150:9-153:19
-	android:exported
-		ADDED from C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:152:13-37
-	android:name
-		ADDED from C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:151:13-74
-meta-data#android.app.default_searchable
-ADDED from C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:155:9-157:52
-	android:value
-		ADDED from C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:157:13-49
-	android:name
-		ADDED from C:\Users\13293\Desktop\Git\gitProject\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:156:13-58
diff --git a/src/Notes-master3/app/build/tmp/compileDebugJavaWithJavac/previous-compilation-data.bin b/src/Notes-master3/app/build/tmp/compileDebugJavaWithJavac/previous-compilation-data.bin
deleted file mode 100644
index abd81ee..0000000
Binary files a/src/Notes-master3/app/build/tmp/compileDebugJavaWithJavac/previous-compilation-data.bin and /dev/null differ