diff --git a/src/Notes-master1/.gradle/7.0.2/dependencies-accessors/dependencies-accessors.lock b/src/Note-master2/.gradle/7.0.2/dependencies-accessors/dependencies-accessors.lock
similarity index 100%
rename from src/Notes-master1/.gradle/7.0.2/dependencies-accessors/dependencies-accessors.lock
rename to src/Note-master2/.gradle/7.0.2/dependencies-accessors/dependencies-accessors.lock
diff --git a/src/Notes-master1/.gradle/7.0.2/dependencies-accessors/gc.properties b/src/Note-master2/.gradle/7.0.2/dependencies-accessors/gc.properties
similarity index 100%
rename from src/Notes-master1/.gradle/7.0.2/dependencies-accessors/gc.properties
rename to src/Note-master2/.gradle/7.0.2/dependencies-accessors/gc.properties
diff --git a/src/Notes-master1/.gradle/7.0.2/executionHistory/executionHistory.bin b/src/Note-master2/.gradle/7.0.2/executionHistory/executionHistory.bin
similarity index 83%
rename from src/Notes-master1/.gradle/7.0.2/executionHistory/executionHistory.bin
rename to src/Note-master2/.gradle/7.0.2/executionHistory/executionHistory.bin
index c60d13a..1e73b55 100644
Binary files a/src/Notes-master1/.gradle/7.0.2/executionHistory/executionHistory.bin and b/src/Note-master2/.gradle/7.0.2/executionHistory/executionHistory.bin differ
diff --git a/src/Note-master2/.gradle/7.0.2/executionHistory/executionHistory.lock b/src/Note-master2/.gradle/7.0.2/executionHistory/executionHistory.lock
new file mode 100644
index 0000000..7a0e055
Binary files /dev/null and b/src/Note-master2/.gradle/7.0.2/executionHistory/executionHistory.lock differ
diff --git a/src/Notes-master1/.gradle/7.0.2/fileChanges/last-build.bin b/src/Note-master2/.gradle/7.0.2/fileChanges/last-build.bin
similarity index 100%
rename from src/Notes-master1/.gradle/7.0.2/fileChanges/last-build.bin
rename to src/Note-master2/.gradle/7.0.2/fileChanges/last-build.bin
diff --git a/src/Notes-master1/.gradle/7.0.2/fileHashes/fileHashes.bin b/src/Note-master2/.gradle/7.0.2/fileHashes/fileHashes.bin
similarity index 77%
rename from src/Notes-master1/.gradle/7.0.2/fileHashes/fileHashes.bin
rename to src/Note-master2/.gradle/7.0.2/fileHashes/fileHashes.bin
index 0c7ad48..648a01d 100644
Binary files a/src/Notes-master1/.gradle/7.0.2/fileHashes/fileHashes.bin and b/src/Note-master2/.gradle/7.0.2/fileHashes/fileHashes.bin differ
diff --git a/src/Note-master2/.gradle/7.0.2/fileHashes/fileHashes.lock b/src/Note-master2/.gradle/7.0.2/fileHashes/fileHashes.lock
new file mode 100644
index 0000000..23af1fc
Binary files /dev/null and b/src/Note-master2/.gradle/7.0.2/fileHashes/fileHashes.lock differ
diff --git a/src/Notes-master1/.gradle/7.0.2/fileHashes/resourceHashesCache.bin b/src/Note-master2/.gradle/7.0.2/fileHashes/resourceHashesCache.bin
similarity index 100%
rename from src/Notes-master1/.gradle/7.0.2/fileHashes/resourceHashesCache.bin
rename to src/Note-master2/.gradle/7.0.2/fileHashes/resourceHashesCache.bin
diff --git a/src/Notes-master1/.gradle/7.0.2/gc.properties b/src/Note-master2/.gradle/7.0.2/gc.properties
similarity index 100%
rename from src/Notes-master1/.gradle/7.0.2/gc.properties
rename to src/Note-master2/.gradle/7.0.2/gc.properties
diff --git a/src/Notes-master1/.gradle/7.0.2/javaCompile/classAnalysis.bin b/src/Note-master2/.gradle/7.0.2/javaCompile/classAnalysis.bin
similarity index 100%
rename from src/Notes-master1/.gradle/7.0.2/javaCompile/classAnalysis.bin
rename to src/Note-master2/.gradle/7.0.2/javaCompile/classAnalysis.bin
diff --git a/src/Notes-master1/.gradle/7.0.2/javaCompile/jarAnalysis.bin b/src/Note-master2/.gradle/7.0.2/javaCompile/jarAnalysis.bin
similarity index 100%
rename from src/Notes-master1/.gradle/7.0.2/javaCompile/jarAnalysis.bin
rename to src/Note-master2/.gradle/7.0.2/javaCompile/jarAnalysis.bin
diff --git a/src/Note-master2/.gradle/7.0.2/javaCompile/javaCompile.lock b/src/Note-master2/.gradle/7.0.2/javaCompile/javaCompile.lock
new file mode 100644
index 0000000..a46726f
Binary files /dev/null and b/src/Note-master2/.gradle/7.0.2/javaCompile/javaCompile.lock differ
diff --git a/src/Notes-master1/.gradle/7.0.2/javaCompile/taskHistory.bin b/src/Note-master2/.gradle/7.0.2/javaCompile/taskHistory.bin
similarity index 80%
rename from src/Notes-master1/.gradle/7.0.2/javaCompile/taskHistory.bin
rename to src/Note-master2/.gradle/7.0.2/javaCompile/taskHistory.bin
index 7e033a8..30193a3 100644
Binary files a/src/Notes-master1/.gradle/7.0.2/javaCompile/taskHistory.bin and b/src/Note-master2/.gradle/7.0.2/javaCompile/taskHistory.bin differ
diff --git a/src/Note-master2/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/src/Note-master2/.gradle/buildOutputCleanup/buildOutputCleanup.lock
new file mode 100644
index 0000000..1ac6c28
Binary files /dev/null and b/src/Note-master2/.gradle/buildOutputCleanup/buildOutputCleanup.lock differ
diff --git a/src/Notes-master1/.gradle/buildOutputCleanup/cache.properties b/src/Note-master2/.gradle/buildOutputCleanup/cache.properties
similarity index 100%
rename from src/Notes-master1/.gradle/buildOutputCleanup/cache.properties
rename to src/Note-master2/.gradle/buildOutputCleanup/cache.properties
diff --git a/src/Notes-master1/.gradle/buildOutputCleanup/outputFiles.bin b/src/Note-master2/.gradle/buildOutputCleanup/outputFiles.bin
similarity index 100%
rename from src/Notes-master1/.gradle/buildOutputCleanup/outputFiles.bin
rename to src/Note-master2/.gradle/buildOutputCleanup/outputFiles.bin
diff --git a/src/Notes-master1/.gradle/checksums/checksums.lock b/src/Note-master2/.gradle/checksums/checksums.lock
similarity index 100%
rename from src/Notes-master1/.gradle/checksums/checksums.lock
rename to src/Note-master2/.gradle/checksums/checksums.lock
diff --git a/src/Notes-master1/.gradle/checksums/md5-checksums.bin b/src/Note-master2/.gradle/checksums/md5-checksums.bin
similarity index 100%
rename from src/Notes-master1/.gradle/checksums/md5-checksums.bin
rename to src/Note-master2/.gradle/checksums/md5-checksums.bin
diff --git a/src/Notes-master1/.gradle/checksums/sha1-checksums.bin b/src/Note-master2/.gradle/checksums/sha1-checksums.bin
similarity index 100%
rename from src/Notes-master1/.gradle/checksums/sha1-checksums.bin
rename to src/Note-master2/.gradle/checksums/sha1-checksums.bin
diff --git a/src/Notes-master1/.gradle/vcs-1/gc.properties b/src/Note-master2/.gradle/vcs-1/gc.properties
similarity index 100%
rename from src/Notes-master1/.gradle/vcs-1/gc.properties
rename to src/Note-master2/.gradle/vcs-1/gc.properties
diff --git a/src/Notes-master1/.idea/.gitignore b/src/Note-master2/.idea/.gitignore
similarity index 100%
rename from src/Notes-master1/.idea/.gitignore
rename to src/Note-master2/.idea/.gitignore
diff --git a/src/Notes-master1/.idea/Notes-master1.iml b/src/Note-master2/.idea/Notes-master1.iml
similarity index 100%
rename from src/Notes-master1/.idea/Notes-master1.iml
rename to src/Note-master2/.idea/Notes-master1.iml
diff --git a/src/Notes-master1/.idea/compiler.xml b/src/Note-master2/.idea/compiler.xml
similarity index 100%
rename from src/Notes-master1/.idea/compiler.xml
rename to src/Note-master2/.idea/compiler.xml
diff --git a/src/Notes-master1/.idea/deploymentTargetDropDown.xml b/src/Note-master2/.idea/deploymentTargetDropDown.xml
similarity index 80%
rename from src/Notes-master1/.idea/deploymentTargetDropDown.xml
rename to src/Note-master2/.idea/deploymentTargetDropDown.xml
index 453fd17..c429c19 100644
--- a/src/Notes-master1/.idea/deploymentTargetDropDown.xml
+++ b/src/Note-master2/.idea/deploymentTargetDropDown.xml
@@ -7,11 +7,11 @@
-
+
-
+
\ No newline at end of file
diff --git a/src/Notes-master1/.idea/gradle.properties b/src/Note-master2/.idea/gradle.properties
similarity index 100%
rename from src/Notes-master1/.idea/gradle.properties
rename to src/Note-master2/.idea/gradle.properties
diff --git a/src/Notes-master1/.idea/gradle.xml b/src/Note-master2/.idea/gradle.xml
similarity index 100%
rename from src/Notes-master1/.idea/gradle.xml
rename to src/Note-master2/.idea/gradle.xml
diff --git a/src/Notes-master1/.idea/jarRepositories.xml b/src/Note-master2/.idea/jarRepositories.xml
similarity index 100%
rename from src/Notes-master1/.idea/jarRepositories.xml
rename to src/Note-master2/.idea/jarRepositories.xml
diff --git a/src/Notes-master1/.idea/misc.xml b/src/Note-master2/.idea/misc.xml
similarity index 100%
rename from src/Notes-master1/.idea/misc.xml
rename to src/Note-master2/.idea/misc.xml
diff --git a/src/Notes-master1/.idea/modules.xml b/src/Note-master2/.idea/modules.xml
similarity index 100%
rename from src/Notes-master1/.idea/modules.xml
rename to src/Note-master2/.idea/modules.xml
diff --git a/src/Notes-master1/.idea/modules/Notes-master.iml b/src/Note-master2/.idea/modules/Notes-master.iml
similarity index 100%
rename from src/Notes-master1/.idea/modules/Notes-master.iml
rename to src/Note-master2/.idea/modules/Notes-master.iml
diff --git a/src/Notes-master1/app/build.gradle b/src/Note-master2/app/build.gradle
similarity index 100%
rename from src/Notes-master1/app/build.gradle
rename to src/Note-master2/app/build.gradle
diff --git a/src/Notes-master1/app/build/generated/source/buildConfig/debug/net/micode/notes/BuildConfig.java b/src/Note-master2/app/build/generated/source/buildConfig/debug/net/micode/notes/BuildConfig.java
similarity index 100%
rename from src/Notes-master1/app/build/generated/source/buildConfig/debug/net/micode/notes/BuildConfig.java
rename to src/Note-master2/app/build/generated/source/buildConfig/debug/net/micode/notes/BuildConfig.java
diff --git a/src/Notes-master1/app/build/intermediates/annotation_processor_list/debug/annotationProcessors.json b/src/Note-master2/app/build/intermediates/annotation_processor_list/debug/annotationProcessors.json
similarity index 100%
rename from src/Notes-master1/app/build/intermediates/annotation_processor_list/debug/annotationProcessors.json
rename to src/Note-master2/app/build/intermediates/annotation_processor_list/debug/annotationProcessors.json
diff --git a/src/Notes-master1/app/build/intermediates/app_metadata/debug/app-metadata.properties b/src/Note-master2/app/build/intermediates/app_metadata/debug/app-metadata.properties
similarity index 100%
rename from src/Notes-master1/app/build/intermediates/app_metadata/debug/app-metadata.properties
rename to src/Note-master2/app/build/intermediates/app_metadata/debug/app-metadata.properties
diff --git a/src/Notes-master1/app/build/intermediates/compatible_screen_manifest/debug/output-metadata.json b/src/Note-master2/app/build/intermediates/compatible_screen_manifest/debug/output-metadata.json
similarity index 100%
rename from src/Notes-master1/app/build/intermediates/compatible_screen_manifest/debug/output-metadata.json
rename to src/Note-master2/app/build/intermediates/compatible_screen_manifest/debug/output-metadata.json
diff --git a/src/Notes-master1/app/build/intermediates/compile_and_runtime_not_namespaced_r_class_jar/debug/R.jar b/src/Note-master2/app/build/intermediates/compile_and_runtime_not_namespaced_r_class_jar/debug/R.jar
similarity index 100%
rename from src/Notes-master1/app/build/intermediates/compile_and_runtime_not_namespaced_r_class_jar/debug/R.jar
rename to src/Note-master2/app/build/intermediates/compile_and_runtime_not_namespaced_r_class_jar/debug/R.jar
diff --git a/src/Note-master2/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_0/graph.bin b/src/Note-master2/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_0/graph.bin
new file mode 100644
index 0000000..39415c8
Binary files /dev/null and b/src/Note-master2/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_0/graph.bin differ
diff --git a/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_1/graph.bin b/src/Note-master2/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_1/graph.bin
similarity index 100%
rename from src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_1/graph.bin
rename to src/Note-master2/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_1/graph.bin
diff --git a/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_2/graph.bin b/src/Note-master2/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_2/graph.bin
similarity index 100%
rename from src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_2/graph.bin
rename to src/Note-master2/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_2/graph.bin
diff --git a/src/Note-master2/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_3/graph.bin b/src/Note-master2/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_3/graph.bin
new file mode 100644
index 0000000..1d932b4
Binary files /dev/null and b/src/Note-master2/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_3/graph.bin differ
diff --git a/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_4/graph.bin b/src/Note-master2/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_4/graph.bin
similarity index 100%
rename from src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_4/graph.bin
rename to src/Note-master2/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_4/graph.bin
diff --git a/src/Note-master2/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_5/graph.bin b/src/Note-master2/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_5/graph.bin
new file mode 100644
index 0000000..9bce23b
Binary files /dev/null and b/src/Note-master2/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_5/graph.bin differ
diff --git a/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_54143eeb0ea1a5cb11cabce248cb9602bc9bff6f0457d8f480658f8e704f3947_bucket_0/graph.bin b/src/Note-master2/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_748c4ec49227b61b4fb4c2f241d6e7698d950ebb617b1660c77683541c1b7890_bucket_0/graph.bin
similarity index 100%
rename from src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_54143eeb0ea1a5cb11cabce248cb9602bc9bff6f0457d8f480658f8e704f3947_bucket_0/graph.bin
rename to src/Note-master2/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_748c4ec49227b61b4fb4c2f241d6e7698d950ebb617b1660c77683541c1b7890_bucket_0/graph.bin
diff --git a/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_54143eeb0ea1a5cb11cabce248cb9602bc9bff6f0457d8f480658f8e704f3947_bucket_1/graph.bin b/src/Note-master2/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_748c4ec49227b61b4fb4c2f241d6e7698d950ebb617b1660c77683541c1b7890_bucket_1/graph.bin
similarity index 100%
rename from src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_54143eeb0ea1a5cb11cabce248cb9602bc9bff6f0457d8f480658f8e704f3947_bucket_1/graph.bin
rename to src/Note-master2/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_748c4ec49227b61b4fb4c2f241d6e7698d950ebb617b1660c77683541c1b7890_bucket_1/graph.bin
diff --git a/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_54143eeb0ea1a5cb11cabce248cb9602bc9bff6f0457d8f480658f8e704f3947_bucket_2/graph.bin b/src/Note-master2/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_748c4ec49227b61b4fb4c2f241d6e7698d950ebb617b1660c77683541c1b7890_bucket_2/graph.bin
similarity index 100%
rename from src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_54143eeb0ea1a5cb11cabce248cb9602bc9bff6f0457d8f480658f8e704f3947_bucket_2/graph.bin
rename to src/Note-master2/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_748c4ec49227b61b4fb4c2f241d6e7698d950ebb617b1660c77683541c1b7890_bucket_2/graph.bin
diff --git a/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_54143eeb0ea1a5cb11cabce248cb9602bc9bff6f0457d8f480658f8e704f3947_bucket_3/graph.bin b/src/Note-master2/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_748c4ec49227b61b4fb4c2f241d6e7698d950ebb617b1660c77683541c1b7890_bucket_3/graph.bin
similarity index 100%
rename from src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_54143eeb0ea1a5cb11cabce248cb9602bc9bff6f0457d8f480658f8e704f3947_bucket_3/graph.bin
rename to src/Note-master2/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_748c4ec49227b61b4fb4c2f241d6e7698d950ebb617b1660c77683541c1b7890_bucket_3/graph.bin
diff --git a/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_54143eeb0ea1a5cb11cabce248cb9602bc9bff6f0457d8f480658f8e704f3947_bucket_4/graph.bin b/src/Note-master2/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_748c4ec49227b61b4fb4c2f241d6e7698d950ebb617b1660c77683541c1b7890_bucket_4/graph.bin
similarity index 100%
rename from src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_54143eeb0ea1a5cb11cabce248cb9602bc9bff6f0457d8f480658f8e704f3947_bucket_4/graph.bin
rename to src/Note-master2/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_748c4ec49227b61b4fb4c2f241d6e7698d950ebb617b1660c77683541c1b7890_bucket_4/graph.bin
diff --git a/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_54143eeb0ea1a5cb11cabce248cb9602bc9bff6f0457d8f480658f8e704f3947_bucket_5/graph.bin b/src/Note-master2/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_748c4ec49227b61b4fb4c2f241d6e7698d950ebb617b1660c77683541c1b7890_bucket_5/graph.bin
similarity index 100%
rename from src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_54143eeb0ea1a5cb11cabce248cb9602bc9bff6f0457d8f480658f8e704f3947_bucket_5/graph.bin
rename to src/Note-master2/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_748c4ec49227b61b4fb4c2f241d6e7698d950ebb617b1660c77683541c1b7890_bucket_5/graph.bin
diff --git a/src/Notes-master1/app/build/intermediates/dex/debug/mergeDexDebug/classes.dex b/src/Note-master2/app/build/intermediates/dex/debug/mergeDexDebug/classes.dex
similarity index 100%
rename from src/Notes-master1/app/build/intermediates/dex/debug/mergeDexDebug/classes.dex
rename to src/Note-master2/app/build/intermediates/dex/debug/mergeDexDebug/classes.dex
diff --git a/src/Note-master2/app/build/intermediates/dex_archive_input_jar_hashes/debug/out b/src/Note-master2/app/build/intermediates/dex_archive_input_jar_hashes/debug/out
new file mode 100644
index 0000000..9c8d626
Binary files /dev/null and b/src/Note-master2/app/build/intermediates/dex_archive_input_jar_hashes/debug/out differ
diff --git a/src/Notes-master1/app/build/intermediates/dex_number_of_buckets_file/debug/out b/src/Note-master2/app/build/intermediates/dex_number_of_buckets_file/debug/out
similarity index 100%
rename from src/Notes-master1/app/build/intermediates/dex_number_of_buckets_file/debug/out
rename to src/Note-master2/app/build/intermediates/dex_number_of_buckets_file/debug/out
diff --git a/src/Notes-master1/app/build/intermediates/external_libs_dex/debug/mergeExtDexDebug/classes.dex b/src/Note-master2/app/build/intermediates/external_libs_dex/debug/mergeExtDexDebug/classes.dex
similarity index 100%
rename from src/Notes-master1/app/build/intermediates/external_libs_dex/debug/mergeExtDexDebug/classes.dex
rename to src/Note-master2/app/build/intermediates/external_libs_dex/debug/mergeExtDexDebug/classes.dex
diff --git a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/merge-state b/src/Note-master2/app/build/intermediates/incremental/debug-mergeJavaRes/merge-state
similarity index 100%
rename from src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/merge-state
rename to src/Note-master2/app/build/intermediates/incremental/debug-mergeJavaRes/merge-state
diff --git a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/+3SR9rNZjN9r94TK5x2tuvC0eWI= b/src/Note-master2/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/+3SR9rNZjN9r94TK5x2tuvC0eWI=
similarity index 100%
rename from src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/+3SR9rNZjN9r94TK5x2tuvC0eWI=
rename to src/Note-master2/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/+3SR9rNZjN9r94TK5x2tuvC0eWI=
diff --git a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/1QXWzZH1gKCU+hXmrICJjSu0k+I= b/src/Note-master2/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/1QXWzZH1gKCU+hXmrICJjSu0k+I=
similarity index 100%
rename from src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/1QXWzZH1gKCU+hXmrICJjSu0k+I=
rename to src/Note-master2/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/1QXWzZH1gKCU+hXmrICJjSu0k+I=
diff --git a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/BOIi6rpe1jPEZhvuOAiPPeBO2TI= b/src/Note-master2/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/BOIi6rpe1jPEZhvuOAiPPeBO2TI=
similarity index 100%
rename from src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/BOIi6rpe1jPEZhvuOAiPPeBO2TI=
rename to src/Note-master2/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/BOIi6rpe1jPEZhvuOAiPPeBO2TI=
diff --git a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/CooRMKOxoYc0srR5JlgZqWzon_0= b/src/Note-master2/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/CooRMKOxoYc0srR5JlgZqWzon_0=
similarity index 100%
rename from src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/CooRMKOxoYc0srR5JlgZqWzon_0=
rename to src/Note-master2/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/CooRMKOxoYc0srR5JlgZqWzon_0=
diff --git a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/D20DNlAkQyW_NATfsd+NP+iPtAE= b/src/Note-master2/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/D20DNlAkQyW_NATfsd+NP+iPtAE=
similarity index 100%
rename from src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/D20DNlAkQyW_NATfsd+NP+iPtAE=
rename to src/Note-master2/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/D20DNlAkQyW_NATfsd+NP+iPtAE=
diff --git a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/DUXQvVfwQywVK3EBx58qwdqvxVU= b/src/Note-master2/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/DUXQvVfwQywVK3EBx58qwdqvxVU=
similarity index 100%
rename from src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/DUXQvVfwQywVK3EBx58qwdqvxVU=
rename to src/Note-master2/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/DUXQvVfwQywVK3EBx58qwdqvxVU=
diff --git a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/DqUQ+IOJzBHOZJwuTMaqSFopZyU= b/src/Note-master2/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/DqUQ+IOJzBHOZJwuTMaqSFopZyU=
similarity index 100%
rename from src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/DqUQ+IOJzBHOZJwuTMaqSFopZyU=
rename to src/Note-master2/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/DqUQ+IOJzBHOZJwuTMaqSFopZyU=
diff --git a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/G_Rs+Z7qh+DUHNDJvveG45s6zKI= b/src/Note-master2/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/G_Rs+Z7qh+DUHNDJvveG45s6zKI=
similarity index 100%
rename from src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/G_Rs+Z7qh+DUHNDJvveG45s6zKI=
rename to src/Note-master2/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/G_Rs+Z7qh+DUHNDJvveG45s6zKI=
diff --git a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/IZ+Bp4i_4COc2fQPm060P9fd0AA= b/src/Note-master2/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/IZ+Bp4i_4COc2fQPm060P9fd0AA=
similarity index 100%
rename from src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/IZ+Bp4i_4COc2fQPm060P9fd0AA=
rename to src/Note-master2/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/IZ+Bp4i_4COc2fQPm060P9fd0AA=
diff --git a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/IezlHqK9Qp8pYHrP+TZI2dvsHGU= b/src/Note-master2/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/IezlHqK9Qp8pYHrP+TZI2dvsHGU=
similarity index 100%
rename from src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/IezlHqK9Qp8pYHrP+TZI2dvsHGU=
rename to src/Note-master2/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/IezlHqK9Qp8pYHrP+TZI2dvsHGU=
diff --git a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/Kkar5RqxYiYaEpi6Dk_Wzafwp8Q= b/src/Note-master2/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/Kkar5RqxYiYaEpi6Dk_Wzafwp8Q=
similarity index 100%
rename from src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/Kkar5RqxYiYaEpi6Dk_Wzafwp8Q=
rename to src/Note-master2/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/Kkar5RqxYiYaEpi6Dk_Wzafwp8Q=
diff --git a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/MG4YtaeeLEfsEkBuYUJrXlKcJqM= b/src/Note-master2/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/MG4YtaeeLEfsEkBuYUJrXlKcJqM=
similarity index 100%
rename from src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/MG4YtaeeLEfsEkBuYUJrXlKcJqM=
rename to src/Note-master2/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/MG4YtaeeLEfsEkBuYUJrXlKcJqM=
diff --git a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/Nw61gu7yMlyG_qBY2U3gAdKC7z4= b/src/Note-master2/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/Nw61gu7yMlyG_qBY2U3gAdKC7z4=
similarity index 100%
rename from src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/Nw61gu7yMlyG_qBY2U3gAdKC7z4=
rename to src/Note-master2/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/Nw61gu7yMlyG_qBY2U3gAdKC7z4=
diff --git a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/SXMDHRkfKr_S9NS4p+uY4i3rTeY= b/src/Note-master2/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/SXMDHRkfKr_S9NS4p+uY4i3rTeY=
similarity index 100%
rename from src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/SXMDHRkfKr_S9NS4p+uY4i3rTeY=
rename to src/Note-master2/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/SXMDHRkfKr_S9NS4p+uY4i3rTeY=
diff --git a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/TVukIUN5jd0q+pAtn7Bar+sGJ9o= b/src/Note-master2/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/TVukIUN5jd0q+pAtn7Bar+sGJ9o=
similarity index 100%
rename from src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/TVukIUN5jd0q+pAtn7Bar+sGJ9o=
rename to src/Note-master2/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/TVukIUN5jd0q+pAtn7Bar+sGJ9o=
diff --git a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/ULyNxQnQW5oS3EkxX8WWKRMhfpk= b/src/Note-master2/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/ULyNxQnQW5oS3EkxX8WWKRMhfpk=
similarity index 100%
rename from src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/ULyNxQnQW5oS3EkxX8WWKRMhfpk=
rename to src/Note-master2/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/ULyNxQnQW5oS3EkxX8WWKRMhfpk=
diff --git a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/YvWEofOgEgZqi6Sg8Q56KNVoUGo= b/src/Note-master2/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/YvWEofOgEgZqi6Sg8Q56KNVoUGo=
similarity index 100%
rename from src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/YvWEofOgEgZqi6Sg8Q56KNVoUGo=
rename to src/Note-master2/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/YvWEofOgEgZqi6Sg8Q56KNVoUGo=
diff --git a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/ZVoQb6UtY2Dfc_qitHI4T97n6WE= b/src/Note-master2/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/ZVoQb6UtY2Dfc_qitHI4T97n6WE=
similarity index 100%
rename from src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/ZVoQb6UtY2Dfc_qitHI4T97n6WE=
rename to src/Note-master2/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/ZVoQb6UtY2Dfc_qitHI4T97n6WE=
diff --git a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/dcHNgZteshJKBc0jI+4TDV_LOro= b/src/Note-master2/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/dcHNgZteshJKBc0jI+4TDV_LOro=
similarity index 100%
rename from src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/dcHNgZteshJKBc0jI+4TDV_LOro=
rename to src/Note-master2/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/dcHNgZteshJKBc0jI+4TDV_LOro=
diff --git a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/f4Vc5wl3QjGgVO+kCZCnzN+5vdk= b/src/Note-master2/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/f4Vc5wl3QjGgVO+kCZCnzN+5vdk=
similarity index 100%
rename from src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/f4Vc5wl3QjGgVO+kCZCnzN+5vdk=
rename to src/Note-master2/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/f4Vc5wl3QjGgVO+kCZCnzN+5vdk=
diff --git a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/fBSy396Jhtl89vJyKBQSGxIxazU= b/src/Note-master2/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/fBSy396Jhtl89vJyKBQSGxIxazU=
similarity index 100%
rename from src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/fBSy396Jhtl89vJyKBQSGxIxazU=
rename to src/Note-master2/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/fBSy396Jhtl89vJyKBQSGxIxazU=
diff --git a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/jfToyDgug5i7I_e2VPW_8ghuwLI= b/src/Note-master2/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/jfToyDgug5i7I_e2VPW_8ghuwLI=
similarity index 100%
rename from src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/jfToyDgug5i7I_e2VPW_8ghuwLI=
rename to src/Note-master2/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/jfToyDgug5i7I_e2VPW_8ghuwLI=
diff --git a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/mGH1IGkVsqpNvU3GA5BXewgecuA= b/src/Note-master2/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/mGH1IGkVsqpNvU3GA5BXewgecuA=
similarity index 100%
rename from src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/mGH1IGkVsqpNvU3GA5BXewgecuA=
rename to src/Note-master2/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/mGH1IGkVsqpNvU3GA5BXewgecuA=
diff --git a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/pBfzJDsVFfIcMJwxRg00beTCJec= b/src/Note-master2/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/pBfzJDsVFfIcMJwxRg00beTCJec=
similarity index 100%
rename from src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/pBfzJDsVFfIcMJwxRg00beTCJec=
rename to src/Note-master2/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/pBfzJDsVFfIcMJwxRg00beTCJec=
diff --git a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/qclNlFdq5QdpvtMkMfqSXTYMmKg= b/src/Note-master2/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/qclNlFdq5QdpvtMkMfqSXTYMmKg=
similarity index 100%
rename from src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/qclNlFdq5QdpvtMkMfqSXTYMmKg=
rename to src/Note-master2/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/qclNlFdq5QdpvtMkMfqSXTYMmKg=
diff --git a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/xKjWxu56pSRv7N7AUNr92yCTJTg= b/src/Note-master2/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/xKjWxu56pSRv7N7AUNr92yCTJTg=
similarity index 100%
rename from src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/xKjWxu56pSRv7N7AUNr92yCTJTg=
rename to src/Note-master2/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/xKjWxu56pSRv7N7AUNr92yCTJTg=
diff --git a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/xjqyIIDGa8rYEiXETo48PGr3g3Y= b/src/Note-master2/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/xjqyIIDGa8rYEiXETo48PGr3g3Y=
similarity index 100%
rename from src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/xjqyIIDGa8rYEiXETo48PGr3g3Y=
rename to src/Note-master2/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/xjqyIIDGa8rYEiXETo48PGr3g3Y=
diff --git a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/y2e0Wv00LNaQgOa+Wx6wHMttoH8= b/src/Note-master2/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/y2e0Wv00LNaQgOa+Wx6wHMttoH8=
similarity index 100%
rename from src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/y2e0Wv00LNaQgOa+Wx6wHMttoH8=
rename to src/Note-master2/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/y2e0Wv00LNaQgOa+Wx6wHMttoH8=
diff --git a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/zmnpwx3bY2LGO0Dzp7ABVZx0sxk= b/src/Note-master2/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/zmnpwx3bY2LGO0Dzp7ABVZx0sxk=
similarity index 100%
rename from src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/zmnpwx3bY2LGO0Dzp7ABVZx0sxk=
rename to src/Note-master2/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/zmnpwx3bY2LGO0Dzp7ABVZx0sxk=
diff --git a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/zn6nqbcMSN_Sfqd_jiPglynyEzs= b/src/Note-master2/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/zn6nqbcMSN_Sfqd_jiPglynyEzs=
similarity index 100%
rename from src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/zn6nqbcMSN_Sfqd_jiPglynyEzs=
rename to src/Note-master2/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/zn6nqbcMSN_Sfqd_jiPglynyEzs=
diff --git a/src/Note-master2/app/build/intermediates/incremental/mergeDebugAssets/merger.xml b/src/Note-master2/app/build/intermediates/incremental/mergeDebugAssets/merger.xml
new file mode 100644
index 0000000..b1d9d52
--- /dev/null
+++ b/src/Note-master2/app/build/intermediates/incremental/mergeDebugAssets/merger.xml
@@ -0,0 +1,2 @@
+
+
\ No newline at end of file
diff --git a/src/Note-master2/app/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml b/src/Note-master2/app/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml
new file mode 100644
index 0000000..e603191
--- /dev/null
+++ b/src/Note-master2/app/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml
@@ -0,0 +1,2 @@
+
+
\ No newline at end of file
diff --git a/src/Note-master2/app/build/intermediates/incremental/mergeDebugResources/compile-file-map.properties b/src/Note-master2/app/build/intermediates/incremental/mergeDebugResources/compile-file-map.properties
new file mode 100644
index 0000000..09429e7
--- /dev/null
+++ b/src/Note-master2/app/build/intermediates/incremental/mergeDebugResources/compile-file-map.properties
@@ -0,0 +1,96 @@
+#Thu Sep 16 14:28:45 GMT+08:00 2021
+D\:\\Note-master2\\app\\src\\main\\res\\drawable-hdpi\\font_normal.png=D\:\\Note-master2\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_normal.png.flat
+D\:\\Note-master2\\app\\src\\main\\res\\drawable-hdpi\\list_yellow_down.9.png=D\:\\Note-master2\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_down.9.png.flat
+D\:\\Note-master2\\app\\src\\main\\res\\layout\\settings_header.xml=D\:\\Note-master2\\app\\build\\intermediates\\merged_res\\debug\\layout_settings_header.xml.flat
+D\:\\Note-master2\\app\\src\\main\\res\\drawable-hdpi\\bg_btn_set_color.png=D\:\\Note-master2\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_bg_btn_set_color.png.flat
+D\:\\Note-master2\\app\\src\\main\\res\\drawable-hdpi\\widget_2x_blue.png=D\:\\Note-master2\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_blue.png.flat
+D\:\\Note-master2\\app\\src\\main\\res\\drawable-hdpi\\list_white_down.9.png=D\:\\Note-master2\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_down.9.png.flat
+D\:\\Note-master2\\app\\src\\main\\res\\menu\\sub_folder.xml=D\:\\Note-master2\\app\\build\\intermediates\\merged_res\\debug\\menu_sub_folder.xml.flat
+D\:\\Note-master2\\app\\src\\main\\res\\layout\\dialog_edit_text.xml=D\:\\Note-master2\\app\\build\\intermediates\\merged_res\\debug\\layout_dialog_edit_text.xml.flat
+D\:\\Note-master2\\app\\src\\main\\res\\drawable-hdpi\\list_blue_single.9.png=D\:\\Note-master2\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_blue_single.9.png.flat
+D\:\\Note-master2\\app\\src\\main\\res\\drawable-hdpi\\list_green_middle.9.png=D\:\\Note-master2\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_green_middle.9.png.flat
+D\:\\Note-master2\\app\\src\\main\\res\\layout\\folder_list_item.xml=D\:\\Note-master2\\app\\build\\intermediates\\merged_res\\debug\\layout_folder_list_item.xml.flat
+D\:\\Note-master2\\app\\src\\main\\res\\drawable-hdpi\\note_edit_color_selector_panel.png=D\:\\Note-master2\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_note_edit_color_selector_panel.png.flat
+D\:\\Note-master2\\app\\src\\main\\res\\layout\\note_list_footer.xml=D\:\\Note-master2\\app\\build\\intermediates\\merged_res\\debug\\layout_note_list_footer.xml.flat
+D\:\\Note-master2\\app\\src\\main\\res\\drawable-hdpi\\edit_yellow.9.png=D\:\\Note-master2\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_yellow.9.png.flat
+D\:\\Note-master2\\app\\src\\main\\res\\menu\\call_record_folder.xml=D\:\\Note-master2\\app\\build\\intermediates\\merged_res\\debug\\menu_call_record_folder.xml.flat
+D\:\\Note-master2\\app\\src\\main\\res\\drawable-hdpi\\font_small.png=D\:\\Note-master2\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_small.png.flat
+D\:\\Note-master2\\app\\src\\main\\res\\menu\\note_edit.xml=D\:\\Note-master2\\app\\build\\intermediates\\merged_res\\debug\\menu_note_edit.xml.flat
+D\:\\Note-master2\\app\\src\\main\\res\\menu\\call_note_edit.xml=D\:\\Note-master2\\app\\build\\intermediates\\merged_res\\debug\\menu_call_note_edit.xml.flat
+D\:\\Note-master2\\app\\src\\main\\res\\drawable-hdpi\\widget_2x_green.png=D\:\\Note-master2\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_green.png.flat
+D\:\\Note-master2\\app\\src\\main\\res\\drawable-hdpi\\clock.png=D\:\\Note-master2\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_clock.png.flat
+D\:\\Note-master2\\app\\src\\main\\res\\xml\\widget_4x_info.xml=D\:\\Note-master2\\app\\build\\intermediates\\merged_res\\debug\\xml_widget_4x_info.xml.flat
+D\:\\Note-master2\\app\\src\\main\\res\\drawable-hdpi\\new_note_normal.png=D\:\\Note-master2\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_new_note_normal.png.flat
+D\:\\Note-master2\\app\\src\\main\\res\\drawable-hdpi\\widget_4x_white.png=D\:\\Note-master2\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_white.png.flat
+D\:\\Note-master2\\app\\src\\main\\res\\drawable-hdpi\\font_size_selector_bg.9.png=D\:\\Note-master2\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_size_selector_bg.9.png.flat
+D\:\\Note-master2\\app\\src\\main\\res\\drawable-hdpi\\list_yellow_middle.9.png=D\:\\Note-master2\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_middle.9.png.flat
+D\:\\Note-master2\\app\\src\\main\\res\\layout\\account_dialog_title.xml=D\:\\Note-master2\\app\\build\\intermediates\\merged_res\\debug\\layout_account_dialog_title.xml.flat
+D\:\\Note-master2\\app\\src\\main\\res\\drawable-hdpi\\list_blue_up.9.png=D\:\\Note-master2\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_blue_up.9.png.flat
+D\:\\Note-master2\\app\\src\\main\\res\\drawable-hdpi\\call_record.png=D\:\\Note-master2\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_call_record.png.flat
+D\:\\Note-master2\\app\\src\\main\\res\\drawable-hdpi\\list_white_single.9.png=D\:\\Note-master2\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_single.9.png.flat
+D\:\\Note-master2\\app\\src\\main\\res\\drawable-hdpi\\list_green_down.9.png=D\:\\Note-master2\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_green_down.9.png.flat
+D\:\\Note-master2\\app\\src\\main\\res\\drawable-hdpi\\list_yellow_up.9.png=D\:\\Note-master2\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_up.9.png.flat
+D\:\\Note-master2\\app\\src\\main\\res\\layout\\datetime_picker.xml=D\:\\Note-master2\\app\\build\\intermediates\\merged_res\\debug\\layout_datetime_picker.xml.flat
+D\:\\Note-master2\\app\\src\\main\\res\\drawable-hdpi\\list_blue_middle.9.png=D\:\\Note-master2\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_blue_middle.9.png.flat
+D\:\\Note-master2\\app\\src\\main\\res\\drawable-hdpi\\list_background.png=D\:\\Note-master2\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_background.png.flat
+D\:\\Note-master2\\app\\src\\main\\res\\drawable-hdpi\\list_blue_down.9.png=D\:\\Note-master2\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_blue_down.9.png.flat
+D\:\\Note-master2\\app\\src\\main\\res\\color\\secondary_text_dark.xml=D\:\\Note-master2\\app\\build\\intermediates\\merged_res\\debug\\color_secondary_text_dark.xml.flat
+D\:\\Note-master2\\app\\src\\main\\res\\drawable-hdpi\\menu_move.png=D\:\\Note-master2\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_menu_move.png.flat
+D\:\\Note-master2\\app\\src\\main\\res\\menu\\note_list_dropdown.xml=D\:\\Note-master2\\app\\build\\intermediates\\merged_res\\debug\\menu_note_list_dropdown.xml.flat
+D\:\\Note-master2\\app\\src\\main\\res\\drawable-hdpi\\list_folder.9.png=D\:\\Note-master2\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_folder.9.png.flat
+D\:\\Note-master2\\app\\src\\main\\res\\layout\\add_account_text.xml=D\:\\Note-master2\\app\\build\\intermediates\\merged_res\\debug\\layout_add_account_text.xml.flat
+D\:\\Note-master2\\app\\src\\main\\res\\raw-zh-rCN\\introduction=D\:\\Note-master2\\app\\build\\intermediates\\merged_res\\debug\\raw-zh-rCN_introduction.flat
+D\:\\Note-master2\\app\\src\\main\\res\\drawable-hdpi\\title_bar_bg.9.png=D\:\\Note-master2\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_title_bar_bg.9.png.flat
+D\:\\Note-master2\\app\\src\\main\\res\\layout\\note_edit.xml=D\:\\Note-master2\\app\\build\\intermediates\\merged_res\\debug\\layout_note_edit.xml.flat
+D\:\\Note-master2\\app\\src\\main\\res\\drawable-hdpi\\notification.png=D\:\\Note-master2\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_notification.png.flat
+D\:\\Note-master2\\app\\src\\main\\res\\drawable-hdpi\\edit_title_blue.9.png=D\:\\Note-master2\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_blue.9.png.flat
+D\:\\Note-master2\\app\\src\\main\\res\\drawable-hdpi\\list_green_single.9.png=D\:\\Note-master2\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_green_single.9.png.flat
+D\:\\Note-master2\\app\\src\\main\\res\\drawable-hdpi\\list_red_down.9.png=D\:\\Note-master2\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_down.9.png.flat
+D\:\\Note-master2\\app\\src\\main\\res\\drawable-hdpi\\font_large.png=D\:\\Note-master2\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_large.png.flat
+D\:\\Note-master2\\app\\src\\main\\res\\drawable-hdpi\\widget_2x_white.png=D\:\\Note-master2\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_white.png.flat
+D\:\\Note-master2\\app\\src\\main\\res\\drawable-hdpi\\selected.png=D\:\\Note-master2\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_selected.png.flat
+D\:\\Note-master2\\app\\src\\main\\res\\drawable-hdpi\\list_red_middle.9.png=D\:\\Note-master2\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_middle.9.png.flat
+D\:\\Note-master2\\app\\src\\main\\res\\drawable-hdpi\\edit_title_red.9.png=D\:\\Note-master2\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_red.9.png.flat
+D\:\\Note-master2\\app\\src\\main\\res\\drawable-hdpi\\widget_4x_blue.png=D\:\\Note-master2\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_blue.png.flat
+D\:\\Note-master2\\app\\src\\main\\res\\drawable\\new_note.xml=D\:\\Note-master2\\app\\build\\intermediates\\merged_res\\debug\\drawable_new_note.xml.flat
+D\:\\Note-master2\\app\\src\\main\\res\\drawable-hdpi\\list_white_middle.9.png=D\:\\Note-master2\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_middle.9.png.flat
+D\:\\Note-master2\\app\\src\\main\\res\\drawable-hdpi\\list_footer_bg.9.png=D\:\\Note-master2\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_footer_bg.9.png.flat
+D\:\\Note-master2\\app\\src\\main\\res\\drawable-hdpi\\new_note_pressed.png=D\:\\Note-master2\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_new_note_pressed.png.flat
+D\:\\Note-master2\\app\\src\\main\\res\\drawable-hdpi\\edit_blue.9.png=D\:\\Note-master2\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_blue.9.png.flat
+D\:\\Note-master2\\app\\src\\main\\res\\xml\\searchable.xml=D\:\\Note-master2\\app\\build\\intermediates\\merged_res\\debug\\xml_searchable.xml.flat
+D\:\\Note-master2\\app\\src\\main\\res\\drawable-hdpi\\list_red_up.9.png=D\:\\Note-master2\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_up.9.png.flat
+D\:\\Note-master2\\app\\src\\main\\res\\drawable-hdpi\\list_yellow_single.9.png=D\:\\Note-master2\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_single.9.png.flat
+D\:\\Note-master2\\app\\src\\main\\res\\drawable-hdpi\\widget_2x_yellow.png=D\:\\Note-master2\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_yellow.png.flat
+D\:\\Note-master2\\app\\src\\main\\res\\layout\\note_list.xml=D\:\\Note-master2\\app\\build\\intermediates\\merged_res\\debug\\layout_note_list.xml.flat
+D\:\\Note-master2\\app\\src\\main\\res\\drawable-hdpi\\title_alert.png=D\:\\Note-master2\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_title_alert.png.flat
+D\:\\Note-master2\\app\\src\\main\\res\\drawable-hdpi\\edit_green.9.png=D\:\\Note-master2\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_green.9.png.flat
+D\:\\Note-master2\\app\\src\\main\\res\\drawable-hdpi\\widget_4x_red.png=D\:\\Note-master2\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_red.png.flat
+D\:\\Note-master2\\app\\src\\main\\res\\drawable-hdpi\\widget_4x_yellow.png=D\:\\Note-master2\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_yellow.png.flat
+D\:\\Note-master2\\app\\src\\main\\res\\drawable-hdpi\\edit_title_yellow.9.png=D\:\\Note-master2\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_yellow.9.png.flat
+D\:\\Note-master2\\app\\src\\main\\res\\drawable-hdpi\\edit_white.9.png=D\:\\Note-master2\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_white.9.png.flat
+D\:\\Note-master2\\app\\src\\main\\res\\xml\\widget_2x_info.xml=D\:\\Note-master2\\app\\build\\intermediates\\merged_res\\debug\\xml_widget_2x_info.xml.flat
+D\:\\Note-master2\\app\\src\\main\\res\\layout\\widget_2x.xml=D\:\\Note-master2\\app\\build\\intermediates\\merged_res\\debug\\layout_widget_2x.xml.flat
+D\:\\Note-master2\\app\\src\\main\\res\\drawable-hdpi\\edit_title_white.9.png=D\:\\Note-master2\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_white.9.png.flat
+D\:\\Note-master2\\app\\src\\main\\res\\menu\\note_list_options.xml=D\:\\Note-master2\\app\\build\\intermediates\\merged_res\\debug\\menu_note_list_options.xml.flat
+D\:\\Note-master2\\app\\src\\main\\res\\drawable-hdpi\\bg_color_btn_mask.png=D\:\\Note-master2\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_bg_color_btn_mask.png.flat
+D\:\\Note-master2\\app\\src\\main\\res\\drawable-hdpi\\icon_app.png=D\:\\Note-master2\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_icon_app.png.flat
+D\:\\Note-master2\\app\\src\\main\\res\\drawable-hdpi\\menu_delete.png=D\:\\Note-master2\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_menu_delete.png.flat
+D\:\\Note-master2\\app\\src\\main\\res\\drawable-hdpi\\edit_title_green.9.png=D\:\\Note-master2\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_green.9.png.flat
+D\:\\Note-master2\\app\\src\\main\\res\\drawable-hdpi\\font_super.png=D\:\\Note-master2\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_super.png.flat
+D\:\\Note-master2\\app\\src\\main\\res\\drawable-hdpi\\list_white_up.9.png=D\:\\Note-master2\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_up.9.png.flat
+D\:\\Note-master2\\app\\src\\main\\res\\drawable-hdpi\\list_green_up.9.png=D\:\\Note-master2\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_green_up.9.png.flat
+D\:\\Note-master2\\app\\src\\main\\res\\xml\\preferences.xml=D\:\\Note-master2\\app\\build\\intermediates\\merged_res\\debug\\xml_preferences.xml.flat
+D\:\\Note-master2\\app\\src\\main\\res\\drawable-hdpi\\search_result.png=D\:\\Note-master2\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_search_result.png.flat
+D\:\\Note-master2\\app\\src\\main\\res\\layout\\note_edit_list_item.xml=D\:\\Note-master2\\app\\build\\intermediates\\merged_res\\debug\\layout_note_edit_list_item.xml.flat
+D\:\\Note-master2\\app\\src\\main\\res\\drawable-hdpi\\list_red_single.9.png=D\:\\Note-master2\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_single.9.png.flat
+D\:\\Note-master2\\app\\src\\main\\res\\layout\\note_list_dropdown_menu.xml=D\:\\Note-master2\\app\\build\\intermediates\\merged_res\\debug\\layout_note_list_dropdown_menu.xml.flat
+D\:\\Note-master2\\app\\src\\main\\res\\color\\primary_text_dark.xml=D\:\\Note-master2\\app\\build\\intermediates\\merged_res\\debug\\color_primary_text_dark.xml.flat
+D\:\\Note-master2\\app\\src\\main\\res\\menu\\note_list.xml=D\:\\Note-master2\\app\\build\\intermediates\\merged_res\\debug\\menu_note_list.xml.flat
+D\:\\Note-master2\\app\\src\\main\\res\\drawable-hdpi\\delete.png=D\:\\Note-master2\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_delete.png.flat
+D\:\\Note-master2\\app\\src\\main\\res\\drawable-hdpi\\edit_red.9.png=D\:\\Note-master2\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_red.9.png.flat
+D\:\\Note-master2\\app\\src\\main\\res\\drawable-hdpi\\widget_4x_green.png=D\:\\Note-master2\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_green.png.flat
+D\:\\Note-master2\\app\\src\\main\\res\\raw\\introduction=D\:\\Note-master2\\app\\build\\intermediates\\merged_res\\debug\\raw_introduction.flat
+D\:\\Note-master2\\app\\src\\main\\res\\layout\\widget_4x.xml=D\:\\Note-master2\\app\\build\\intermediates\\merged_res\\debug\\layout_widget_4x.xml.flat
+D\:\\Note-master2\\app\\src\\main\\res\\layout\\note_item.xml=D\:\\Note-master2\\app\\build\\intermediates\\merged_res\\debug\\layout_note_item.xml.flat
+D\:\\Note-master2\\app\\src\\main\\res\\drawable-hdpi\\dropdown_icon.9.png=D\:\\Note-master2\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_dropdown_icon.9.png.flat
+D\:\\Note-master2\\app\\src\\main\\res\\drawable-hdpi\\widget_2x_red.png=D\:\\Note-master2\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_red.png.flat
diff --git a/src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-af/values-af.xml b/src/Note-master2/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-af/values-af.xml
similarity index 100%
rename from src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-af/values-af.xml
rename to src/Note-master2/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-af/values-af.xml
diff --git a/src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-am/values-am.xml b/src/Note-master2/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-am/values-am.xml
similarity index 100%
rename from src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-am/values-am.xml
rename to src/Note-master2/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-am/values-am.xml
diff --git a/src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-ar/values-ar.xml b/src/Note-master2/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-ar/values-ar.xml
similarity index 100%
rename from src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-ar/values-ar.xml
rename to src/Note-master2/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-ar/values-ar.xml
diff --git a/src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-as/values-as.xml b/src/Note-master2/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-as/values-as.xml
similarity index 100%
rename from src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-as/values-as.xml
rename to src/Note-master2/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-as/values-as.xml
diff --git a/src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-az/values-az.xml b/src/Note-master2/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-az/values-az.xml
similarity index 100%
rename from src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-az/values-az.xml
rename to src/Note-master2/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-az/values-az.xml
diff --git a/src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-b+sr+Latn/values-b+sr+Latn.xml b/src/Note-master2/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-b+sr+Latn/values-b+sr+Latn.xml
similarity index 100%
rename from src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-b+sr+Latn/values-b+sr+Latn.xml
rename to src/Note-master2/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-b+sr+Latn/values-b+sr+Latn.xml
diff --git a/src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-be/values-be.xml b/src/Note-master2/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-be/values-be.xml
similarity index 100%
rename from src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-be/values-be.xml
rename to src/Note-master2/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-be/values-be.xml
diff --git a/src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-bg/values-bg.xml b/src/Note-master2/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-bg/values-bg.xml
similarity index 100%
rename from src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-bg/values-bg.xml
rename to src/Note-master2/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-bg/values-bg.xml
diff --git a/src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-bn/values-bn.xml b/src/Note-master2/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-bn/values-bn.xml
similarity index 100%
rename from src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-bn/values-bn.xml
rename to src/Note-master2/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-bn/values-bn.xml
diff --git a/src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-bs/values-bs.xml b/src/Note-master2/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-bs/values-bs.xml
similarity index 100%
rename from src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-bs/values-bs.xml
rename to src/Note-master2/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-bs/values-bs.xml
diff --git a/src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-ca/values-ca.xml b/src/Note-master2/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-ca/values-ca.xml
similarity index 100%
rename from src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-ca/values-ca.xml
rename to src/Note-master2/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-ca/values-ca.xml
diff --git a/src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-cs/values-cs.xml b/src/Note-master2/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-cs/values-cs.xml
similarity index 100%
rename from src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-cs/values-cs.xml
rename to src/Note-master2/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-cs/values-cs.xml
diff --git a/src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-da/values-da.xml b/src/Note-master2/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-da/values-da.xml
similarity index 100%
rename from src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-da/values-da.xml
rename to src/Note-master2/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-da/values-da.xml
diff --git a/src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-de/values-de.xml b/src/Note-master2/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-de/values-de.xml
similarity index 100%
rename from src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-de/values-de.xml
rename to src/Note-master2/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-de/values-de.xml
diff --git a/src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-el/values-el.xml b/src/Note-master2/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-el/values-el.xml
similarity index 100%
rename from src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-el/values-el.xml
rename to src/Note-master2/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-el/values-el.xml
diff --git a/src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-en-rAU/values-en-rAU.xml b/src/Note-master2/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-en-rAU/values-en-rAU.xml
similarity index 100%
rename from src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-en-rAU/values-en-rAU.xml
rename to src/Note-master2/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-en-rAU/values-en-rAU.xml
diff --git a/src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-en-rCA/values-en-rCA.xml b/src/Note-master2/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-en-rCA/values-en-rCA.xml
similarity index 100%
rename from src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-en-rCA/values-en-rCA.xml
rename to src/Note-master2/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-en-rCA/values-en-rCA.xml
diff --git a/src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-en-rGB/values-en-rGB.xml b/src/Note-master2/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-en-rGB/values-en-rGB.xml
similarity index 100%
rename from src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-en-rGB/values-en-rGB.xml
rename to src/Note-master2/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-en-rGB/values-en-rGB.xml
diff --git a/src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-en-rIN/values-en-rIN.xml b/src/Note-master2/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-en-rIN/values-en-rIN.xml
similarity index 100%
rename from src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-en-rIN/values-en-rIN.xml
rename to src/Note-master2/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-en-rIN/values-en-rIN.xml
diff --git a/src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-en-rXC/values-en-rXC.xml b/src/Note-master2/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-en-rXC/values-en-rXC.xml
similarity index 100%
rename from src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-en-rXC/values-en-rXC.xml
rename to src/Note-master2/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-en-rXC/values-en-rXC.xml
diff --git a/src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-es-rUS/values-es-rUS.xml b/src/Note-master2/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-es-rUS/values-es-rUS.xml
similarity index 100%
rename from src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-es-rUS/values-es-rUS.xml
rename to src/Note-master2/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-es-rUS/values-es-rUS.xml
diff --git a/src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-es/values-es.xml b/src/Note-master2/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-es/values-es.xml
similarity index 100%
rename from src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-es/values-es.xml
rename to src/Note-master2/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-es/values-es.xml
diff --git a/src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-et/values-et.xml b/src/Note-master2/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-et/values-et.xml
similarity index 100%
rename from src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-et/values-et.xml
rename to src/Note-master2/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-et/values-et.xml
diff --git a/src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-eu/values-eu.xml b/src/Note-master2/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-eu/values-eu.xml
similarity index 100%
rename from src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-eu/values-eu.xml
rename to src/Note-master2/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-eu/values-eu.xml
diff --git a/src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-fa/values-fa.xml b/src/Note-master2/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-fa/values-fa.xml
similarity index 100%
rename from src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-fa/values-fa.xml
rename to src/Note-master2/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-fa/values-fa.xml
diff --git a/src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-fi/values-fi.xml b/src/Note-master2/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-fi/values-fi.xml
similarity index 100%
rename from src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-fi/values-fi.xml
rename to src/Note-master2/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-fi/values-fi.xml
diff --git a/src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-fr-rCA/values-fr-rCA.xml b/src/Note-master2/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-fr-rCA/values-fr-rCA.xml
similarity index 100%
rename from src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-fr-rCA/values-fr-rCA.xml
rename to src/Note-master2/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-fr-rCA/values-fr-rCA.xml
diff --git a/src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-fr/values-fr.xml b/src/Note-master2/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-fr/values-fr.xml
similarity index 100%
rename from src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-fr/values-fr.xml
rename to src/Note-master2/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-fr/values-fr.xml
diff --git a/src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-gl/values-gl.xml b/src/Note-master2/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-gl/values-gl.xml
similarity index 100%
rename from src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-gl/values-gl.xml
rename to src/Note-master2/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-gl/values-gl.xml
diff --git a/src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-gu/values-gu.xml b/src/Note-master2/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-gu/values-gu.xml
similarity index 100%
rename from src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-gu/values-gu.xml
rename to src/Note-master2/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-gu/values-gu.xml
diff --git a/src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-h720dp-v13/values-h720dp-v13.xml b/src/Note-master2/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-h720dp-v13/values-h720dp-v13.xml
similarity index 100%
rename from src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-h720dp-v13/values-h720dp-v13.xml
rename to src/Note-master2/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-h720dp-v13/values-h720dp-v13.xml
diff --git a/src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-hdpi-v4/values-hdpi-v4.xml b/src/Note-master2/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-hdpi-v4/values-hdpi-v4.xml
similarity index 100%
rename from src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-hdpi-v4/values-hdpi-v4.xml
rename to src/Note-master2/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-hdpi-v4/values-hdpi-v4.xml
diff --git a/src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-hi/values-hi.xml b/src/Note-master2/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-hi/values-hi.xml
similarity index 100%
rename from src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-hi/values-hi.xml
rename to src/Note-master2/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-hi/values-hi.xml
diff --git a/src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-hr/values-hr.xml b/src/Note-master2/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-hr/values-hr.xml
similarity index 100%
rename from src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-hr/values-hr.xml
rename to src/Note-master2/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-hr/values-hr.xml
diff --git a/src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-hu/values-hu.xml b/src/Note-master2/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-hu/values-hu.xml
similarity index 100%
rename from src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-hu/values-hu.xml
rename to src/Note-master2/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-hu/values-hu.xml
diff --git a/src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-hy/values-hy.xml b/src/Note-master2/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-hy/values-hy.xml
similarity index 100%
rename from src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-hy/values-hy.xml
rename to src/Note-master2/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-hy/values-hy.xml
diff --git a/src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-in/values-in.xml b/src/Note-master2/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-in/values-in.xml
similarity index 100%
rename from src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-in/values-in.xml
rename to src/Note-master2/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-in/values-in.xml
diff --git a/src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-is/values-is.xml b/src/Note-master2/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-is/values-is.xml
similarity index 100%
rename from src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-is/values-is.xml
rename to src/Note-master2/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-is/values-is.xml
diff --git a/src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-it/values-it.xml b/src/Note-master2/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-it/values-it.xml
similarity index 100%
rename from src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-it/values-it.xml
rename to src/Note-master2/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-it/values-it.xml
diff --git a/src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-iw/values-iw.xml b/src/Note-master2/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-iw/values-iw.xml
similarity index 100%
rename from src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-iw/values-iw.xml
rename to src/Note-master2/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-iw/values-iw.xml
diff --git a/src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-ja/values-ja.xml b/src/Note-master2/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-ja/values-ja.xml
similarity index 100%
rename from src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-ja/values-ja.xml
rename to src/Note-master2/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-ja/values-ja.xml
diff --git a/src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-ka/values-ka.xml b/src/Note-master2/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-ka/values-ka.xml
similarity index 100%
rename from src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-ka/values-ka.xml
rename to src/Note-master2/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-ka/values-ka.xml
diff --git a/src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-kk/values-kk.xml b/src/Note-master2/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-kk/values-kk.xml
similarity index 100%
rename from src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-kk/values-kk.xml
rename to src/Note-master2/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-kk/values-kk.xml
diff --git a/src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-km/values-km.xml b/src/Note-master2/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-km/values-km.xml
similarity index 100%
rename from src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-km/values-km.xml
rename to src/Note-master2/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-km/values-km.xml
diff --git a/src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-kn/values-kn.xml b/src/Note-master2/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-kn/values-kn.xml
similarity index 100%
rename from src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-kn/values-kn.xml
rename to src/Note-master2/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-kn/values-kn.xml
diff --git a/src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-ko/values-ko.xml b/src/Note-master2/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-ko/values-ko.xml
similarity index 100%
rename from src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-ko/values-ko.xml
rename to src/Note-master2/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-ko/values-ko.xml
diff --git a/src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-ky/values-ky.xml b/src/Note-master2/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-ky/values-ky.xml
similarity index 100%
rename from src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-ky/values-ky.xml
rename to src/Note-master2/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-ky/values-ky.xml
diff --git a/src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-land/values-land.xml b/src/Note-master2/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-land/values-land.xml
similarity index 100%
rename from src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-land/values-land.xml
rename to src/Note-master2/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-land/values-land.xml
diff --git a/src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-large-v4/values-large-v4.xml b/src/Note-master2/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-large-v4/values-large-v4.xml
similarity index 100%
rename from src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-large-v4/values-large-v4.xml
rename to src/Note-master2/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-large-v4/values-large-v4.xml
diff --git a/src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-ldltr-v21/values-ldltr-v21.xml b/src/Note-master2/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-ldltr-v21/values-ldltr-v21.xml
similarity index 100%
rename from src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-ldltr-v21/values-ldltr-v21.xml
rename to src/Note-master2/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-ldltr-v21/values-ldltr-v21.xml
diff --git a/src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-lo/values-lo.xml b/src/Note-master2/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-lo/values-lo.xml
similarity index 100%
rename from src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-lo/values-lo.xml
rename to src/Note-master2/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-lo/values-lo.xml
diff --git a/src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-lt/values-lt.xml b/src/Note-master2/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-lt/values-lt.xml
similarity index 100%
rename from src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-lt/values-lt.xml
rename to src/Note-master2/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-lt/values-lt.xml
diff --git a/src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-lv/values-lv.xml b/src/Note-master2/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-lv/values-lv.xml
similarity index 100%
rename from src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-lv/values-lv.xml
rename to src/Note-master2/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-lv/values-lv.xml
diff --git a/src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-mk/values-mk.xml b/src/Note-master2/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-mk/values-mk.xml
similarity index 100%
rename from src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-mk/values-mk.xml
rename to src/Note-master2/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-mk/values-mk.xml
diff --git a/src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-ml/values-ml.xml b/src/Note-master2/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-ml/values-ml.xml
similarity index 100%
rename from src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-ml/values-ml.xml
rename to src/Note-master2/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-ml/values-ml.xml
diff --git a/src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-mn/values-mn.xml b/src/Note-master2/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-mn/values-mn.xml
similarity index 100%
rename from src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-mn/values-mn.xml
rename to src/Note-master2/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-mn/values-mn.xml
diff --git a/src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-mr/values-mr.xml b/src/Note-master2/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-mr/values-mr.xml
similarity index 100%
rename from src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-mr/values-mr.xml
rename to src/Note-master2/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-mr/values-mr.xml
diff --git a/src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-ms/values-ms.xml b/src/Note-master2/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-ms/values-ms.xml
similarity index 100%
rename from src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-ms/values-ms.xml
rename to src/Note-master2/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-ms/values-ms.xml
diff --git a/src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-my/values-my.xml b/src/Note-master2/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-my/values-my.xml
similarity index 100%
rename from src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-my/values-my.xml
rename to src/Note-master2/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-my/values-my.xml
diff --git a/src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-nb/values-nb.xml b/src/Note-master2/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-nb/values-nb.xml
similarity index 100%
rename from src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-nb/values-nb.xml
rename to src/Note-master2/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-nb/values-nb.xml
diff --git a/src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-ne/values-ne.xml b/src/Note-master2/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-ne/values-ne.xml
similarity index 100%
rename from src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-ne/values-ne.xml
rename to src/Note-master2/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-ne/values-ne.xml
diff --git a/src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-night-v8/values-night-v8.xml b/src/Note-master2/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-night-v8/values-night-v8.xml
similarity index 100%
rename from src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-night-v8/values-night-v8.xml
rename to src/Note-master2/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-night-v8/values-night-v8.xml
diff --git a/src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-nl/values-nl.xml b/src/Note-master2/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-nl/values-nl.xml
similarity index 100%
rename from src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-nl/values-nl.xml
rename to src/Note-master2/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-nl/values-nl.xml
diff --git a/src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-or/values-or.xml b/src/Note-master2/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-or/values-or.xml
similarity index 100%
rename from src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-or/values-or.xml
rename to src/Note-master2/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-or/values-or.xml
diff --git a/src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-pa/values-pa.xml b/src/Note-master2/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-pa/values-pa.xml
similarity index 100%
rename from src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-pa/values-pa.xml
rename to src/Note-master2/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-pa/values-pa.xml
diff --git a/src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-pl/values-pl.xml b/src/Note-master2/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-pl/values-pl.xml
similarity index 100%
rename from src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-pl/values-pl.xml
rename to src/Note-master2/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-pl/values-pl.xml
diff --git a/src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-port/values-port.xml b/src/Note-master2/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-port/values-port.xml
similarity index 100%
rename from src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-port/values-port.xml
rename to src/Note-master2/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-port/values-port.xml
diff --git a/src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-pt-rBR/values-pt-rBR.xml b/src/Note-master2/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-pt-rBR/values-pt-rBR.xml
similarity index 100%
rename from src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-pt-rBR/values-pt-rBR.xml
rename to src/Note-master2/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-pt-rBR/values-pt-rBR.xml
diff --git a/src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-pt-rPT/values-pt-rPT.xml b/src/Note-master2/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-pt-rPT/values-pt-rPT.xml
similarity index 100%
rename from src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-pt-rPT/values-pt-rPT.xml
rename to src/Note-master2/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-pt-rPT/values-pt-rPT.xml
diff --git a/src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-pt/values-pt.xml b/src/Note-master2/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-pt/values-pt.xml
similarity index 100%
rename from src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-pt/values-pt.xml
rename to src/Note-master2/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-pt/values-pt.xml
diff --git a/src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-ro/values-ro.xml b/src/Note-master2/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-ro/values-ro.xml
similarity index 100%
rename from src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-ro/values-ro.xml
rename to src/Note-master2/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-ro/values-ro.xml
diff --git a/src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-ru/values-ru.xml b/src/Note-master2/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-ru/values-ru.xml
similarity index 100%
rename from src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-ru/values-ru.xml
rename to src/Note-master2/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-ru/values-ru.xml
diff --git a/src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-si/values-si.xml b/src/Note-master2/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-si/values-si.xml
similarity index 100%
rename from src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-si/values-si.xml
rename to src/Note-master2/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-si/values-si.xml
diff --git a/src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-sk/values-sk.xml b/src/Note-master2/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-sk/values-sk.xml
similarity index 100%
rename from src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-sk/values-sk.xml
rename to src/Note-master2/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-sk/values-sk.xml
diff --git a/src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-sl/values-sl.xml b/src/Note-master2/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-sl/values-sl.xml
similarity index 100%
rename from src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-sl/values-sl.xml
rename to src/Note-master2/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-sl/values-sl.xml
diff --git a/src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-sq/values-sq.xml b/src/Note-master2/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-sq/values-sq.xml
similarity index 100%
rename from src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-sq/values-sq.xml
rename to src/Note-master2/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-sq/values-sq.xml
diff --git a/src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-sr/values-sr.xml b/src/Note-master2/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-sr/values-sr.xml
similarity index 100%
rename from src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-sr/values-sr.xml
rename to src/Note-master2/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-sr/values-sr.xml
diff --git a/src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-sv/values-sv.xml b/src/Note-master2/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-sv/values-sv.xml
similarity index 100%
rename from src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-sv/values-sv.xml
rename to src/Note-master2/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-sv/values-sv.xml
diff --git a/src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-sw/values-sw.xml b/src/Note-master2/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-sw/values-sw.xml
similarity index 100%
rename from src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-sw/values-sw.xml
rename to src/Note-master2/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-sw/values-sw.xml
diff --git a/src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-sw600dp-v13/values-sw600dp-v13.xml b/src/Note-master2/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-sw600dp-v13/values-sw600dp-v13.xml
similarity index 100%
rename from src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-sw600dp-v13/values-sw600dp-v13.xml
rename to src/Note-master2/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-sw600dp-v13/values-sw600dp-v13.xml
diff --git a/src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-ta/values-ta.xml b/src/Note-master2/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-ta/values-ta.xml
similarity index 100%
rename from src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-ta/values-ta.xml
rename to src/Note-master2/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-ta/values-ta.xml
diff --git a/src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-te/values-te.xml b/src/Note-master2/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-te/values-te.xml
similarity index 100%
rename from src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-te/values-te.xml
rename to src/Note-master2/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-te/values-te.xml
diff --git a/src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-th/values-th.xml b/src/Note-master2/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-th/values-th.xml
similarity index 100%
rename from src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-th/values-th.xml
rename to src/Note-master2/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-th/values-th.xml
diff --git a/src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-tl/values-tl.xml b/src/Note-master2/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-tl/values-tl.xml
similarity index 100%
rename from src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-tl/values-tl.xml
rename to src/Note-master2/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-tl/values-tl.xml
diff --git a/src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-tr/values-tr.xml b/src/Note-master2/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-tr/values-tr.xml
similarity index 100%
rename from src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-tr/values-tr.xml
rename to src/Note-master2/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-tr/values-tr.xml
diff --git a/src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-uk/values-uk.xml b/src/Note-master2/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-uk/values-uk.xml
similarity index 100%
rename from src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-uk/values-uk.xml
rename to src/Note-master2/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-uk/values-uk.xml
diff --git a/src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-ur/values-ur.xml b/src/Note-master2/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-ur/values-ur.xml
similarity index 100%
rename from src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-ur/values-ur.xml
rename to src/Note-master2/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-ur/values-ur.xml
diff --git a/src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-uz/values-uz.xml b/src/Note-master2/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-uz/values-uz.xml
similarity index 100%
rename from src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-uz/values-uz.xml
rename to src/Note-master2/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-uz/values-uz.xml
diff --git a/src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-v16/values-v16.xml b/src/Note-master2/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-v16/values-v16.xml
similarity index 100%
rename from src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-v16/values-v16.xml
rename to src/Note-master2/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-v16/values-v16.xml
diff --git a/src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-v17/values-v17.xml b/src/Note-master2/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-v17/values-v17.xml
similarity index 100%
rename from src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-v17/values-v17.xml
rename to src/Note-master2/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-v17/values-v17.xml
diff --git a/src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-v18/values-v18.xml b/src/Note-master2/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-v18/values-v18.xml
similarity index 100%
rename from src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-v18/values-v18.xml
rename to src/Note-master2/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-v18/values-v18.xml
diff --git a/src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-v21/values-v21.xml b/src/Note-master2/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-v21/values-v21.xml
similarity index 100%
rename from src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-v21/values-v21.xml
rename to src/Note-master2/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-v21/values-v21.xml
diff --git a/src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-v22/values-v22.xml b/src/Note-master2/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-v22/values-v22.xml
similarity index 100%
rename from src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-v22/values-v22.xml
rename to src/Note-master2/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-v22/values-v22.xml
diff --git a/src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-v23/values-v23.xml b/src/Note-master2/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-v23/values-v23.xml
similarity index 100%
rename from src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-v23/values-v23.xml
rename to src/Note-master2/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-v23/values-v23.xml
diff --git a/src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-v24/values-v24.xml b/src/Note-master2/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-v24/values-v24.xml
similarity index 100%
rename from src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-v24/values-v24.xml
rename to src/Note-master2/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-v24/values-v24.xml
diff --git a/src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-v25/values-v25.xml b/src/Note-master2/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-v25/values-v25.xml
similarity index 100%
rename from src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-v25/values-v25.xml
rename to src/Note-master2/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-v25/values-v25.xml
diff --git a/src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-v26/values-v26.xml b/src/Note-master2/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-v26/values-v26.xml
similarity index 100%
rename from src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-v26/values-v26.xml
rename to src/Note-master2/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-v26/values-v26.xml
diff --git a/src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-v28/values-v28.xml b/src/Note-master2/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-v28/values-v28.xml
similarity index 100%
rename from src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-v28/values-v28.xml
rename to src/Note-master2/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-v28/values-v28.xml
diff --git a/src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-vi/values-vi.xml b/src/Note-master2/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-vi/values-vi.xml
similarity index 100%
rename from src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-vi/values-vi.xml
rename to src/Note-master2/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-vi/values-vi.xml
diff --git a/src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-watch-v20/values-watch-v20.xml b/src/Note-master2/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-watch-v20/values-watch-v20.xml
similarity index 100%
rename from src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-watch-v20/values-watch-v20.xml
rename to src/Note-master2/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-watch-v20/values-watch-v20.xml
diff --git a/src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-watch-v21/values-watch-v21.xml b/src/Note-master2/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-watch-v21/values-watch-v21.xml
similarity index 100%
rename from src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-watch-v21/values-watch-v21.xml
rename to src/Note-master2/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-watch-v21/values-watch-v21.xml
diff --git a/src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-xlarge-v4/values-xlarge-v4.xml b/src/Note-master2/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-xlarge-v4/values-xlarge-v4.xml
similarity index 100%
rename from src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-xlarge-v4/values-xlarge-v4.xml
rename to src/Note-master2/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-xlarge-v4/values-xlarge-v4.xml
diff --git a/src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-zh-rCN/values-zh-rCN.xml b/src/Note-master2/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-zh-rCN/values-zh-rCN.xml
similarity index 100%
rename from src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-zh-rCN/values-zh-rCN.xml
rename to src/Note-master2/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-zh-rCN/values-zh-rCN.xml
diff --git a/src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-zh-rHK/values-zh-rHK.xml b/src/Note-master2/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-zh-rHK/values-zh-rHK.xml
similarity index 100%
rename from src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-zh-rHK/values-zh-rHK.xml
rename to src/Note-master2/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-zh-rHK/values-zh-rHK.xml
diff --git a/src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-zh-rTW/values-zh-rTW.xml b/src/Note-master2/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-zh-rTW/values-zh-rTW.xml
similarity index 100%
rename from src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-zh-rTW/values-zh-rTW.xml
rename to src/Note-master2/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-zh-rTW/values-zh-rTW.xml
diff --git a/src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-zu/values-zu.xml b/src/Note-master2/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-zu/values-zu.xml
similarity index 100%
rename from src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-zu/values-zu.xml
rename to src/Note-master2/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-zu/values-zu.xml
diff --git a/src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values/values.xml b/src/Note-master2/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values/values.xml
similarity index 100%
rename from src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values/values.xml
rename to src/Note-master2/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values/values.xml
diff --git a/src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merger.xml b/src/Note-master2/app/build/intermediates/incremental/mergeDebugResources/merger.xml
similarity index 93%
rename from src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merger.xml
rename to src/Note-master2/app/build/intermediates/incremental/mergeDebugResources/merger.xml
index 27aa3c6..76baccc 100644
--- a/src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merger.xml
+++ b/src/Note-master2/app/build/intermediates/incremental/mergeDebugResources/merger.xml
@@ -2600,7 +2600,7 @@
- 60%
- 90%
- 50%
- 70%
- 45%
- 72%
"转到主屏幕""转到上一层级""更多选项""完成""查看全部""选择应用""关闭""开启""Alt+""Ctrl+""Delete 键""Enter 键""Fn+""Meta+""Shift+""空格键""Sym+""Menu+""搜索…""清除查询""搜索查询""搜索""提交查询""语音搜索""分享方式""使用%s分享""收起""搜索""瀏覽主頁""向上瀏覽""更多選項""完成""顯示全部""選擇應用程式""關閉""開啟""Alt +""Ctrl +""刪除""Enter 鍵""Fn +""Meta +""Shift +""空白鍵""Sym +""Menu +""搜尋…""清除查詢""搜尋查詢""搜尋""提交查詢""語音搜尋""分享對象""使用「%s」分享""收合""搜尋""瀏覽首頁""向上瀏覽""更多選項""完成""查看全部""選擇應用程式""關閉""開啟""Alt +""Ctrl +""Delete 鍵""Enter 鍵""Fn +""Meta +""Shift +""空格鍵""Sym +""Menu +""搜尋…""清除查詢""搜尋查詢""搜尋""提交查詢""語音搜尋""選擇分享對象""與「%s」分享""收合""搜尋""Zulazulela ekhaya""Zulazulela phezulu""Izinketho eziningi""Kwenziwe""Buka konke""Khetha uhlelo lokusebenza""VALIWE""VULIWE""Alt+""Ctrl+""susa""enter""Function+""Meta+""Shift+""space""Sym+""Imenyu+""Iyasesha...""Sula inkinga""Umbuzo wosesho""Sesha""Hambisa umbuzo""Ukusesha ngezwi""Yabelana no-""Yabelana ne-%s""Goqa""Sesha"
+
diff --git a/src/Note-master2/app/build/intermediates/incremental/mergeDebugShaders/merger.xml b/src/Note-master2/app/build/intermediates/incremental/mergeDebugShaders/merger.xml
new file mode 100644
index 0000000..e9e163d
--- /dev/null
+++ b/src/Note-master2/app/build/intermediates/incremental/mergeDebugShaders/merger.xml
@@ -0,0 +1,2 @@
+
+
\ No newline at end of file
diff --git a/src/Note-master2/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt b/src/Note-master2/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt
new file mode 100644
index 0000000..4dbf11d
--- /dev/null
+++ b/src/Note-master2/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt
@@ -0,0 +1,4 @@
+#Thu Sep 16 14:28:53 GMT+08:00 2021
+base.0=D\:\\Note-master2\\app\\build\\intermediates\\dex\\debug\\mergeDexDebug\\classes.dex
+renamed.0=classes.dex
+path.0=classes.dex
diff --git a/src/Notes-master1/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/androidResources b/src/Note-master2/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/androidResources
similarity index 100%
rename from src/Notes-master1/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/androidResources
rename to src/Note-master2/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/androidResources
diff --git a/src/Notes-master1/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/javaResources0 b/src/Note-master2/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/javaResources0
similarity index 100%
rename from src/Notes-master1/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/javaResources0
rename to src/Note-master2/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/javaResources0
diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/BuildConfig.class b/src/Note-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/BuildConfig.class
similarity index 100%
rename from src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/BuildConfig.class
rename to src/Note-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/BuildConfig.class
diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Contact.class b/src/Note-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Contact.class
similarity index 100%
rename from src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Contact.class
rename to src/Note-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Contact.class
diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$CallNote.class b/src/Note-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$CallNote.class
similarity index 100%
rename from src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$CallNote.class
rename to src/Note-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$CallNote.class
diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$DataColumns.class b/src/Note-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$DataColumns.class
similarity index 100%
rename from src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$DataColumns.class
rename to src/Note-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$DataColumns.class
diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$DataConstants.class b/src/Note-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$DataConstants.class
similarity index 100%
rename from src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$DataConstants.class
rename to src/Note-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$DataConstants.class
diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$NoteColumns.class b/src/Note-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$NoteColumns.class
similarity index 100%
rename from src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$NoteColumns.class
rename to src/Note-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$NoteColumns.class
diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$TextNote.class b/src/Note-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$TextNote.class
similarity index 100%
rename from src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$TextNote.class
rename to src/Note-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$TextNote.class
diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes.class b/src/Note-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes.class
similarity index 100%
rename from src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes.class
rename to src/Note-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes.class
diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/data/NotesDatabaseHelper$TABLE.class b/src/Note-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/data/NotesDatabaseHelper$TABLE.class
similarity index 100%
rename from src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/data/NotesDatabaseHelper$TABLE.class
rename to src/Note-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/data/NotesDatabaseHelper$TABLE.class
diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/data/NotesDatabaseHelper.class b/src/Note-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/data/NotesDatabaseHelper.class
similarity index 100%
rename from src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/data/NotesDatabaseHelper.class
rename to src/Note-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/data/NotesDatabaseHelper.class
diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/data/NotesProvider.class b/src/Note-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/data/NotesProvider.class
similarity index 100%
rename from src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/data/NotesProvider.class
rename to src/Note-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/data/NotesProvider.class
diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/MetaData.class b/src/Note-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/MetaData.class
similarity index 100%
rename from src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/MetaData.class
rename to src/Note-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/MetaData.class
diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/Node.class b/src/Note-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/Node.class
similarity index 100%
rename from src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/Node.class
rename to src/Note-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/Node.class
diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/SqlData.class b/src/Note-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/SqlData.class
similarity index 100%
rename from src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/SqlData.class
rename to src/Note-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/SqlData.class
diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/SqlNote.class b/src/Note-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/SqlNote.class
similarity index 100%
rename from src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/SqlNote.class
rename to src/Note-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/SqlNote.class
diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/Task.class b/src/Note-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/Task.class
similarity index 100%
rename from src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/Task.class
rename to src/Note-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/Task.class
diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/TaskList.class b/src/Note-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/TaskList.class
similarity index 100%
rename from src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/TaskList.class
rename to src/Note-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/TaskList.class
diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/exception/ActionFailureException.class b/src/Note-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/exception/ActionFailureException.class
similarity index 100%
rename from src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/exception/ActionFailureException.class
rename to src/Note-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/exception/ActionFailureException.class
diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/exception/NetworkFailureException.class b/src/Note-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/exception/NetworkFailureException.class
similarity index 100%
rename from src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/exception/NetworkFailureException.class
rename to src/Note-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/exception/NetworkFailureException.class
diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskASyncTask$1.class b/src/Note-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskASyncTask$1.class
similarity index 100%
rename from src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskASyncTask$1.class
rename to src/Note-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskASyncTask$1.class
diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskASyncTask$OnCompleteListener.class b/src/Note-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskASyncTask$OnCompleteListener.class
similarity index 100%
rename from src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskASyncTask$OnCompleteListener.class
rename to src/Note-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskASyncTask$OnCompleteListener.class
diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskASyncTask.class b/src/Note-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskASyncTask.class
similarity index 100%
rename from src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskASyncTask.class
rename to src/Note-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskASyncTask.class
diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskClient.class b/src/Note-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskClient.class
similarity index 100%
rename from src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskClient.class
rename to src/Note-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskClient.class
diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskManager.class b/src/Note-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskManager.class
similarity index 100%
rename from src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskManager.class
rename to src/Note-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskManager.class
diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskSyncService$1.class b/src/Note-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskSyncService$1.class
similarity index 100%
rename from src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskSyncService$1.class
rename to src/Note-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskSyncService$1.class
diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskSyncService.class b/src/Note-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskSyncService.class
similarity index 100%
rename from src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskSyncService.class
rename to src/Note-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskSyncService.class
diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/model/Note$NoteData.class b/src/Note-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/model/Note$NoteData.class
similarity index 100%
rename from src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/model/Note$NoteData.class
rename to src/Note-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/model/Note$NoteData.class
diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/model/Note.class b/src/Note-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/model/Note.class
similarity index 100%
rename from src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/model/Note.class
rename to src/Note-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/model/Note.class
diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/model/WorkingNote$NoteSettingChangedListener.class b/src/Note-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/model/WorkingNote$NoteSettingChangedListener.class
similarity index 100%
rename from src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/model/WorkingNote$NoteSettingChangedListener.class
rename to src/Note-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/model/WorkingNote$NoteSettingChangedListener.class
diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/model/WorkingNote.class b/src/Note-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/model/WorkingNote.class
similarity index 100%
rename from src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/model/WorkingNote.class
rename to src/Note-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/model/WorkingNote.class
diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/BackupUtils$TextExport.class b/src/Note-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/BackupUtils$TextExport.class
similarity index 100%
rename from src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/BackupUtils$TextExport.class
rename to src/Note-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/BackupUtils$TextExport.class
diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/BackupUtils.class b/src/Note-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/BackupUtils.class
similarity index 100%
rename from src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/BackupUtils.class
rename to src/Note-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/BackupUtils.class
diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/DataUtils.class b/src/Note-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/DataUtils.class
similarity index 100%
rename from src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/DataUtils.class
rename to src/Note-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/DataUtils.class
diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/GTaskStringUtils.class b/src/Note-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/GTaskStringUtils.class
similarity index 100%
rename from src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/GTaskStringUtils.class
rename to src/Note-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/GTaskStringUtils.class
diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$NoteBgResources.class b/src/Note-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$NoteBgResources.class
similarity index 100%
rename from src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$NoteBgResources.class
rename to src/Note-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$NoteBgResources.class
diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$NoteItemBgResources.class b/src/Note-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$NoteItemBgResources.class
similarity index 100%
rename from src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$NoteItemBgResources.class
rename to src/Note-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$NoteItemBgResources.class
diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$TextAppearanceResources.class b/src/Note-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$TextAppearanceResources.class
similarity index 100%
rename from src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$TextAppearanceResources.class
rename to src/Note-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$TextAppearanceResources.class
diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$WidgetBgResources.class b/src/Note-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$WidgetBgResources.class
similarity index 100%
rename from src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$WidgetBgResources.class
rename to src/Note-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$WidgetBgResources.class
diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser.class b/src/Note-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser.class
similarity index 100%
rename from src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser.class
rename to src/Note-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser.class
diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/AlarmAlertActivity.class b/src/Note-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/AlarmAlertActivity.class
similarity index 100%
rename from src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/AlarmAlertActivity.class
rename to src/Note-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/AlarmAlertActivity.class
diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/AlarmInitReceiver.class b/src/Note-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/AlarmInitReceiver.class
similarity index 100%
rename from src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/AlarmInitReceiver.class
rename to src/Note-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/AlarmInitReceiver.class
diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/AlarmReceiver.class b/src/Note-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/AlarmReceiver.class
similarity index 100%
rename from src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/AlarmReceiver.class
rename to src/Note-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/AlarmReceiver.class
diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$1.class b/src/Note-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$1.class
similarity index 100%
rename from src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$1.class
rename to src/Note-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$1.class
diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$2.class b/src/Note-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$2.class
similarity index 100%
rename from src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$2.class
rename to src/Note-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$2.class
diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$3.class b/src/Note-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$3.class
similarity index 100%
rename from src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$3.class
rename to src/Note-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$3.class
diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$4.class b/src/Note-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$4.class
similarity index 100%
rename from src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$4.class
rename to src/Note-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$4.class
diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$OnDateTimeChangedListener.class b/src/Note-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$OnDateTimeChangedListener.class
similarity index 100%
rename from src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$OnDateTimeChangedListener.class
rename to src/Note-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$OnDateTimeChangedListener.class
diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker.class b/src/Note-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker.class
similarity index 100%
rename from src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker.class
rename to src/Note-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker.class
diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePickerDialog$1.class b/src/Note-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePickerDialog$1.class
similarity index 100%
rename from src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePickerDialog$1.class
rename to src/Note-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePickerDialog$1.class
diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePickerDialog$OnDateTimeSetListener.class b/src/Note-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePickerDialog$OnDateTimeSetListener.class
similarity index 100%
rename from src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePickerDialog$OnDateTimeSetListener.class
rename to src/Note-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePickerDialog$OnDateTimeSetListener.class
diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePickerDialog.class b/src/Note-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePickerDialog.class
similarity index 100%
rename from src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePickerDialog.class
rename to src/Note-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePickerDialog.class
diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DropdownMenu$1.class b/src/Note-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DropdownMenu$1.class
similarity index 100%
rename from src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DropdownMenu$1.class
rename to src/Note-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DropdownMenu$1.class
diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DropdownMenu.class b/src/Note-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DropdownMenu.class
similarity index 100%
rename from src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DropdownMenu.class
rename to src/Note-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DropdownMenu.class
diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/FoldersListAdapter$FolderListItem.class b/src/Note-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/FoldersListAdapter$FolderListItem.class
similarity index 100%
rename from src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/FoldersListAdapter$FolderListItem.class
rename to src/Note-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/FoldersListAdapter$FolderListItem.class
diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/FoldersListAdapter.class b/src/Note-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/FoldersListAdapter.class
similarity index 100%
rename from src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/FoldersListAdapter.class
rename to src/Note-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/FoldersListAdapter.class
diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$1.class b/src/Note-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$1.class
similarity index 100%
rename from src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$1.class
rename to src/Note-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$1.class
diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$2.class b/src/Note-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$2.class
similarity index 100%
rename from src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$2.class
rename to src/Note-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$2.class
diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$3.class b/src/Note-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$3.class
similarity index 100%
rename from src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$3.class
rename to src/Note-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$3.class
diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$HeadViewHolder.class b/src/Note-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$HeadViewHolder.class
similarity index 100%
rename from src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$HeadViewHolder.class
rename to src/Note-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$HeadViewHolder.class
diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity.class b/src/Note-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity.class
similarity index 100%
rename from src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity.class
rename to src/Note-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity.class
diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditText$1.class b/src/Note-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditText$1.class
similarity index 100%
rename from src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditText$1.class
rename to src/Note-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditText$1.class
diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditText$OnTextViewChangeListener.class b/src/Note-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditText$OnTextViewChangeListener.class
similarity index 100%
rename from src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditText$OnTextViewChangeListener.class
rename to src/Note-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditText$OnTextViewChangeListener.class
diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditText.class b/src/Note-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditText.class
similarity index 100%
rename from src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditText.class
rename to src/Note-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditText.class
diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteItemData.class b/src/Note-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteItemData.class
similarity index 100%
rename from src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteItemData.class
rename to src/Note-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteItemData.class
diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$1.class b/src/Note-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$1.class
similarity index 100%
rename from src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$1.class
rename to src/Note-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$1.class
diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$2.class b/src/Note-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$2.class
similarity index 100%
rename from src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$2.class
rename to src/Note-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$2.class
diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$3.class b/src/Note-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$3.class
similarity index 100%
rename from src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$3.class
rename to src/Note-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$3.class
diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$4.class b/src/Note-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$4.class
similarity index 100%
rename from src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$4.class
rename to src/Note-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$4.class
diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$5.class b/src/Note-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$5.class
similarity index 100%
rename from src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$5.class
rename to src/Note-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$5.class
diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$6.class b/src/Note-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$6.class
similarity index 100%
rename from src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$6.class
rename to src/Note-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$6.class
diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$7.class b/src/Note-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$7.class
similarity index 100%
rename from src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$7.class
rename to src/Note-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$7.class
diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$8.class b/src/Note-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$8.class
similarity index 100%
rename from src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$8.class
rename to src/Note-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$8.class
diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$9.class b/src/Note-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$9.class
similarity index 100%
rename from src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$9.class
rename to src/Note-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$9.class
diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$BackgroundQueryHandler.class b/src/Note-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$BackgroundQueryHandler.class
similarity index 100%
rename from src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$BackgroundQueryHandler.class
rename to src/Note-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$BackgroundQueryHandler.class
diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ListEditState.class b/src/Note-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ListEditState.class
similarity index 100%
rename from src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ListEditState.class
rename to src/Note-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ListEditState.class
diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback$1.class b/src/Note-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback$1.class
similarity index 100%
rename from src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback$1.class
rename to src/Note-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback$1.class
diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback$2.class b/src/Note-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback$2.class
similarity index 100%
rename from src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback$2.class
rename to src/Note-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback$2.class
diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback.class b/src/Note-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback.class
similarity index 100%
rename from src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback.class
rename to src/Note-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback.class
diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$NewNoteOnTouchListener.class b/src/Note-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$NewNoteOnTouchListener.class
similarity index 100%
rename from src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$NewNoteOnTouchListener.class
rename to src/Note-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$NewNoteOnTouchListener.class
diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.class b/src/Note-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.class
similarity index 100%
rename from src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.class
rename to src/Note-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.class
diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity.class b/src/Note-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity.class
similarity index 100%
rename from src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity.class
rename to src/Note-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity.class
diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListAdapter$AppWidgetAttribute.class b/src/Note-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListAdapter$AppWidgetAttribute.class
similarity index 100%
rename from src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListAdapter$AppWidgetAttribute.class
rename to src/Note-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListAdapter$AppWidgetAttribute.class
diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListAdapter.class b/src/Note-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListAdapter.class
similarity index 100%
rename from src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListAdapter.class
rename to src/Note-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListAdapter.class
diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListItem.class b/src/Note-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListItem.class
similarity index 100%
rename from src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListItem.class
rename to src/Note-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListItem.class
diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$1.class b/src/Note-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$1.class
similarity index 100%
rename from src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$1.class
rename to src/Note-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$1.class
diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$2.class b/src/Note-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$2.class
similarity index 100%
rename from src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$2.class
rename to src/Note-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$2.class
diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$3.class b/src/Note-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$3.class
similarity index 100%
rename from src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$3.class
rename to src/Note-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$3.class
diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$4.class b/src/Note-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$4.class
similarity index 100%
rename from src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$4.class
rename to src/Note-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$4.class
diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$5.class b/src/Note-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$5.class
similarity index 100%
rename from src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$5.class
rename to src/Note-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$5.class
diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$6.class b/src/Note-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$6.class
similarity index 100%
rename from src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$6.class
rename to src/Note-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$6.class
diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$7.class b/src/Note-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$7.class
similarity index 100%
rename from src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$7.class
rename to src/Note-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$7.class
diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$8.class b/src/Note-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$8.class
similarity index 100%
rename from src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$8.class
rename to src/Note-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$8.class
diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$GTaskReceiver.class b/src/Note-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$GTaskReceiver.class
similarity index 100%
rename from src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$GTaskReceiver.class
rename to src/Note-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$GTaskReceiver.class
diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity.class b/src/Note-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity.class
similarity index 100%
rename from src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity.class
rename to src/Note-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity.class
diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider.class b/src/Note-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider.class
similarity index 100%
rename from src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider.class
rename to src/Note-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider.class
diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider_2x.class b/src/Note-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider_2x.class
similarity index 100%
rename from src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider_2x.class
rename to src/Note-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider_2x.class
diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider_4x.class b/src/Note-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider_4x.class
similarity index 100%
rename from src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider_4x.class
rename to src/Note-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider_4x.class
diff --git a/src/Note-master2/app/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt b/src/Note-master2/app/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt
new file mode 100644
index 0000000..95c9edf
--- /dev/null
+++ b/src/Note-master2/app/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt
@@ -0,0 +1,275 @@
+1
+2
+17
+21
+22 D:\Note-master2\app\src\main\AndroidManifest.xml:23:5-44
+23 android:minSdkVersion="14"
+23-->D:\Note-master2\app\src\main\AndroidManifest.xml:23:15-41
+24 android:targetSdkVersion="14" />
+24-->D:\Note-master2\app\src\main\AndroidManifest.xml:23:5-44
+25
+26
+26-->D:\Note-master2\app\src\main\AndroidManifest.xml:25:5-81
+26-->D:\Note-master2\app\src\main\AndroidManifest.xml:25:22-78
+27
+27-->D:\Note-master2\app\src\main\AndroidManifest.xml:26:5-88
+27-->D:\Note-master2\app\src\main\AndroidManifest.xml:26:22-85
+28
+28-->D:\Note-master2\app\src\main\AndroidManifest.xml:27:5-67
+28-->D:\Note-master2\app\src\main\AndroidManifest.xml:27:22-64
+29
+29-->D:\Note-master2\app\src\main\AndroidManifest.xml:28:5-72
+29-->D:\Note-master2\app\src\main\AndroidManifest.xml:28:22-69
+30
+30-->D:\Note-master2\app\src\main\AndroidManifest.xml:29:5-74
+30-->D:\Note-master2\app\src\main\AndroidManifest.xml:29:22-71
+31
+31-->D:\Note-master2\app\src\main\AndroidManifest.xml:30:5-80
+31-->D:\Note-master2\app\src\main\AndroidManifest.xml:30:22-77
+32
+32-->D:\Note-master2\app\src\main\AndroidManifest.xml:31:5-71
+32-->D:\Note-master2\app\src\main\AndroidManifest.xml:31:22-68
+33
+33-->D:\Note-master2\app\src\main\AndroidManifest.xml:32:5-74
+33-->D:\Note-master2\app\src\main\AndroidManifest.xml:32:22-71
+34
+34-->D:\Note-master2\app\src\main\AndroidManifest.xml:33:5-81
+34-->D:\Note-master2\app\src\main\AndroidManifest.xml:33:22-78
+35
+36 D:\Note-master2\app\src\main\AndroidManifest.xml:35:5-149:19
+37 android:appComponentFactory="android.support.v4.app.CoreComponentFactory"
+37-->[com.android.support:support-compat:28.0.0] C:\Users\86155\.gradle\caches\transforms-3\c9913736ba0af3f26ba50dd9aa679a2b\transformed\support-compat-28.0.0\AndroidManifest.xml:22:18-91
+38 android:debuggable="true"
+39 android:icon="@drawable/icon_app"
+39-->D:\Note-master2\app\src\main\AndroidManifest.xml:36:9-42
+40 android:label="@string/app_name"
+40-->D:\Note-master2\app\src\main\AndroidManifest.xml:37:9-41
+41 android:testOnly="true" >
+42 D:\Note-master2\app\src\main\AndroidManifest.xml:38:9-51:20
+43 android:name="net.micode.notes.ui.NotesListActivity"
+43-->D:\Note-master2\app\src\main\AndroidManifest.xml:39:13-49
+44 android:configChanges="keyboardHidden|orientation|screenSize"
+44-->D:\Note-master2\app\src\main\AndroidManifest.xml:40:13-74
+45 android:label="@string/app_name"
+45-->D:\Note-master2\app\src\main\AndroidManifest.xml:41:13-45
+46 android:launchMode="singleTop"
+46-->D:\Note-master2\app\src\main\AndroidManifest.xml:42:13-43
+47 android:theme="@style/NoteTheme"
+47-->D:\Note-master2\app\src\main\AndroidManifest.xml:43:13-45
+48 android:uiOptions="splitActionBarWhenNarrow"
+48-->D:\Note-master2\app\src\main\AndroidManifest.xml:44:13-57
+49 android:windowSoftInputMode="adjustPan" >
+49-->D:\Note-master2\app\src\main\AndroidManifest.xml:45:13-52
+50
+50-->D:\Note-master2\app\src\main\AndroidManifest.xml:47:13-50:29
+51
+51-->D:\Note-master2\app\src\main\AndroidManifest.xml:48:17-69
+51-->D:\Note-master2\app\src\main\AndroidManifest.xml:48:25-66
+52
+53
+53-->D:\Note-master2\app\src\main\AndroidManifest.xml:49:17-77
+53-->D:\Note-master2\app\src\main\AndroidManifest.xml:49:27-74
+54
+55
+56 D:\Note-master2\app\src\main\AndroidManifest.xml:53:9-81:20
+57 android:name="net.micode.notes.ui.NoteEditActivity"
+57-->D:\Note-master2\app\src\main\AndroidManifest.xml:54:13-48
+58 android:configChanges="keyboardHidden|orientation|screenSize"
+58-->D:\Note-master2\app\src\main\AndroidManifest.xml:55:13-74
+59 android:launchMode="singleTop"
+59-->D:\Note-master2\app\src\main\AndroidManifest.xml:56:13-43
+60 android:theme="@style/NoteTheme" >
+60-->D:\Note-master2\app\src\main\AndroidManifest.xml:57:13-45
+61
+61-->D:\Note-master2\app\src\main\AndroidManifest.xml:59:13-64:29
+62
+62-->D:\Note-master2\app\src\main\AndroidManifest.xml:60:17-69
+62-->D:\Note-master2\app\src\main\AndroidManifest.xml:60:25-66
+63
+64
+64-->D:\Note-master2\app\src\main\AndroidManifest.xml:61:17-76
+64-->D:\Note-master2\app\src\main\AndroidManifest.xml:61:27-73
+65
+66
+66-->D:\Note-master2\app\src\main\AndroidManifest.xml:62:17-78
+66-->D:\Note-master2\app\src\main\AndroidManifest.xml:62:23-75
+67
+67-->D:\Note-master2\app\src\main\AndroidManifest.xml:62:17-78
+67-->D:\Note-master2\app\src\main\AndroidManifest.xml:62:23-75
+68
+69
+69-->D:\Note-master2\app\src\main\AndroidManifest.xml:66:13-71:29
+70
+70-->D:\Note-master2\app\src\main\AndroidManifest.xml:67:17-79
+70-->D:\Note-master2\app\src\main\AndroidManifest.xml:67:25-76
+71
+72
+72-->D:\Note-master2\app\src\main\AndroidManifest.xml:61:17-76
+72-->D:\Note-master2\app\src\main\AndroidManifest.xml:61:27-73
+73
+74
+74-->D:\Note-master2\app\src\main\AndroidManifest.xml:62:17-78
+74-->D:\Note-master2\app\src\main\AndroidManifest.xml:62:23-75
+75
+75-->D:\Note-master2\app\src\main\AndroidManifest.xml:62:17-78
+75-->D:\Note-master2\app\src\main\AndroidManifest.xml:62:23-75
+76
+77
+77-->D:\Note-master2\app\src\main\AndroidManifest.xml:73:13-76:29
+78
+78-->D:\Note-master2\app\src\main\AndroidManifest.xml:74:17-71
+78-->D:\Note-master2\app\src\main\AndroidManifest.xml:74:25-68
+79
+80
+80-->D:\Note-master2\app\src\main\AndroidManifest.xml:61:17-76
+80-->D:\Note-master2\app\src\main\AndroidManifest.xml:61:27-73
+81
+82
+83 D:\Note-master2\app\src\main\AndroidManifest.xml:78:13-80:54
+84 android:name="android.app.searchable"
+84-->D:\Note-master2\app\src\main\AndroidManifest.xml:79:17-54
+85 android:resource="@xml/searchable" />
+85-->D:\Note-master2\app\src\main\AndroidManifest.xml:80:17-51
+86
+87
+88 D:\Note-master2\app\src\main\AndroidManifest.xml:83:9-86:43
+89 android:name="net.micode.notes.data.NotesProvider"
+89-->D:\Note-master2\app\src\main\AndroidManifest.xml:84:13-63
+90 android:authorities="micode_notes"
+90-->D:\Note-master2\app\src\main\AndroidManifest.xml:85:13-47
+91 android:multiprocess="true" />
+91-->D:\Note-master2\app\src\main\AndroidManifest.xml:86:13-40
+92
+93 D:\Note-master2\app\src\main\AndroidManifest.xml:88:9-100:20
+94 android:name="net.micode.notes.widget.NoteWidgetProvider_2x"
+94-->D:\Note-master2\app\src\main\AndroidManifest.xml:89:13-57
+95 android:label="@string/app_widget2x2" >
+95-->D:\Note-master2\app\src\main\AndroidManifest.xml:90:13-50
+96
+96-->D:\Note-master2\app\src\main\AndroidManifest.xml:91:13-95:29
+97
+97-->D:\Note-master2\app\src\main\AndroidManifest.xml:92:17-84
+97-->D:\Note-master2\app\src\main\AndroidManifest.xml:92:25-81
+98
+98-->D:\Note-master2\app\src\main\AndroidManifest.xml:93:17-85
+98-->D:\Note-master2\app\src\main\AndroidManifest.xml:93:25-82
+99
+99-->D:\Note-master2\app\src\main\AndroidManifest.xml:94:17-85
+99-->D:\Note-master2\app\src\main\AndroidManifest.xml:94:25-82
+100
+101
+102 D:\Note-master2\app\src\main\AndroidManifest.xml:97:13-99:58
+103 android:name="android.appwidget.provider"
+103-->D:\Note-master2\app\src\main\AndroidManifest.xml:98:17-58
+104 android:resource="@xml/widget_2x_info" />
+104-->D:\Note-master2\app\src\main\AndroidManifest.xml:99:17-55
+105
+106 D:\Note-master2\app\src\main\AndroidManifest.xml:101:9-114:20
+107 android:name="net.micode.notes.widget.NoteWidgetProvider_4x"
+107-->D:\Note-master2\app\src\main\AndroidManifest.xml:102:13-57
+108 android:label="@string/app_widget4x4" >
+108-->D:\Note-master2\app\src\main\AndroidManifest.xml:103:13-50
+109
+109-->D:\Note-master2\app\src\main\AndroidManifest.xml:91:13-95:29
+110
+110-->D:\Note-master2\app\src\main\AndroidManifest.xml:92:17-84
+110-->D:\Note-master2\app\src\main\AndroidManifest.xml:92:25-81
+111
+111-->D:\Note-master2\app\src\main\AndroidManifest.xml:93:17-85
+111-->D:\Note-master2\app\src\main\AndroidManifest.xml:93:25-82
+112
+112-->D:\Note-master2\app\src\main\AndroidManifest.xml:94:17-85
+112-->D:\Note-master2\app\src\main\AndroidManifest.xml:94:25-82
+113
+114
+115 D:\Note-master2\app\src\main\AndroidManifest.xml:97:13-99:58
+116 android:name="android.appwidget.provider"
+116-->D:\Note-master2\app\src\main\AndroidManifest.xml:98:17-58
+117 android:resource="@xml/widget_4x_info" />
+117-->D:\Note-master2\app\src\main\AndroidManifest.xml:99:17-55
+118
+119
+119-->D:\Note-master2\app\src\main\AndroidManifest.xml:116:9-120:20
+119-->D:\Note-master2\app\src\main\AndroidManifest.xml:116:19-55
+120
+120-->D:\Note-master2\app\src\main\AndroidManifest.xml:117:13-119:29
+121
+121-->D:\Note-master2\app\src\main\AndroidManifest.xml:118:17-79
+121-->D:\Note-master2\app\src\main\AndroidManifest.xml:118:25-76
+122
+123
+124 D:\Note-master2\app\src\main\AndroidManifest.xml:122:9-125:20
+125 android:name="net.micode.notes.ui.AlarmReceiver"
+125-->D:\Note-master2\app\src\main\AndroidManifest.xml:123:13-61
+126 android:process=":remote" >
+126-->D:\Note-master2\app\src\main\AndroidManifest.xml:124:13-38
+127
+128
+129 D:\Note-master2\app\src\main\AndroidManifest.xml:127:9-132:20
+130 android:name="net.micode.notes.ui.AlarmAlertActivity"
+130-->D:\Note-master2\app\src\main\AndroidManifest.xml:128:13-50
+131 android:label="@string/app_name"
+131-->D:\Note-master2\app\src\main\AndroidManifest.xml:129:13-45
+132 android:launchMode="singleInstance"
+132-->D:\Note-master2\app\src\main\AndroidManifest.xml:130:13-48
+133 android:theme="@android:style/Theme.Holo.Wallpaper.NoTitleBar" >
+133-->D:\Note-master2\app\src\main\AndroidManifest.xml:131:13-75
+134
+135 D:\Note-master2\app\src\main\AndroidManifest.xml:134:9-139:20
+136 android:name="net.micode.notes.ui.NotesPreferenceActivity"
+136-->D:\Note-master2\app\src\main\AndroidManifest.xml:135:13-71
+137 android:label="@string/preferences_title"
+137-->D:\Note-master2\app\src\main\AndroidManifest.xml:136:13-54
+138 android:launchMode="singleTop"
+138-->D:\Note-master2\app\src\main\AndroidManifest.xml:137:13-43
+139 android:theme="@android:style/Theme.Holo.Light" >
+139-->D:\Note-master2\app\src\main\AndroidManifest.xml:138:13-60
+140
+141
+142 D:\Note-master2\app\src\main\AndroidManifest.xml:141:9-144:19
+143 android:name="net.micode.notes.gtask.remote.GTaskSyncService"
+143-->D:\Note-master2\app\src\main\AndroidManifest.xml:142:13-74
+144 android:exported="false" >
+144-->D:\Note-master2\app\src\main\AndroidManifest.xml:143:13-37
+145
+146
+147 D:\Note-master2\app\src\main\AndroidManifest.xml:146:9-148:52
+148 android:name="android.app.default_searchable"
+148-->D:\Note-master2\app\src\main\AndroidManifest.xml:147:13-58
+149 android:value=".ui.NoteEditActivity" />
+149-->D:\Note-master2\app\src\main\AndroidManifest.xml:148:13-49
+150
+151
+152
diff --git a/src/Notes-master1/app/build/intermediates/merged_java_res/debug/base.jar b/src/Note-master2/app/build/intermediates/merged_java_res/debug/base.jar
similarity index 100%
rename from src/Notes-master1/app/build/intermediates/merged_java_res/debug/base.jar
rename to src/Note-master2/app/build/intermediates/merged_java_res/debug/base.jar
diff --git a/src/Notes-master1/app/build/intermediates/merged_manifest/debug/AndroidManifest.xml b/src/Note-master2/app/build/intermediates/merged_manifest/debug/AndroidManifest.xml
similarity index 100%
rename from src/Notes-master1/app/build/intermediates/merged_manifest/debug/AndroidManifest.xml
rename to src/Note-master2/app/build/intermediates/merged_manifest/debug/AndroidManifest.xml
diff --git a/src/Notes-master1/app/build/intermediates/merged_manifests/debug/AndroidManifest.xml b/src/Note-master2/app/build/intermediates/merged_manifests/debug/AndroidManifest.xml
similarity index 100%
rename from src/Notes-master1/app/build/intermediates/merged_manifests/debug/AndroidManifest.xml
rename to src/Note-master2/app/build/intermediates/merged_manifests/debug/AndroidManifest.xml
diff --git a/src/Notes-master1/app/build/intermediates/merged_manifests/debug/output-metadata.json b/src/Note-master2/app/build/intermediates/merged_manifests/debug/output-metadata.json
similarity index 100%
rename from src/Notes-master1/app/build/intermediates/merged_manifests/debug/output-metadata.json
rename to src/Note-master2/app/build/intermediates/merged_manifests/debug/output-metadata.json
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/color_primary_text_dark.xml.flat b/src/Note-master2/app/build/intermediates/merged_res/debug/color_primary_text_dark.xml.flat
similarity index 76%
rename from src/Notes-master1/app/build/intermediates/merged_res/debug/color_primary_text_dark.xml.flat
rename to src/Note-master2/app/build/intermediates/merged_res/debug/color_primary_text_dark.xml.flat
index 9a0e912..908fafc 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/color_primary_text_dark.xml.flat and b/src/Note-master2/app/build/intermediates/merged_res/debug/color_primary_text_dark.xml.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/color_secondary_text_dark.xml.flat b/src/Note-master2/app/build/intermediates/merged_res/debug/color_secondary_text_dark.xml.flat
similarity index 50%
rename from src/Notes-master1/app/build/intermediates/merged_res/debug/color_secondary_text_dark.xml.flat
rename to src/Note-master2/app/build/intermediates/merged_res/debug/color_secondary_text_dark.xml.flat
index 3fcc862..16162b5 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/color_secondary_text_dark.xml.flat and b/src/Note-master2/app/build/intermediates/merged_res/debug/color_secondary_text_dark.xml.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_bg_btn_set_color.png.flat b/src/Note-master2/app/build/intermediates/merged_res/debug/drawable-hdpi_bg_btn_set_color.png.flat
similarity index 95%
rename from src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_bg_btn_set_color.png.flat
rename to src/Note-master2/app/build/intermediates/merged_res/debug/drawable-hdpi_bg_btn_set_color.png.flat
index 636f43c..d9ad6ee 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_bg_btn_set_color.png.flat and b/src/Note-master2/app/build/intermediates/merged_res/debug/drawable-hdpi_bg_btn_set_color.png.flat differ
diff --git a/src/Note-master2/app/build/intermediates/merged_res/debug/drawable-hdpi_bg_color_btn_mask.png.flat b/src/Note-master2/app/build/intermediates/merged_res/debug/drawable-hdpi_bg_color_btn_mask.png.flat
new file mode 100644
index 0000000..702d777
Binary files /dev/null and b/src/Note-master2/app/build/intermediates/merged_res/debug/drawable-hdpi_bg_color_btn_mask.png.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_call_record.png.flat b/src/Note-master2/app/build/intermediates/merged_res/debug/drawable-hdpi_call_record.png.flat
similarity index 95%
rename from src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_call_record.png.flat
rename to src/Note-master2/app/build/intermediates/merged_res/debug/drawable-hdpi_call_record.png.flat
index 7fb6dfb..fac001d 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_call_record.png.flat and b/src/Note-master2/app/build/intermediates/merged_res/debug/drawable-hdpi_call_record.png.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_clock.png.flat b/src/Note-master2/app/build/intermediates/merged_res/debug/drawable-hdpi_clock.png.flat
similarity index 95%
rename from src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_clock.png.flat
rename to src/Note-master2/app/build/intermediates/merged_res/debug/drawable-hdpi_clock.png.flat
index 654ac6b..0f4e4e4 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_clock.png.flat and b/src/Note-master2/app/build/intermediates/merged_res/debug/drawable-hdpi_clock.png.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_delete.png.flat b/src/Note-master2/app/build/intermediates/merged_res/debug/drawable-hdpi_delete.png.flat
similarity index 96%
rename from src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_delete.png.flat
rename to src/Note-master2/app/build/intermediates/merged_res/debug/drawable-hdpi_delete.png.flat
index 3aae5e2..47253a3 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_delete.png.flat and b/src/Note-master2/app/build/intermediates/merged_res/debug/drawable-hdpi_delete.png.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_dropdown_icon.9.png.flat b/src/Note-master2/app/build/intermediates/merged_res/debug/drawable-hdpi_dropdown_icon.9.png.flat
similarity index 62%
rename from src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_dropdown_icon.9.png.flat
rename to src/Note-master2/app/build/intermediates/merged_res/debug/drawable-hdpi_dropdown_icon.9.png.flat
index 302aeff..40a21f7 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_dropdown_icon.9.png.flat and b/src/Note-master2/app/build/intermediates/merged_res/debug/drawable-hdpi_dropdown_icon.9.png.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_blue.9.png.flat b/src/Note-master2/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_blue.9.png.flat
similarity index 85%
rename from src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_blue.9.png.flat
rename to src/Note-master2/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_blue.9.png.flat
index e5eb8b4..e8a2979 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_blue.9.png.flat and b/src/Note-master2/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_blue.9.png.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_green.9.png.flat b/src/Note-master2/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_green.9.png.flat
similarity index 85%
rename from src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_green.9.png.flat
rename to src/Note-master2/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_green.9.png.flat
index 6cc95df..9f7943e 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_green.9.png.flat and b/src/Note-master2/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_green.9.png.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_red.9.png.flat b/src/Note-master2/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_red.9.png.flat
similarity index 79%
rename from src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_red.9.png.flat
rename to src/Note-master2/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_red.9.png.flat
index ccc843a..d79fbd3 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_red.9.png.flat and b/src/Note-master2/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_red.9.png.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_title_blue.9.png.flat b/src/Note-master2/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_title_blue.9.png.flat
similarity index 94%
rename from src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_title_blue.9.png.flat
rename to src/Note-master2/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_title_blue.9.png.flat
index 4742967..bc8d982 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_title_blue.9.png.flat and b/src/Note-master2/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_title_blue.9.png.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_title_green.9.png.flat b/src/Note-master2/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_title_green.9.png.flat
similarity index 93%
rename from src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_title_green.9.png.flat
rename to src/Note-master2/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_title_green.9.png.flat
index 1398c53..00c3946 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_title_green.9.png.flat and b/src/Note-master2/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_title_green.9.png.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_title_red.9.png.flat b/src/Note-master2/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_title_red.9.png.flat
similarity index 92%
rename from src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_title_red.9.png.flat
rename to src/Note-master2/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_title_red.9.png.flat
index 726619c..4743630 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_title_red.9.png.flat and b/src/Note-master2/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_title_red.9.png.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_title_white.9.png.flat b/src/Note-master2/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_title_white.9.png.flat
similarity index 82%
rename from src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_title_white.9.png.flat
rename to src/Note-master2/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_title_white.9.png.flat
index 9c5a014..5e910e1 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_title_white.9.png.flat and b/src/Note-master2/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_title_white.9.png.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_title_yellow.9.png.flat b/src/Note-master2/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_title_yellow.9.png.flat
similarity index 93%
rename from src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_title_yellow.9.png.flat
rename to src/Note-master2/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_title_yellow.9.png.flat
index 6ea7bf6..f46815a 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_title_yellow.9.png.flat and b/src/Note-master2/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_title_yellow.9.png.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_white.9.png.flat b/src/Note-master2/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_white.9.png.flat
similarity index 74%
rename from src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_white.9.png.flat
rename to src/Note-master2/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_white.9.png.flat
index 8d60ea5..8178c3c 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_white.9.png.flat and b/src/Note-master2/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_white.9.png.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_yellow.9.png.flat b/src/Note-master2/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_yellow.9.png.flat
similarity index 84%
rename from src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_yellow.9.png.flat
rename to src/Note-master2/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_yellow.9.png.flat
index f9c6ab9..b21526f 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_yellow.9.png.flat and b/src/Note-master2/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_yellow.9.png.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_font_large.png.flat b/src/Note-master2/app/build/intermediates/merged_res/debug/drawable-hdpi_font_large.png.flat
similarity index 94%
rename from src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_font_large.png.flat
rename to src/Note-master2/app/build/intermediates/merged_res/debug/drawable-hdpi_font_large.png.flat
index 1838cb6..56acfdf 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_font_large.png.flat and b/src/Note-master2/app/build/intermediates/merged_res/debug/drawable-hdpi_font_large.png.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_font_normal.png.flat b/src/Note-master2/app/build/intermediates/merged_res/debug/drawable-hdpi_font_normal.png.flat
similarity index 94%
rename from src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_font_normal.png.flat
rename to src/Note-master2/app/build/intermediates/merged_res/debug/drawable-hdpi_font_normal.png.flat
index a6dbcb9..ff26bbb 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_font_normal.png.flat and b/src/Note-master2/app/build/intermediates/merged_res/debug/drawable-hdpi_font_normal.png.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_font_size_selector_bg.9.png.flat b/src/Note-master2/app/build/intermediates/merged_res/debug/drawable-hdpi_font_size_selector_bg.9.png.flat
similarity index 89%
rename from src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_font_size_selector_bg.9.png.flat
rename to src/Note-master2/app/build/intermediates/merged_res/debug/drawable-hdpi_font_size_selector_bg.9.png.flat
index 2880df8..9cfeeb2 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_font_size_selector_bg.9.png.flat and b/src/Note-master2/app/build/intermediates/merged_res/debug/drawable-hdpi_font_size_selector_bg.9.png.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_font_small.png.flat b/src/Note-master2/app/build/intermediates/merged_res/debug/drawable-hdpi_font_small.png.flat
similarity index 94%
rename from src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_font_small.png.flat
rename to src/Note-master2/app/build/intermediates/merged_res/debug/drawable-hdpi_font_small.png.flat
index 83c1c63..d325875 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_font_small.png.flat and b/src/Note-master2/app/build/intermediates/merged_res/debug/drawable-hdpi_font_small.png.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_font_super.png.flat b/src/Note-master2/app/build/intermediates/merged_res/debug/drawable-hdpi_font_super.png.flat
similarity index 95%
rename from src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_font_super.png.flat
rename to src/Note-master2/app/build/intermediates/merged_res/debug/drawable-hdpi_font_super.png.flat
index 20017fc..eb17827 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_font_super.png.flat and b/src/Note-master2/app/build/intermediates/merged_res/debug/drawable-hdpi_font_super.png.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_icon_app.png.flat b/src/Note-master2/app/build/intermediates/merged_res/debug/drawable-hdpi_icon_app.png.flat
similarity index 97%
rename from src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_icon_app.png.flat
rename to src/Note-master2/app/build/intermediates/merged_res/debug/drawable-hdpi_icon_app.png.flat
index d9d8f01..3362044 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_icon_app.png.flat and b/src/Note-master2/app/build/intermediates/merged_res/debug/drawable-hdpi_icon_app.png.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_background.png.flat b/src/Note-master2/app/build/intermediates/merged_res/debug/drawable-hdpi_list_background.png.flat
similarity index 99%
rename from src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_background.png.flat
rename to src/Note-master2/app/build/intermediates/merged_res/debug/drawable-hdpi_list_background.png.flat
index 6c080df..6211026 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_background.png.flat and b/src/Note-master2/app/build/intermediates/merged_res/debug/drawable-hdpi_list_background.png.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_blue_down.9.png.flat b/src/Note-master2/app/build/intermediates/merged_res/debug/drawable-hdpi_list_blue_down.9.png.flat
similarity index 90%
rename from src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_blue_down.9.png.flat
rename to src/Note-master2/app/build/intermediates/merged_res/debug/drawable-hdpi_list_blue_down.9.png.flat
index 2047ac3..b79570c 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_blue_down.9.png.flat and b/src/Note-master2/app/build/intermediates/merged_res/debug/drawable-hdpi_list_blue_down.9.png.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_blue_middle.9.png.flat b/src/Note-master2/app/build/intermediates/merged_res/debug/drawable-hdpi_list_blue_middle.9.png.flat
similarity index 67%
rename from src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_blue_middle.9.png.flat
rename to src/Note-master2/app/build/intermediates/merged_res/debug/drawable-hdpi_list_blue_middle.9.png.flat
index 35d03f2..27c92b9 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_blue_middle.9.png.flat and b/src/Note-master2/app/build/intermediates/merged_res/debug/drawable-hdpi_list_blue_middle.9.png.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_blue_single.9.png.flat b/src/Note-master2/app/build/intermediates/merged_res/debug/drawable-hdpi_list_blue_single.9.png.flat
similarity index 91%
rename from src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_blue_single.9.png.flat
rename to src/Note-master2/app/build/intermediates/merged_res/debug/drawable-hdpi_list_blue_single.9.png.flat
index 2a2e448..09210c9 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_blue_single.9.png.flat and b/src/Note-master2/app/build/intermediates/merged_res/debug/drawable-hdpi_list_blue_single.9.png.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_blue_up.9.png.flat b/src/Note-master2/app/build/intermediates/merged_res/debug/drawable-hdpi_list_blue_up.9.png.flat
similarity index 80%
rename from src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_blue_up.9.png.flat
rename to src/Note-master2/app/build/intermediates/merged_res/debug/drawable-hdpi_list_blue_up.9.png.flat
index 16696a8..95c4505 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_blue_up.9.png.flat and b/src/Note-master2/app/build/intermediates/merged_res/debug/drawable-hdpi_list_blue_up.9.png.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_folder.9.png.flat b/src/Note-master2/app/build/intermediates/merged_res/debug/drawable-hdpi_list_folder.9.png.flat
similarity index 95%
rename from src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_folder.9.png.flat
rename to src/Note-master2/app/build/intermediates/merged_res/debug/drawable-hdpi_list_folder.9.png.flat
index ca01840..ff9ad4b 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_folder.9.png.flat and b/src/Note-master2/app/build/intermediates/merged_res/debug/drawable-hdpi_list_folder.9.png.flat differ
diff --git a/src/Note-master2/app/build/intermediates/merged_res/debug/drawable-hdpi_list_footer_bg.9.png.flat b/src/Note-master2/app/build/intermediates/merged_res/debug/drawable-hdpi_list_footer_bg.9.png.flat
new file mode 100644
index 0000000..f7c6b0f
Binary files /dev/null and b/src/Note-master2/app/build/intermediates/merged_res/debug/drawable-hdpi_list_footer_bg.9.png.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_green_down.9.png.flat b/src/Note-master2/app/build/intermediates/merged_res/debug/drawable-hdpi_list_green_down.9.png.flat
similarity index 90%
rename from src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_green_down.9.png.flat
rename to src/Note-master2/app/build/intermediates/merged_res/debug/drawable-hdpi_list_green_down.9.png.flat
index 8250cfc..982f5af 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_green_down.9.png.flat and b/src/Note-master2/app/build/intermediates/merged_res/debug/drawable-hdpi_list_green_down.9.png.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_green_middle.9.png.flat b/src/Note-master2/app/build/intermediates/merged_res/debug/drawable-hdpi_list_green_middle.9.png.flat
similarity index 71%
rename from src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_green_middle.9.png.flat
rename to src/Note-master2/app/build/intermediates/merged_res/debug/drawable-hdpi_list_green_middle.9.png.flat
index 7d807fa..4df6fa2 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_green_middle.9.png.flat and b/src/Note-master2/app/build/intermediates/merged_res/debug/drawable-hdpi_list_green_middle.9.png.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_green_single.9.png.flat b/src/Note-master2/app/build/intermediates/merged_res/debug/drawable-hdpi_list_green_single.9.png.flat
similarity index 91%
rename from src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_green_single.9.png.flat
rename to src/Note-master2/app/build/intermediates/merged_res/debug/drawable-hdpi_list_green_single.9.png.flat
index 18056d5..19b05aa 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_green_single.9.png.flat and b/src/Note-master2/app/build/intermediates/merged_res/debug/drawable-hdpi_list_green_single.9.png.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_green_up.9.png.flat b/src/Note-master2/app/build/intermediates/merged_res/debug/drawable-hdpi_list_green_up.9.png.flat
similarity index 81%
rename from src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_green_up.9.png.flat
rename to src/Note-master2/app/build/intermediates/merged_res/debug/drawable-hdpi_list_green_up.9.png.flat
index ccb6e41..3500b4e 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_green_up.9.png.flat and b/src/Note-master2/app/build/intermediates/merged_res/debug/drawable-hdpi_list_green_up.9.png.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_red_down.9.png.flat b/src/Note-master2/app/build/intermediates/merged_res/debug/drawable-hdpi_list_red_down.9.png.flat
similarity index 88%
rename from src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_red_down.9.png.flat
rename to src/Note-master2/app/build/intermediates/merged_res/debug/drawable-hdpi_list_red_down.9.png.flat
index a5e25e0..3646f05 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_red_down.9.png.flat and b/src/Note-master2/app/build/intermediates/merged_res/debug/drawable-hdpi_list_red_down.9.png.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_red_middle.9.png.flat b/src/Note-master2/app/build/intermediates/merged_res/debug/drawable-hdpi_list_red_middle.9.png.flat
similarity index 70%
rename from src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_red_middle.9.png.flat
rename to src/Note-master2/app/build/intermediates/merged_res/debug/drawable-hdpi_list_red_middle.9.png.flat
index e2d684b..2679b48 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_red_middle.9.png.flat and b/src/Note-master2/app/build/intermediates/merged_res/debug/drawable-hdpi_list_red_middle.9.png.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_red_single.9.png.flat b/src/Note-master2/app/build/intermediates/merged_res/debug/drawable-hdpi_list_red_single.9.png.flat
similarity index 90%
rename from src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_red_single.9.png.flat
rename to src/Note-master2/app/build/intermediates/merged_res/debug/drawable-hdpi_list_red_single.9.png.flat
index 4865e3f..8993367 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_red_single.9.png.flat and b/src/Note-master2/app/build/intermediates/merged_res/debug/drawable-hdpi_list_red_single.9.png.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_red_up.9.png.flat b/src/Note-master2/app/build/intermediates/merged_res/debug/drawable-hdpi_list_red_up.9.png.flat
similarity index 78%
rename from src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_red_up.9.png.flat
rename to src/Note-master2/app/build/intermediates/merged_res/debug/drawable-hdpi_list_red_up.9.png.flat
index 127dbc1..5019998 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_red_up.9.png.flat and b/src/Note-master2/app/build/intermediates/merged_res/debug/drawable-hdpi_list_red_up.9.png.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_white_down.9.png.flat b/src/Note-master2/app/build/intermediates/merged_res/debug/drawable-hdpi_list_white_down.9.png.flat
similarity index 87%
rename from src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_white_down.9.png.flat
rename to src/Note-master2/app/build/intermediates/merged_res/debug/drawable-hdpi_list_white_down.9.png.flat
index 6fbb9b5..51aa406 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_white_down.9.png.flat and b/src/Note-master2/app/build/intermediates/merged_res/debug/drawable-hdpi_list_white_down.9.png.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_white_middle.9.png.flat b/src/Note-master2/app/build/intermediates/merged_res/debug/drawable-hdpi_list_white_middle.9.png.flat
similarity index 65%
rename from src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_white_middle.9.png.flat
rename to src/Note-master2/app/build/intermediates/merged_res/debug/drawable-hdpi_list_white_middle.9.png.flat
index 3efa49c..412cd78 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_white_middle.9.png.flat and b/src/Note-master2/app/build/intermediates/merged_res/debug/drawable-hdpi_list_white_middle.9.png.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_white_single.9.png.flat b/src/Note-master2/app/build/intermediates/merged_res/debug/drawable-hdpi_list_white_single.9.png.flat
similarity index 88%
rename from src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_white_single.9.png.flat
rename to src/Note-master2/app/build/intermediates/merged_res/debug/drawable-hdpi_list_white_single.9.png.flat
index 8f653ea..f8eab37 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_white_single.9.png.flat and b/src/Note-master2/app/build/intermediates/merged_res/debug/drawable-hdpi_list_white_single.9.png.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_white_up.9.png.flat b/src/Note-master2/app/build/intermediates/merged_res/debug/drawable-hdpi_list_white_up.9.png.flat
similarity index 74%
rename from src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_white_up.9.png.flat
rename to src/Note-master2/app/build/intermediates/merged_res/debug/drawable-hdpi_list_white_up.9.png.flat
index e13fad7..2289309 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_white_up.9.png.flat and b/src/Note-master2/app/build/intermediates/merged_res/debug/drawable-hdpi_list_white_up.9.png.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_yellow_down.9.png.flat b/src/Note-master2/app/build/intermediates/merged_res/debug/drawable-hdpi_list_yellow_down.9.png.flat
similarity index 88%
rename from src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_yellow_down.9.png.flat
rename to src/Note-master2/app/build/intermediates/merged_res/debug/drawable-hdpi_list_yellow_down.9.png.flat
index e3579c5..b2a2d15 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_yellow_down.9.png.flat and b/src/Note-master2/app/build/intermediates/merged_res/debug/drawable-hdpi_list_yellow_down.9.png.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_yellow_middle.9.png.flat b/src/Note-master2/app/build/intermediates/merged_res/debug/drawable-hdpi_list_yellow_middle.9.png.flat
similarity index 76%
rename from src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_yellow_middle.9.png.flat
rename to src/Note-master2/app/build/intermediates/merged_res/debug/drawable-hdpi_list_yellow_middle.9.png.flat
index 0b4a325..0b63294 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_yellow_middle.9.png.flat and b/src/Note-master2/app/build/intermediates/merged_res/debug/drawable-hdpi_list_yellow_middle.9.png.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_yellow_single.9.png.flat b/src/Note-master2/app/build/intermediates/merged_res/debug/drawable-hdpi_list_yellow_single.9.png.flat
similarity index 91%
rename from src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_yellow_single.9.png.flat
rename to src/Note-master2/app/build/intermediates/merged_res/debug/drawable-hdpi_list_yellow_single.9.png.flat
index 992026d..2c45087 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_yellow_single.9.png.flat and b/src/Note-master2/app/build/intermediates/merged_res/debug/drawable-hdpi_list_yellow_single.9.png.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_yellow_up.9.png.flat b/src/Note-master2/app/build/intermediates/merged_res/debug/drawable-hdpi_list_yellow_up.9.png.flat
similarity index 78%
rename from src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_yellow_up.9.png.flat
rename to src/Note-master2/app/build/intermediates/merged_res/debug/drawable-hdpi_list_yellow_up.9.png.flat
index 4502b78..1593585 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_yellow_up.9.png.flat and b/src/Note-master2/app/build/intermediates/merged_res/debug/drawable-hdpi_list_yellow_up.9.png.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_menu_delete.png.flat b/src/Note-master2/app/build/intermediates/merged_res/debug/drawable-hdpi_menu_delete.png.flat
similarity index 95%
rename from src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_menu_delete.png.flat
rename to src/Note-master2/app/build/intermediates/merged_res/debug/drawable-hdpi_menu_delete.png.flat
index cba8af0..4597d6e 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_menu_delete.png.flat and b/src/Note-master2/app/build/intermediates/merged_res/debug/drawable-hdpi_menu_delete.png.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_menu_move.png.flat b/src/Note-master2/app/build/intermediates/merged_res/debug/drawable-hdpi_menu_move.png.flat
similarity index 95%
rename from src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_menu_move.png.flat
rename to src/Note-master2/app/build/intermediates/merged_res/debug/drawable-hdpi_menu_move.png.flat
index f9d67b9..b1362af 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_menu_move.png.flat and b/src/Note-master2/app/build/intermediates/merged_res/debug/drawable-hdpi_menu_move.png.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_new_note_normal.png.flat b/src/Note-master2/app/build/intermediates/merged_res/debug/drawable-hdpi_new_note_normal.png.flat
similarity index 99%
rename from src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_new_note_normal.png.flat
rename to src/Note-master2/app/build/intermediates/merged_res/debug/drawable-hdpi_new_note_normal.png.flat
index ca85394..1daeef2 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_new_note_normal.png.flat and b/src/Note-master2/app/build/intermediates/merged_res/debug/drawable-hdpi_new_note_normal.png.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_new_note_pressed.png.flat b/src/Note-master2/app/build/intermediates/merged_res/debug/drawable-hdpi_new_note_pressed.png.flat
similarity index 99%
rename from src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_new_note_pressed.png.flat
rename to src/Note-master2/app/build/intermediates/merged_res/debug/drawable-hdpi_new_note_pressed.png.flat
index 76630b4..6f21e97 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_new_note_pressed.png.flat and b/src/Note-master2/app/build/intermediates/merged_res/debug/drawable-hdpi_new_note_pressed.png.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_note_edit_color_selector_panel.png.flat b/src/Note-master2/app/build/intermediates/merged_res/debug/drawable-hdpi_note_edit_color_selector_panel.png.flat
similarity index 97%
rename from src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_note_edit_color_selector_panel.png.flat
rename to src/Note-master2/app/build/intermediates/merged_res/debug/drawable-hdpi_note_edit_color_selector_panel.png.flat
index d16fb3a..bdc9561 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_note_edit_color_selector_panel.png.flat and b/src/Note-master2/app/build/intermediates/merged_res/debug/drawable-hdpi_note_edit_color_selector_panel.png.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_notification.png.flat b/src/Note-master2/app/build/intermediates/merged_res/debug/drawable-hdpi_notification.png.flat
similarity index 94%
rename from src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_notification.png.flat
rename to src/Note-master2/app/build/intermediates/merged_res/debug/drawable-hdpi_notification.png.flat
index 86df61c..07caed4 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_notification.png.flat and b/src/Note-master2/app/build/intermediates/merged_res/debug/drawable-hdpi_notification.png.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_search_result.png.flat b/src/Note-master2/app/build/intermediates/merged_res/debug/drawable-hdpi_search_result.png.flat
similarity index 95%
rename from src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_search_result.png.flat
rename to src/Note-master2/app/build/intermediates/merged_res/debug/drawable-hdpi_search_result.png.flat
index 04c9b56..d5fae08 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_search_result.png.flat and b/src/Note-master2/app/build/intermediates/merged_res/debug/drawable-hdpi_search_result.png.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_selected.png.flat b/src/Note-master2/app/build/intermediates/merged_res/debug/drawable-hdpi_selected.png.flat
similarity index 97%
rename from src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_selected.png.flat
rename to src/Note-master2/app/build/intermediates/merged_res/debug/drawable-hdpi_selected.png.flat
index 4b0436a..6ff621e 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_selected.png.flat and b/src/Note-master2/app/build/intermediates/merged_res/debug/drawable-hdpi_selected.png.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_title_alert.png.flat b/src/Note-master2/app/build/intermediates/merged_res/debug/drawable-hdpi_title_alert.png.flat
similarity index 95%
rename from src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_title_alert.png.flat
rename to src/Note-master2/app/build/intermediates/merged_res/debug/drawable-hdpi_title_alert.png.flat
index 10f5b22..28b0506 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_title_alert.png.flat and b/src/Note-master2/app/build/intermediates/merged_res/debug/drawable-hdpi_title_alert.png.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_title_bar_bg.9.png.flat b/src/Note-master2/app/build/intermediates/merged_res/debug/drawable-hdpi_title_bar_bg.9.png.flat
similarity index 94%
rename from src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_title_bar_bg.9.png.flat
rename to src/Note-master2/app/build/intermediates/merged_res/debug/drawable-hdpi_title_bar_bg.9.png.flat
index e51619c..edbccb4 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_title_bar_bg.9.png.flat and b/src/Note-master2/app/build/intermediates/merged_res/debug/drawable-hdpi_title_bar_bg.9.png.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_2x_blue.png.flat b/src/Note-master2/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_2x_blue.png.flat
similarity index 90%
rename from src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_2x_blue.png.flat
rename to src/Note-master2/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_2x_blue.png.flat
index 4c621a1..855ce4a 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_2x_blue.png.flat and b/src/Note-master2/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_2x_blue.png.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_2x_green.png.flat b/src/Note-master2/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_2x_green.png.flat
similarity index 92%
rename from src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_2x_green.png.flat
rename to src/Note-master2/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_2x_green.png.flat
index 0ec6034..af5ae80 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_2x_green.png.flat and b/src/Note-master2/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_2x_green.png.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_2x_red.png.flat b/src/Note-master2/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_2x_red.png.flat
similarity index 92%
rename from src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_2x_red.png.flat
rename to src/Note-master2/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_2x_red.png.flat
index e2e3daf..822464d 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_2x_red.png.flat and b/src/Note-master2/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_2x_red.png.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_2x_white.png.flat b/src/Note-master2/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_2x_white.png.flat
similarity index 91%
rename from src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_2x_white.png.flat
rename to src/Note-master2/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_2x_white.png.flat
index 49ec262..701dc27 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_2x_white.png.flat and b/src/Note-master2/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_2x_white.png.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_2x_yellow.png.flat b/src/Note-master2/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_2x_yellow.png.flat
similarity index 90%
rename from src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_2x_yellow.png.flat
rename to src/Note-master2/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_2x_yellow.png.flat
index e5ce872..f2d1598 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_2x_yellow.png.flat and b/src/Note-master2/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_2x_yellow.png.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_4x_blue.png.flat b/src/Note-master2/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_4x_blue.png.flat
similarity index 95%
rename from src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_4x_blue.png.flat
rename to src/Note-master2/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_4x_blue.png.flat
index 7bf3769..659e7c7 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_4x_blue.png.flat and b/src/Note-master2/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_4x_blue.png.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_4x_green.png.flat b/src/Note-master2/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_4x_green.png.flat
similarity index 95%
rename from src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_4x_green.png.flat
rename to src/Note-master2/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_4x_green.png.flat
index c99097e..91b2edc 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_4x_green.png.flat and b/src/Note-master2/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_4x_green.png.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_4x_red.png.flat b/src/Note-master2/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_4x_red.png.flat
similarity index 96%
rename from src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_4x_red.png.flat
rename to src/Note-master2/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_4x_red.png.flat
index 1a1164c..55dc0a6 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_4x_red.png.flat and b/src/Note-master2/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_4x_red.png.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_4x_white.png.flat b/src/Note-master2/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_4x_white.png.flat
similarity index 96%
rename from src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_4x_white.png.flat
rename to src/Note-master2/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_4x_white.png.flat
index bfb1ac7..b41b653 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_4x_white.png.flat and b/src/Note-master2/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_4x_white.png.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_4x_yellow.png.flat b/src/Note-master2/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_4x_yellow.png.flat
similarity index 95%
rename from src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_4x_yellow.png.flat
rename to src/Note-master2/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_4x_yellow.png.flat
index 9b25610..3dc656a 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_4x_yellow.png.flat and b/src/Note-master2/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_4x_yellow.png.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable_new_note.xml.flat b/src/Note-master2/app/build/intermediates/merged_res/debug/drawable_new_note.xml.flat
similarity index 68%
rename from src/Notes-master1/app/build/intermediates/merged_res/debug/drawable_new_note.xml.flat
rename to src/Note-master2/app/build/intermediates/merged_res/debug/drawable_new_note.xml.flat
index eccd6a6..5217c1f 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable_new_note.xml.flat and b/src/Note-master2/app/build/intermediates/merged_res/debug/drawable_new_note.xml.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/layout_account_dialog_title.xml.flat b/src/Note-master2/app/build/intermediates/merged_res/debug/layout_account_dialog_title.xml.flat
similarity index 88%
rename from src/Notes-master1/app/build/intermediates/merged_res/debug/layout_account_dialog_title.xml.flat
rename to src/Note-master2/app/build/intermediates/merged_res/debug/layout_account_dialog_title.xml.flat
index 4f74c37..80529bc 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/layout_account_dialog_title.xml.flat and b/src/Note-master2/app/build/intermediates/merged_res/debug/layout_account_dialog_title.xml.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/layout_add_account_text.xml.flat b/src/Note-master2/app/build/intermediates/merged_res/debug/layout_add_account_text.xml.flat
similarity index 84%
rename from src/Notes-master1/app/build/intermediates/merged_res/debug/layout_add_account_text.xml.flat
rename to src/Note-master2/app/build/intermediates/merged_res/debug/layout_add_account_text.xml.flat
index ecc9675..22992a2 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/layout_add_account_text.xml.flat and b/src/Note-master2/app/build/intermediates/merged_res/debug/layout_add_account_text.xml.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/layout_datetime_picker.xml.flat b/src/Note-master2/app/build/intermediates/merged_res/debug/layout_datetime_picker.xml.flat
similarity index 93%
rename from src/Notes-master1/app/build/intermediates/merged_res/debug/layout_datetime_picker.xml.flat
rename to src/Note-master2/app/build/intermediates/merged_res/debug/layout_datetime_picker.xml.flat
index 58888e4..291a690 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/layout_datetime_picker.xml.flat and b/src/Note-master2/app/build/intermediates/merged_res/debug/layout_datetime_picker.xml.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/layout_dialog_edit_text.xml.flat b/src/Note-master2/app/build/intermediates/merged_res/debug/layout_dialog_edit_text.xml.flat
similarity index 69%
rename from src/Notes-master1/app/build/intermediates/merged_res/debug/layout_dialog_edit_text.xml.flat
rename to src/Note-master2/app/build/intermediates/merged_res/debug/layout_dialog_edit_text.xml.flat
index 87bf869..2c0deef 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/layout_dialog_edit_text.xml.flat and b/src/Note-master2/app/build/intermediates/merged_res/debug/layout_dialog_edit_text.xml.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/layout_folder_list_item.xml.flat b/src/Note-master2/app/build/intermediates/merged_res/debug/layout_folder_list_item.xml.flat
similarity index 79%
rename from src/Notes-master1/app/build/intermediates/merged_res/debug/layout_folder_list_item.xml.flat
rename to src/Note-master2/app/build/intermediates/merged_res/debug/layout_folder_list_item.xml.flat
index 144c574..b0dc993 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/layout_folder_list_item.xml.flat and b/src/Note-master2/app/build/intermediates/merged_res/debug/layout_folder_list_item.xml.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/layout_note_edit.xml.flat b/src/Note-master2/app/build/intermediates/merged_res/debug/layout_note_edit.xml.flat
similarity index 99%
rename from src/Notes-master1/app/build/intermediates/merged_res/debug/layout_note_edit.xml.flat
rename to src/Note-master2/app/build/intermediates/merged_res/debug/layout_note_edit.xml.flat
index a930191..898f55a 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/layout_note_edit.xml.flat and b/src/Note-master2/app/build/intermediates/merged_res/debug/layout_note_edit.xml.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/layout_note_edit_list_item.xml.flat b/src/Note-master2/app/build/intermediates/merged_res/debug/layout_note_edit_list_item.xml.flat
similarity index 87%
rename from src/Notes-master1/app/build/intermediates/merged_res/debug/layout_note_edit_list_item.xml.flat
rename to src/Note-master2/app/build/intermediates/merged_res/debug/layout_note_edit_list_item.xml.flat
index 5612136..4ce0af6 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/layout_note_edit_list_item.xml.flat and b/src/Note-master2/app/build/intermediates/merged_res/debug/layout_note_edit_list_item.xml.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/layout_note_item.xml.flat b/src/Note-master2/app/build/intermediates/merged_res/debug/layout_note_item.xml.flat
similarity index 95%
rename from src/Notes-master1/app/build/intermediates/merged_res/debug/layout_note_item.xml.flat
rename to src/Note-master2/app/build/intermediates/merged_res/debug/layout_note_item.xml.flat
index 91c908a..9df84b8 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/layout_note_item.xml.flat and b/src/Note-master2/app/build/intermediates/merged_res/debug/layout_note_item.xml.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/layout_note_list.xml.flat b/src/Note-master2/app/build/intermediates/merged_res/debug/layout_note_list.xml.flat
similarity index 93%
rename from src/Notes-master1/app/build/intermediates/merged_res/debug/layout_note_list.xml.flat
rename to src/Note-master2/app/build/intermediates/merged_res/debug/layout_note_list.xml.flat
index fad261e..9551bbd 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/layout_note_list.xml.flat and b/src/Note-master2/app/build/intermediates/merged_res/debug/layout_note_list.xml.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/layout_note_list_dropdown_menu.xml.flat b/src/Note-master2/app/build/intermediates/merged_res/debug/layout_note_list_dropdown_menu.xml.flat
similarity index 83%
rename from src/Notes-master1/app/build/intermediates/merged_res/debug/layout_note_list_dropdown_menu.xml.flat
rename to src/Note-master2/app/build/intermediates/merged_res/debug/layout_note_list_dropdown_menu.xml.flat
index d72c9ee..9c32a5b 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/layout_note_list_dropdown_menu.xml.flat and b/src/Note-master2/app/build/intermediates/merged_res/debug/layout_note_list_dropdown_menu.xml.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/layout_note_list_footer.xml.flat b/src/Note-master2/app/build/intermediates/merged_res/debug/layout_note_list_footer.xml.flat
similarity index 76%
rename from src/Notes-master1/app/build/intermediates/merged_res/debug/layout_note_list_footer.xml.flat
rename to src/Note-master2/app/build/intermediates/merged_res/debug/layout_note_list_footer.xml.flat
index 981a9e5..2f089ca 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/layout_note_list_footer.xml.flat and b/src/Note-master2/app/build/intermediates/merged_res/debug/layout_note_list_footer.xml.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/layout_settings_header.xml.flat b/src/Note-master2/app/build/intermediates/merged_res/debug/layout_settings_header.xml.flat
similarity index 88%
rename from src/Notes-master1/app/build/intermediates/merged_res/debug/layout_settings_header.xml.flat
rename to src/Note-master2/app/build/intermediates/merged_res/debug/layout_settings_header.xml.flat
index d059c5a..ad880fc 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/layout_settings_header.xml.flat and b/src/Note-master2/app/build/intermediates/merged_res/debug/layout_settings_header.xml.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/layout_widget_2x.xml.flat b/src/Note-master2/app/build/intermediates/merged_res/debug/layout_widget_2x.xml.flat
similarity index 87%
rename from src/Notes-master1/app/build/intermediates/merged_res/debug/layout_widget_2x.xml.flat
rename to src/Note-master2/app/build/intermediates/merged_res/debug/layout_widget_2x.xml.flat
index 8648a1d..99dcab1 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/layout_widget_2x.xml.flat and b/src/Note-master2/app/build/intermediates/merged_res/debug/layout_widget_2x.xml.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/layout_widget_4x.xml.flat b/src/Note-master2/app/build/intermediates/merged_res/debug/layout_widget_4x.xml.flat
similarity index 87%
rename from src/Notes-master1/app/build/intermediates/merged_res/debug/layout_widget_4x.xml.flat
rename to src/Note-master2/app/build/intermediates/merged_res/debug/layout_widget_4x.xml.flat
index d421dd7..942951f 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/layout_widget_4x.xml.flat and b/src/Note-master2/app/build/intermediates/merged_res/debug/layout_widget_4x.xml.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/menu_call_note_edit.xml.flat b/src/Note-master2/app/build/intermediates/merged_res/debug/menu_call_note_edit.xml.flat
similarity index 89%
rename from src/Notes-master1/app/build/intermediates/merged_res/debug/menu_call_note_edit.xml.flat
rename to src/Note-master2/app/build/intermediates/merged_res/debug/menu_call_note_edit.xml.flat
index 6936bfa..1f649c7 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/menu_call_note_edit.xml.flat and b/src/Note-master2/app/build/intermediates/merged_res/debug/menu_call_note_edit.xml.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/menu_call_record_folder.xml.flat b/src/Note-master2/app/build/intermediates/merged_res/debug/menu_call_record_folder.xml.flat
similarity index 57%
rename from src/Notes-master1/app/build/intermediates/merged_res/debug/menu_call_record_folder.xml.flat
rename to src/Note-master2/app/build/intermediates/merged_res/debug/menu_call_record_folder.xml.flat
index 3f22129..dc39c38 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/menu_call_record_folder.xml.flat and b/src/Note-master2/app/build/intermediates/merged_res/debug/menu_call_record_folder.xml.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/menu_note_edit.xml.flat b/src/Note-master2/app/build/intermediates/merged_res/debug/menu_note_edit.xml.flat
similarity index 91%
rename from src/Notes-master1/app/build/intermediates/merged_res/debug/menu_note_edit.xml.flat
rename to src/Note-master2/app/build/intermediates/merged_res/debug/menu_note_edit.xml.flat
index c75bf06..5a0517f 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/menu_note_edit.xml.flat and b/src/Note-master2/app/build/intermediates/merged_res/debug/menu_note_edit.xml.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/menu_note_list.xml.flat b/src/Note-master2/app/build/intermediates/merged_res/debug/menu_note_list.xml.flat
similarity index 87%
rename from src/Notes-master1/app/build/intermediates/merged_res/debug/menu_note_list.xml.flat
rename to src/Note-master2/app/build/intermediates/merged_res/debug/menu_note_list.xml.flat
index 9a85e22..7221407 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/menu_note_list.xml.flat and b/src/Note-master2/app/build/intermediates/merged_res/debug/menu_note_list.xml.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/menu_note_list_dropdown.xml.flat b/src/Note-master2/app/build/intermediates/merged_res/debug/menu_note_list_dropdown.xml.flat
similarity index 55%
rename from src/Notes-master1/app/build/intermediates/merged_res/debug/menu_note_list_dropdown.xml.flat
rename to src/Note-master2/app/build/intermediates/merged_res/debug/menu_note_list_dropdown.xml.flat
index 82984ff..4b423f4 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/menu_note_list_dropdown.xml.flat and b/src/Note-master2/app/build/intermediates/merged_res/debug/menu_note_list_dropdown.xml.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/menu_note_list_options.xml.flat b/src/Note-master2/app/build/intermediates/merged_res/debug/menu_note_list_options.xml.flat
similarity index 82%
rename from src/Notes-master1/app/build/intermediates/merged_res/debug/menu_note_list_options.xml.flat
rename to src/Note-master2/app/build/intermediates/merged_res/debug/menu_note_list_options.xml.flat
index 902d00c..79fe208 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/menu_note_list_options.xml.flat and b/src/Note-master2/app/build/intermediates/merged_res/debug/menu_note_list_options.xml.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/menu_sub_folder.xml.flat b/src/Note-master2/app/build/intermediates/merged_res/debug/menu_sub_folder.xml.flat
similarity index 59%
rename from src/Notes-master1/app/build/intermediates/merged_res/debug/menu_sub_folder.xml.flat
rename to src/Note-master2/app/build/intermediates/merged_res/debug/menu_sub_folder.xml.flat
index 5464d1a..08d4c5f 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/menu_sub_folder.xml.flat and b/src/Note-master2/app/build/intermediates/merged_res/debug/menu_sub_folder.xml.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/raw-zh-rCN_introduction.flat b/src/Note-master2/app/build/intermediates/merged_res/debug/raw-zh-rCN_introduction.flat
similarity index 74%
rename from src/Notes-master1/app/build/intermediates/merged_res/debug/raw-zh-rCN_introduction.flat
rename to src/Note-master2/app/build/intermediates/merged_res/debug/raw-zh-rCN_introduction.flat
index 74a7b9d..5a26772 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/raw-zh-rCN_introduction.flat and b/src/Note-master2/app/build/intermediates/merged_res/debug/raw-zh-rCN_introduction.flat differ
diff --git a/src/Note-master2/app/build/intermediates/merged_res/debug/raw_introduction.flat b/src/Note-master2/app/build/intermediates/merged_res/debug/raw_introduction.flat
new file mode 100644
index 0000000..76a6844
Binary files /dev/null and b/src/Note-master2/app/build/intermediates/merged_res/debug/raw_introduction.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-af_values-af.arsc.flat b/src/Note-master2/app/build/intermediates/merged_res/debug/values-af_values-af.arsc.flat
similarity index 88%
rename from src/Notes-master1/app/build/intermediates/merged_res/debug/values-af_values-af.arsc.flat
rename to src/Note-master2/app/build/intermediates/merged_res/debug/values-af_values-af.arsc.flat
index 0d168ab..72ad346 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-af_values-af.arsc.flat and b/src/Note-master2/app/build/intermediates/merged_res/debug/values-af_values-af.arsc.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-am_values-am.arsc.flat b/src/Note-master2/app/build/intermediates/merged_res/debug/values-am_values-am.arsc.flat
similarity index 89%
rename from src/Notes-master1/app/build/intermediates/merged_res/debug/values-am_values-am.arsc.flat
rename to src/Note-master2/app/build/intermediates/merged_res/debug/values-am_values-am.arsc.flat
index 5d38499..1ac78e7 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-am_values-am.arsc.flat and b/src/Note-master2/app/build/intermediates/merged_res/debug/values-am_values-am.arsc.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-ar_values-ar.arsc.flat b/src/Note-master2/app/build/intermediates/merged_res/debug/values-ar_values-ar.arsc.flat
similarity index 89%
rename from src/Notes-master1/app/build/intermediates/merged_res/debug/values-ar_values-ar.arsc.flat
rename to src/Note-master2/app/build/intermediates/merged_res/debug/values-ar_values-ar.arsc.flat
index 7ff2099..16cb340 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-ar_values-ar.arsc.flat and b/src/Note-master2/app/build/intermediates/merged_res/debug/values-ar_values-ar.arsc.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-as_values-as.arsc.flat b/src/Note-master2/app/build/intermediates/merged_res/debug/values-as_values-as.arsc.flat
similarity index 91%
rename from src/Notes-master1/app/build/intermediates/merged_res/debug/values-as_values-as.arsc.flat
rename to src/Note-master2/app/build/intermediates/merged_res/debug/values-as_values-as.arsc.flat
index 173d0ff..8e66e4a 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-as_values-as.arsc.flat and b/src/Note-master2/app/build/intermediates/merged_res/debug/values-as_values-as.arsc.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-az_values-az.arsc.flat b/src/Note-master2/app/build/intermediates/merged_res/debug/values-az_values-az.arsc.flat
similarity index 89%
rename from src/Notes-master1/app/build/intermediates/merged_res/debug/values-az_values-az.arsc.flat
rename to src/Note-master2/app/build/intermediates/merged_res/debug/values-az_values-az.arsc.flat
index fed9f15..86c02a1 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-az_values-az.arsc.flat and b/src/Note-master2/app/build/intermediates/merged_res/debug/values-az_values-az.arsc.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-b+sr+Latn_values-b+sr+Latn.arsc.flat b/src/Note-master2/app/build/intermediates/merged_res/debug/values-b+sr+Latn_values-b+sr+Latn.arsc.flat
similarity index 89%
rename from src/Notes-master1/app/build/intermediates/merged_res/debug/values-b+sr+Latn_values-b+sr+Latn.arsc.flat
rename to src/Note-master2/app/build/intermediates/merged_res/debug/values-b+sr+Latn_values-b+sr+Latn.arsc.flat
index 3263165..ec21289 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-b+sr+Latn_values-b+sr+Latn.arsc.flat and b/src/Note-master2/app/build/intermediates/merged_res/debug/values-b+sr+Latn_values-b+sr+Latn.arsc.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-be_values-be.arsc.flat b/src/Note-master2/app/build/intermediates/merged_res/debug/values-be_values-be.arsc.flat
similarity index 90%
rename from src/Notes-master1/app/build/intermediates/merged_res/debug/values-be_values-be.arsc.flat
rename to src/Note-master2/app/build/intermediates/merged_res/debug/values-be_values-be.arsc.flat
index f29506c..79a4678 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-be_values-be.arsc.flat and b/src/Note-master2/app/build/intermediates/merged_res/debug/values-be_values-be.arsc.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-bg_values-bg.arsc.flat b/src/Note-master2/app/build/intermediates/merged_res/debug/values-bg_values-bg.arsc.flat
similarity index 90%
rename from src/Notes-master1/app/build/intermediates/merged_res/debug/values-bg_values-bg.arsc.flat
rename to src/Note-master2/app/build/intermediates/merged_res/debug/values-bg_values-bg.arsc.flat
index cf819b9..deee319 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-bg_values-bg.arsc.flat and b/src/Note-master2/app/build/intermediates/merged_res/debug/values-bg_values-bg.arsc.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-bn_values-bn.arsc.flat b/src/Note-master2/app/build/intermediates/merged_res/debug/values-bn_values-bn.arsc.flat
similarity index 91%
rename from src/Notes-master1/app/build/intermediates/merged_res/debug/values-bn_values-bn.arsc.flat
rename to src/Note-master2/app/build/intermediates/merged_res/debug/values-bn_values-bn.arsc.flat
index d719752..8d7d639 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-bn_values-bn.arsc.flat and b/src/Note-master2/app/build/intermediates/merged_res/debug/values-bn_values-bn.arsc.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-bs_values-bs.arsc.flat b/src/Note-master2/app/build/intermediates/merged_res/debug/values-bs_values-bs.arsc.flat
similarity index 89%
rename from src/Notes-master1/app/build/intermediates/merged_res/debug/values-bs_values-bs.arsc.flat
rename to src/Note-master2/app/build/intermediates/merged_res/debug/values-bs_values-bs.arsc.flat
index c3e6553..fcbdf59 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-bs_values-bs.arsc.flat and b/src/Note-master2/app/build/intermediates/merged_res/debug/values-bs_values-bs.arsc.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-ca_values-ca.arsc.flat b/src/Note-master2/app/build/intermediates/merged_res/debug/values-ca_values-ca.arsc.flat
similarity index 89%
rename from src/Notes-master1/app/build/intermediates/merged_res/debug/values-ca_values-ca.arsc.flat
rename to src/Note-master2/app/build/intermediates/merged_res/debug/values-ca_values-ca.arsc.flat
index 6bc6c17..338d5fc 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-ca_values-ca.arsc.flat and b/src/Note-master2/app/build/intermediates/merged_res/debug/values-ca_values-ca.arsc.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-cs_values-cs.arsc.flat b/src/Note-master2/app/build/intermediates/merged_res/debug/values-cs_values-cs.arsc.flat
similarity index 89%
rename from src/Notes-master1/app/build/intermediates/merged_res/debug/values-cs_values-cs.arsc.flat
rename to src/Note-master2/app/build/intermediates/merged_res/debug/values-cs_values-cs.arsc.flat
index 01e8d1d..3774960 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-cs_values-cs.arsc.flat and b/src/Note-master2/app/build/intermediates/merged_res/debug/values-cs_values-cs.arsc.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-da_values-da.arsc.flat b/src/Note-master2/app/build/intermediates/merged_res/debug/values-da_values-da.arsc.flat
similarity index 88%
rename from src/Notes-master1/app/build/intermediates/merged_res/debug/values-da_values-da.arsc.flat
rename to src/Note-master2/app/build/intermediates/merged_res/debug/values-da_values-da.arsc.flat
index fb18fa9..d5e47c5 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-da_values-da.arsc.flat and b/src/Note-master2/app/build/intermediates/merged_res/debug/values-da_values-da.arsc.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-de_values-de.arsc.flat b/src/Note-master2/app/build/intermediates/merged_res/debug/values-de_values-de.arsc.flat
similarity index 89%
rename from src/Notes-master1/app/build/intermediates/merged_res/debug/values-de_values-de.arsc.flat
rename to src/Note-master2/app/build/intermediates/merged_res/debug/values-de_values-de.arsc.flat
index 90581e2..324fa93 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-de_values-de.arsc.flat and b/src/Note-master2/app/build/intermediates/merged_res/debug/values-de_values-de.arsc.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-el_values-el.arsc.flat b/src/Note-master2/app/build/intermediates/merged_res/debug/values-el_values-el.arsc.flat
similarity index 90%
rename from src/Notes-master1/app/build/intermediates/merged_res/debug/values-el_values-el.arsc.flat
rename to src/Note-master2/app/build/intermediates/merged_res/debug/values-el_values-el.arsc.flat
index 70cd0f7..370c5ba 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-el_values-el.arsc.flat and b/src/Note-master2/app/build/intermediates/merged_res/debug/values-el_values-el.arsc.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-en-rAU_values-en-rAU.arsc.flat b/src/Note-master2/app/build/intermediates/merged_res/debug/values-en-rAU_values-en-rAU.arsc.flat
similarity index 89%
rename from src/Notes-master1/app/build/intermediates/merged_res/debug/values-en-rAU_values-en-rAU.arsc.flat
rename to src/Note-master2/app/build/intermediates/merged_res/debug/values-en-rAU_values-en-rAU.arsc.flat
index 5ff4c73..b5dda9a 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-en-rAU_values-en-rAU.arsc.flat and b/src/Note-master2/app/build/intermediates/merged_res/debug/values-en-rAU_values-en-rAU.arsc.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-en-rCA_values-en-rCA.arsc.flat b/src/Note-master2/app/build/intermediates/merged_res/debug/values-en-rCA_values-en-rCA.arsc.flat
similarity index 89%
rename from src/Notes-master1/app/build/intermediates/merged_res/debug/values-en-rCA_values-en-rCA.arsc.flat
rename to src/Note-master2/app/build/intermediates/merged_res/debug/values-en-rCA_values-en-rCA.arsc.flat
index 750715f..1974bd3 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-en-rCA_values-en-rCA.arsc.flat and b/src/Note-master2/app/build/intermediates/merged_res/debug/values-en-rCA_values-en-rCA.arsc.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-en-rGB_values-en-rGB.arsc.flat b/src/Note-master2/app/build/intermediates/merged_res/debug/values-en-rGB_values-en-rGB.arsc.flat
similarity index 89%
rename from src/Notes-master1/app/build/intermediates/merged_res/debug/values-en-rGB_values-en-rGB.arsc.flat
rename to src/Note-master2/app/build/intermediates/merged_res/debug/values-en-rGB_values-en-rGB.arsc.flat
index 1fd2995..9e39181 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-en-rGB_values-en-rGB.arsc.flat and b/src/Note-master2/app/build/intermediates/merged_res/debug/values-en-rGB_values-en-rGB.arsc.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-en-rIN_values-en-rIN.arsc.flat b/src/Note-master2/app/build/intermediates/merged_res/debug/values-en-rIN_values-en-rIN.arsc.flat
similarity index 89%
rename from src/Notes-master1/app/build/intermediates/merged_res/debug/values-en-rIN_values-en-rIN.arsc.flat
rename to src/Note-master2/app/build/intermediates/merged_res/debug/values-en-rIN_values-en-rIN.arsc.flat
index bbf5764..68a8d6a 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-en-rIN_values-en-rIN.arsc.flat and b/src/Note-master2/app/build/intermediates/merged_res/debug/values-en-rIN_values-en-rIN.arsc.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-en-rXC_values-en-rXC.arsc.flat b/src/Note-master2/app/build/intermediates/merged_res/debug/values-en-rXC_values-en-rXC.arsc.flat
similarity index 98%
rename from src/Notes-master1/app/build/intermediates/merged_res/debug/values-en-rXC_values-en-rXC.arsc.flat
rename to src/Note-master2/app/build/intermediates/merged_res/debug/values-en-rXC_values-en-rXC.arsc.flat
index 7703402..eecfd00 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-en-rXC_values-en-rXC.arsc.flat and b/src/Note-master2/app/build/intermediates/merged_res/debug/values-en-rXC_values-en-rXC.arsc.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-es-rUS_values-es-rUS.arsc.flat b/src/Note-master2/app/build/intermediates/merged_res/debug/values-es-rUS_values-es-rUS.arsc.flat
similarity index 89%
rename from src/Notes-master1/app/build/intermediates/merged_res/debug/values-es-rUS_values-es-rUS.arsc.flat
rename to src/Note-master2/app/build/intermediates/merged_res/debug/values-es-rUS_values-es-rUS.arsc.flat
index de10682..ed9e858 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-es-rUS_values-es-rUS.arsc.flat and b/src/Note-master2/app/build/intermediates/merged_res/debug/values-es-rUS_values-es-rUS.arsc.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-es_values-es.arsc.flat b/src/Note-master2/app/build/intermediates/merged_res/debug/values-es_values-es.arsc.flat
similarity index 89%
rename from src/Notes-master1/app/build/intermediates/merged_res/debug/values-es_values-es.arsc.flat
rename to src/Note-master2/app/build/intermediates/merged_res/debug/values-es_values-es.arsc.flat
index 578dcdb..a2639cc 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-es_values-es.arsc.flat and b/src/Note-master2/app/build/intermediates/merged_res/debug/values-es_values-es.arsc.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-et_values-et.arsc.flat b/src/Note-master2/app/build/intermediates/merged_res/debug/values-et_values-et.arsc.flat
similarity index 89%
rename from src/Notes-master1/app/build/intermediates/merged_res/debug/values-et_values-et.arsc.flat
rename to src/Note-master2/app/build/intermediates/merged_res/debug/values-et_values-et.arsc.flat
index 2d35f85..4e14f12 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-et_values-et.arsc.flat and b/src/Note-master2/app/build/intermediates/merged_res/debug/values-et_values-et.arsc.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-eu_values-eu.arsc.flat b/src/Note-master2/app/build/intermediates/merged_res/debug/values-eu_values-eu.arsc.flat
similarity index 89%
rename from src/Notes-master1/app/build/intermediates/merged_res/debug/values-eu_values-eu.arsc.flat
rename to src/Note-master2/app/build/intermediates/merged_res/debug/values-eu_values-eu.arsc.flat
index b4f44e5..1dd9ed1 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-eu_values-eu.arsc.flat and b/src/Note-master2/app/build/intermediates/merged_res/debug/values-eu_values-eu.arsc.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-fa_values-fa.arsc.flat b/src/Note-master2/app/build/intermediates/merged_res/debug/values-fa_values-fa.arsc.flat
similarity index 90%
rename from src/Notes-master1/app/build/intermediates/merged_res/debug/values-fa_values-fa.arsc.flat
rename to src/Note-master2/app/build/intermediates/merged_res/debug/values-fa_values-fa.arsc.flat
index ff61455..5672752 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-fa_values-fa.arsc.flat and b/src/Note-master2/app/build/intermediates/merged_res/debug/values-fa_values-fa.arsc.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-fi_values-fi.arsc.flat b/src/Note-master2/app/build/intermediates/merged_res/debug/values-fi_values-fi.arsc.flat
similarity index 89%
rename from src/Notes-master1/app/build/intermediates/merged_res/debug/values-fi_values-fi.arsc.flat
rename to src/Note-master2/app/build/intermediates/merged_res/debug/values-fi_values-fi.arsc.flat
index aea59ed..b17fd5d 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-fi_values-fi.arsc.flat and b/src/Note-master2/app/build/intermediates/merged_res/debug/values-fi_values-fi.arsc.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-fr-rCA_values-fr-rCA.arsc.flat b/src/Note-master2/app/build/intermediates/merged_res/debug/values-fr-rCA_values-fr-rCA.arsc.flat
similarity index 89%
rename from src/Notes-master1/app/build/intermediates/merged_res/debug/values-fr-rCA_values-fr-rCA.arsc.flat
rename to src/Note-master2/app/build/intermediates/merged_res/debug/values-fr-rCA_values-fr-rCA.arsc.flat
index f647211..3bad760 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-fr-rCA_values-fr-rCA.arsc.flat and b/src/Note-master2/app/build/intermediates/merged_res/debug/values-fr-rCA_values-fr-rCA.arsc.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-fr_values-fr.arsc.flat b/src/Note-master2/app/build/intermediates/merged_res/debug/values-fr_values-fr.arsc.flat
similarity index 89%
rename from src/Notes-master1/app/build/intermediates/merged_res/debug/values-fr_values-fr.arsc.flat
rename to src/Note-master2/app/build/intermediates/merged_res/debug/values-fr_values-fr.arsc.flat
index 9bc000f..9a5289f 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-fr_values-fr.arsc.flat and b/src/Note-master2/app/build/intermediates/merged_res/debug/values-fr_values-fr.arsc.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-gl_values-gl.arsc.flat b/src/Note-master2/app/build/intermediates/merged_res/debug/values-gl_values-gl.arsc.flat
similarity index 89%
rename from src/Notes-master1/app/build/intermediates/merged_res/debug/values-gl_values-gl.arsc.flat
rename to src/Note-master2/app/build/intermediates/merged_res/debug/values-gl_values-gl.arsc.flat
index 4ad8d38..d4217a2 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-gl_values-gl.arsc.flat and b/src/Note-master2/app/build/intermediates/merged_res/debug/values-gl_values-gl.arsc.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-gu_values-gu.arsc.flat b/src/Note-master2/app/build/intermediates/merged_res/debug/values-gu_values-gu.arsc.flat
similarity index 90%
rename from src/Notes-master1/app/build/intermediates/merged_res/debug/values-gu_values-gu.arsc.flat
rename to src/Note-master2/app/build/intermediates/merged_res/debug/values-gu_values-gu.arsc.flat
index 875d929..62ab73a 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-gu_values-gu.arsc.flat and b/src/Note-master2/app/build/intermediates/merged_res/debug/values-gu_values-gu.arsc.flat differ
diff --git a/src/Note-master2/app/build/intermediates/merged_res/debug/values-h720dp-v13_values-h720dp-v13.arsc.flat b/src/Note-master2/app/build/intermediates/merged_res/debug/values-h720dp-v13_values-h720dp-v13.arsc.flat
new file mode 100644
index 0000000..2b1514a
Binary files /dev/null and b/src/Note-master2/app/build/intermediates/merged_res/debug/values-h720dp-v13_values-h720dp-v13.arsc.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-hdpi-v4_values-hdpi-v4.arsc.flat b/src/Note-master2/app/build/intermediates/merged_res/debug/values-hdpi-v4_values-hdpi-v4.arsc.flat
similarity index 52%
rename from src/Notes-master1/app/build/intermediates/merged_res/debug/values-hdpi-v4_values-hdpi-v4.arsc.flat
rename to src/Note-master2/app/build/intermediates/merged_res/debug/values-hdpi-v4_values-hdpi-v4.arsc.flat
index 845ef43..ef6748c 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-hdpi-v4_values-hdpi-v4.arsc.flat and b/src/Note-master2/app/build/intermediates/merged_res/debug/values-hdpi-v4_values-hdpi-v4.arsc.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-hi_values-hi.arsc.flat b/src/Note-master2/app/build/intermediates/merged_res/debug/values-hi_values-hi.arsc.flat
similarity index 90%
rename from src/Notes-master1/app/build/intermediates/merged_res/debug/values-hi_values-hi.arsc.flat
rename to src/Note-master2/app/build/intermediates/merged_res/debug/values-hi_values-hi.arsc.flat
index dd7278c..01c3bc0 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-hi_values-hi.arsc.flat and b/src/Note-master2/app/build/intermediates/merged_res/debug/values-hi_values-hi.arsc.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-hr_values-hr.arsc.flat b/src/Note-master2/app/build/intermediates/merged_res/debug/values-hr_values-hr.arsc.flat
similarity index 89%
rename from src/Notes-master1/app/build/intermediates/merged_res/debug/values-hr_values-hr.arsc.flat
rename to src/Note-master2/app/build/intermediates/merged_res/debug/values-hr_values-hr.arsc.flat
index 721050c..a0390dc 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-hr_values-hr.arsc.flat and b/src/Note-master2/app/build/intermediates/merged_res/debug/values-hr_values-hr.arsc.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-hu_values-hu.arsc.flat b/src/Note-master2/app/build/intermediates/merged_res/debug/values-hu_values-hu.arsc.flat
similarity index 89%
rename from src/Notes-master1/app/build/intermediates/merged_res/debug/values-hu_values-hu.arsc.flat
rename to src/Note-master2/app/build/intermediates/merged_res/debug/values-hu_values-hu.arsc.flat
index b6b10d6..94d1470 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-hu_values-hu.arsc.flat and b/src/Note-master2/app/build/intermediates/merged_res/debug/values-hu_values-hu.arsc.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-hy_values-hy.arsc.flat b/src/Note-master2/app/build/intermediates/merged_res/debug/values-hy_values-hy.arsc.flat
similarity index 89%
rename from src/Notes-master1/app/build/intermediates/merged_res/debug/values-hy_values-hy.arsc.flat
rename to src/Note-master2/app/build/intermediates/merged_res/debug/values-hy_values-hy.arsc.flat
index 35a8a3c..bed5608 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-hy_values-hy.arsc.flat and b/src/Note-master2/app/build/intermediates/merged_res/debug/values-hy_values-hy.arsc.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-in_values-in.arsc.flat b/src/Note-master2/app/build/intermediates/merged_res/debug/values-in_values-in.arsc.flat
similarity index 89%
rename from src/Notes-master1/app/build/intermediates/merged_res/debug/values-in_values-in.arsc.flat
rename to src/Note-master2/app/build/intermediates/merged_res/debug/values-in_values-in.arsc.flat
index adcfbee..6b5c8f0 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-in_values-in.arsc.flat and b/src/Note-master2/app/build/intermediates/merged_res/debug/values-in_values-in.arsc.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-is_values-is.arsc.flat b/src/Note-master2/app/build/intermediates/merged_res/debug/values-is_values-is.arsc.flat
similarity index 88%
rename from src/Notes-master1/app/build/intermediates/merged_res/debug/values-is_values-is.arsc.flat
rename to src/Note-master2/app/build/intermediates/merged_res/debug/values-is_values-is.arsc.flat
index 71245c0..3d0938a 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-is_values-is.arsc.flat and b/src/Note-master2/app/build/intermediates/merged_res/debug/values-is_values-is.arsc.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-it_values-it.arsc.flat b/src/Note-master2/app/build/intermediates/merged_res/debug/values-it_values-it.arsc.flat
similarity index 89%
rename from src/Notes-master1/app/build/intermediates/merged_res/debug/values-it_values-it.arsc.flat
rename to src/Note-master2/app/build/intermediates/merged_res/debug/values-it_values-it.arsc.flat
index 621e9ab..72f3347 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-it_values-it.arsc.flat and b/src/Note-master2/app/build/intermediates/merged_res/debug/values-it_values-it.arsc.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-iw_values-iw.arsc.flat b/src/Note-master2/app/build/intermediates/merged_res/debug/values-iw_values-iw.arsc.flat
similarity index 89%
rename from src/Notes-master1/app/build/intermediates/merged_res/debug/values-iw_values-iw.arsc.flat
rename to src/Note-master2/app/build/intermediates/merged_res/debug/values-iw_values-iw.arsc.flat
index f2fb3e0..fe3454c 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-iw_values-iw.arsc.flat and b/src/Note-master2/app/build/intermediates/merged_res/debug/values-iw_values-iw.arsc.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-ja_values-ja.arsc.flat b/src/Note-master2/app/build/intermediates/merged_res/debug/values-ja_values-ja.arsc.flat
similarity index 89%
rename from src/Notes-master1/app/build/intermediates/merged_res/debug/values-ja_values-ja.arsc.flat
rename to src/Note-master2/app/build/intermediates/merged_res/debug/values-ja_values-ja.arsc.flat
index 7fc7ac5..fba4fdb 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-ja_values-ja.arsc.flat and b/src/Note-master2/app/build/intermediates/merged_res/debug/values-ja_values-ja.arsc.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-ka_values-ka.arsc.flat b/src/Note-master2/app/build/intermediates/merged_res/debug/values-ka_values-ka.arsc.flat
similarity index 90%
rename from src/Notes-master1/app/build/intermediates/merged_res/debug/values-ka_values-ka.arsc.flat
rename to src/Note-master2/app/build/intermediates/merged_res/debug/values-ka_values-ka.arsc.flat
index 13e7169..69521f2 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-ka_values-ka.arsc.flat and b/src/Note-master2/app/build/intermediates/merged_res/debug/values-ka_values-ka.arsc.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-kk_values-kk.arsc.flat b/src/Note-master2/app/build/intermediates/merged_res/debug/values-kk_values-kk.arsc.flat
similarity index 90%
rename from src/Notes-master1/app/build/intermediates/merged_res/debug/values-kk_values-kk.arsc.flat
rename to src/Note-master2/app/build/intermediates/merged_res/debug/values-kk_values-kk.arsc.flat
index b0b93c6..5cf2d9a 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-kk_values-kk.arsc.flat and b/src/Note-master2/app/build/intermediates/merged_res/debug/values-kk_values-kk.arsc.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-km_values-km.arsc.flat b/src/Note-master2/app/build/intermediates/merged_res/debug/values-km_values-km.arsc.flat
similarity index 90%
rename from src/Notes-master1/app/build/intermediates/merged_res/debug/values-km_values-km.arsc.flat
rename to src/Note-master2/app/build/intermediates/merged_res/debug/values-km_values-km.arsc.flat
index 63a044f..f618e4a 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-km_values-km.arsc.flat and b/src/Note-master2/app/build/intermediates/merged_res/debug/values-km_values-km.arsc.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-kn_values-kn.arsc.flat b/src/Note-master2/app/build/intermediates/merged_res/debug/values-kn_values-kn.arsc.flat
similarity index 91%
rename from src/Notes-master1/app/build/intermediates/merged_res/debug/values-kn_values-kn.arsc.flat
rename to src/Note-master2/app/build/intermediates/merged_res/debug/values-kn_values-kn.arsc.flat
index 7ea5cda..2161ff2 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-kn_values-kn.arsc.flat and b/src/Note-master2/app/build/intermediates/merged_res/debug/values-kn_values-kn.arsc.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-ko_values-ko.arsc.flat b/src/Note-master2/app/build/intermediates/merged_res/debug/values-ko_values-ko.arsc.flat
similarity index 88%
rename from src/Notes-master1/app/build/intermediates/merged_res/debug/values-ko_values-ko.arsc.flat
rename to src/Note-master2/app/build/intermediates/merged_res/debug/values-ko_values-ko.arsc.flat
index 7d0c9b1..69d52bf 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-ko_values-ko.arsc.flat and b/src/Note-master2/app/build/intermediates/merged_res/debug/values-ko_values-ko.arsc.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-ky_values-ky.arsc.flat b/src/Note-master2/app/build/intermediates/merged_res/debug/values-ky_values-ky.arsc.flat
similarity index 89%
rename from src/Notes-master1/app/build/intermediates/merged_res/debug/values-ky_values-ky.arsc.flat
rename to src/Note-master2/app/build/intermediates/merged_res/debug/values-ky_values-ky.arsc.flat
index 7a3b653..e179d67 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-ky_values-ky.arsc.flat and b/src/Note-master2/app/build/intermediates/merged_res/debug/values-ky_values-ky.arsc.flat differ
diff --git a/src/Note-master2/app/build/intermediates/merged_res/debug/values-land_values-land.arsc.flat b/src/Note-master2/app/build/intermediates/merged_res/debug/values-land_values-land.arsc.flat
new file mode 100644
index 0000000..57cc851
Binary files /dev/null and b/src/Note-master2/app/build/intermediates/merged_res/debug/values-land_values-land.arsc.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-large-v4_values-large-v4.arsc.flat b/src/Note-master2/app/build/intermediates/merged_res/debug/values-large-v4_values-large-v4.arsc.flat
similarity index 73%
rename from src/Notes-master1/app/build/intermediates/merged_res/debug/values-large-v4_values-large-v4.arsc.flat
rename to src/Note-master2/app/build/intermediates/merged_res/debug/values-large-v4_values-large-v4.arsc.flat
index 76cbaad..1665d7e 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-large-v4_values-large-v4.arsc.flat and b/src/Note-master2/app/build/intermediates/merged_res/debug/values-large-v4_values-large-v4.arsc.flat differ
diff --git a/src/Note-master2/app/build/intermediates/merged_res/debug/values-ldltr-v21_values-ldltr-v21.arsc.flat b/src/Note-master2/app/build/intermediates/merged_res/debug/values-ldltr-v21_values-ldltr-v21.arsc.flat
new file mode 100644
index 0000000..24e4459
Binary files /dev/null and b/src/Note-master2/app/build/intermediates/merged_res/debug/values-ldltr-v21_values-ldltr-v21.arsc.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-lo_values-lo.arsc.flat b/src/Note-master2/app/build/intermediates/merged_res/debug/values-lo_values-lo.arsc.flat
similarity index 90%
rename from src/Notes-master1/app/build/intermediates/merged_res/debug/values-lo_values-lo.arsc.flat
rename to src/Note-master2/app/build/intermediates/merged_res/debug/values-lo_values-lo.arsc.flat
index 068f945..6258e76 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-lo_values-lo.arsc.flat and b/src/Note-master2/app/build/intermediates/merged_res/debug/values-lo_values-lo.arsc.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-lt_values-lt.arsc.flat b/src/Note-master2/app/build/intermediates/merged_res/debug/values-lt_values-lt.arsc.flat
similarity index 89%
rename from src/Notes-master1/app/build/intermediates/merged_res/debug/values-lt_values-lt.arsc.flat
rename to src/Note-master2/app/build/intermediates/merged_res/debug/values-lt_values-lt.arsc.flat
index db9aa27..f3e3c1b 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-lt_values-lt.arsc.flat and b/src/Note-master2/app/build/intermediates/merged_res/debug/values-lt_values-lt.arsc.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-lv_values-lv.arsc.flat b/src/Note-master2/app/build/intermediates/merged_res/debug/values-lv_values-lv.arsc.flat
similarity index 90%
rename from src/Notes-master1/app/build/intermediates/merged_res/debug/values-lv_values-lv.arsc.flat
rename to src/Note-master2/app/build/intermediates/merged_res/debug/values-lv_values-lv.arsc.flat
index 0f1e81d..3788db5 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-lv_values-lv.arsc.flat and b/src/Note-master2/app/build/intermediates/merged_res/debug/values-lv_values-lv.arsc.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-mk_values-mk.arsc.flat b/src/Note-master2/app/build/intermediates/merged_res/debug/values-mk_values-mk.arsc.flat
similarity index 90%
rename from src/Notes-master1/app/build/intermediates/merged_res/debug/values-mk_values-mk.arsc.flat
rename to src/Note-master2/app/build/intermediates/merged_res/debug/values-mk_values-mk.arsc.flat
index a2a826d..6d674ac 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-mk_values-mk.arsc.flat and b/src/Note-master2/app/build/intermediates/merged_res/debug/values-mk_values-mk.arsc.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-ml_values-ml.arsc.flat b/src/Note-master2/app/build/intermediates/merged_res/debug/values-ml_values-ml.arsc.flat
similarity index 91%
rename from src/Notes-master1/app/build/intermediates/merged_res/debug/values-ml_values-ml.arsc.flat
rename to src/Note-master2/app/build/intermediates/merged_res/debug/values-ml_values-ml.arsc.flat
index 74571b6..f50a369 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-ml_values-ml.arsc.flat and b/src/Note-master2/app/build/intermediates/merged_res/debug/values-ml_values-ml.arsc.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-mn_values-mn.arsc.flat b/src/Note-master2/app/build/intermediates/merged_res/debug/values-mn_values-mn.arsc.flat
similarity index 89%
rename from src/Notes-master1/app/build/intermediates/merged_res/debug/values-mn_values-mn.arsc.flat
rename to src/Note-master2/app/build/intermediates/merged_res/debug/values-mn_values-mn.arsc.flat
index 0325e76..4ff1891 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-mn_values-mn.arsc.flat and b/src/Note-master2/app/build/intermediates/merged_res/debug/values-mn_values-mn.arsc.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-mr_values-mr.arsc.flat b/src/Note-master2/app/build/intermediates/merged_res/debug/values-mr_values-mr.arsc.flat
similarity index 90%
rename from src/Notes-master1/app/build/intermediates/merged_res/debug/values-mr_values-mr.arsc.flat
rename to src/Note-master2/app/build/intermediates/merged_res/debug/values-mr_values-mr.arsc.flat
index 36bb94a..895da78 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-mr_values-mr.arsc.flat and b/src/Note-master2/app/build/intermediates/merged_res/debug/values-mr_values-mr.arsc.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-ms_values-ms.arsc.flat b/src/Note-master2/app/build/intermediates/merged_res/debug/values-ms_values-ms.arsc.flat
similarity index 89%
rename from src/Notes-master1/app/build/intermediates/merged_res/debug/values-ms_values-ms.arsc.flat
rename to src/Note-master2/app/build/intermediates/merged_res/debug/values-ms_values-ms.arsc.flat
index 0e2e2c5..5f799d3 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-ms_values-ms.arsc.flat and b/src/Note-master2/app/build/intermediates/merged_res/debug/values-ms_values-ms.arsc.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-my_values-my.arsc.flat b/src/Note-master2/app/build/intermediates/merged_res/debug/values-my_values-my.arsc.flat
similarity index 91%
rename from src/Notes-master1/app/build/intermediates/merged_res/debug/values-my_values-my.arsc.flat
rename to src/Note-master2/app/build/intermediates/merged_res/debug/values-my_values-my.arsc.flat
index 854d994..8757e9d 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-my_values-my.arsc.flat and b/src/Note-master2/app/build/intermediates/merged_res/debug/values-my_values-my.arsc.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-nb_values-nb.arsc.flat b/src/Note-master2/app/build/intermediates/merged_res/debug/values-nb_values-nb.arsc.flat
similarity index 88%
rename from src/Notes-master1/app/build/intermediates/merged_res/debug/values-nb_values-nb.arsc.flat
rename to src/Note-master2/app/build/intermediates/merged_res/debug/values-nb_values-nb.arsc.flat
index 19a7a6c..8d61981 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-nb_values-nb.arsc.flat and b/src/Note-master2/app/build/intermediates/merged_res/debug/values-nb_values-nb.arsc.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-ne_values-ne.arsc.flat b/src/Note-master2/app/build/intermediates/merged_res/debug/values-ne_values-ne.arsc.flat
similarity index 91%
rename from src/Notes-master1/app/build/intermediates/merged_res/debug/values-ne_values-ne.arsc.flat
rename to src/Note-master2/app/build/intermediates/merged_res/debug/values-ne_values-ne.arsc.flat
index cc888c1..f6d51bb 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-ne_values-ne.arsc.flat and b/src/Note-master2/app/build/intermediates/merged_res/debug/values-ne_values-ne.arsc.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-night-v8_values-night-v8.arsc.flat b/src/Note-master2/app/build/intermediates/merged_res/debug/values-night-v8_values-night-v8.arsc.flat
similarity index 74%
rename from src/Notes-master1/app/build/intermediates/merged_res/debug/values-night-v8_values-night-v8.arsc.flat
rename to src/Note-master2/app/build/intermediates/merged_res/debug/values-night-v8_values-night-v8.arsc.flat
index e32a4d8..8056af4 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-night-v8_values-night-v8.arsc.flat and b/src/Note-master2/app/build/intermediates/merged_res/debug/values-night-v8_values-night-v8.arsc.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-nl_values-nl.arsc.flat b/src/Note-master2/app/build/intermediates/merged_res/debug/values-nl_values-nl.arsc.flat
similarity index 89%
rename from src/Notes-master1/app/build/intermediates/merged_res/debug/values-nl_values-nl.arsc.flat
rename to src/Note-master2/app/build/intermediates/merged_res/debug/values-nl_values-nl.arsc.flat
index 733c618..6f9ece5 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-nl_values-nl.arsc.flat and b/src/Note-master2/app/build/intermediates/merged_res/debug/values-nl_values-nl.arsc.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-or_values-or.arsc.flat b/src/Note-master2/app/build/intermediates/merged_res/debug/values-or_values-or.arsc.flat
similarity index 91%
rename from src/Notes-master1/app/build/intermediates/merged_res/debug/values-or_values-or.arsc.flat
rename to src/Note-master2/app/build/intermediates/merged_res/debug/values-or_values-or.arsc.flat
index 47a75ab..f0970ea 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-or_values-or.arsc.flat and b/src/Note-master2/app/build/intermediates/merged_res/debug/values-or_values-or.arsc.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-pa_values-pa.arsc.flat b/src/Note-master2/app/build/intermediates/merged_res/debug/values-pa_values-pa.arsc.flat
similarity index 89%
rename from src/Notes-master1/app/build/intermediates/merged_res/debug/values-pa_values-pa.arsc.flat
rename to src/Note-master2/app/build/intermediates/merged_res/debug/values-pa_values-pa.arsc.flat
index 1e7d270..6dec18c 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-pa_values-pa.arsc.flat and b/src/Note-master2/app/build/intermediates/merged_res/debug/values-pa_values-pa.arsc.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-pl_values-pl.arsc.flat b/src/Note-master2/app/build/intermediates/merged_res/debug/values-pl_values-pl.arsc.flat
similarity index 89%
rename from src/Notes-master1/app/build/intermediates/merged_res/debug/values-pl_values-pl.arsc.flat
rename to src/Note-master2/app/build/intermediates/merged_res/debug/values-pl_values-pl.arsc.flat
index 40a39ca..e8f0fb0 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-pl_values-pl.arsc.flat and b/src/Note-master2/app/build/intermediates/merged_res/debug/values-pl_values-pl.arsc.flat differ
diff --git a/src/Note-master2/app/build/intermediates/merged_res/debug/values-port_values-port.arsc.flat b/src/Note-master2/app/build/intermediates/merged_res/debug/values-port_values-port.arsc.flat
new file mode 100644
index 0000000..f26571c
Binary files /dev/null and b/src/Note-master2/app/build/intermediates/merged_res/debug/values-port_values-port.arsc.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-pt-rBR_values-pt-rBR.arsc.flat b/src/Note-master2/app/build/intermediates/merged_res/debug/values-pt-rBR_values-pt-rBR.arsc.flat
similarity index 89%
rename from src/Notes-master1/app/build/intermediates/merged_res/debug/values-pt-rBR_values-pt-rBR.arsc.flat
rename to src/Note-master2/app/build/intermediates/merged_res/debug/values-pt-rBR_values-pt-rBR.arsc.flat
index 5809497..e7bd156 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-pt-rBR_values-pt-rBR.arsc.flat and b/src/Note-master2/app/build/intermediates/merged_res/debug/values-pt-rBR_values-pt-rBR.arsc.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-pt-rPT_values-pt-rPT.arsc.flat b/src/Note-master2/app/build/intermediates/merged_res/debug/values-pt-rPT_values-pt-rPT.arsc.flat
similarity index 89%
rename from src/Notes-master1/app/build/intermediates/merged_res/debug/values-pt-rPT_values-pt-rPT.arsc.flat
rename to src/Note-master2/app/build/intermediates/merged_res/debug/values-pt-rPT_values-pt-rPT.arsc.flat
index ac4eb5d..4880862 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-pt-rPT_values-pt-rPT.arsc.flat and b/src/Note-master2/app/build/intermediates/merged_res/debug/values-pt-rPT_values-pt-rPT.arsc.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-pt_values-pt.arsc.flat b/src/Note-master2/app/build/intermediates/merged_res/debug/values-pt_values-pt.arsc.flat
similarity index 89%
rename from src/Notes-master1/app/build/intermediates/merged_res/debug/values-pt_values-pt.arsc.flat
rename to src/Note-master2/app/build/intermediates/merged_res/debug/values-pt_values-pt.arsc.flat
index 7e1d099..3bcedb7 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-pt_values-pt.arsc.flat and b/src/Note-master2/app/build/intermediates/merged_res/debug/values-pt_values-pt.arsc.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-ro_values-ro.arsc.flat b/src/Note-master2/app/build/intermediates/merged_res/debug/values-ro_values-ro.arsc.flat
similarity index 89%
rename from src/Notes-master1/app/build/intermediates/merged_res/debug/values-ro_values-ro.arsc.flat
rename to src/Note-master2/app/build/intermediates/merged_res/debug/values-ro_values-ro.arsc.flat
index 6dbda85..f273aa2 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-ro_values-ro.arsc.flat and b/src/Note-master2/app/build/intermediates/merged_res/debug/values-ro_values-ro.arsc.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-ru_values-ru.arsc.flat b/src/Note-master2/app/build/intermediates/merged_res/debug/values-ru_values-ru.arsc.flat
similarity index 90%
rename from src/Notes-master1/app/build/intermediates/merged_res/debug/values-ru_values-ru.arsc.flat
rename to src/Note-master2/app/build/intermediates/merged_res/debug/values-ru_values-ru.arsc.flat
index 2a7714b..5c17b64 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-ru_values-ru.arsc.flat and b/src/Note-master2/app/build/intermediates/merged_res/debug/values-ru_values-ru.arsc.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-si_values-si.arsc.flat b/src/Note-master2/app/build/intermediates/merged_res/debug/values-si_values-si.arsc.flat
similarity index 90%
rename from src/Notes-master1/app/build/intermediates/merged_res/debug/values-si_values-si.arsc.flat
rename to src/Note-master2/app/build/intermediates/merged_res/debug/values-si_values-si.arsc.flat
index b30af21..6498b63 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-si_values-si.arsc.flat and b/src/Note-master2/app/build/intermediates/merged_res/debug/values-si_values-si.arsc.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-sk_values-sk.arsc.flat b/src/Note-master2/app/build/intermediates/merged_res/debug/values-sk_values-sk.arsc.flat
similarity index 89%
rename from src/Notes-master1/app/build/intermediates/merged_res/debug/values-sk_values-sk.arsc.flat
rename to src/Note-master2/app/build/intermediates/merged_res/debug/values-sk_values-sk.arsc.flat
index 12fa271..84e844d 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-sk_values-sk.arsc.flat and b/src/Note-master2/app/build/intermediates/merged_res/debug/values-sk_values-sk.arsc.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-sl_values-sl.arsc.flat b/src/Note-master2/app/build/intermediates/merged_res/debug/values-sl_values-sl.arsc.flat
similarity index 89%
rename from src/Notes-master1/app/build/intermediates/merged_res/debug/values-sl_values-sl.arsc.flat
rename to src/Note-master2/app/build/intermediates/merged_res/debug/values-sl_values-sl.arsc.flat
index 6ef4efc..45ce35a 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-sl_values-sl.arsc.flat and b/src/Note-master2/app/build/intermediates/merged_res/debug/values-sl_values-sl.arsc.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-sq_values-sq.arsc.flat b/src/Note-master2/app/build/intermediates/merged_res/debug/values-sq_values-sq.arsc.flat
similarity index 89%
rename from src/Notes-master1/app/build/intermediates/merged_res/debug/values-sq_values-sq.arsc.flat
rename to src/Note-master2/app/build/intermediates/merged_res/debug/values-sq_values-sq.arsc.flat
index c15075c..04621d4 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-sq_values-sq.arsc.flat and b/src/Note-master2/app/build/intermediates/merged_res/debug/values-sq_values-sq.arsc.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-sr_values-sr.arsc.flat b/src/Note-master2/app/build/intermediates/merged_res/debug/values-sr_values-sr.arsc.flat
similarity index 90%
rename from src/Notes-master1/app/build/intermediates/merged_res/debug/values-sr_values-sr.arsc.flat
rename to src/Note-master2/app/build/intermediates/merged_res/debug/values-sr_values-sr.arsc.flat
index e5e0e78..ab3e42f 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-sr_values-sr.arsc.flat and b/src/Note-master2/app/build/intermediates/merged_res/debug/values-sr_values-sr.arsc.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-sv_values-sv.arsc.flat b/src/Note-master2/app/build/intermediates/merged_res/debug/values-sv_values-sv.arsc.flat
similarity index 89%
rename from src/Notes-master1/app/build/intermediates/merged_res/debug/values-sv_values-sv.arsc.flat
rename to src/Note-master2/app/build/intermediates/merged_res/debug/values-sv_values-sv.arsc.flat
index 6845786..423fc41 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-sv_values-sv.arsc.flat and b/src/Note-master2/app/build/intermediates/merged_res/debug/values-sv_values-sv.arsc.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-sw600dp-v13_values-sw600dp-v13.arsc.flat b/src/Note-master2/app/build/intermediates/merged_res/debug/values-sw600dp-v13_values-sw600dp-v13.arsc.flat
similarity index 70%
rename from src/Notes-master1/app/build/intermediates/merged_res/debug/values-sw600dp-v13_values-sw600dp-v13.arsc.flat
rename to src/Note-master2/app/build/intermediates/merged_res/debug/values-sw600dp-v13_values-sw600dp-v13.arsc.flat
index ed0f45c..b20e92e 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-sw600dp-v13_values-sw600dp-v13.arsc.flat and b/src/Note-master2/app/build/intermediates/merged_res/debug/values-sw600dp-v13_values-sw600dp-v13.arsc.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-sw_values-sw.arsc.flat b/src/Note-master2/app/build/intermediates/merged_res/debug/values-sw_values-sw.arsc.flat
similarity index 88%
rename from src/Notes-master1/app/build/intermediates/merged_res/debug/values-sw_values-sw.arsc.flat
rename to src/Note-master2/app/build/intermediates/merged_res/debug/values-sw_values-sw.arsc.flat
index 41e0d02..157f9a3 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-sw_values-sw.arsc.flat and b/src/Note-master2/app/build/intermediates/merged_res/debug/values-sw_values-sw.arsc.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-ta_values-ta.arsc.flat b/src/Note-master2/app/build/intermediates/merged_res/debug/values-ta_values-ta.arsc.flat
similarity index 91%
rename from src/Notes-master1/app/build/intermediates/merged_res/debug/values-ta_values-ta.arsc.flat
rename to src/Note-master2/app/build/intermediates/merged_res/debug/values-ta_values-ta.arsc.flat
index 509c614..704bad5 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-ta_values-ta.arsc.flat and b/src/Note-master2/app/build/intermediates/merged_res/debug/values-ta_values-ta.arsc.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-te_values-te.arsc.flat b/src/Note-master2/app/build/intermediates/merged_res/debug/values-te_values-te.arsc.flat
similarity index 91%
rename from src/Notes-master1/app/build/intermediates/merged_res/debug/values-te_values-te.arsc.flat
rename to src/Note-master2/app/build/intermediates/merged_res/debug/values-te_values-te.arsc.flat
index 6ae9377..64ec31b 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-te_values-te.arsc.flat and b/src/Note-master2/app/build/intermediates/merged_res/debug/values-te_values-te.arsc.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-th_values-th.arsc.flat b/src/Note-master2/app/build/intermediates/merged_res/debug/values-th_values-th.arsc.flat
similarity index 90%
rename from src/Notes-master1/app/build/intermediates/merged_res/debug/values-th_values-th.arsc.flat
rename to src/Note-master2/app/build/intermediates/merged_res/debug/values-th_values-th.arsc.flat
index f6ad263..de3c8fd 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-th_values-th.arsc.flat and b/src/Note-master2/app/build/intermediates/merged_res/debug/values-th_values-th.arsc.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-tl_values-tl.arsc.flat b/src/Note-master2/app/build/intermediates/merged_res/debug/values-tl_values-tl.arsc.flat
similarity index 89%
rename from src/Notes-master1/app/build/intermediates/merged_res/debug/values-tl_values-tl.arsc.flat
rename to src/Note-master2/app/build/intermediates/merged_res/debug/values-tl_values-tl.arsc.flat
index 14d49ef..23be4c0 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-tl_values-tl.arsc.flat and b/src/Note-master2/app/build/intermediates/merged_res/debug/values-tl_values-tl.arsc.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-tr_values-tr.arsc.flat b/src/Note-master2/app/build/intermediates/merged_res/debug/values-tr_values-tr.arsc.flat
similarity index 88%
rename from src/Notes-master1/app/build/intermediates/merged_res/debug/values-tr_values-tr.arsc.flat
rename to src/Note-master2/app/build/intermediates/merged_res/debug/values-tr_values-tr.arsc.flat
index 4892129..ef6f73b 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-tr_values-tr.arsc.flat and b/src/Note-master2/app/build/intermediates/merged_res/debug/values-tr_values-tr.arsc.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-uk_values-uk.arsc.flat b/src/Note-master2/app/build/intermediates/merged_res/debug/values-uk_values-uk.arsc.flat
similarity index 89%
rename from src/Notes-master1/app/build/intermediates/merged_res/debug/values-uk_values-uk.arsc.flat
rename to src/Note-master2/app/build/intermediates/merged_res/debug/values-uk_values-uk.arsc.flat
index e93e6fb..b645ffe 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-uk_values-uk.arsc.flat and b/src/Note-master2/app/build/intermediates/merged_res/debug/values-uk_values-uk.arsc.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-ur_values-ur.arsc.flat b/src/Note-master2/app/build/intermediates/merged_res/debug/values-ur_values-ur.arsc.flat
similarity index 89%
rename from src/Notes-master1/app/build/intermediates/merged_res/debug/values-ur_values-ur.arsc.flat
rename to src/Note-master2/app/build/intermediates/merged_res/debug/values-ur_values-ur.arsc.flat
index cb6ff62..1e33c42 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-ur_values-ur.arsc.flat and b/src/Note-master2/app/build/intermediates/merged_res/debug/values-ur_values-ur.arsc.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-uz_values-uz.arsc.flat b/src/Note-master2/app/build/intermediates/merged_res/debug/values-uz_values-uz.arsc.flat
similarity index 89%
rename from src/Notes-master1/app/build/intermediates/merged_res/debug/values-uz_values-uz.arsc.flat
rename to src/Note-master2/app/build/intermediates/merged_res/debug/values-uz_values-uz.arsc.flat
index c0640f0..40be04b 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-uz_values-uz.arsc.flat and b/src/Note-master2/app/build/intermediates/merged_res/debug/values-uz_values-uz.arsc.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-v16_values-v16.arsc.flat b/src/Note-master2/app/build/intermediates/merged_res/debug/values-v16_values-v16.arsc.flat
similarity index 52%
rename from src/Notes-master1/app/build/intermediates/merged_res/debug/values-v16_values-v16.arsc.flat
rename to src/Note-master2/app/build/intermediates/merged_res/debug/values-v16_values-v16.arsc.flat
index 6fdf609..2f04268 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-v16_values-v16.arsc.flat and b/src/Note-master2/app/build/intermediates/merged_res/debug/values-v16_values-v16.arsc.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-v17_values-v17.arsc.flat b/src/Note-master2/app/build/intermediates/merged_res/debug/values-v17_values-v17.arsc.flat
similarity index 93%
rename from src/Notes-master1/app/build/intermediates/merged_res/debug/values-v17_values-v17.arsc.flat
rename to src/Note-master2/app/build/intermediates/merged_res/debug/values-v17_values-v17.arsc.flat
index 4eeb8ba..090feb6 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-v17_values-v17.arsc.flat and b/src/Note-master2/app/build/intermediates/merged_res/debug/values-v17_values-v17.arsc.flat differ
diff --git a/src/Note-master2/app/build/intermediates/merged_res/debug/values-v18_values-v18.arsc.flat b/src/Note-master2/app/build/intermediates/merged_res/debug/values-v18_values-v18.arsc.flat
new file mode 100644
index 0000000..86f9a0d
Binary files /dev/null and b/src/Note-master2/app/build/intermediates/merged_res/debug/values-v18_values-v18.arsc.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-v21_values-v21.arsc.flat b/src/Note-master2/app/build/intermediates/merged_res/debug/values-v21_values-v21.arsc.flat
similarity index 98%
rename from src/Notes-master1/app/build/intermediates/merged_res/debug/values-v21_values-v21.arsc.flat
rename to src/Note-master2/app/build/intermediates/merged_res/debug/values-v21_values-v21.arsc.flat
index 508facf..14d47c3 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-v21_values-v21.arsc.flat and b/src/Note-master2/app/build/intermediates/merged_res/debug/values-v21_values-v21.arsc.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-v22_values-v22.arsc.flat b/src/Note-master2/app/build/intermediates/merged_res/debug/values-v22_values-v22.arsc.flat
similarity index 74%
rename from src/Notes-master1/app/build/intermediates/merged_res/debug/values-v22_values-v22.arsc.flat
rename to src/Note-master2/app/build/intermediates/merged_res/debug/values-v22_values-v22.arsc.flat
index a57abf8..5303204 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-v22_values-v22.arsc.flat and b/src/Note-master2/app/build/intermediates/merged_res/debug/values-v22_values-v22.arsc.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-v23_values-v23.arsc.flat b/src/Note-master2/app/build/intermediates/merged_res/debug/values-v23_values-v23.arsc.flat
similarity index 90%
rename from src/Notes-master1/app/build/intermediates/merged_res/debug/values-v23_values-v23.arsc.flat
rename to src/Note-master2/app/build/intermediates/merged_res/debug/values-v23_values-v23.arsc.flat
index f24ca8e..575ccac 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-v23_values-v23.arsc.flat and b/src/Note-master2/app/build/intermediates/merged_res/debug/values-v23_values-v23.arsc.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-v24_values-v24.arsc.flat b/src/Note-master2/app/build/intermediates/merged_res/debug/values-v24_values-v24.arsc.flat
similarity index 55%
rename from src/Notes-master1/app/build/intermediates/merged_res/debug/values-v24_values-v24.arsc.flat
rename to src/Note-master2/app/build/intermediates/merged_res/debug/values-v24_values-v24.arsc.flat
index 2b8f9f9..9e12958 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-v24_values-v24.arsc.flat and b/src/Note-master2/app/build/intermediates/merged_res/debug/values-v24_values-v24.arsc.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-v25_values-v25.arsc.flat b/src/Note-master2/app/build/intermediates/merged_res/debug/values-v25_values-v25.arsc.flat
similarity index 60%
rename from src/Notes-master1/app/build/intermediates/merged_res/debug/values-v25_values-v25.arsc.flat
rename to src/Note-master2/app/build/intermediates/merged_res/debug/values-v25_values-v25.arsc.flat
index 960fd4a..d453d69 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-v25_values-v25.arsc.flat and b/src/Note-master2/app/build/intermediates/merged_res/debug/values-v25_values-v25.arsc.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-v26_values-v26.arsc.flat b/src/Note-master2/app/build/intermediates/merged_res/debug/values-v26_values-v26.arsc.flat
similarity index 77%
rename from src/Notes-master1/app/build/intermediates/merged_res/debug/values-v26_values-v26.arsc.flat
rename to src/Note-master2/app/build/intermediates/merged_res/debug/values-v26_values-v26.arsc.flat
index 7540161..c31e23f 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-v26_values-v26.arsc.flat and b/src/Note-master2/app/build/intermediates/merged_res/debug/values-v26_values-v26.arsc.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-v28_values-v28.arsc.flat b/src/Note-master2/app/build/intermediates/merged_res/debug/values-v28_values-v28.arsc.flat
similarity index 68%
rename from src/Notes-master1/app/build/intermediates/merged_res/debug/values-v28_values-v28.arsc.flat
rename to src/Note-master2/app/build/intermediates/merged_res/debug/values-v28_values-v28.arsc.flat
index ef855db..198e412 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-v28_values-v28.arsc.flat and b/src/Note-master2/app/build/intermediates/merged_res/debug/values-v28_values-v28.arsc.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-vi_values-vi.arsc.flat b/src/Note-master2/app/build/intermediates/merged_res/debug/values-vi_values-vi.arsc.flat
similarity index 89%
rename from src/Notes-master1/app/build/intermediates/merged_res/debug/values-vi_values-vi.arsc.flat
rename to src/Note-master2/app/build/intermediates/merged_res/debug/values-vi_values-vi.arsc.flat
index 26e0c0f..e0e4c0b 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-vi_values-vi.arsc.flat and b/src/Note-master2/app/build/intermediates/merged_res/debug/values-vi_values-vi.arsc.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-watch-v20_values-watch-v20.arsc.flat b/src/Note-master2/app/build/intermediates/merged_res/debug/values-watch-v20_values-watch-v20.arsc.flat
similarity index 67%
rename from src/Notes-master1/app/build/intermediates/merged_res/debug/values-watch-v20_values-watch-v20.arsc.flat
rename to src/Note-master2/app/build/intermediates/merged_res/debug/values-watch-v20_values-watch-v20.arsc.flat
index a92cfd2..c6297a4 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-watch-v20_values-watch-v20.arsc.flat and b/src/Note-master2/app/build/intermediates/merged_res/debug/values-watch-v20_values-watch-v20.arsc.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-watch-v21_values-watch-v21.arsc.flat b/src/Note-master2/app/build/intermediates/merged_res/debug/values-watch-v21_values-watch-v21.arsc.flat
similarity index 72%
rename from src/Notes-master1/app/build/intermediates/merged_res/debug/values-watch-v21_values-watch-v21.arsc.flat
rename to src/Note-master2/app/build/intermediates/merged_res/debug/values-watch-v21_values-watch-v21.arsc.flat
index 568dc86..cfbdc61 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-watch-v21_values-watch-v21.arsc.flat and b/src/Note-master2/app/build/intermediates/merged_res/debug/values-watch-v21_values-watch-v21.arsc.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-xlarge-v4_values-xlarge-v4.arsc.flat b/src/Note-master2/app/build/intermediates/merged_res/debug/values-xlarge-v4_values-xlarge-v4.arsc.flat
similarity index 61%
rename from src/Notes-master1/app/build/intermediates/merged_res/debug/values-xlarge-v4_values-xlarge-v4.arsc.flat
rename to src/Note-master2/app/build/intermediates/merged_res/debug/values-xlarge-v4_values-xlarge-v4.arsc.flat
index a149566..0fb5b0a 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-xlarge-v4_values-xlarge-v4.arsc.flat and b/src/Note-master2/app/build/intermediates/merged_res/debug/values-xlarge-v4_values-xlarge-v4.arsc.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-zh-rCN_values-zh-rCN.arsc.flat b/src/Note-master2/app/build/intermediates/merged_res/debug/values-zh-rCN_values-zh-rCN.arsc.flat
similarity index 97%
rename from src/Notes-master1/app/build/intermediates/merged_res/debug/values-zh-rCN_values-zh-rCN.arsc.flat
rename to src/Note-master2/app/build/intermediates/merged_res/debug/values-zh-rCN_values-zh-rCN.arsc.flat
index 5fdcdde..1c5fc31 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-zh-rCN_values-zh-rCN.arsc.flat and b/src/Note-master2/app/build/intermediates/merged_res/debug/values-zh-rCN_values-zh-rCN.arsc.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-zh-rHK_values-zh-rHK.arsc.flat b/src/Note-master2/app/build/intermediates/merged_res/debug/values-zh-rHK_values-zh-rHK.arsc.flat
similarity index 89%
rename from src/Notes-master1/app/build/intermediates/merged_res/debug/values-zh-rHK_values-zh-rHK.arsc.flat
rename to src/Note-master2/app/build/intermediates/merged_res/debug/values-zh-rHK_values-zh-rHK.arsc.flat
index 9bc9a5c..9366543 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-zh-rHK_values-zh-rHK.arsc.flat and b/src/Note-master2/app/build/intermediates/merged_res/debug/values-zh-rHK_values-zh-rHK.arsc.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-zh-rTW_values-zh-rTW.arsc.flat b/src/Note-master2/app/build/intermediates/merged_res/debug/values-zh-rTW_values-zh-rTW.arsc.flat
similarity index 97%
rename from src/Notes-master1/app/build/intermediates/merged_res/debug/values-zh-rTW_values-zh-rTW.arsc.flat
rename to src/Note-master2/app/build/intermediates/merged_res/debug/values-zh-rTW_values-zh-rTW.arsc.flat
index 8ea78d4..2c2ff52 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-zh-rTW_values-zh-rTW.arsc.flat and b/src/Note-master2/app/build/intermediates/merged_res/debug/values-zh-rTW_values-zh-rTW.arsc.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-zu_values-zu.arsc.flat b/src/Note-master2/app/build/intermediates/merged_res/debug/values-zu_values-zu.arsc.flat
similarity index 89%
rename from src/Notes-master1/app/build/intermediates/merged_res/debug/values-zu_values-zu.arsc.flat
rename to src/Note-master2/app/build/intermediates/merged_res/debug/values-zu_values-zu.arsc.flat
index ec0ab54..f83ec2c 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-zu_values-zu.arsc.flat and b/src/Note-master2/app/build/intermediates/merged_res/debug/values-zu_values-zu.arsc.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/values_values.arsc.flat b/src/Note-master2/app/build/intermediates/merged_res/debug/values_values.arsc.flat
similarity index 99%
rename from src/Notes-master1/app/build/intermediates/merged_res/debug/values_values.arsc.flat
rename to src/Note-master2/app/build/intermediates/merged_res/debug/values_values.arsc.flat
index 0562773..5e2d81c 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values_values.arsc.flat and b/src/Note-master2/app/build/intermediates/merged_res/debug/values_values.arsc.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/xml_preferences.xml.flat b/src/Note-master2/app/build/intermediates/merged_res/debug/xml_preferences.xml.flat
similarity index 77%
rename from src/Notes-master1/app/build/intermediates/merged_res/debug/xml_preferences.xml.flat
rename to src/Note-master2/app/build/intermediates/merged_res/debug/xml_preferences.xml.flat
index a444fe8..25bf21c 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/xml_preferences.xml.flat and b/src/Note-master2/app/build/intermediates/merged_res/debug/xml_preferences.xml.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/xml_searchable.xml.flat b/src/Note-master2/app/build/intermediates/merged_res/debug/xml_searchable.xml.flat
similarity index 79%
rename from src/Notes-master1/app/build/intermediates/merged_res/debug/xml_searchable.xml.flat
rename to src/Note-master2/app/build/intermediates/merged_res/debug/xml_searchable.xml.flat
index 6bcba7a..ba17eb2 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/xml_searchable.xml.flat and b/src/Note-master2/app/build/intermediates/merged_res/debug/xml_searchable.xml.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/xml_widget_2x_info.xml.flat b/src/Note-master2/app/build/intermediates/merged_res/debug/xml_widget_2x_info.xml.flat
similarity index 69%
rename from src/Notes-master1/app/build/intermediates/merged_res/debug/xml_widget_2x_info.xml.flat
rename to src/Note-master2/app/build/intermediates/merged_res/debug/xml_widget_2x_info.xml.flat
index 02fe800..1806d32 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/xml_widget_2x_info.xml.flat and b/src/Note-master2/app/build/intermediates/merged_res/debug/xml_widget_2x_info.xml.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/xml_widget_4x_info.xml.flat b/src/Note-master2/app/build/intermediates/merged_res/debug/xml_widget_4x_info.xml.flat
similarity index 69%
rename from src/Notes-master1/app/build/intermediates/merged_res/debug/xml_widget_4x_info.xml.flat
rename to src/Note-master2/app/build/intermediates/merged_res/debug/xml_widget_4x_info.xml.flat
index d85d646..e851995 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/xml_widget_4x_info.xml.flat and b/src/Note-master2/app/build/intermediates/merged_res/debug/xml_widget_4x_info.xml.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/debug.json b/src/Note-master2/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/debug.json
similarity index 94%
rename from src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/debug.json
rename to src/Note-master2/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/debug.json
index adcd77e..5840342 100644
--- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/debug.json
+++ b/src/Note-master2/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/debug.json
@@ -1,42 +1,26 @@
{
"logs": [
{
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-ar_values-ar.arsc.flat",
+ "outputFile": "D:\\Note-master2\\app\\build\\intermediates\\merged_res\\debug\\values-v22_values-v22.arsc.flat",
"map": [
{
- "source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\c9913736ba0af3f26ba50dd9aa679a2b\\transformed\\support-compat-28.0.0\\res\\values-ar\\values-ar.xml",
- "from": {
- "startLines": "2",
- "startColumns": "4",
- "startOffsets": "55",
- "endColumns": "100",
- "endOffsets": "151"
- },
- "to": {
- "startLines": "30",
- "startColumns": "4",
- "startOffsets": "2860",
- "endColumns": "100",
- "endOffsets": "2956"
- }
- },
- {
- "source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\4051cc509ba70441b9465808cc62a56d\\transformed\\appcompat-v7-28.0.0\\res\\values-ar\\values-ar.xml",
+ "source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\4051cc509ba70441b9465808cc62a56d\\transformed\\appcompat-v7-28.0.0\\res\\values-v22\\values-v22.xml",
"from": {
- "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29",
- "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",
- "startOffsets": "105,222,326,435,517,618,732,811,890,981,1074,1170,1264,1365,1458,1553,1647,1738,1832,1911,2016,2117,2213,2321,2424,2527,2682,2779",
- "endColumns": "116,103,108,81,100,113,78,78,90,92,95,93,100,92,94,93,90,93,78,104,100,95,107,102,102,154,96,80",
- "endOffsets": "217,321,430,512,613,727,806,885,976,1069,1165,1259,1360,1453,1548,1642,1733,1827,1906,2011,2112,2208,2316,2419,2522,2677,2774,2855"
+ "startLines": "2,3,4,9",
+ "startColumns": "4,4,4,4",
+ "startOffsets": "55,130,217,553",
+ "endLines": "2,3,8,13",
+ "endColumns": "74,86,12,12",
+ "endOffsets": "125,212,548,896"
}
}
]
},
{
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-tr_values-tr.arsc.flat",
+ "outputFile": "D:\\Note-master2\\app\\build\\intermediates\\merged_res\\debug\\values-kk_values-kk.arsc.flat",
"map": [
{
- "source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\c9913736ba0af3f26ba50dd9aa679a2b\\transformed\\support-compat-28.0.0\\res\\values-tr\\values-tr.xml",
+ "source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\c9913736ba0af3f26ba50dd9aa679a2b\\transformed\\support-compat-28.0.0\\res\\values-kk\\values-kk.xml",
"from": {
"startLines": "2",
"startColumns": "4",
@@ -47,38 +31,38 @@
"to": {
"startLines": "30",
"startColumns": "4",
- "startOffsets": "2865",
+ "startOffsets": "2893",
"endColumns": "100",
- "endOffsets": "2961"
+ "endOffsets": "2989"
}
},
{
- "source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\4051cc509ba70441b9465808cc62a56d\\transformed\\appcompat-v7-28.0.0\\res\\values-tr\\values-tr.xml",
+ "source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\4051cc509ba70441b9465808cc62a56d\\transformed\\appcompat-v7-28.0.0\\res\\values-kk\\values-kk.xml",
"from": {
"startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29",
"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",
- "startOffsets": "105,210,309,421,506,612,732,811,887,978,1071,1164,1258,1356,1449,1551,1646,1737,1828,1907,2014,2119,2215,2322,2424,2532,2688,2786",
- "endColumns": "104,98,111,84,105,119,78,75,90,92,92,93,97,92,101,94,90,90,78,106,104,95,106,101,107,155,97,78",
- "endOffsets": "205,304,416,501,607,727,806,882,973,1066,1159,1253,1351,1444,1546,1641,1732,1823,1902,2009,2114,2210,2317,2419,2527,2683,2781,2860"
+ "startOffsets": "105,217,320,430,515,621,740,821,901,992,1085,1181,1275,1376,1469,1564,1661,1752,1844,1925,2028,2133,2231,2338,2447,2547,2713,2812",
+ "endColumns": "111,102,109,84,105,118,80,79,90,92,95,93,100,92,94,96,90,91,80,102,104,97,106,108,99,165,98,80",
+ "endOffsets": "212,315,425,510,616,735,816,896,987,1080,1176,1270,1371,1464,1559,1656,1747,1839,1920,2023,2128,2226,2333,2442,2542,2708,2807,2888"
}
}
]
},
{
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-es-rUS_values-es-rUS.arsc.flat",
+ "outputFile": "D:\\Note-master2\\app\\build\\intermediates\\merged_res\\debug\\values-sv_values-sv.arsc.flat",
"map": [
{
- "source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\4051cc509ba70441b9465808cc62a56d\\transformed\\appcompat-v7-28.0.0\\res\\values-es-rUS\\values-es-rUS.xml",
+ "source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\4051cc509ba70441b9465808cc62a56d\\transformed\\appcompat-v7-28.0.0\\res\\values-sv\\values-sv.xml",
"from": {
"startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29",
"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",
- "startOffsets": "105,225,334,442,527,628,751,836,918,1009,1102,1198,1292,1392,1485,1584,1680,1771,1862,1944,2056,2156,2257,2365,2472,2579,2738,2838",
- "endColumns": "119,108,107,84,100,122,84,81,90,92,95,93,99,92,98,95,90,90,81,111,99,100,107,106,106,158,99,81",
- "endOffsets": "220,329,437,522,623,746,831,913,1004,1097,1193,1287,1387,1480,1579,1675,1766,1857,1939,2051,2151,2252,2360,2467,2574,2733,2833,2915"
+ "startOffsets": "105,211,314,425,510,612,725,801,877,970,1065,1161,1255,1358,1453,1550,1648,1744,1837,1917,2023,2123,2219,2324,2426,2528,2682,2784",
+ "endColumns": "105,102,110,84,101,112,75,75,92,94,95,93,102,94,96,97,95,92,79,105,99,95,104,101,101,153,101,78",
+ "endOffsets": "206,309,420,505,607,720,796,872,965,1060,1156,1250,1353,1448,1545,1643,1739,1832,1912,2018,2118,2214,2319,2421,2523,2677,2779,2858"
}
},
{
- "source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\c9913736ba0af3f26ba50dd9aa679a2b\\transformed\\support-compat-28.0.0\\res\\values-es-rUS\\values-es-rUS.xml",
+ "source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\c9913736ba0af3f26ba50dd9aa679a2b\\transformed\\support-compat-28.0.0\\res\\values-sv\\values-sv.xml",
"from": {
"startLines": "2",
"startColumns": "4",
@@ -89,28 +73,18 @@
"to": {
"startLines": "30",
"startColumns": "4",
- "startOffsets": "2920",
+ "startOffsets": "2863",
"endColumns": "100",
- "endOffsets": "3016"
+ "endOffsets": "2959"
}
}
]
},
{
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-da_values-da.arsc.flat",
+ "outputFile": "D:\\Note-master2\\app\\build\\intermediates\\merged_res\\debug\\values-de_values-de.arsc.flat",
"map": [
{
- "source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\4051cc509ba70441b9465808cc62a56d\\transformed\\appcompat-v7-28.0.0\\res\\values-da\\values-da.xml",
- "from": {
- "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29",
- "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",
- "startOffsets": "105,208,307,419,502,602,715,792,869,960,1053,1149,1243,1338,1431,1526,1624,1715,1806,1885,1994,2102,2198,2312,2414,2515,2668,2765",
- "endColumns": "102,98,111,82,99,112,76,76,90,92,95,93,94,92,94,97,90,90,78,108,107,95,113,101,100,152,96,78",
- "endOffsets": "203,302,414,497,597,710,787,864,955,1048,1144,1238,1333,1426,1521,1619,1710,1801,1880,1989,2097,2193,2307,2409,2510,2663,2760,2839"
- }
- },
- {
- "source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\c9913736ba0af3f26ba50dd9aa679a2b\\transformed\\support-compat-28.0.0\\res\\values-da\\values-da.xml",
+ "source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\c9913736ba0af3f26ba50dd9aa679a2b\\transformed\\support-compat-28.0.0\\res\\values-de\\values-de.xml",
"from": {
"startLines": "2",
"startColumns": "4",
@@ -121,34 +95,59 @@
"to": {
"startLines": "30",
"startColumns": "4",
- "startOffsets": "2844",
+ "startOffsets": "2925",
"endColumns": "100",
- "endOffsets": "2940"
+ "endOffsets": "3021"
+ }
+ },
+ {
+ "source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\4051cc509ba70441b9465808cc62a56d\\transformed\\appcompat-v7-28.0.0\\res\\values-de\\values-de.xml",
+ "from": {
+ "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29",
+ "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",
+ "startOffsets": "105,210,308,420,506,611,726,803,879,971,1065,1162,1263,1371,1471,1575,1675,1773,1870,1952,2063,2166,2265,2376,2478,2585,2741,2843",
+ "endColumns": "104,97,111,85,104,114,76,75,91,93,96,100,107,99,103,99,97,96,81,110,102,98,110,101,106,155,101,81",
+ "endOffsets": "205,303,415,501,606,721,798,874,966,1060,1157,1258,1366,1466,1570,1670,1768,1865,1947,2058,2161,2260,2371,2473,2580,2736,2838,2920"
}
}
]
},
{
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-v28_values-v28.arsc.flat",
+ "outputFile": "D:\\Note-master2\\app\\build\\intermediates\\merged_res\\debug\\values-v26_values-v26.arsc.flat",
"map": [
{
- "source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\4051cc509ba70441b9465808cc62a56d\\transformed\\appcompat-v7-28.0.0\\res\\values-v28\\values-v28.xml",
+ "source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\4051cc509ba70441b9465808cc62a56d\\transformed\\appcompat-v7-28.0.0\\res\\values-v26\\values-v26.xml",
"from": {
- "startLines": "2,3,4,8",
- "startColumns": "4,4,4,4",
- "startOffsets": "55,130,217,447",
- "endLines": "2,3,7,11",
- "endColumns": "74,86,12,12",
- "endOffsets": "125,212,442,684"
+ "startLines": "2,3,4,8,12,16",
+ "startColumns": "4,4,4,4,4,4",
+ "startOffsets": "55,130,217,431,657,896",
+ "endLines": "2,3,7,11,15,16",
+ "endColumns": "74,86,12,12,12,92",
+ "endOffsets": "125,212,426,652,891,984"
}
}
]
},
{
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-si_values-si.arsc.flat",
+ "outputFile": "D:\\Note-master2\\app\\build\\intermediates\\merged_res\\debug\\values-night-v8_values-night-v8.arsc.flat",
"map": [
{
- "source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\c9913736ba0af3f26ba50dd9aa679a2b\\transformed\\support-compat-28.0.0\\res\\values-si\\values-si.xml",
+ "source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\4051cc509ba70441b9465808cc62a56d\\transformed\\appcompat-v7-28.0.0\\res\\values-night-v8\\values-night-v8.xml",
+ "from": {
+ "startLines": "2,3,4,5,6,7,8",
+ "startColumns": "4,4,4,4,4,4,4",
+ "startOffsets": "55,125,209,293,389,491,593",
+ "endColumns": "69,83,83,95,101,101,93",
+ "endOffsets": "120,204,288,384,486,588,682"
+ }
+ }
+ ]
+ },
+ {
+ "outputFile": "D:\\Note-master2\\app\\build\\intermediates\\merged_res\\debug\\values-ur_values-ur.arsc.flat",
+ "map": [
+ {
+ "source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\c9913736ba0af3f26ba50dd9aa679a2b\\transformed\\support-compat-28.0.0\\res\\values-ur\\values-ur.xml",
"from": {
"startLines": "2",
"startColumns": "4",
@@ -159,38 +158,53 @@
"to": {
"startLines": "30",
"startColumns": "4",
- "startOffsets": "2903",
+ "startOffsets": "2904",
"endColumns": "100",
- "endOffsets": "2999"
+ "endOffsets": "3000"
}
},
{
- "source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\4051cc509ba70441b9465808cc62a56d\\transformed\\appcompat-v7-28.0.0\\res\\values-si\\values-si.xml",
+ "source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\4051cc509ba70441b9465808cc62a56d\\transformed\\appcompat-v7-28.0.0\\res\\values-ur\\values-ur.xml",
"from": {
"startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29",
"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",
- "startOffsets": "105,215,322,429,517,622,738,827,914,1005,1098,1193,1287,1388,1481,1576,1670,1761,1852,1936,2045,2150,2248,2358,2457,2563,2722,2821",
- "endColumns": "109,106,106,87,104,115,88,86,90,92,94,93,100,92,94,93,90,90,83,108,104,97,109,98,105,158,98,81",
- "endOffsets": "210,317,424,512,617,733,822,909,1000,1093,1188,1282,1383,1476,1571,1665,1756,1847,1931,2040,2145,2243,2353,2452,2558,2717,2816,2898"
+ "startOffsets": "105,215,321,430,516,620,740,816,892,984,1078,1174,1268,1370,1464,1560,1654,1746,1838,1923,2031,2140,2242,2353,2453,2561,2726,2824",
+ "endColumns": "109,105,108,85,103,119,75,75,91,93,95,93,101,93,95,93,91,91,84,107,108,101,110,99,107,164,97,79",
+ "endOffsets": "210,316,425,511,615,735,811,887,979,1073,1169,1263,1365,1459,1555,1649,1741,1833,1918,2026,2135,2237,2348,2448,2556,2721,2819,2899"
}
}
]
},
{
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-ml_values-ml.arsc.flat",
+ "outputFile": "D:\\Note-master2\\app\\build\\intermediates\\merged_res\\debug\\values-large-v4_values-large-v4.arsc.flat",
"map": [
{
- "source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\4051cc509ba70441b9465808cc62a56d\\transformed\\appcompat-v7-28.0.0\\res\\values-ml\\values-ml.xml",
+ "source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\4051cc509ba70441b9465808cc62a56d\\transformed\\appcompat-v7-28.0.0\\res\\values-large-v4\\values-large-v4.xml",
+ "from": {
+ "startLines": "2,3,4,5,6,7,8,9,10",
+ "startColumns": "4,4,4,4,4,4,4,4,4",
+ "startOffsets": "55,114,185,256,326,396,464,532,636",
+ "endColumns": "58,70,70,69,69,67,67,103,115",
+ "endOffsets": "109,180,251,321,391,459,527,631,747"
+ }
+ }
+ ]
+ },
+ {
+ "outputFile": "D:\\Note-master2\\app\\build\\intermediates\\merged_res\\debug\\values-my_values-my.arsc.flat",
+ "map": [
+ {
+ "source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\4051cc509ba70441b9465808cc62a56d\\transformed\\appcompat-v7-28.0.0\\res\\values-my\\values-my.xml",
"from": {
"startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29",
"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",
- "startOffsets": "105,224,342,457,550,655,787,864,940,1031,1124,1226,1320,1421,1515,1610,1709,1800,1891,1973,2084,2190,2288,2402,2502,2613,2772,2873",
- "endColumns": "118,117,114,92,104,131,76,75,90,92,101,93,100,93,94,98,90,90,81,110,105,97,113,99,110,158,100,81",
- "endOffsets": "219,337,452,545,650,782,859,935,1026,1119,1221,1315,1416,1510,1605,1704,1795,1886,1968,2079,2185,2283,2397,2497,2608,2767,2868,2950"
+ "startOffsets": "105,214,319,436,529,641,769,847,926,1017,1110,1206,1300,1401,1494,1589,1683,1774,1865,1951,2074,2186,2288,2414,2525,2635,2795,2895",
+ "endColumns": "108,104,116,92,111,127,77,78,90,92,95,93,100,92,94,93,90,90,85,122,111,101,125,110,109,159,99,83",
+ "endOffsets": "209,314,431,524,636,764,842,921,1012,1105,1201,1295,1396,1489,1584,1678,1769,1860,1946,2069,2181,2283,2409,2520,2630,2790,2890,2974"
}
},
{
- "source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\c9913736ba0af3f26ba50dd9aa679a2b\\transformed\\support-compat-28.0.0\\res\\values-ml\\values-ml.xml",
+ "source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\c9913736ba0af3f26ba50dd9aa679a2b\\transformed\\support-compat-28.0.0\\res\\values-my\\values-my.xml",
"from": {
"startLines": "2",
"startColumns": "4",
@@ -201,28 +215,28 @@
"to": {
"startLines": "30",
"startColumns": "4",
- "startOffsets": "2955",
+ "startOffsets": "2979",
"endColumns": "100",
- "endOffsets": "3051"
+ "endOffsets": "3075"
}
}
]
},
{
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-es_values-es.arsc.flat",
+ "outputFile": "D:\\Note-master2\\app\\build\\intermediates\\merged_res\\debug\\values-fa_values-fa.arsc.flat",
"map": [
{
- "source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\4051cc509ba70441b9465808cc62a56d\\transformed\\appcompat-v7-28.0.0\\res\\values-es\\values-es.xml",
+ "source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\4051cc509ba70441b9465808cc62a56d\\transformed\\appcompat-v7-28.0.0\\res\\values-fa\\values-fa.xml",
"from": {
"startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29",
"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",
- "startOffsets": "105,222,335,443,528,629,757,842,924,1016,1110,1208,1302,1403,1497,1593,1689,1781,1873,1955,2062,2162,2261,2369,2476,2583,2742,2842",
- "endColumns": "116,112,107,84,100,127,84,81,91,93,97,93,100,93,95,95,91,91,81,106,99,98,107,106,106,158,99,81",
- "endOffsets": "217,330,438,523,624,752,837,919,1011,1105,1203,1297,1398,1492,1588,1684,1776,1868,1950,2057,2157,2256,2364,2471,2578,2737,2837,2919"
+ "startOffsets": "105,215,318,429,513,616,731,810,888,981,1076,1172,1266,1369,1464,1561,1660,1753,1843,1924,2036,2139,2237,2347,2451,2560,2721,2822",
+ "endColumns": "109,102,110,83,102,114,78,77,92,94,95,93,102,94,96,98,92,89,80,111,102,97,109,103,108,160,100,80",
+ "endOffsets": "210,313,424,508,611,726,805,883,976,1071,1167,1261,1364,1459,1556,1655,1748,1838,1919,2031,2134,2232,2342,2446,2555,2716,2817,2898"
}
},
{
- "source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\c9913736ba0af3f26ba50dd9aa679a2b\\transformed\\support-compat-28.0.0\\res\\values-es\\values-es.xml",
+ "source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\c9913736ba0af3f26ba50dd9aa679a2b\\transformed\\support-compat-28.0.0\\res\\values-fa\\values-fa.xml",
"from": {
"startLines": "2",
"startColumns": "4",
@@ -233,18 +247,18 @@
"to": {
"startLines": "30",
"startColumns": "4",
- "startOffsets": "2924",
+ "startOffsets": "2903",
"endColumns": "100",
- "endOffsets": "3020"
+ "endOffsets": "2999"
}
}
]
},
{
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-de_values-de.arsc.flat",
+ "outputFile": "D:\\Note-master2\\app\\build\\intermediates\\merged_res\\debug\\values-nl_values-nl.arsc.flat",
"map": [
{
- "source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\c9913736ba0af3f26ba50dd9aa679a2b\\transformed\\support-compat-28.0.0\\res\\values-de\\values-de.xml",
+ "source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\c9913736ba0af3f26ba50dd9aa679a2b\\transformed\\support-compat-28.0.0\\res\\values-nl\\values-nl.xml",
"from": {
"startLines": "2",
"startColumns": "4",
@@ -255,28 +269,28 @@
"to": {
"startLines": "30",
"startColumns": "4",
- "startOffsets": "2925",
+ "startOffsets": "2921",
"endColumns": "100",
- "endOffsets": "3021"
+ "endOffsets": "3017"
}
},
{
- "source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\4051cc509ba70441b9465808cc62a56d\\transformed\\appcompat-v7-28.0.0\\res\\values-de\\values-de.xml",
+ "source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\4051cc509ba70441b9465808cc62a56d\\transformed\\appcompat-v7-28.0.0\\res\\values-nl\\values-nl.xml",
"from": {
"startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29",
"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",
- "startOffsets": "105,210,308,420,506,611,726,803,879,971,1065,1162,1263,1371,1471,1575,1675,1773,1870,1952,2063,2166,2265,2376,2478,2585,2741,2843",
- "endColumns": "104,97,111,85,104,114,76,75,91,93,96,100,107,99,103,99,97,96,81,110,102,98,110,101,106,155,101,81",
- "endOffsets": "205,303,415,501,606,721,798,874,966,1060,1157,1258,1366,1466,1570,1670,1768,1865,1947,2058,2161,2260,2371,2473,2580,2736,2838,2920"
+ "startOffsets": "105,223,328,435,521,629,749,826,903,995,1089,1190,1284,1385,1479,1575,1670,1762,1854,1936,2047,2151,2250,2365,2478,2581,2736,2839",
+ "endColumns": "117,104,106,85,107,119,76,76,91,93,100,93,100,93,95,94,91,91,81,110,103,98,114,112,102,154,102,81",
+ "endOffsets": "218,323,430,516,624,744,821,898,990,1084,1185,1279,1380,1474,1570,1665,1757,1849,1931,2042,2146,2245,2360,2473,2576,2731,2834,2916"
}
}
]
},
{
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-sr_values-sr.arsc.flat",
+ "outputFile": "D:\\Note-master2\\app\\build\\intermediates\\merged_res\\debug\\values-vi_values-vi.arsc.flat",
"map": [
{
- "source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\c9913736ba0af3f26ba50dd9aa679a2b\\transformed\\support-compat-28.0.0\\res\\values-sr\\values-sr.xml",
+ "source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\c9913736ba0af3f26ba50dd9aa679a2b\\transformed\\support-compat-28.0.0\\res\\values-vi\\values-vi.xml",
"from": {
"startLines": "2",
"startColumns": "4",
@@ -287,38 +301,38 @@
"to": {
"startLines": "30",
"startColumns": "4",
- "startOffsets": "2905",
+ "startOffsets": "2901",
"endColumns": "100",
- "endOffsets": "3001"
+ "endOffsets": "2997"
}
},
{
- "source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\4051cc509ba70441b9465808cc62a56d\\transformed\\appcompat-v7-28.0.0\\res\\values-sr\\values-sr.xml",
+ "source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\4051cc509ba70441b9465808cc62a56d\\transformed\\appcompat-v7-28.0.0\\res\\values-vi\\values-vi.xml",
"from": {
"startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29",
"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",
- "startOffsets": "105,214,317,423,509,613,731,812,892,983,1076,1172,1266,1367,1460,1555,1660,1751,1842,1930,2035,2143,2244,2348,2456,2557,2724,2821",
- "endColumns": "108,102,105,85,103,117,80,79,90,92,95,93,100,92,94,104,90,90,87,104,107,100,103,107,100,166,96,83",
- "endOffsets": "209,312,418,504,608,726,807,887,978,1071,1167,1261,1362,1455,1550,1655,1746,1837,1925,2030,2138,2239,2343,2451,2552,2719,2816,2900"
+ "startOffsets": "105,219,327,436,520,623,742,819,896,987,1080,1176,1270,1371,1464,1559,1657,1748,1839,1923,2027,2136,2237,2342,2456,2561,2718,2817",
+ "endColumns": "113,107,108,83,102,118,76,76,90,92,95,93,100,92,94,97,90,90,83,103,108,100,104,113,104,156,98,83",
+ "endOffsets": "214,322,431,515,618,737,814,891,982,1075,1171,1265,1366,1459,1554,1652,1743,1834,1918,2022,2131,2232,2337,2451,2556,2713,2812,2896"
}
}
]
},
{
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-sv_values-sv.arsc.flat",
+ "outputFile": "D:\\Note-master2\\app\\build\\intermediates\\merged_res\\debug\\values-es_values-es.arsc.flat",
"map": [
{
- "source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\4051cc509ba70441b9465808cc62a56d\\transformed\\appcompat-v7-28.0.0\\res\\values-sv\\values-sv.xml",
+ "source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\4051cc509ba70441b9465808cc62a56d\\transformed\\appcompat-v7-28.0.0\\res\\values-es\\values-es.xml",
"from": {
"startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29",
"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",
- "startOffsets": "105,211,314,425,510,612,725,801,877,970,1065,1161,1255,1358,1453,1550,1648,1744,1837,1917,2023,2123,2219,2324,2426,2528,2682,2784",
- "endColumns": "105,102,110,84,101,112,75,75,92,94,95,93,102,94,96,97,95,92,79,105,99,95,104,101,101,153,101,78",
- "endOffsets": "206,309,420,505,607,720,796,872,965,1060,1156,1250,1353,1448,1545,1643,1739,1832,1912,2018,2118,2214,2319,2421,2523,2677,2779,2858"
+ "startOffsets": "105,222,335,443,528,629,757,842,924,1016,1110,1208,1302,1403,1497,1593,1689,1781,1873,1955,2062,2162,2261,2369,2476,2583,2742,2842",
+ "endColumns": "116,112,107,84,100,127,84,81,91,93,97,93,100,93,95,95,91,91,81,106,99,98,107,106,106,158,99,81",
+ "endOffsets": "217,330,438,523,624,752,837,919,1011,1105,1203,1297,1398,1492,1588,1684,1776,1868,1950,2057,2157,2256,2364,2471,2578,2737,2837,2919"
}
},
{
- "source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\c9913736ba0af3f26ba50dd9aa679a2b\\transformed\\support-compat-28.0.0\\res\\values-sv\\values-sv.xml",
+ "source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\c9913736ba0af3f26ba50dd9aa679a2b\\transformed\\support-compat-28.0.0\\res\\values-es\\values-es.xml",
"from": {
"startLines": "2",
"startColumns": "4",
@@ -329,28 +343,18 @@
"to": {
"startLines": "30",
"startColumns": "4",
- "startOffsets": "2863",
+ "startOffsets": "2924",
"endColumns": "100",
- "endOffsets": "2959"
+ "endOffsets": "3020"
}
}
]
},
{
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-ky_values-ky.arsc.flat",
+ "outputFile": "D:\\Note-master2\\app\\build\\intermediates\\merged_res\\debug\\values-tr_values-tr.arsc.flat",
"map": [
{
- "source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\4051cc509ba70441b9465808cc62a56d\\transformed\\appcompat-v7-28.0.0\\res\\values-ky\\values-ky.xml",
- "from": {
- "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29",
- "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",
- "startOffsets": "105,209,304,423,507,614,731,809,888,979,1072,1168,1262,1363,1456,1551,1646,1737,1828,1909,2019,2126,2224,2330,2437,2538,2699,2802",
- "endColumns": "103,94,118,83,106,116,77,78,90,92,95,93,100,92,94,94,90,90,80,109,106,97,105,106,100,160,102,80",
- "endOffsets": "204,299,418,502,609,726,804,883,974,1067,1163,1257,1358,1451,1546,1641,1732,1823,1904,2014,2121,2219,2325,2432,2533,2694,2797,2878"
- }
- },
- {
- "source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\c9913736ba0af3f26ba50dd9aa679a2b\\transformed\\support-compat-28.0.0\\res\\values-ky\\values-ky.xml",
+ "source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\c9913736ba0af3f26ba50dd9aa679a2b\\transformed\\support-compat-28.0.0\\res\\values-tr\\values-tr.xml",
"from": {
"startLines": "2",
"startColumns": "4",
@@ -361,18 +365,38 @@
"to": {
"startLines": "30",
"startColumns": "4",
- "startOffsets": "2883",
+ "startOffsets": "2865",
"endColumns": "100",
- "endOffsets": "2979"
+ "endOffsets": "2961"
+ }
+ },
+ {
+ "source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\4051cc509ba70441b9465808cc62a56d\\transformed\\appcompat-v7-28.0.0\\res\\values-tr\\values-tr.xml",
+ "from": {
+ "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29",
+ "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",
+ "startOffsets": "105,210,309,421,506,612,732,811,887,978,1071,1164,1258,1356,1449,1551,1646,1737,1828,1907,2014,2119,2215,2322,2424,2532,2688,2786",
+ "endColumns": "104,98,111,84,105,119,78,75,90,92,92,93,97,92,101,94,90,90,78,106,104,95,106,101,107,155,97,78",
+ "endOffsets": "205,304,416,501,607,727,806,882,973,1066,1159,1253,1351,1444,1546,1641,1732,1823,1902,2009,2114,2210,2317,2419,2527,2683,2781,2860"
}
}
]
},
{
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-en-rAU_values-en-rAU.arsc.flat",
+ "outputFile": "D:\\Note-master2\\app\\build\\intermediates\\merged_res\\debug\\values-ml_values-ml.arsc.flat",
"map": [
{
- "source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\c9913736ba0af3f26ba50dd9aa679a2b\\transformed\\support-compat-28.0.0\\res\\values-en-rAU\\values-en-rAU.xml",
+ "source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\4051cc509ba70441b9465808cc62a56d\\transformed\\appcompat-v7-28.0.0\\res\\values-ml\\values-ml.xml",
+ "from": {
+ "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29",
+ "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",
+ "startOffsets": "105,224,342,457,550,655,787,864,940,1031,1124,1226,1320,1421,1515,1610,1709,1800,1891,1973,2084,2190,2288,2402,2502,2613,2772,2873",
+ "endColumns": "118,117,114,92,104,131,76,75,90,92,101,93,100,93,94,98,90,90,81,110,105,97,113,99,110,158,100,81",
+ "endOffsets": "219,337,452,545,650,782,859,935,1026,1119,1221,1315,1416,1510,1605,1704,1795,1886,1968,2079,2185,2283,2397,2497,2608,2767,2868,2950"
+ }
+ },
+ {
+ "source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\c9913736ba0af3f26ba50dd9aa679a2b\\transformed\\support-compat-28.0.0\\res\\values-ml\\values-ml.xml",
"from": {
"startLines": "2",
"startColumns": "4",
@@ -383,38 +407,28 @@
"to": {
"startLines": "30",
"startColumns": "4",
- "startOffsets": "2846",
+ "startOffsets": "2955",
"endColumns": "100",
- "endOffsets": "2942"
- }
- },
- {
- "source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\4051cc509ba70441b9465808cc62a56d\\transformed\\appcompat-v7-28.0.0\\res\\values-en-rAU\\values-en-rAU.xml",
- "from": {
- "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29",
- "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",
- "startOffsets": "105,209,309,417,501,601,716,793,869,960,1053,1149,1243,1344,1437,1532,1626,1717,1808,1890,1993,2097,2196,2301,2404,2508,2664,2764",
- "endColumns": "103,99,107,83,99,114,76,75,90,92,95,93,100,92,94,93,90,90,81,102,103,98,104,102,103,155,99,81",
- "endOffsets": "204,304,412,496,596,711,788,864,955,1048,1144,1238,1339,1432,1527,1621,1712,1803,1885,1988,2092,2191,2296,2399,2503,2659,2759,2841"
+ "endOffsets": "3051"
}
}
]
},
{
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-en-rCA_values-en-rCA.arsc.flat",
+ "outputFile": "D:\\Note-master2\\app\\build\\intermediates\\merged_res\\debug\\values-da_values-da.arsc.flat",
"map": [
{
- "source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\4051cc509ba70441b9465808cc62a56d\\transformed\\appcompat-v7-28.0.0\\res\\values-en-rCA\\values-en-rCA.xml",
+ "source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\4051cc509ba70441b9465808cc62a56d\\transformed\\appcompat-v7-28.0.0\\res\\values-da\\values-da.xml",
"from": {
"startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29",
"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",
- "startOffsets": "105,209,309,417,501,601,716,793,869,960,1053,1149,1243,1344,1437,1532,1626,1717,1808,1890,1993,2097,2196,2301,2404,2508,2664,2764",
- "endColumns": "103,99,107,83,99,114,76,75,90,92,95,93,100,92,94,93,90,90,81,102,103,98,104,102,103,155,99,81",
- "endOffsets": "204,304,412,496,596,711,788,864,955,1048,1144,1238,1339,1432,1527,1621,1712,1803,1885,1988,2092,2191,2296,2399,2503,2659,2759,2841"
+ "startOffsets": "105,208,307,419,502,602,715,792,869,960,1053,1149,1243,1338,1431,1526,1624,1715,1806,1885,1994,2102,2198,2312,2414,2515,2668,2765",
+ "endColumns": "102,98,111,82,99,112,76,76,90,92,95,93,94,92,94,97,90,90,78,108,107,95,113,101,100,152,96,78",
+ "endOffsets": "203,302,414,497,597,710,787,864,955,1048,1144,1238,1333,1426,1521,1619,1710,1801,1880,1989,2097,2193,2307,2409,2510,2663,2760,2839"
}
},
{
- "source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\c9913736ba0af3f26ba50dd9aa679a2b\\transformed\\support-compat-28.0.0\\res\\values-en-rCA\\values-en-rCA.xml",
+ "source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\c9913736ba0af3f26ba50dd9aa679a2b\\transformed\\support-compat-28.0.0\\res\\values-da\\values-da.xml",
"from": {
"startLines": "2",
"startColumns": "4",
@@ -425,28 +439,28 @@
"to": {
"startLines": "30",
"startColumns": "4",
- "startOffsets": "2846",
+ "startOffsets": "2844",
"endColumns": "100",
- "endOffsets": "2942"
+ "endOffsets": "2940"
}
}
]
},
{
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-it_values-it.arsc.flat",
+ "outputFile": "D:\\Note-master2\\app\\build\\intermediates\\merged_res\\debug\\values-ky_values-ky.arsc.flat",
"map": [
{
- "source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\4051cc509ba70441b9465808cc62a56d\\transformed\\appcompat-v7-28.0.0\\res\\values-it\\values-it.xml",
+ "source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\4051cc509ba70441b9465808cc62a56d\\transformed\\appcompat-v7-28.0.0\\res\\values-ky\\values-ky.xml",
"from": {
"startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29",
"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",
- "startOffsets": "105,214,314,423,507,616,741,818,894,986,1080,1174,1268,1370,1464,1561,1667,1759,1851,1932,2038,2146,2244,2348,2453,2560,2723,2823",
- "endColumns": "108,99,108,83,108,124,76,75,91,93,93,93,101,93,96,105,91,91,80,105,107,97,103,104,106,162,99,82",
- "endOffsets": "209,309,418,502,611,736,813,889,981,1075,1169,1263,1365,1459,1556,1662,1754,1846,1927,2033,2141,2239,2343,2448,2555,2718,2818,2901"
+ "startOffsets": "105,209,304,423,507,614,731,809,888,979,1072,1168,1262,1363,1456,1551,1646,1737,1828,1909,2019,2126,2224,2330,2437,2538,2699,2802",
+ "endColumns": "103,94,118,83,106,116,77,78,90,92,95,93,100,92,94,94,90,90,80,109,106,97,105,106,100,160,102,80",
+ "endOffsets": "204,299,418,502,609,726,804,883,974,1067,1163,1257,1358,1451,1546,1641,1732,1823,1904,2014,2121,2219,2325,2432,2533,2694,2797,2878"
}
},
{
- "source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\c9913736ba0af3f26ba50dd9aa679a2b\\transformed\\support-compat-28.0.0\\res\\values-it\\values-it.xml",
+ "source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\c9913736ba0af3f26ba50dd9aa679a2b\\transformed\\support-compat-28.0.0\\res\\values-ky\\values-ky.xml",
"from": {
"startLines": "2",
"startColumns": "4",
@@ -457,88 +471,92 @@
"to": {
"startLines": "30",
"startColumns": "4",
- "startOffsets": "2906",
+ "startOffsets": "2883",
"endColumns": "100",
- "endOffsets": "3002"
+ "endOffsets": "2979"
}
}
]
},
{
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-v24_values-v24.arsc.flat",
+ "outputFile": "D:\\Note-master2\\app\\build\\intermediates\\merged_res\\debug\\values-zh-rHK_values-zh-rHK.arsc.flat",
"map": [
{
- "source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\4051cc509ba70441b9465808cc62a56d\\transformed\\appcompat-v7-28.0.0\\res\\values-v24\\values-v24.xml",
+ "source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\c9913736ba0af3f26ba50dd9aa679a2b\\transformed\\support-compat-28.0.0\\res\\values-zh-rHK\\values-zh-rHK.xml",
"from": {
- "startLines": "2,3",
- "startColumns": "4,4",
- "startOffsets": "55,212",
- "endColumns": "156,134",
- "endOffsets": "207,342"
+ "startLines": "2",
+ "startColumns": "4",
+ "startOffsets": "55",
+ "endColumns": "100",
+ "endOffsets": "151"
+ },
+ "to": {
+ "startLines": "30",
+ "startColumns": "4",
+ "startOffsets": "2746",
+ "endColumns": "100",
+ "endOffsets": "2842"
+ }
+ },
+ {
+ "source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\4051cc509ba70441b9465808cc62a56d\\transformed\\appcompat-v7-28.0.0\\res\\values-zh-rHK\\values-zh-rHK.xml",
+ "from": {
+ "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29",
+ "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",
+ "startOffsets": "105,200,293,393,475,572,680,756,832,924,1018,1110,1206,1302,1396,1492,1584,1676,1768,1846,1942,2038,2133,2230,2325,2423,2574,2668",
+ "endColumns": "94,92,99,81,96,107,75,75,91,93,91,95,95,93,95,91,91,91,77,95,95,94,96,94,97,150,93,77",
+ "endOffsets": "195,288,388,470,567,675,751,827,919,1013,1105,1201,1297,1391,1487,1579,1671,1763,1841,1937,2033,2128,2225,2320,2418,2569,2663,2741"
}
}
]
},
{
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-zh-rTW_values-zh-rTW.arsc.flat",
+ "outputFile": "D:\\Note-master2\\app\\build\\intermediates\\merged_res\\debug\\values-is_values-is.arsc.flat",
"map": [
{
- "source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\4051cc509ba70441b9465808cc62a56d\\transformed\\appcompat-v7-28.0.0\\res\\values-zh-rTW\\values-zh-rTW.xml",
+ "source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\4051cc509ba70441b9465808cc62a56d\\transformed\\appcompat-v7-28.0.0\\res\\values-is\\values-is.xml",
"from": {
"startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29",
"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",
- "startOffsets": "105,200,293,393,475,572,680,756,832,924,1018,1116,1212,1308,1402,1498,1590,1682,1774,1852,1948,2044,2139,2236,2331,2431,2581,2675",
- "endColumns": "94,92,99,81,96,107,75,75,91,93,97,95,95,93,95,91,91,91,77,95,95,94,96,94,99,149,93,77",
- "endOffsets": "195,288,388,470,567,675,751,827,919,1013,1111,1207,1303,1397,1493,1585,1677,1769,1847,1943,2039,2134,2231,2326,2426,2576,2670,2748"
- },
- "to": {
- "startLines": "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,121",
- "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",
- "startOffsets": "384,479,572,672,754,851,959,1035,1111,1203,1297,1395,1491,1587,1681,1777,1869,1961,2053,2131,2227,2323,2418,2515,2610,2710,2860,7815",
- "endColumns": "94,92,99,81,96,107,75,75,91,93,97,95,95,93,95,91,91,91,77,95,95,94,96,94,99,149,93,77",
- "endOffsets": "474,567,667,749,846,954,1030,1106,1198,1292,1390,1486,1582,1676,1772,1864,1956,2048,2126,2222,2318,2413,2510,2605,2705,2855,2949,7888"
+ "startOffsets": "105,205,302,414,499,600,714,794,874,965,1058,1154,1248,1355,1448,1543,1638,1729,1823,1904,2014,2122,2220,2329,2428,2531,2686,2784",
+ "endColumns": "99,96,111,84,100,113,79,79,90,92,95,93,106,92,94,94,90,93,80,109,107,97,108,98,102,154,97,80",
+ "endOffsets": "200,297,409,494,595,709,789,869,960,1053,1149,1243,1350,1443,1538,1633,1724,1818,1899,2009,2117,2215,2324,2423,2526,2681,2779,2860"
}
},
{
- "source": "D:\\Notes-master1\\app\\src\\main\\res\\values-zh-rTW\\strings.xml",
+ "source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\c9913736ba0af3f26ba50dd9aa679a2b\\transformed\\support-compat-28.0.0\\res\\values-is\\values-is.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"
+ "startLines": "2",
+ "startColumns": "4",
+ "startOffsets": "55",
+ "endColumns": "100",
+ "endOffsets": "151"
},
"to": {
- "startLines": "6,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,122,123,125,126,127,128,129,130,131,132,133,134,135",
- "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,2954,3026,3092,3165,3215,3255,3303,3351,3396,3453,3507,3557,3619,3687,3764,3823,3889,3952,4007,4067,4130,4184,4244,4297,4359,4443,4523,4573,4632,4675,4728,4771,4822,4872,4932,4985,5036,5082,5130,5178,5224,5271,5321,5366,5425,5477,5529,5572,5619,5675,5730,5785,5829,5871,5912,5962,6021,6072,6121,6170,6217,6264,6311,6356,6407,6460,6535,6594,6651,6725,6789,6858,6936,7046,7150,7223,7289,7344,7409,7474,7523,7606,7684,7722,7767,7893,7955,8113,8168,8227,8294,8352,8414,8462,8507,8555,8606,8672",
- "endLines": "8,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,122,123,125,126,127,128,129,130,131,132,133,134,135",
- "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,3021,3087,3160,3210,3250,3298,3346,3391,3448,3502,3552,3614,3682,3759,3818,3884,3947,4002,4062,4125,4179,4239,4292,4354,4438,4518,4568,4627,4670,4723,4766,4817,4867,4927,4980,5031,5077,5125,5173,5219,5266,5316,5361,5420,5472,5524,5567,5614,5670,5725,5780,5824,5866,5907,5957,6016,6067,6116,6165,6212,6259,6306,6351,6402,6455,6530,6589,6646,6720,6784,6853,6931,7041,7145,7218,7284,7339,7404,7469,7518,7601,7679,7717,7762,7810,7950,8007,8163,8222,8289,8347,8409,8457,8502,8550,8601,8667,8733"
+ "startLines": "30",
+ "startColumns": "4",
+ "startOffsets": "2865",
+ "endColumns": "100",
+ "endOffsets": "2961"
}
- },
+ }
+ ]
+ },
+ {
+ "outputFile": "D:\\Note-master2\\app\\build\\intermediates\\merged_res\\debug\\values-pt-rPT_values-pt-rPT.arsc.flat",
+ "map": [
{
- "source": "D:\\Notes-master1\\app\\src\\main\\res\\values-zh-rTW\\arrays.xml",
+ "source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\4051cc509ba70441b9465808cc62a56d\\transformed\\appcompat-v7-28.0.0\\res\\values-pt-rPT\\values-pt-rPT.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"
+ "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29",
+ "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",
+ "startOffsets": "105,225,331,438,527,628,752,836,917,1009,1103,1201,1295,1395,1489,1585,1680,1772,1864,1951,2058,2170,2272,2380,2487,2594,2765,2864",
+ "endColumns": "119,105,106,88,100,123,83,80,91,93,97,93,99,93,95,94,91,91,86,106,111,101,107,106,106,170,98,84",
+ "endOffsets": "220,326,433,522,623,747,831,912,1004,1098,1196,1290,1390,1484,1580,1675,1767,1859,1946,2053,2165,2267,2375,2482,2589,2760,2859,2944"
}
},
{
- "source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\c9913736ba0af3f26ba50dd9aa679a2b\\transformed\\support-compat-28.0.0\\res\\values-zh-rTW\\values-zh-rTW.xml",
+ "source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\c9913736ba0af3f26ba50dd9aa679a2b\\transformed\\support-compat-28.0.0\\res\\values-pt-rPT\\values-pt-rPT.xml",
"from": {
"startLines": "2",
"startColumns": "4",
@@ -547,20 +565,20 @@
"endOffsets": "151"
},
"to": {
- "startLines": "124",
+ "startLines": "30",
"startColumns": "4",
- "startOffsets": "8012",
+ "startOffsets": "2949",
"endColumns": "100",
- "endOffsets": "8108"
+ "endOffsets": "3045"
}
}
]
},
{
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-bn_values-bn.arsc.flat",
+ "outputFile": "D:\\Note-master2\\app\\build\\intermediates\\merged_res\\debug\\values-ko_values-ko.arsc.flat",
"map": [
{
- "source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\c9913736ba0af3f26ba50dd9aa679a2b\\transformed\\support-compat-28.0.0\\res\\values-bn\\values-bn.xml",
+ "source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\c9913736ba0af3f26ba50dd9aa679a2b\\transformed\\support-compat-28.0.0\\res\\values-ko\\values-ko.xml",
"from": {
"startLines": "2",
"startColumns": "4",
@@ -571,28 +589,28 @@
"to": {
"startLines": "30",
"startColumns": "4",
- "startOffsets": "2939",
+ "startOffsets": "2756",
"endColumns": "100",
- "endOffsets": "3035"
+ "endOffsets": "2852"
}
},
{
- "source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\4051cc509ba70441b9465808cc62a56d\\transformed\\appcompat-v7-28.0.0\\res\\values-bn\\values-bn.xml",
+ "source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\4051cc509ba70441b9465808cc62a56d\\transformed\\appcompat-v7-28.0.0\\res\\values-ko\\values-ko.xml",
"from": {
"startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29",
"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",
- "startOffsets": "105,214,326,432,526,631,760,838,916,1007,1100,1195,1289,1390,1483,1578,1672,1763,1854,1941,2051,2159,2258,2368,2474,2587,2752,2857",
- "endColumns": "108,111,105,93,104,128,77,77,90,92,94,93,100,92,94,93,90,90,86,109,107,98,109,105,112,164,104,81",
- "endOffsets": "209,321,427,521,626,755,833,911,1002,1095,1190,1284,1385,1478,1573,1667,1758,1849,1936,2046,2154,2253,2363,2469,2582,2747,2852,2934"
+ "startOffsets": "105,200,294,396,478,576,682,761,837,928,1021,1113,1204,1305,1398,1493,1587,1678,1769,1849,1947,2042,2137,2237,2333,2432,2584,2678",
+ "endColumns": "94,93,101,81,97,105,78,75,90,92,91,90,100,92,94,93,90,90,79,97,94,94,99,95,98,151,93,77",
+ "endOffsets": "195,289,391,473,571,677,756,832,923,1016,1108,1199,1300,1393,1488,1582,1673,1764,1844,1942,2037,2132,2232,2328,2427,2579,2673,2751"
}
}
]
},
{
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-ca_values-ca.arsc.flat",
+ "outputFile": "D:\\Note-master2\\app\\build\\intermediates\\merged_res\\debug\\values-sr_values-sr.arsc.flat",
"map": [
{
- "source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\c9913736ba0af3f26ba50dd9aa679a2b\\transformed\\support-compat-28.0.0\\res\\values-ca\\values-ca.xml",
+ "source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\c9913736ba0af3f26ba50dd9aa679a2b\\transformed\\support-compat-28.0.0\\res\\values-sr\\values-sr.xml",
"from": {
"startLines": "2",
"startColumns": "4",
@@ -603,38 +621,44 @@
"to": {
"startLines": "30",
"startColumns": "4",
- "startOffsets": "2915",
+ "startOffsets": "2905",
"endColumns": "100",
- "endOffsets": "3011"
+ "endOffsets": "3001"
}
},
{
- "source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\4051cc509ba70441b9465808cc62a56d\\transformed\\appcompat-v7-28.0.0\\res\\values-ca\\values-ca.xml",
+ "source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\4051cc509ba70441b9465808cc62a56d\\transformed\\appcompat-v7-28.0.0\\res\\values-sr\\values-sr.xml",
"from": {
"startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29",
"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",
- "startOffsets": "105,223,329,436,519,627,753,837,918,1009,1102,1196,1291,1390,1483,1576,1670,1761,1852,1935,2046,2155,2253,2363,2467,2575,2735,2834",
- "endColumns": "117,105,106,82,107,125,83,80,90,92,93,94,98,92,92,93,90,90,82,110,108,97,109,103,107,159,98,80",
- "endOffsets": "218,324,431,514,622,748,832,913,1004,1097,1191,1286,1385,1478,1571,1665,1756,1847,1930,2041,2150,2248,2358,2462,2570,2730,2829,2910"
+ "startOffsets": "105,214,317,423,509,613,731,812,892,983,1076,1172,1266,1367,1460,1555,1660,1751,1842,1930,2035,2143,2244,2348,2456,2557,2724,2821",
+ "endColumns": "108,102,105,85,103,117,80,79,90,92,95,93,100,92,94,104,90,90,87,104,107,100,103,107,100,166,96,83",
+ "endOffsets": "209,312,418,504,608,726,807,887,978,1071,1167,1261,1362,1455,1550,1655,1746,1837,1925,2030,2138,2239,2343,2451,2552,2719,2816,2900"
}
}
]
},
{
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-cs_values-cs.arsc.flat",
+ "outputFile": "D:\\Note-master2\\app\\build\\intermediates\\merged_res\\debug\\values-v17_values-v17.arsc.flat",
"map": [
{
- "source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\4051cc509ba70441b9465808cc62a56d\\transformed\\appcompat-v7-28.0.0\\res\\values-cs\\values-cs.xml",
+ "source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\4051cc509ba70441b9465808cc62a56d\\transformed\\appcompat-v7-28.0.0\\res\\values-v17\\values-v17.xml",
"from": {
- "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29",
- "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",
- "startOffsets": "105,212,314,423,509,614,731,812,893,984,1077,1173,1267,1362,1455,1550,1647,1738,1829,1913,2017,2126,2225,2331,2441,2548,2711,2809",
- "endColumns": "106,101,108,85,104,116,80,80,90,92,95,93,94,92,94,96,90,90,83,103,108,98,105,109,106,162,97,81",
- "endOffsets": "207,309,418,504,609,726,807,888,979,1072,1168,1262,1357,1450,1545,1642,1733,1824,1908,2012,2121,2220,2326,2436,2543,2706,2804,2886"
+ "startLines": "2,5,9,12,15,18,22,25,29,33,37,40,43,46,50,53,57",
+ "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
+ "startOffsets": "55,228,456,614,764,936,1161,1331,1559,1783,2025,2196,2370,2539,2812,3012,3216",
+ "endLines": "4,8,11,14,17,21,24,28,32,36,39,42,45,49,52,56,60",
+ "endColumns": "12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12",
+ "endOffsets": "223,451,609,759,931,1156,1326,1554,1778,2020,2191,2365,2534,2807,3007,3211,3540"
}
- },
+ }
+ ]
+ },
+ {
+ "outputFile": "D:\\Note-master2\\app\\build\\intermediates\\merged_res\\debug\\values-ru_values-ru.arsc.flat",
+ "map": [
{
- "source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\c9913736ba0af3f26ba50dd9aa679a2b\\transformed\\support-compat-28.0.0\\res\\values-cs\\values-cs.xml",
+ "source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\c9913736ba0af3f26ba50dd9aa679a2b\\transformed\\support-compat-28.0.0\\res\\values-ru\\values-ru.xml",
"from": {
"startLines": "2",
"startColumns": "4",
@@ -645,18 +669,53 @@
"to": {
"startLines": "30",
"startColumns": "4",
- "startOffsets": "2891",
+ "startOffsets": "2913",
"endColumns": "100",
- "endOffsets": "2987"
+ "endOffsets": "3009"
+ }
+ },
+ {
+ "source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\4051cc509ba70441b9465808cc62a56d\\transformed\\appcompat-v7-28.0.0\\res\\values-ru\\values-ru.xml",
+ "from": {
+ "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29",
+ "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",
+ "startOffsets": "105,220,322,434,520,625,745,824,902,994,1088,1184,1277,1373,1467,1563,1658,1750,1842,1922,2028,2136,2234,2343,2449,2557,2732,2832",
+ "endColumns": "114,101,111,85,104,119,78,77,91,93,95,92,95,93,95,94,91,91,79,105,107,97,108,105,107,174,99,80",
+ "endOffsets": "215,317,429,515,620,740,819,897,989,1083,1179,1272,1368,1462,1558,1653,1745,1837,1917,2023,2131,2229,2338,2444,2552,2727,2827,2908"
}
}
]
},
{
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-am_values-am.arsc.flat",
+ "outputFile": "D:\\Note-master2\\app\\build\\intermediates\\merged_res\\debug\\values-sw600dp-v13_values-sw600dp-v13.arsc.flat",
"map": [
{
- "source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\c9913736ba0af3f26ba50dd9aa679a2b\\transformed\\support-compat-28.0.0\\res\\values-am\\values-am.xml",
+ "source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\4051cc509ba70441b9465808cc62a56d\\transformed\\appcompat-v7-28.0.0\\res\\values-sw600dp-v13\\values-sw600dp-v13.xml",
+ "from": {
+ "startLines": "2,3,4,5,6,7,8,9",
+ "startColumns": "4,4,4,4,4,4,4,4",
+ "startOffsets": "55,124,193,263,337,413,472,543",
+ "endColumns": "68,68,69,73,75,58,70,67",
+ "endOffsets": "119,188,258,332,408,467,538,606"
+ }
+ }
+ ]
+ },
+ {
+ "outputFile": "D:\\Note-master2\\app\\build\\intermediates\\merged_res\\debug\\values-en-rGB_values-en-rGB.arsc.flat",
+ "map": [
+ {
+ "source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\4051cc509ba70441b9465808cc62a56d\\transformed\\appcompat-v7-28.0.0\\res\\values-en-rGB\\values-en-rGB.xml",
+ "from": {
+ "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29",
+ "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",
+ "startOffsets": "105,209,309,417,501,601,716,793,869,960,1053,1149,1243,1344,1437,1532,1626,1717,1808,1890,1993,2097,2196,2301,2404,2508,2664,2764",
+ "endColumns": "103,99,107,83,99,114,76,75,90,92,95,93,100,92,94,93,90,90,81,102,103,98,104,102,103,155,99,81",
+ "endOffsets": "204,304,412,496,596,711,788,864,955,1048,1144,1238,1339,1432,1527,1621,1712,1803,1885,1988,2092,2191,2296,2399,2503,2659,2759,2841"
+ }
+ },
+ {
+ "source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\c9913736ba0af3f26ba50dd9aa679a2b\\transformed\\support-compat-28.0.0\\res\\values-en-rGB\\values-en-rGB.xml",
"from": {
"startLines": "2",
"startColumns": "4",
@@ -667,28 +726,18 @@
"to": {
"startLines": "30",
"startColumns": "4",
- "startOffsets": "2817",
+ "startOffsets": "2846",
"endColumns": "100",
- "endOffsets": "2913"
- }
- },
- {
- "source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\4051cc509ba70441b9465808cc62a56d\\transformed\\appcompat-v7-28.0.0\\res\\values-am\\values-am.xml",
- "from": {
- "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29",
- "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",
- "startOffsets": "105,207,306,412,498,601,714,792,870,961,1054,1147,1241,1342,1435,1530,1624,1715,1805,1884,1984,2084,2180,2283,2382,2489,2642,2738",
- "endColumns": "101,98,105,85,102,112,77,77,90,92,92,93,100,92,94,93,90,89,78,99,99,95,102,98,106,152,95,78",
- "endOffsets": "202,301,407,493,596,709,787,865,956,1049,1142,1236,1337,1430,1525,1619,1710,1800,1879,1979,2079,2175,2278,2377,2484,2637,2733,2812"
+ "endOffsets": "2942"
}
}
]
},
{
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-en-rIN_values-en-rIN.arsc.flat",
+ "outputFile": "D:\\Note-master2\\app\\build\\intermediates\\merged_res\\debug\\values-ca_values-ca.arsc.flat",
"map": [
{
- "source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\c9913736ba0af3f26ba50dd9aa679a2b\\transformed\\support-compat-28.0.0\\res\\values-en-rIN\\values-en-rIN.xml",
+ "source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\c9913736ba0af3f26ba50dd9aa679a2b\\transformed\\support-compat-28.0.0\\res\\values-ca\\values-ca.xml",
"from": {
"startLines": "2",
"startColumns": "4",
@@ -699,86 +748,62 @@
"to": {
"startLines": "30",
"startColumns": "4",
- "startOffsets": "2846",
+ "startOffsets": "2915",
"endColumns": "100",
- "endOffsets": "2942"
+ "endOffsets": "3011"
}
},
{
- "source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\4051cc509ba70441b9465808cc62a56d\\transformed\\appcompat-v7-28.0.0\\res\\values-en-rIN\\values-en-rIN.xml",
+ "source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\4051cc509ba70441b9465808cc62a56d\\transformed\\appcompat-v7-28.0.0\\res\\values-ca\\values-ca.xml",
"from": {
"startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29",
"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",
- "startOffsets": "105,209,309,417,501,601,716,793,869,960,1053,1149,1243,1344,1437,1532,1626,1717,1808,1890,1993,2097,2196,2301,2404,2508,2664,2764",
- "endColumns": "103,99,107,83,99,114,76,75,90,92,95,93,100,92,94,93,90,90,81,102,103,98,104,102,103,155,99,81",
- "endOffsets": "204,304,412,496,596,711,788,864,955,1048,1144,1238,1339,1432,1527,1621,1712,1803,1885,1988,2092,2191,2296,2399,2503,2659,2759,2841"
+ "startOffsets": "105,223,329,436,519,627,753,837,918,1009,1102,1196,1291,1390,1483,1576,1670,1761,1852,1935,2046,2155,2253,2363,2467,2575,2735,2834",
+ "endColumns": "117,105,106,82,107,125,83,80,90,92,93,94,98,92,92,93,90,90,82,110,108,97,109,103,107,159,98,80",
+ "endOffsets": "218,324,431,514,622,748,832,913,1004,1097,1191,1286,1385,1478,1571,1665,1756,1847,1930,2041,2150,2248,2358,2462,2570,2730,2829,2910"
}
}
]
},
{
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-en-rXC_values-en-rXC.arsc.flat",
+ "outputFile": "D:\\Note-master2\\app\\build\\intermediates\\merged_res\\debug\\values-v16_values-v16.arsc.flat",
"map": [
{
- "source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\c9913736ba0af3f26ba50dd9aa679a2b\\transformed\\support-compat-28.0.0\\res\\values-en-rXC\\values-en-rXC.xml",
+ "source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\4051cc509ba70441b9465808cc62a56d\\transformed\\appcompat-v7-28.0.0\\res\\values-v16\\values-v16.xml",
"from": {
"startLines": "2",
"startColumns": "4",
"startOffsets": "55",
- "endColumns": "202",
- "endOffsets": "253"
+ "endLines": "5",
+ "endColumns": "12",
+ "endOffsets": "223"
},
"to": {
- "startLines": "30",
+ "startLines": "3",
"startColumns": "4",
- "startOffsets": "5682",
- "endColumns": "202",
- "endOffsets": "5880"
+ "startOffsets": "121",
+ "endLines": "6",
+ "endColumns": "12",
+ "endOffsets": "289"
}
},
{
- "source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\4051cc509ba70441b9465808cc62a56d\\transformed\\appcompat-v7-28.0.0\\res\\values-en-rXC\\values-en-rXC.xml",
- "from": {
- "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29",
- "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",
- "startOffsets": "105,310,510,719,904,1106,1321,1494,1671,1862,2055,2253,2449,2652,2847,3044,3239,3432,3623,3807,4011,4216,4417,4624,4826,5031,5303,5503",
- "endColumns": "204,199,208,184,201,214,172,176,190,192,197,195,202,194,196,194,192,190,183,203,204,200,206,201,204,271,199,178",
- "endOffsets": "305,505,714,899,1101,1316,1489,1666,1857,2050,2248,2444,2647,2842,3039,3234,3427,3618,3802,4006,4211,4412,4619,4821,5026,5298,5498,5677"
- }
- }
- ]
- },
- {
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-watch-v20_values-watch-v20.arsc.flat",
- "map": [
- {
- "source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\4051cc509ba70441b9465808cc62a56d\\transformed\\appcompat-v7-28.0.0\\res\\values-watch-v20\\values-watch-v20.xml",
+ "source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\c9913736ba0af3f26ba50dd9aa679a2b\\transformed\\support-compat-28.0.0\\res\\values-v16\\values-v16.xml",
"from": {
- "startLines": "2,5,8",
- "startColumns": "4,4,4",
- "startOffsets": "55,214,385",
- "endLines": "4,7,10",
- "endColumns": "12,12,12",
- "endOffsets": "209,380,553"
+ "startLines": "2",
+ "startColumns": "4",
+ "startOffsets": "55",
+ "endColumns": "65",
+ "endOffsets": "116"
}
}
]
},
{
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-te_values-te.arsc.flat",
+ "outputFile": "D:\\Note-master2\\app\\build\\intermediates\\merged_res\\debug\\values-ar_values-ar.arsc.flat",
"map": [
{
- "source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\4051cc509ba70441b9465808cc62a56d\\transformed\\appcompat-v7-28.0.0\\res\\values-te\\values-te.xml",
- "from": {
- "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29",
- "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",
- "startOffsets": "105,219,328,439,529,634,759,841,923,1014,1107,1203,1297,1398,1491,1586,1681,1772,1863,1947,2060,2168,2267,2378,2480,2597,2763,2864",
- "endColumns": "113,108,110,89,104,124,81,81,90,92,95,93,100,92,94,94,90,90,83,112,107,98,110,101,116,165,100,81",
- "endOffsets": "214,323,434,524,629,754,836,918,1009,1102,1198,1292,1393,1486,1581,1676,1767,1858,1942,2055,2163,2262,2373,2475,2592,2758,2859,2941"
- }
- },
- {
- "source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\c9913736ba0af3f26ba50dd9aa679a2b\\transformed\\support-compat-28.0.0\\res\\values-te\\values-te.xml",
+ "source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\c9913736ba0af3f26ba50dd9aa679a2b\\transformed\\support-compat-28.0.0\\res\\values-ar\\values-ar.xml",
"from": {
"startLines": "2",
"startColumns": "4",
@@ -789,28 +814,28 @@
"to": {
"startLines": "30",
"startColumns": "4",
- "startOffsets": "2946",
+ "startOffsets": "2860",
"endColumns": "100",
- "endOffsets": "3042"
+ "endOffsets": "2956"
}
- }
- ]
- },
- {
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-my_values-my.arsc.flat",
- "map": [
+ },
{
- "source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\4051cc509ba70441b9465808cc62a56d\\transformed\\appcompat-v7-28.0.0\\res\\values-my\\values-my.xml",
+ "source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\4051cc509ba70441b9465808cc62a56d\\transformed\\appcompat-v7-28.0.0\\res\\values-ar\\values-ar.xml",
"from": {
"startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29",
"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",
- "startOffsets": "105,214,319,436,529,641,769,847,926,1017,1110,1206,1300,1401,1494,1589,1683,1774,1865,1951,2074,2186,2288,2414,2525,2635,2795,2895",
- "endColumns": "108,104,116,92,111,127,77,78,90,92,95,93,100,92,94,93,90,90,85,122,111,101,125,110,109,159,99,83",
- "endOffsets": "209,314,431,524,636,764,842,921,1012,1105,1201,1295,1396,1489,1584,1678,1769,1860,1946,2069,2181,2283,2409,2520,2630,2790,2890,2974"
+ "startOffsets": "105,222,326,435,517,618,732,811,890,981,1074,1170,1264,1365,1458,1553,1647,1738,1832,1911,2016,2117,2213,2321,2424,2527,2682,2779",
+ "endColumns": "116,103,108,81,100,113,78,78,90,92,95,93,100,92,94,93,90,93,78,104,100,95,107,102,102,154,96,80",
+ "endOffsets": "217,321,430,512,613,727,806,885,976,1069,1165,1259,1360,1453,1548,1642,1733,1827,1906,2011,2112,2208,2316,2419,2522,2677,2774,2855"
}
- },
+ }
+ ]
+ },
+ {
+ "outputFile": "D:\\Note-master2\\app\\build\\intermediates\\merged_res\\debug\\values-lt_values-lt.arsc.flat",
+ "map": [
{
- "source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\c9913736ba0af3f26ba50dd9aa679a2b\\transformed\\support-compat-28.0.0\\res\\values-my\\values-my.xml",
+ "source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\c9913736ba0af3f26ba50dd9aa679a2b\\transformed\\support-compat-28.0.0\\res\\values-lt\\values-lt.xml",
"from": {
"startLines": "2",
"startColumns": "4",
@@ -821,48 +846,28 @@
"to": {
"startLines": "30",
"startColumns": "4",
- "startOffsets": "2979",
+ "startOffsets": "2978",
"endColumns": "100",
- "endOffsets": "3075"
- }
- }
- ]
- },
- {
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-port_values-port.arsc.flat",
- "map": [
- {
- "source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\4051cc509ba70441b9465808cc62a56d\\transformed\\appcompat-v7-28.0.0\\res\\values-port\\values-port.xml",
- "from": {
- "startLines": "2",
- "startColumns": "4",
- "startOffsets": "55",
- "endColumns": "55",
- "endOffsets": "106"
+ "endOffsets": "3074"
}
- }
- ]
- },
- {
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-v18_values-v18.arsc.flat",
- "map": [
+ },
{
- "source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\4051cc509ba70441b9465808cc62a56d\\transformed\\appcompat-v7-28.0.0\\res\\values-v18\\values-v18.xml",
+ "source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\4051cc509ba70441b9465808cc62a56d\\transformed\\appcompat-v7-28.0.0\\res\\values-lt\\values-lt.xml",
"from": {
- "startLines": "2",
- "startColumns": "4",
- "startOffsets": "55",
- "endColumns": "48",
- "endOffsets": "99"
+ "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29",
+ "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",
+ "startOffsets": "105,221,322,435,522,631,752,834,915,1009,1105,1203,1299,1403,1499,1597,1700,1794,1888,1973,2082,2191,2291,2401,2505,2618,2794,2895",
+ "endColumns": "115,100,112,86,108,120,81,80,93,95,97,95,103,95,97,102,93,93,84,108,108,99,109,103,112,175,100,82",
+ "endOffsets": "216,317,430,517,626,747,829,910,1004,1100,1198,1294,1398,1494,1592,1695,1789,1883,1968,2077,2186,2286,2396,2500,2613,2789,2890,2973"
}
}
]
},
{
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-ru_values-ru.arsc.flat",
+ "outputFile": "D:\\Note-master2\\app\\build\\intermediates\\merged_res\\debug\\values-uz_values-uz.arsc.flat",
"map": [
{
- "source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\c9913736ba0af3f26ba50dd9aa679a2b\\transformed\\support-compat-28.0.0\\res\\values-ru\\values-ru.xml",
+ "source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\c9913736ba0af3f26ba50dd9aa679a2b\\transformed\\support-compat-28.0.0\\res\\values-uz\\values-uz.xml",
"from": {
"startLines": "2",
"startColumns": "4",
@@ -873,28 +878,38 @@
"to": {
"startLines": "30",
"startColumns": "4",
- "startOffsets": "2913",
+ "startOffsets": "2889",
"endColumns": "100",
- "endOffsets": "3009"
+ "endOffsets": "2985"
}
},
{
- "source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\4051cc509ba70441b9465808cc62a56d\\transformed\\appcompat-v7-28.0.0\\res\\values-ru\\values-ru.xml",
+ "source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\4051cc509ba70441b9465808cc62a56d\\transformed\\appcompat-v7-28.0.0\\res\\values-uz\\values-uz.xml",
"from": {
"startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29",
"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",
- "startOffsets": "105,220,322,434,520,625,745,824,902,994,1088,1184,1277,1373,1467,1563,1658,1750,1842,1922,2028,2136,2234,2343,2449,2557,2732,2832",
- "endColumns": "114,101,111,85,104,119,78,77,91,93,95,92,95,93,95,94,91,91,79,105,107,97,108,105,107,174,99,80",
- "endOffsets": "215,317,429,515,620,740,819,897,989,1083,1179,1272,1368,1462,1558,1653,1745,1837,1917,2023,2131,2229,2338,2444,2552,2727,2827,2908"
+ "startOffsets": "105,210,314,428,514,614,730,810,889,980,1073,1169,1263,1358,1451,1546,1641,1732,1824,1908,2017,2124,2225,2333,2438,2545,2706,2805",
+ "endColumns": "104,103,113,85,99,115,79,78,90,92,95,93,94,92,94,94,90,91,83,108,106,100,107,104,106,160,98,83",
+ "endOffsets": "205,309,423,509,609,725,805,884,975,1068,1164,1258,1353,1446,1541,1636,1727,1819,1903,2012,2119,2220,2328,2433,2540,2701,2800,2884"
}
}
]
},
{
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-ko_values-ko.arsc.flat",
+ "outputFile": "D:\\Note-master2\\app\\build\\intermediates\\merged_res\\debug\\values-lo_values-lo.arsc.flat",
"map": [
{
- "source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\c9913736ba0af3f26ba50dd9aa679a2b\\transformed\\support-compat-28.0.0\\res\\values-ko\\values-ko.xml",
+ "source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\4051cc509ba70441b9465808cc62a56d\\transformed\\appcompat-v7-28.0.0\\res\\values-lo\\values-lo.xml",
+ "from": {
+ "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29",
+ "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",
+ "startOffsets": "105,208,305,412,497,602,714,791,869,960,1053,1149,1243,1344,1437,1532,1626,1717,1808,1888,1995,2092,2190,2295,2398,2502,2659,2755",
+ "endColumns": "102,96,106,84,104,111,76,77,90,92,95,93,100,92,94,93,90,90,79,106,96,97,104,102,103,156,95,80",
+ "endOffsets": "203,300,407,492,597,709,786,864,955,1048,1144,1238,1339,1432,1527,1621,1712,1803,1883,1990,2087,2185,2290,2393,2497,2654,2750,2831"
+ }
+ },
+ {
+ "source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\c9913736ba0af3f26ba50dd9aa679a2b\\transformed\\support-compat-28.0.0\\res\\values-lo\\values-lo.xml",
"from": {
"startLines": "2",
"startColumns": "4",
@@ -905,28 +920,18 @@
"to": {
"startLines": "30",
"startColumns": "4",
- "startOffsets": "2756",
+ "startOffsets": "2836",
"endColumns": "100",
- "endOffsets": "2852"
- }
- },
- {
- "source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\4051cc509ba70441b9465808cc62a56d\\transformed\\appcompat-v7-28.0.0\\res\\values-ko\\values-ko.xml",
- "from": {
- "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29",
- "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",
- "startOffsets": "105,200,294,396,478,576,682,761,837,928,1021,1113,1204,1305,1398,1493,1587,1678,1769,1849,1947,2042,2137,2237,2333,2432,2584,2678",
- "endColumns": "94,93,101,81,97,105,78,75,90,92,91,90,100,92,94,93,90,90,79,97,94,94,99,95,98,151,93,77",
- "endOffsets": "195,289,391,473,571,677,756,832,923,1016,1108,1199,1300,1393,1488,1582,1673,1764,1844,1942,2037,2132,2232,2328,2427,2579,2673,2751"
+ "endOffsets": "2932"
}
}
]
},
{
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-lt_values-lt.arsc.flat",
+ "outputFile": "D:\\Note-master2\\app\\build\\intermediates\\merged_res\\debug\\values-fi_values-fi.arsc.flat",
"map": [
{
- "source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\c9913736ba0af3f26ba50dd9aa679a2b\\transformed\\support-compat-28.0.0\\res\\values-lt\\values-lt.xml",
+ "source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\c9913736ba0af3f26ba50dd9aa679a2b\\transformed\\support-compat-28.0.0\\res\\values-fi\\values-fi.xml",
"from": {
"startLines": "2",
"startColumns": "4",
@@ -937,28 +942,28 @@
"to": {
"startLines": "30",
"startColumns": "4",
- "startOffsets": "2978",
+ "startOffsets": "2872",
"endColumns": "100",
- "endOffsets": "3074"
+ "endOffsets": "2968"
}
},
{
- "source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\4051cc509ba70441b9465808cc62a56d\\transformed\\appcompat-v7-28.0.0\\res\\values-lt\\values-lt.xml",
+ "source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\4051cc509ba70441b9465808cc62a56d\\transformed\\appcompat-v7-28.0.0\\res\\values-fi\\values-fi.xml",
"from": {
"startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29",
"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",
- "startOffsets": "105,221,322,435,522,631,752,834,915,1009,1105,1203,1299,1403,1499,1597,1700,1794,1888,1973,2082,2191,2291,2401,2505,2618,2794,2895",
- "endColumns": "115,100,112,86,108,120,81,80,93,95,97,95,103,95,97,102,93,93,84,108,108,99,109,103,112,175,100,82",
- "endOffsets": "216,317,430,517,626,747,829,910,1004,1100,1198,1294,1398,1494,1592,1695,1789,1883,1968,2077,2186,2286,2396,2500,2613,2789,2890,2973"
+ "startOffsets": "105,213,313,414,500,605,723,810,892,983,1076,1172,1266,1361,1454,1550,1649,1740,1834,1914,2021,2124,2221,2327,2426,2530,2693,2792",
+ "endColumns": "107,99,100,85,104,117,86,81,90,92,95,93,94,92,95,98,90,93,79,106,102,96,105,98,103,162,98,79",
+ "endOffsets": "208,308,409,495,600,718,805,887,978,1071,1167,1261,1356,1449,1545,1644,1735,1829,1909,2016,2119,2216,2322,2421,2525,2688,2787,2867"
}
}
]
},
{
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-uz_values-uz.arsc.flat",
+ "outputFile": "D:\\Note-master2\\app\\build\\intermediates\\merged_res\\debug\\values-si_values-si.arsc.flat",
"map": [
{
- "source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\c9913736ba0af3f26ba50dd9aa679a2b\\transformed\\support-compat-28.0.0\\res\\values-uz\\values-uz.xml",
+ "source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\c9913736ba0af3f26ba50dd9aa679a2b\\transformed\\support-compat-28.0.0\\res\\values-si\\values-si.xml",
"from": {
"startLines": "2",
"startColumns": "4",
@@ -969,28 +974,28 @@
"to": {
"startLines": "30",
"startColumns": "4",
- "startOffsets": "2889",
+ "startOffsets": "2903",
"endColumns": "100",
- "endOffsets": "2985"
+ "endOffsets": "2999"
}
},
{
- "source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\4051cc509ba70441b9465808cc62a56d\\transformed\\appcompat-v7-28.0.0\\res\\values-uz\\values-uz.xml",
+ "source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\4051cc509ba70441b9465808cc62a56d\\transformed\\appcompat-v7-28.0.0\\res\\values-si\\values-si.xml",
"from": {
"startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29",
"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",
- "startOffsets": "105,210,314,428,514,614,730,810,889,980,1073,1169,1263,1358,1451,1546,1641,1732,1824,1908,2017,2124,2225,2333,2438,2545,2706,2805",
- "endColumns": "104,103,113,85,99,115,79,78,90,92,95,93,94,92,94,94,90,91,83,108,106,100,107,104,106,160,98,83",
- "endOffsets": "205,309,423,509,609,725,805,884,975,1068,1164,1258,1353,1446,1541,1636,1727,1819,1903,2012,2119,2220,2328,2433,2540,2701,2800,2884"
+ "startOffsets": "105,215,322,429,517,622,738,827,914,1005,1098,1193,1287,1388,1481,1576,1670,1761,1852,1936,2045,2150,2248,2358,2457,2563,2722,2821",
+ "endColumns": "109,106,106,87,104,115,88,86,90,92,94,93,100,92,94,93,90,90,83,108,104,97,109,98,105,158,98,81",
+ "endOffsets": "210,317,424,512,617,733,822,909,1000,1093,1188,1282,1383,1476,1571,1665,1756,1847,1931,2040,2145,2243,2353,2452,2558,2717,2816,2898"
}
}
]
},
{
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-th_values-th.arsc.flat",
+ "outputFile": "D:\\Note-master2\\app\\build\\intermediates\\merged_res\\debug\\values-am_values-am.arsc.flat",
"map": [
{
- "source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\c9913736ba0af3f26ba50dd9aa679a2b\\transformed\\support-compat-28.0.0\\res\\values-th\\values-th.xml",
+ "source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\c9913736ba0af3f26ba50dd9aa679a2b\\transformed\\support-compat-28.0.0\\res\\values-am\\values-am.xml",
"from": {
"startLines": "2",
"startColumns": "4",
@@ -1001,44 +1006,38 @@
"to": {
"startLines": "30",
"startColumns": "4",
- "startOffsets": "2845",
+ "startOffsets": "2817",
"endColumns": "100",
- "endOffsets": "2941"
+ "endOffsets": "2913"
}
},
{
- "source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\4051cc509ba70441b9465808cc62a56d\\transformed\\appcompat-v7-28.0.0\\res\\values-th\\values-th.xml",
+ "source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\4051cc509ba70441b9465808cc62a56d\\transformed\\appcompat-v7-28.0.0\\res\\values-am\\values-am.xml",
"from": {
"startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29",
"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",
- "startOffsets": "105,210,308,416,505,607,717,794,872,963,1056,1152,1246,1347,1440,1535,1629,1720,1811,1892,2000,2104,2202,2310,2415,2516,2669,2764",
- "endColumns": "104,97,107,88,101,109,76,77,90,92,95,93,100,92,94,93,90,90,80,107,103,97,107,104,100,152,94,80",
- "endOffsets": "205,303,411,500,602,712,789,867,958,1051,1147,1241,1342,1435,1530,1624,1715,1806,1887,1995,2099,2197,2305,2410,2511,2664,2759,2840"
+ "startOffsets": "105,207,306,412,498,601,714,792,870,961,1054,1147,1241,1342,1435,1530,1624,1715,1805,1884,1984,2084,2180,2283,2382,2489,2642,2738",
+ "endColumns": "101,98,105,85,102,112,77,77,90,92,92,93,100,92,94,93,90,89,78,99,99,95,102,98,106,152,95,78",
+ "endOffsets": "202,301,407,493,596,709,787,865,956,1049,1142,1236,1337,1430,1525,1619,1710,1800,1879,1979,2079,2175,2278,2377,2484,2637,2733,2812"
}
}
]
},
{
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-watch-v21_values-watch-v21.arsc.flat",
+ "outputFile": "D:\\Note-master2\\app\\build\\intermediates\\merged_res\\debug\\values-in_values-in.arsc.flat",
"map": [
{
- "source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\4051cc509ba70441b9465808cc62a56d\\transformed\\appcompat-v7-28.0.0\\res\\values-watch-v21\\values-watch-v21.xml",
+ "source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\4051cc509ba70441b9465808cc62a56d\\transformed\\appcompat-v7-28.0.0\\res\\values-in\\values-in.xml",
"from": {
- "startLines": "2,6,10",
- "startColumns": "4,4,4",
- "startOffsets": "55,271,499",
- "endLines": "5,9,13",
- "endColumns": "12,12,12",
- "endOffsets": "266,494,724"
+ "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29",
+ "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",
+ "startOffsets": "105,215,317,422,509,613,729,811,890,981,1074,1170,1264,1365,1458,1553,1647,1738,1829,1915,2018,2127,2228,2332,2440,2548,2704,2803",
+ "endColumns": "109,101,104,86,103,115,81,78,90,92,95,93,100,92,94,93,90,90,85,102,108,100,103,107,107,155,98,83",
+ "endOffsets": "210,312,417,504,608,724,806,885,976,1069,1165,1259,1360,1453,1548,1642,1733,1824,1910,2013,2122,2223,2327,2435,2543,2699,2798,2882"
}
- }
- ]
- },
- {
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-hy_values-hy.arsc.flat",
- "map": [
+ },
{
- "source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\c9913736ba0af3f26ba50dd9aa679a2b\\transformed\\support-compat-28.0.0\\res\\values-hy\\values-hy.xml",
+ "source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\c9913736ba0af3f26ba50dd9aa679a2b\\transformed\\support-compat-28.0.0\\res\\values-in\\values-in.xml",
"from": {
"startLines": "2",
"startColumns": "4",
@@ -1049,28 +1048,43 @@
"to": {
"startLines": "30",
"startColumns": "4",
- "startOffsets": "2884",
+ "startOffsets": "2887",
"endColumns": "100",
- "endOffsets": "2980"
+ "endOffsets": "2983"
}
- },
+ }
+ ]
+ },
+ {
+ "outputFile": "D:\\Note-master2\\app\\build\\intermediates\\merged_res\\debug\\values-h720dp-v13_values-h720dp-v13.arsc.flat",
+ "map": [
{
- "source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\4051cc509ba70441b9465808cc62a56d\\transformed\\appcompat-v7-28.0.0\\res\\values-hy\\values-hy.xml",
+ "source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\4051cc509ba70441b9465808cc62a56d\\transformed\\appcompat-v7-28.0.0\\res\\values-h720dp-v13\\values-h720dp-v13.xml",
"from": {
- "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29",
- "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",
- "startOffsets": "105,208,309,419,508,614,729,811,892,983,1076,1172,1266,1367,1460,1555,1649,1740,1831,1916,2023,2130,2229,2339,2446,2546,2703,2802",
- "endColumns": "102,100,109,88,105,114,81,80,90,92,95,93,100,92,94,93,90,90,84,106,106,98,109,106,99,156,98,81",
- "endOffsets": "203,304,414,503,609,724,806,887,978,1071,1167,1261,1362,1455,1550,1644,1735,1826,1911,2018,2125,2224,2334,2441,2541,2698,2797,2879"
+ "startLines": "2",
+ "startColumns": "4",
+ "startOffsets": "55",
+ "endColumns": "66",
+ "endOffsets": "117"
}
}
]
},
{
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-nb_values-nb.arsc.flat",
+ "outputFile": "D:\\Note-master2\\app\\build\\intermediates\\merged_res\\debug\\values-iw_values-iw.arsc.flat",
"map": [
{
- "source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\c9913736ba0af3f26ba50dd9aa679a2b\\transformed\\support-compat-28.0.0\\res\\values-nb\\values-nb.xml",
+ "source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\4051cc509ba70441b9465808cc62a56d\\transformed\\appcompat-v7-28.0.0\\res\\values-iw\\values-iw.xml",
+ "from": {
+ "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29",
+ "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",
+ "startOffsets": "105,209,308,416,500,600,714,792,870,961,1055,1151,1245,1346,1439,1534,1631,1722,1814,1895,1997,2101,2199,2302,2403,2503,2655,2751",
+ "endColumns": "103,98,107,83,99,113,77,77,90,93,95,93,100,92,94,96,90,91,80,101,103,97,102,100,99,151,95,80",
+ "endOffsets": "204,303,411,495,595,709,787,865,956,1050,1146,1240,1341,1434,1529,1626,1717,1809,1890,1992,2096,2194,2297,2398,2498,2650,2746,2827"
+ }
+ },
+ {
+ "source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\c9913736ba0af3f26ba50dd9aa679a2b\\transformed\\support-compat-28.0.0\\res\\values-iw\\values-iw.xml",
"from": {
"startLines": "2",
"startColumns": "4",
@@ -1081,53 +1095,18 @@
"to": {
"startLines": "30",
"startColumns": "4",
- "startOffsets": "2826",
+ "startOffsets": "2832",
"endColumns": "100",
- "endOffsets": "2922"
- }
- },
- {
- "source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\4051cc509ba70441b9465808cc62a56d\\transformed\\appcompat-v7-28.0.0\\res\\values-nb\\values-nb.xml",
- "from": {
- "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29",
- "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",
- "startOffsets": "105,213,308,422,508,608,721,797,873,964,1057,1153,1247,1348,1441,1536,1634,1725,1816,1896,1999,2098,2194,2298,2396,2497,2650,2747",
- "endColumns": "107,94,113,85,99,112,75,75,90,92,95,93,100,92,94,97,90,90,79,102,98,95,103,97,100,152,96,78",
- "endOffsets": "208,303,417,503,603,716,792,868,959,1052,1148,1242,1343,1436,1531,1629,1720,1811,1891,1994,2093,2189,2293,2391,2492,2645,2742,2821"
- }
- }
- ]
- },
- {
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-sw600dp-v13_values-sw600dp-v13.arsc.flat",
- "map": [
- {
- "source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\4051cc509ba70441b9465808cc62a56d\\transformed\\appcompat-v7-28.0.0\\res\\values-sw600dp-v13\\values-sw600dp-v13.xml",
- "from": {
- "startLines": "2,3,4,5,6,7,8,9",
- "startColumns": "4,4,4,4,4,4,4,4",
- "startOffsets": "55,124,193,263,337,413,472,543",
- "endColumns": "68,68,69,73,75,58,70,67",
- "endOffsets": "119,188,258,332,408,467,538,606"
+ "endOffsets": "2928"
}
}
]
},
{
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-hu_values-hu.arsc.flat",
+ "outputFile": "D:\\Note-master2\\app\\build\\intermediates\\merged_res\\debug\\values-bs_values-bs.arsc.flat",
"map": [
{
- "source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\4051cc509ba70441b9465808cc62a56d\\transformed\\appcompat-v7-28.0.0\\res\\values-hu\\values-hu.xml",
- "from": {
- "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29",
- "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",
- "startOffsets": "105,213,318,433,517,629,759,835,911,1002,1095,1191,1285,1386,1479,1574,1669,1760,1851,1934,2044,2155,2255,2366,2474,2593,2775,2878",
- "endColumns": "107,104,114,83,111,129,75,75,90,92,95,93,100,92,94,94,90,90,82,109,110,99,110,107,118,181,102,82",
- "endOffsets": "208,313,428,512,624,754,830,906,997,1090,1186,1280,1381,1474,1569,1664,1755,1846,1929,2039,2150,2250,2361,2469,2588,2770,2873,2956"
- }
- },
- {
- "source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\c9913736ba0af3f26ba50dd9aa679a2b\\transformed\\support-compat-28.0.0\\res\\values-hu\\values-hu.xml",
+ "source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\c9913736ba0af3f26ba50dd9aa679a2b\\transformed\\support-compat-28.0.0\\res\\values-bs\\values-bs.xml",
"from": {
"startLines": "2",
"startColumns": "4",
@@ -1138,60 +1117,28 @@
"to": {
"startLines": "30",
"startColumns": "4",
- "startOffsets": "2961",
+ "startOffsets": "2926",
"endColumns": "100",
- "endOffsets": "3057"
+ "endOffsets": "3022"
}
- }
- ]
- },
- {
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-lv_values-lv.arsc.flat",
- "map": [
+ },
{
- "source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\4051cc509ba70441b9465808cc62a56d\\transformed\\appcompat-v7-28.0.0\\res\\values-lv\\values-lv.xml",
+ "source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\4051cc509ba70441b9465808cc62a56d\\transformed\\appcompat-v7-28.0.0\\res\\values-bs\\values-bs.xml",
"from": {
"startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29",
"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",
- "startOffsets": "105,225,333,442,528,632,754,836,918,1028,1136,1243,1352,1464,1567,1679,1786,1891,1991,2076,2185,2297,2396,2507,2616,2721,2895,2994",
- "endColumns": "119,107,108,85,103,121,81,81,109,107,106,108,111,102,111,106,104,99,84,108,111,98,110,108,104,173,98,81",
- "endOffsets": "220,328,437,523,627,749,831,913,1023,1131,1238,1347,1459,1562,1674,1781,1886,1986,2071,2180,2292,2391,2502,2611,2716,2890,2989,3071"
- }
- },
- {
- "source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\c9913736ba0af3f26ba50dd9aa679a2b\\transformed\\support-compat-28.0.0\\res\\values-lv\\values-lv.xml",
- "from": {
- "startLines": "2",
- "startColumns": "4",
- "startOffsets": "55",
- "endColumns": "100",
- "endOffsets": "151"
- },
- "to": {
- "startLines": "30",
- "startColumns": "4",
- "startOffsets": "3076",
- "endColumns": "100",
- "endOffsets": "3172"
+ "startOffsets": "105,224,333,440,526,630,752,834,915,1006,1099,1195,1289,1390,1483,1578,1677,1768,1859,1945,2048,2153,2251,2356,2469,2572,2745,2842",
+ "endColumns": "118,108,106,85,103,121,81,80,90,92,95,93,100,92,94,98,90,90,85,102,104,97,104,112,102,172,96,83",
+ "endOffsets": "219,328,435,521,625,747,829,910,1001,1094,1190,1284,1385,1478,1573,1672,1763,1854,1940,2043,2148,2246,2351,2464,2567,2740,2837,2921"
}
}
]
},
{
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-in_values-in.arsc.flat",
+ "outputFile": "D:\\Note-master2\\app\\build\\intermediates\\merged_res\\debug\\values-tl_values-tl.arsc.flat",
"map": [
{
- "source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\4051cc509ba70441b9465808cc62a56d\\transformed\\appcompat-v7-28.0.0\\res\\values-in\\values-in.xml",
- "from": {
- "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29",
- "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",
- "startOffsets": "105,215,317,422,509,613,729,811,890,981,1074,1170,1264,1365,1458,1553,1647,1738,1829,1915,2018,2127,2228,2332,2440,2548,2704,2803",
- "endColumns": "109,101,104,86,103,115,81,78,90,92,95,93,100,92,94,93,90,90,85,102,108,100,103,107,107,155,98,83",
- "endOffsets": "210,312,417,504,608,724,806,885,976,1069,1165,1259,1360,1453,1548,1642,1733,1824,1910,2013,2122,2223,2327,2435,2543,2699,2798,2882"
- }
- },
- {
- "source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\c9913736ba0af3f26ba50dd9aa679a2b\\transformed\\support-compat-28.0.0\\res\\values-in\\values-in.xml",
+ "source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\c9913736ba0af3f26ba50dd9aa679a2b\\transformed\\support-compat-28.0.0\\res\\values-tl\\values-tl.xml",
"from": {
"startLines": "2",
"startColumns": "4",
@@ -1202,18 +1149,28 @@
"to": {
"startLines": "30",
"startColumns": "4",
- "startOffsets": "2887",
+ "startOffsets": "2949",
"endColumns": "100",
- "endOffsets": "2983"
+ "endOffsets": "3045"
+ }
+ },
+ {
+ "source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\4051cc509ba70441b9465808cc62a56d\\transformed\\appcompat-v7-28.0.0\\res\\values-tl\\values-tl.xml",
+ "from": {
+ "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29",
+ "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",
+ "startOffsets": "105,224,332,449,537,643,764,843,921,1012,1105,1201,1295,1396,1489,1584,1678,1769,1860,1944,2053,2164,2265,2375,2492,2600,2763,2865",
+ "endColumns": "118,107,116,87,105,120,78,77,90,92,95,93,100,92,94,93,90,90,83,108,110,100,109,116,107,162,101,83",
+ "endOffsets": "219,327,444,532,638,759,838,916,1007,1100,1196,1290,1391,1484,1579,1673,1764,1855,1939,2048,2159,2260,2370,2487,2595,2758,2860,2944"
}
}
]
},
{
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-bs_values-bs.arsc.flat",
+ "outputFile": "D:\\Note-master2\\app\\build\\intermediates\\merged_res\\debug\\values-ja_values-ja.arsc.flat",
"map": [
{
- "source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\c9913736ba0af3f26ba50dd9aa679a2b\\transformed\\support-compat-28.0.0\\res\\values-bs\\values-bs.xml",
+ "source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\c9913736ba0af3f26ba50dd9aa679a2b\\transformed\\support-compat-28.0.0\\res\\values-ja\\values-ja.xml",
"from": {
"startLines": "2",
"startColumns": "4",
@@ -1224,83 +1181,43 @@
"to": {
"startLines": "30",
"startColumns": "4",
- "startOffsets": "2926",
+ "startOffsets": "2771",
"endColumns": "100",
- "endOffsets": "3022"
+ "endOffsets": "2867"
}
},
{
- "source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\4051cc509ba70441b9465808cc62a56d\\transformed\\appcompat-v7-28.0.0\\res\\values-bs\\values-bs.xml",
+ "source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\4051cc509ba70441b9465808cc62a56d\\transformed\\appcompat-v7-28.0.0\\res\\values-ja\\values-ja.xml",
"from": {
"startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29",
"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",
- "startOffsets": "105,224,333,440,526,630,752,834,915,1006,1099,1195,1289,1390,1483,1578,1677,1768,1859,1945,2048,2153,2251,2356,2469,2572,2745,2842",
- "endColumns": "118,108,106,85,103,121,81,80,90,92,95,93,100,92,94,98,90,90,85,102,104,97,104,112,102,172,96,83",
- "endOffsets": "219,328,435,521,625,747,829,910,1001,1094,1190,1284,1385,1478,1573,1672,1763,1854,1940,2043,2148,2246,2351,2464,2567,2740,2837,2921"
+ "startOffsets": "105,202,295,400,482,580,688,765,841,932,1025,1121,1215,1316,1409,1504,1598,1689,1780,1858,1960,2059,2154,2257,2352,2448,2596,2693",
+ "endColumns": "96,92,104,81,97,107,76,75,90,92,95,93,100,92,94,93,90,90,77,101,98,94,102,94,95,147,96,77",
+ "endOffsets": "197,290,395,477,575,683,760,836,927,1020,1116,1210,1311,1404,1499,1593,1684,1775,1853,1955,2054,2149,2252,2347,2443,2591,2688,2766"
}
}
]
},
{
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-zh-rCN_values-zh-rCN.arsc.flat",
+ "outputFile": "D:\\Note-master2\\app\\build\\intermediates\\merged_res\\debug\\values-land_values-land.arsc.flat",
"map": [
{
- "source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\4051cc509ba70441b9465808cc62a56d\\transformed\\appcompat-v7-28.0.0\\res\\values-zh-rCN\\values-zh-rCN.xml",
- "from": {
- "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29",
- "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",
- "startOffsets": "105,201,296,396,478,575,681,757,833,924,1017,1115,1211,1306,1399,1494,1586,1677,1768,1846,1942,2038,2133,2230,2325,2423,2572,2666",
- "endColumns": "95,94,99,81,96,105,75,75,90,92,97,95,94,92,94,91,90,90,77,95,95,94,96,94,97,148,93,77",
- "endOffsets": "196,291,391,473,570,676,752,828,919,1012,1110,1206,1301,1394,1489,1581,1672,1763,1841,1937,2033,2128,2225,2320,2418,2567,2661,2739"
- },
- "to": {
- "startLines": "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,121",
- "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",
- "startOffsets": "384,480,575,675,757,854,960,1036,1112,1203,1296,1394,1490,1585,1678,1773,1865,1956,2047,2125,2221,2317,2412,2509,2604,2702,2851,7808",
- "endColumns": "95,94,99,81,96,105,75,75,90,92,97,95,94,92,94,91,90,90,77,95,95,94,96,94,97,148,93,77",
- "endOffsets": "475,570,670,752,849,955,1031,1107,1198,1291,1389,1485,1580,1673,1768,1860,1951,2042,2120,2216,2312,2407,2504,2599,2697,2846,2940,7881"
- }
- },
- {
- "source": "D:\\Notes-master1\\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": "D:\\Notes-master1\\app\\src\\main\\res\\values-zh-rCN\\strings.xml",
+ "source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\4051cc509ba70441b9465808cc62a56d\\transformed\\appcompat-v7-28.0.0\\res\\values-land\\values-land.xml",
"from": {
- "startLines": "121,71,70,69,68,19,20,21,112,113,120,119,26,77,78,76,75,74,90,89,88,80,60,29,30,81,72,114,67,63,38,44,49,39,59,58,57,53,52,50,51,54,55,45,66,56,64,43,48,47,46,62,42,61,40,41,65,28,34,36,33,35,32,31,25,24,97,96,99,111,104,103,105,106,108,107,98,102,100,101,95,109,110,118,116,115,117,27,79,87,92,91,93,86,85,84,83,22,23",
- "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
- "startOffsets": "6532,3495,3429,3356,3306,827,867,915,6083,6128,6478,6428,1199,3861,3929,3802,3737,3674,4592,4532,4469,4061,2877,1369,1422,4115,3568,6185,3247,3034,1798,2079,2325,1851,2817,2764,2713,2518,2470,2376,2424,2564,2611,2122,3188,2661,3077,2036,2278,2222,2167,2979,1992,2937,1901,1942,3129,1318,1623,1719,1576,1672,1529,1484,1148,1095,4967,4908,5108,6009,5419,5350,5483,5561,5744,5671,5042,5295,5165,5230,4859,5848,5931,6390,6283,6235,6328,1261,4006,4410,4705,4647,4772,4362,4317,4269,4218,963,1029",
- "endLines": "123,71,70,69,68,19,20,21,112,113,120,119,26,77,78,76,75,74,90,89,88,80,60,29,30,81,72,114,67,63,38,44,49,39,59,58,57,53,52,50,51,54,55,45,66,56,64,43,48,47,46,62,42,61,40,41,65,28,34,36,33,35,32,31,25,24,97,96,99,111,104,103,105,106,108,107,98,102,100,101,95,109,110,118,116,115,117,27,79,87,92,91,93,86,85,84,83,22,23",
- "endColumns": "14,72,65,72,49,39,47,47,44,56,53,49,61,67,76,58,64,62,54,59,62,53,59,52,61,84,80,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65",
- "endOffsets": "6704,3563,3490,3424,3351,862,910,958,6123,6180,6527,6473,1256,3924,4001,3856,3797,3732,4642,4587,4527,4110,2932,1417,1479,4195,3644,6230,3301,3072,1846,2117,2371,1896,2872,2812,2759,2559,2513,2419,2465,2606,2656,2162,3242,2708,3124,2074,2320,2273,2217,3029,2031,2974,1937,1987,3183,1364,1667,1763,1618,1714,1571,1524,1194,1143,5037,4962,5160,6078,5478,5414,5556,5666,5843,5739,5103,5345,5225,5290,4903,5926,6004,6423,6323,6278,6385,1313,4056,4464,4767,4700,4829,4405,4357,4312,4264,1024,1090"
- },
- "to": {
- "startLines": "6,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,122,123,125,126,127,128,129,130,131,132,133,134,135",
- "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,2945,3018,3084,3157,3207,3247,3295,3343,3388,3445,3499,3549,3611,3679,3756,3815,3880,3943,3998,4058,4121,4175,4235,4288,4350,4435,4516,4566,4625,4668,4721,4764,4815,4865,4925,4978,5029,5075,5123,5171,5217,5264,5314,5359,5418,5470,5522,5565,5612,5668,5723,5778,5822,5864,5905,5955,6014,6065,6114,6163,6210,6257,6304,6349,6400,6453,6528,6587,6644,6718,6782,6851,6929,7039,7143,7216,7282,7337,7402,7467,7516,7599,7677,7715,7760,7886,7948,8106,8161,8220,8287,8345,8407,8455,8500,8548,8599,8665",
- "endLines": "8,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,122,123,125,126,127,128,129,130,131,132,133,134,135",
- "endColumns": "14,72,65,72,49,39,47,47,44,56,53,49,61,67,76,58,64,62,54,59,62,53,59,52,61,84,80,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65",
- "endOffsets": "379,3013,3079,3152,3202,3242,3290,3338,3383,3440,3494,3544,3606,3674,3751,3810,3875,3938,3993,4053,4116,4170,4230,4283,4345,4430,4511,4561,4620,4663,4716,4759,4810,4860,4920,4973,5024,5070,5118,5166,5212,5259,5309,5354,5413,5465,5517,5560,5607,5663,5718,5773,5817,5859,5900,5950,6009,6060,6109,6158,6205,6252,6299,6344,6395,6448,6523,6582,6639,6713,6777,6846,6924,7034,7138,7211,7277,7332,7397,7462,7511,7594,7672,7710,7755,7803,7943,8000,8156,8215,8282,8340,8402,8450,8495,8543,8594,8660,8726"
+ "startLines": "2,3,4",
+ "startColumns": "4,4,4",
+ "startOffsets": "55,125,196",
+ "endColumns": "69,70,67",
+ "endOffsets": "120,191,259"
}
- },
+ }
+ ]
+ },
+ {
+ "outputFile": "D:\\Note-master2\\app\\build\\intermediates\\merged_res\\debug\\values-pt-rBR_values-pt-rBR.arsc.flat",
+ "map": [
{
- "source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\c9913736ba0af3f26ba50dd9aa679a2b\\transformed\\support-compat-28.0.0\\res\\values-zh-rCN\\values-zh-rCN.xml",
+ "source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\c9913736ba0af3f26ba50dd9aa679a2b\\transformed\\support-compat-28.0.0\\res\\values-pt-rBR\\values-pt-rBR.xml",
"from": {
"startLines": "2",
"startColumns": "4",
@@ -1309,45 +1226,45 @@
"endOffsets": "151"
},
"to": {
- "startLines": "124",
+ "startLines": "30",
"startColumns": "4",
- "startOffsets": "8005",
+ "startOffsets": "2929",
"endColumns": "100",
- "endOffsets": "8101"
+ "endOffsets": "3025"
+ }
+ },
+ {
+ "source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\4051cc509ba70441b9465808cc62a56d\\transformed\\appcompat-v7-28.0.0\\res\\values-pt-rBR\\values-pt-rBR.xml",
+ "from": {
+ "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29",
+ "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",
+ "startOffsets": "105,225,331,438,527,628,746,829,909,1000,1093,1189,1283,1384,1477,1572,1667,1758,1849,1936,2043,2155,2257,2365,2472,2582,2744,2844",
+ "endColumns": "119,105,106,88,100,117,82,79,90,92,95,93,100,92,94,94,90,90,86,106,111,101,107,106,109,161,99,84",
+ "endOffsets": "220,326,433,522,623,741,824,904,995,1088,1184,1278,1379,1472,1567,1662,1753,1844,1931,2038,2150,2252,2360,2467,2577,2739,2839,2924"
}
}
]
},
{
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-night-v8_values-night-v8.arsc.flat",
+ "outputFile": "D:\\Note-master2\\app\\build\\intermediates\\merged_res\\debug\\values-port_values-port.arsc.flat",
"map": [
{
- "source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\4051cc509ba70441b9465808cc62a56d\\transformed\\appcompat-v7-28.0.0\\res\\values-night-v8\\values-night-v8.xml",
+ "source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\4051cc509ba70441b9465808cc62a56d\\transformed\\appcompat-v7-28.0.0\\res\\values-port\\values-port.xml",
"from": {
- "startLines": "2,3,4,5,6,7,8",
- "startColumns": "4,4,4,4,4,4,4",
- "startOffsets": "55,125,209,293,389,491,593",
- "endColumns": "69,83,83,95,101,101,93",
- "endOffsets": "120,204,288,384,486,588,682"
+ "startLines": "2",
+ "startColumns": "4",
+ "startOffsets": "55",
+ "endColumns": "55",
+ "endOffsets": "106"
}
}
]
},
{
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-is_values-is.arsc.flat",
+ "outputFile": "D:\\Note-master2\\app\\build\\intermediates\\merged_res\\debug\\values-bn_values-bn.arsc.flat",
"map": [
{
- "source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\4051cc509ba70441b9465808cc62a56d\\transformed\\appcompat-v7-28.0.0\\res\\values-is\\values-is.xml",
- "from": {
- "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29",
- "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",
- "startOffsets": "105,205,302,414,499,600,714,794,874,965,1058,1154,1248,1355,1448,1543,1638,1729,1823,1904,2014,2122,2220,2329,2428,2531,2686,2784",
- "endColumns": "99,96,111,84,100,113,79,79,90,92,95,93,106,92,94,94,90,93,80,109,107,97,108,98,102,154,97,80",
- "endOffsets": "200,297,409,494,595,709,789,869,960,1053,1149,1243,1350,1443,1538,1633,1724,1818,1899,2009,2117,2215,2324,2423,2526,2681,2779,2860"
- }
- },
- {
- "source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\c9913736ba0af3f26ba50dd9aa679a2b\\transformed\\support-compat-28.0.0\\res\\values-is\\values-is.xml",
+ "source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\c9913736ba0af3f26ba50dd9aa679a2b\\transformed\\support-compat-28.0.0\\res\\values-bn\\values-bn.xml",
"from": {
"startLines": "2",
"startColumns": "4",
@@ -1358,15 +1275,25 @@
"to": {
"startLines": "30",
"startColumns": "4",
- "startOffsets": "2865",
+ "startOffsets": "2939",
"endColumns": "100",
- "endOffsets": "2961"
+ "endOffsets": "3035"
+ }
+ },
+ {
+ "source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\4051cc509ba70441b9465808cc62a56d\\transformed\\appcompat-v7-28.0.0\\res\\values-bn\\values-bn.xml",
+ "from": {
+ "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29",
+ "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",
+ "startOffsets": "105,214,326,432,526,631,760,838,916,1007,1100,1195,1289,1390,1483,1578,1672,1763,1854,1941,2051,2159,2258,2368,2474,2587,2752,2857",
+ "endColumns": "108,111,105,93,104,128,77,77,90,92,94,93,100,92,94,93,90,90,86,109,107,98,109,105,112,164,104,81",
+ "endOffsets": "209,321,427,521,626,755,833,911,1002,1095,1190,1284,1385,1478,1573,1667,1758,1849,1936,2046,2154,2253,2363,2469,2582,2747,2852,2934"
}
}
]
},
{
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-az_values-az.arsc.flat",
+ "outputFile": "D:\\Note-master2\\app\\build\\intermediates\\merged_res\\debug\\values-az_values-az.arsc.flat",
"map": [
{
"source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\4051cc509ba70441b9465808cc62a56d\\transformed\\appcompat-v7-28.0.0\\res\\values-az\\values-az.xml",
@@ -1398,10 +1325,10 @@
]
},
{
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-ja_values-ja.arsc.flat",
+ "outputFile": "D:\\Note-master2\\app\\build\\intermediates\\merged_res\\debug\\values-kn_values-kn.arsc.flat",
"map": [
{
- "source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\c9913736ba0af3f26ba50dd9aa679a2b\\transformed\\support-compat-28.0.0\\res\\values-ja\\values-ja.xml",
+ "source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\c9913736ba0af3f26ba50dd9aa679a2b\\transformed\\support-compat-28.0.0\\res\\values-kn\\values-kn.xml",
"from": {
"startLines": "2",
"startColumns": "4",
@@ -1412,60 +1339,28 @@
"to": {
"startLines": "30",
"startColumns": "4",
- "startOffsets": "2771",
+ "startOffsets": "2948",
"endColumns": "100",
- "endOffsets": "2867"
+ "endOffsets": "3044"
}
},
{
- "source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\4051cc509ba70441b9465808cc62a56d\\transformed\\appcompat-v7-28.0.0\\res\\values-ja\\values-ja.xml",
+ "source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\4051cc509ba70441b9465808cc62a56d\\transformed\\appcompat-v7-28.0.0\\res\\values-kn\\values-kn.xml",
"from": {
"startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29",
"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",
- "startOffsets": "105,202,295,400,482,580,688,765,841,932,1025,1121,1215,1316,1409,1504,1598,1689,1780,1858,1960,2059,2154,2257,2352,2448,2596,2693",
- "endColumns": "96,92,104,81,97,107,76,75,90,92,95,93,100,92,94,93,90,90,77,101,98,94,102,94,95,147,96,77",
- "endOffsets": "197,290,395,477,575,683,760,836,927,1020,1116,1210,1311,1404,1499,1593,1684,1775,1853,1955,2054,2149,2252,2347,2443,2591,2688,2766"
+ "startOffsets": "105,223,335,448,536,643,770,847,924,1015,1108,1204,1298,1399,1492,1587,1681,1772,1863,1945,2061,2172,2271,2384,2488,2602,2766,2866",
+ "endColumns": "117,111,112,87,106,126,76,76,90,92,95,93,100,92,94,93,90,90,81,115,110,98,112,103,113,163,99,81",
+ "endOffsets": "218,330,443,531,638,765,842,919,1010,1103,1199,1293,1394,1487,1582,1676,1767,1858,1940,2056,2167,2266,2379,2483,2597,2761,2861,2943"
}
}
]
},
{
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-v23_values-v23.arsc.flat",
+ "outputFile": "D:\\Note-master2\\app\\build\\intermediates\\merged_res\\debug\\values-be_values-be.arsc.flat",
"map": [
{
- "source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\4051cc509ba70441b9465808cc62a56d\\transformed\\appcompat-v7-28.0.0\\res\\values-v23\\values-v23.xml",
- "from": {
- "startLines": "2,3,4,5,6,19,32,33,34,35,36",
- "startColumns": "4,4,4,4,4,4,4,4,4,4,4",
- "startOffsets": "55,190,325,400,487,1277,2079,2206,2311,2426,2533",
- "endLines": "2,3,4,5,18,31,32,33,34,35,36",
- "endColumns": "134,134,74,86,12,12,126,104,114,106,112",
- "endOffsets": "185,320,395,482,1272,2074,2201,2306,2421,2528,2641"
- }
- }
- ]
- },
- {
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-v25_values-v25.arsc.flat",
- "map": [
- {
- "source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\4051cc509ba70441b9465808cc62a56d\\transformed\\appcompat-v7-28.0.0\\res\\values-v25\\values-v25.xml",
- "from": {
- "startLines": "2,3,4,6",
- "startColumns": "4,4,4,4",
- "startOffsets": "55,126,209,308",
- "endLines": "2,3,5,7",
- "endColumns": "70,82,12,12",
- "endOffsets": "121,204,303,414"
- }
- }
- ]
- },
- {
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-fr-rCA_values-fr-rCA.arsc.flat",
- "map": [
- {
- "source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\c9913736ba0af3f26ba50dd9aa679a2b\\transformed\\support-compat-28.0.0\\res\\values-fr-rCA\\values-fr-rCA.xml",
+ "source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\c9913736ba0af3f26ba50dd9aa679a2b\\transformed\\support-compat-28.0.0\\res\\values-be\\values-be.xml",
"from": {
"startLines": "2",
"startColumns": "4",
@@ -1476,103 +1371,38 @@
"to": {
"startLines": "30",
"startColumns": "4",
- "startOffsets": "2965",
+ "startOffsets": "2915",
"endColumns": "100",
- "endOffsets": "3061"
+ "endOffsets": "3011"
}
},
{
- "source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\4051cc509ba70441b9465808cc62a56d\\transformed\\appcompat-v7-28.0.0\\res\\values-fr-rCA\\values-fr-rCA.xml",
+ "source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\4051cc509ba70441b9465808cc62a56d\\transformed\\appcompat-v7-28.0.0\\res\\values-be\\values-be.xml",
"from": {
"startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29",
"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",
- "startOffsets": "105,216,331,442,529,645,775,858,938,1029,1122,1221,1316,1417,1510,1603,1698,1789,1880,1976,2086,2198,2301,2412,2519,2621,2780,2879",
- "endColumns": "110,114,110,86,115,129,82,79,90,92,98,94,100,92,92,94,90,90,95,109,111,102,110,106,101,158,98,85",
- "endOffsets": "211,326,437,524,640,770,853,933,1024,1117,1216,1311,1412,1505,1598,1693,1784,1875,1971,2081,2193,2296,2407,2514,2616,2775,2874,2960"
- }
- }
- ]
- },
- {
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-v21_values-v21.arsc.flat",
- "map": [
- {
- "source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\c9913736ba0af3f26ba50dd9aa679a2b\\transformed\\support-compat-28.0.0\\res\\values-v21\\values-v21.xml",
- "from": {
- "startLines": "2,3,4,5,6,7,8,9,10,13",
- "startColumns": "4,4,4,4,4,4,4,4,4,4",
- "startOffsets": "55,159,223,290,354,470,596,722,850,1022",
- "endLines": "2,3,4,5,6,7,8,9,12,17",
- "endColumns": "103,63,66,63,115,125,125,127,12,12",
- "endOffsets": "154,218,285,349,465,591,717,845,1017,1355"
- },
- "to": {
- "startLines": "2,3,4,5,263,264,265,266,267,270",
- "startColumns": "4,4,4,4,4,4,4,4,4,4",
- "startOffsets": "55,159,223,290,19262,19378,19504,19630,19758,19930",
- "endLines": "2,3,4,5,263,264,265,266,269,274",
- "endColumns": "103,63,66,63,115,125,125,127,12,12",
- "endOffsets": "154,218,285,349,19373,19499,19625,19753,19925,20263"
- }
- },
- {
- "source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\4051cc509ba70441b9465808cc62a56d\\transformed\\appcompat-v7-28.0.0\\res\\values-v21\\values-v21.xml",
- "from": {
- "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,17,19,20,21,22,24,26,27,28,29,30,32,34,36,38,40,42,43,48,50,52,53,54,56,58,59,60,61,62,63,107,110,154,157,160,162,164,166,169,171,174,175,176,179,180,181,182,183,184,187,188,190,192,194,196,200,202,203,204,205,207,211,213,215,216,217,218,219,221,222,223,233,234,235,247",
- "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",
- "startOffsets": "55,146,249,352,457,564,673,782,891,1000,1109,1216,1319,1438,1593,1748,1853,1974,2075,2222,2363,2466,2585,2692,2795,2950,3121,3270,3435,3592,3743,3862,4234,4383,4532,4644,4791,4944,5091,5166,5255,5342,5443,5546,8614,8799,11879,12076,12275,12398,12521,12634,12817,12948,13149,13238,13349,13582,13683,13778,13901,14030,14147,14324,14423,14558,14701,14836,14955,15156,15275,15368,15479,15535,15642,15837,15948,16081,16176,16267,16358,16475,16614,16685,16768,17448,17505,17563,18257",
- "endLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,16,18,19,20,21,23,25,26,27,28,29,31,33,35,37,39,41,42,47,49,51,52,53,55,57,58,59,60,61,62,106,109,153,156,159,161,163,165,168,170,173,174,175,178,179,180,181,182,183,186,187,189,191,193,195,199,201,202,203,204,206,210,212,214,215,216,217,218,220,221,222,232,233,234,246,258",
- "endColumns": "90,102,102,104,106,108,108,108,108,108,106,102,118,12,12,104,120,100,12,12,102,118,106,102,12,12,12,12,12,12,118,12,12,12,111,146,12,12,74,88,86,100,102,12,12,12,12,12,12,12,12,12,12,12,88,110,12,100,94,122,128,116,12,98,12,12,12,12,12,12,92,110,55,12,12,12,12,94,90,90,116,12,70,82,12,56,57,12,12",
- "endOffsets": "141,244,347,452,559,668,777,886,995,1104,1211,1314,1433,1588,1743,1848,1969,2070,2217,2358,2461,2580,2687,2790,2945,3116,3265,3430,3587,3738,3857,4229,4378,4527,4639,4786,4939,5086,5161,5250,5337,5438,5541,8609,8794,11874,12071,12270,12393,12516,12629,12812,12943,13144,13233,13344,13577,13678,13773,13896,14025,14142,14319,14418,14553,14696,14831,14950,15151,15270,15363,15474,15530,15637,15832,15943,16076,16171,16262,16353,16470,16609,16680,16763,17443,17500,17558,18252,18958"
- },
- "to": {
- "startLines": "6,7,8,9,10,11,12,13,14,15,16,17,18,19,21,23,24,25,26,28,30,31,32,33,34,36,38,40,42,44,46,47,52,54,56,57,58,60,62,63,64,65,66,67,111,114,158,161,164,166,168,170,173,175,178,179,180,183,184,185,186,187,188,191,192,194,196,198,200,204,206,207,208,209,211,215,217,219,220,221,222,223,225,226,227,237,238,239,251",
- "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",
- "startOffsets": "354,445,548,651,756,863,972,1081,1190,1299,1408,1515,1618,1737,1892,2047,2152,2273,2374,2521,2662,2765,2884,2991,3094,3249,3420,3569,3734,3891,4042,4161,4533,4682,4831,4943,5090,5243,5390,5465,5554,5641,5742,5845,8913,9098,12178,12375,12574,12697,12820,12933,13116,13247,13448,13537,13648,13881,13982,14077,14200,14329,14446,14623,14722,14857,15000,15135,15254,15455,15574,15667,15778,15834,15941,16136,16247,16380,16475,16566,16657,16774,16913,16984,17067,17747,17804,17862,18556",
- "endLines": "6,7,8,9,10,11,12,13,14,15,16,17,18,20,22,23,24,25,27,29,30,31,32,33,35,37,39,41,43,45,46,51,53,55,56,57,59,61,62,63,64,65,66,110,113,157,160,163,165,167,169,172,174,177,178,179,182,183,184,185,186,187,190,191,193,195,197,199,203,205,206,207,208,210,214,216,218,219,220,221,222,224,225,226,236,237,238,250,262",
- "endColumns": "90,102,102,104,106,108,108,108,108,108,106,102,118,12,12,104,120,100,12,12,102,118,106,102,12,12,12,12,12,12,118,12,12,12,111,146,12,12,74,88,86,100,102,12,12,12,12,12,12,12,12,12,12,12,88,110,12,100,94,122,128,116,12,98,12,12,12,12,12,12,92,110,55,12,12,12,12,94,90,90,116,12,70,82,12,56,57,12,12",
- "endOffsets": "440,543,646,751,858,967,1076,1185,1294,1403,1510,1613,1732,1887,2042,2147,2268,2369,2516,2657,2760,2879,2986,3089,3244,3415,3564,3729,3886,4037,4156,4528,4677,4826,4938,5085,5238,5385,5460,5549,5636,5737,5840,8908,9093,12173,12370,12569,12692,12815,12928,13111,13242,13443,13532,13643,13876,13977,14072,14195,14324,14441,14618,14717,14852,14995,15130,15249,15450,15569,15662,15773,15829,15936,16131,16242,16375,16470,16561,16652,16769,16908,16979,17062,17742,17799,17857,18551,19257"
+ "startOffsets": "105,225,328,444,530,638,756,835,913,1005,1099,1195,1289,1385,1479,1575,1670,1762,1854,1937,2043,2149,2247,2355,2460,2565,2734,2834",
+ "endColumns": "119,102,115,85,107,117,78,77,91,93,95,93,95,93,95,94,91,91,82,105,105,97,107,104,104,168,99,80",
+ "endOffsets": "220,323,439,525,633,751,830,908,1000,1094,1190,1284,1380,1474,1570,1665,1757,1849,1932,2038,2144,2242,2350,2455,2560,2729,2829,2910"
}
}
]
},
{
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-uk_values-uk.arsc.flat",
+ "outputFile": "D:\\Note-master2\\app\\build\\intermediates\\merged_res\\debug\\values-ms_values-ms.arsc.flat",
"map": [
{
- "source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\4051cc509ba70441b9465808cc62a56d\\transformed\\appcompat-v7-28.0.0\\res\\values-uk\\values-uk.xml",
+ "source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\4051cc509ba70441b9465808cc62a56d\\transformed\\appcompat-v7-28.0.0\\res\\values-ms\\values-ms.xml",
"from": {
"startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29",
"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",
- "startOffsets": "105,215,317,423,509,617,735,814,894,985,1078,1174,1268,1369,1462,1557,1652,1743,1834,1915,2021,2128,2226,2334,2440,2549,2719,2819",
- "endColumns": "109,101,105,85,107,117,78,79,90,92,95,93,100,92,94,94,90,90,80,105,106,97,107,105,108,169,99,80",
- "endOffsets": "210,312,418,504,612,730,809,889,980,1073,1169,1263,1364,1457,1552,1647,1738,1829,1910,2016,2123,2221,2329,2435,2544,2714,2814,2895"
+ "startOffsets": "105,216,321,429,516,620,731,809,888,979,1072,1167,1261,1360,1453,1548,1642,1733,1824,1904,2016,2125,2222,2331,2434,2541,2700,2801",
+ "endColumns": "110,104,107,86,103,110,77,78,90,92,94,93,98,92,94,93,90,90,79,111,108,96,108,102,106,158,100,79",
+ "endOffsets": "211,316,424,511,615,726,804,883,974,1067,1162,1256,1355,1448,1543,1637,1728,1819,1899,2011,2120,2217,2326,2429,2536,2695,2796,2876"
}
},
{
- "source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\c9913736ba0af3f26ba50dd9aa679a2b\\transformed\\support-compat-28.0.0\\res\\values-uk\\values-uk.xml",
- "from": {
- "startLines": "2",
- "startColumns": "4",
- "startOffsets": "55",
- "endColumns": "100",
- "endOffsets": "151"
- },
- "to": {
- "startLines": "30",
- "startColumns": "4",
- "startOffsets": "2900",
- "endColumns": "100",
- "endOffsets": "2996"
- }
- }
- ]
- },
- {
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-vi_values-vi.arsc.flat",
- "map": [
- {
- "source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\c9913736ba0af3f26ba50dd9aa679a2b\\transformed\\support-compat-28.0.0\\res\\values-vi\\values-vi.xml",
+ "source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\c9913736ba0af3f26ba50dd9aa679a2b\\transformed\\support-compat-28.0.0\\res\\values-ms\\values-ms.xml",
"from": {
"startLines": "2",
"startColumns": "4",
@@ -1583,25 +1413,15 @@
"to": {
"startLines": "30",
"startColumns": "4",
- "startOffsets": "2901",
+ "startOffsets": "2881",
"endColumns": "100",
- "endOffsets": "2997"
- }
- },
- {
- "source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\4051cc509ba70441b9465808cc62a56d\\transformed\\appcompat-v7-28.0.0\\res\\values-vi\\values-vi.xml",
- "from": {
- "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29",
- "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",
- "startOffsets": "105,219,327,436,520,623,742,819,896,987,1080,1176,1270,1371,1464,1559,1657,1748,1839,1923,2027,2136,2237,2342,2456,2561,2718,2817",
- "endColumns": "113,107,108,83,102,118,76,76,90,92,95,93,100,92,94,97,90,90,83,103,108,100,104,113,104,156,98,83",
- "endOffsets": "214,322,431,515,618,737,814,891,982,1075,1171,1265,1366,1459,1554,1652,1743,1834,1918,2022,2131,2232,2337,2451,2556,2713,2812,2896"
+ "endOffsets": "2977"
}
}
]
},
{
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-pl_values-pl.arsc.flat",
+ "outputFile": "D:\\Note-master2\\app\\build\\intermediates\\merged_res\\debug\\values-pl_values-pl.arsc.flat",
"map": [
{
"source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\c9913736ba0af3f26ba50dd9aa679a2b\\transformed\\support-compat-28.0.0\\res\\values-pl\\values-pl.xml",
@@ -1633,10 +1453,10 @@
]
},
{
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-kn_values-kn.arsc.flat",
+ "outputFile": "D:\\Note-master2\\app\\build\\intermediates\\merged_res\\debug\\values-nb_values-nb.arsc.flat",
"map": [
{
- "source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\c9913736ba0af3f26ba50dd9aa679a2b\\transformed\\support-compat-28.0.0\\res\\values-kn\\values-kn.xml",
+ "source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\c9913736ba0af3f26ba50dd9aa679a2b\\transformed\\support-compat-28.0.0\\res\\values-nb\\values-nb.xml",
"from": {
"startLines": "2",
"startColumns": "4",
@@ -1647,166 +1467,181 @@
"to": {
"startLines": "30",
"startColumns": "4",
- "startOffsets": "2948",
+ "startOffsets": "2826",
"endColumns": "100",
- "endOffsets": "3044"
+ "endOffsets": "2922"
}
},
{
- "source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\4051cc509ba70441b9465808cc62a56d\\transformed\\appcompat-v7-28.0.0\\res\\values-kn\\values-kn.xml",
+ "source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\4051cc509ba70441b9465808cc62a56d\\transformed\\appcompat-v7-28.0.0\\res\\values-nb\\values-nb.xml",
"from": {
"startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29",
"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",
- "startOffsets": "105,223,335,448,536,643,770,847,924,1015,1108,1204,1298,1399,1492,1587,1681,1772,1863,1945,2061,2172,2271,2384,2488,2602,2766,2866",
- "endColumns": "117,111,112,87,106,126,76,76,90,92,95,93,100,92,94,93,90,90,81,115,110,98,112,103,113,163,99,81",
- "endOffsets": "218,330,443,531,638,765,842,919,1010,1103,1199,1293,1394,1487,1582,1676,1767,1858,1940,2056,2167,2266,2379,2483,2597,2761,2861,2943"
+ "startOffsets": "105,213,308,422,508,608,721,797,873,964,1057,1153,1247,1348,1441,1536,1634,1725,1816,1896,1999,2098,2194,2298,2396,2497,2650,2747",
+ "endColumns": "107,94,113,85,99,112,75,75,90,92,95,93,100,92,94,97,90,90,79,102,98,95,103,97,100,152,96,78",
+ "endOffsets": "208,303,417,503,603,716,792,868,959,1052,1148,1242,1343,1436,1531,1629,1720,1811,1891,1994,2093,2189,2293,2391,2492,2645,2742,2821"
}
}
]
},
{
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-be_values-be.arsc.flat",
+ "outputFile": "D:\\Note-master2\\app\\build\\intermediates\\merged_res\\debug\\values_values.arsc.flat",
"map": [
{
- "source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\c9913736ba0af3f26ba50dd9aa679a2b\\transformed\\support-compat-28.0.0\\res\\values-be\\values-be.xml",
+ "source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\a90015b78bf619886c4dbbae347a2742\\transformed\\coordinatorlayout-28.0.0\\res\\values\\values.xml",
"from": {
- "startLines": "2",
- "startColumns": "4",
- "startOffsets": "55",
- "endColumns": "100",
- "endOffsets": "151"
+ "startLines": "2,102,3,13",
+ "startColumns": "4,4,4,4",
+ "startOffsets": "55,5935,116,724",
+ "endLines": "2,104,12,101",
+ "endColumns": "60,12,24,24",
+ "endOffsets": "111,6075,719,5930"
},
"to": {
- "startLines": "30",
- "startColumns": "4",
- "startOffsets": "2915",
- "endColumns": "100",
- "endOffsets": "3011"
+ "startLines": "12,1880,2577,2587",
+ "startColumns": "4,4,4,4",
+ "startOffsets": "532,126337,163839,164447",
+ "endLines": "12,1882,2586,2675",
+ "endColumns": "60,12,24,24",
+ "endOffsets": "588,126477,164442,169653"
}
},
{
- "source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\4051cc509ba70441b9465808cc62a56d\\transformed\\appcompat-v7-28.0.0\\res\\values-be\\values-be.xml",
+ "source": "D:\\Note-master2\\app\\src\\main\\res\\values\\strings.xml",
"from": {
- "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29",
- "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",
- "startOffsets": "105,225,328,444,530,638,756,835,913,1005,1099,1195,1289,1385,1479,1575,1670,1762,1854,1937,2043,2149,2247,2355,2460,2565,2734,2834",
- "endColumns": "119,102,115,85,107,117,78,77,91,93,95,93,95,93,95,94,91,91,82,105,105,97,107,104,104,168,99,80",
- "endOffsets": "220,323,439,525,633,751,830,908,1000,1094,1190,1284,1380,1474,1570,1665,1757,1849,1932,2038,2144,2242,2350,2455,2560,2729,2829,2910"
+ "startLines": "128,72,75,74,73,19,20,21,118,119,127,126,26,81,82,80,79,78,94,93,92,84,39,38,64,29,30,85,41,76,120,71,67,42,48,53,43,63,62,61,57,56,54,55,58,59,49,70,60,68,47,52,51,50,66,46,65,44,45,69,28,34,36,33,35,32,31,25,24,101,100,104,116,109,108,110,111,113,112,102,103,107,105,106,99,114,115,125,123,122,124,27,83,91,96,95,97,90,89,88,87,22,23",
+ "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
+ "startOffsets": "8008,3898,4159,4063,3994,827,870,922,7506,7555,7950,7899,1282,4613,4707,4542,4458,4375,5574,5491,5389,4883,2004,1953,3397,1486,1539,4944,2097,4242,7618,3827,3582,2156,2471,2772,2214,3326,3265,3208,2986,2934,2831,2884,3036,3086,2518,3761,3146,3631,2424,2717,2629,2571,3520,2374,3475,2271,2314,3694,1431,1750,1858,1703,1805,1647,1599,1227,1174,6030,5963,6271,7409,6635,6554,6709,6798,7040,6961,6114,6189,6495,6335,6415,5908,7184,7306,7858,7731,7674,7784,1366,4815,5303,5709,5640,5789,5244,5189,5127,5067,974,1084",
+ "endLines": "132,72,75,74,73,19,20,21,118,119,127,126,26,81,82,80,79,78,94,93,92,84,39,38,64,29,30,85,41,76,120,71,67,42,48,53,43,63,62,61,57,56,54,55,58,59,49,70,60,68,47,52,51,50,66,46,65,44,45,69,28,34,36,33,35,32,31,25,24,101,100,104,116,109,108,110,111,113,112,102,103,107,105,106,99,114,115,125,123,122,124,27,83,91,96,95,97,90,89,88,87,22,23",
+ "endColumns": "14,95,82,95,68,42,51,51,48,62,57,50,83,93,107,70,83,82,65,82,101,60,61,50,77,52,59,104,58,101,54,70,48,57,46,58,56,70,60,56,49,51,52,49,49,59,52,65,61,62,46,54,87,57,61,49,44,42,59,66,54,54,52,46,52,55,47,54,52,83,66,63,95,73,80,88,162,143,78,74,81,58,79,79,54,121,102,40,52,56,73,64,67,85,79,68,93,58,54,61,59,109,89",
+ "endOffsets": "8412,3989,4237,4154,4058,865,917,969,7550,7613,8003,7945,1361,4702,4810,4608,4537,4453,5635,5569,5486,4939,2061,1999,3470,1534,1594,5044,2151,4339,7668,3893,3626,2209,2513,2826,2266,3392,3321,3260,3031,2981,2879,2929,3081,3141,2566,3822,3203,3689,2466,2767,2712,2624,3577,2419,3515,2309,2369,3756,1481,1800,1906,1745,1853,1698,1642,1277,1222,6109,6025,6330,7500,6704,6630,6793,6956,7179,7035,6184,6266,6549,6410,6490,5958,7301,7404,7894,7779,7726,7853,1426,4878,5384,5784,5704,5878,5298,5239,5184,5122,1079,1169"
+ },
+ "to": {
+ "startLines": "226,270,271,272,273,274,275,276,277,278,279,280,281,282,283,284,285,286,287,288,289,290,291,292,293,294,295,296,297,298,299,300,301,302,303,304,305,306,307,308,309,310,311,312,313,314,315,316,317,318,319,320,321,322,323,324,325,326,327,328,329,330,331,332,333,334,335,336,337,338,339,340,341,342,343,344,345,346,347,348,349,350,351,352,353,354,355,356,357,358,360,361,363,364,365,366,367,368,369,370,371,372,373",
+ "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
+ "startOffsets": "14613,17764,17860,17943,18039,18108,18151,18203,18255,18304,18367,18425,18476,18560,18654,18762,18833,18917,19000,19066,19149,19251,19312,19374,19425,19503,19556,19616,19721,19780,19882,19937,20008,20057,20115,20162,20221,20278,20349,20410,20467,20517,20569,20622,20672,20722,20782,20835,20901,20963,21026,21073,21128,21216,21274,21336,21386,21431,21474,21534,21601,21656,21711,21764,21811,21864,21920,21968,22023,22076,22160,22227,22291,22387,22461,22542,22631,22794,22938,23017,23092,23174,23233,23313,23393,23448,23570,23673,23714,23767,23877,23951,24087,24155,24241,24321,24390,24484,24543,24598,24660,24720,24830",
+ "endLines": "230,270,271,272,273,274,275,276,277,278,279,280,281,282,283,284,285,286,287,288,289,290,291,292,293,294,295,296,297,298,299,300,301,302,303,304,305,306,307,308,309,310,311,312,313,314,315,316,317,318,319,320,321,322,323,324,325,326,327,328,329,330,331,332,333,334,335,336,337,338,339,340,341,342,343,344,345,346,347,348,349,350,351,352,353,354,355,356,357,358,360,361,363,364,365,366,367,368,369,370,371,372,373",
+ "endColumns": "14,95,82,95,68,42,51,51,48,62,57,50,83,93,107,70,83,82,65,82,101,60,61,50,77,52,59,104,58,101,54,70,48,57,46,58,56,70,60,56,49,51,52,49,49,59,52,65,61,62,46,54,87,57,61,49,44,42,59,66,54,54,52,46,52,55,47,54,52,83,66,63,95,73,80,88,162,143,78,74,81,58,79,79,54,121,102,40,52,56,73,64,67,85,79,68,93,58,54,61,59,109,89",
+ "endOffsets": "15001,17855,17938,18034,18103,18146,18198,18250,18299,18362,18420,18471,18555,18649,18757,18828,18912,18995,19061,19144,19246,19307,19369,19420,19498,19551,19611,19716,19775,19877,19932,20003,20052,20110,20157,20216,20273,20344,20405,20462,20512,20564,20617,20667,20717,20777,20830,20896,20958,21021,21068,21123,21211,21269,21331,21381,21426,21469,21529,21596,21651,21706,21759,21806,21859,21915,21963,22018,22071,22155,22222,22286,22382,22456,22537,22626,22789,22933,23012,23087,23169,23228,23308,23388,23443,23565,23668,23709,23762,23819,23946,24011,24150,24236,24316,24385,24479,24538,24593,24655,24715,24825,24915"
}
- }
- ]
- },
- {
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-ms_values-ms.arsc.flat",
- "map": [
+ },
{
- "source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\4051cc509ba70441b9465808cc62a56d\\transformed\\appcompat-v7-28.0.0\\res\\values-ms\\values-ms.xml",
+ "source": "D:\\Note-master2\\app\\src\\main\\res\\values\\colors.xml",
"from": {
- "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29",
- "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",
- "startOffsets": "105,216,321,429,516,620,731,809,888,979,1072,1167,1261,1360,1453,1548,1642,1733,1824,1904,2016,2125,2222,2331,2434,2541,2700,2801",
- "endColumns": "110,104,107,86,103,110,77,78,90,92,94,93,98,92,94,93,90,90,79,111,108,96,108,102,106,158,100,79",
- "endOffsets": "211,316,424,511,615,726,804,883,974,1067,1162,1256,1355,1448,1543,1637,1728,1819,1899,2011,2120,2217,2326,2429,2536,2695,2796,2876"
+ "startLines": "18",
+ "startColumns": "4",
+ "startOffsets": "712",
+ "endColumns": "56",
+ "endOffsets": "764"
+ },
+ "to": {
+ "startLines": "82",
+ "startColumns": "4",
+ "startOffsets": "5258",
+ "endColumns": "56",
+ "endOffsets": "5310"
}
},
{
- "source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\c9913736ba0af3f26ba50dd9aa679a2b\\transformed\\support-compat-28.0.0\\res\\values-ms\\values-ms.xml",
+ "source": "D:\\Note-master2\\app\\src\\main\\res\\values\\arrays.xml",
"from": {
- "startLines": "2",
- "startColumns": "4",
- "startOffsets": "55",
- "endColumns": "100",
- "endOffsets": "151"
+ "startLines": "19,26",
+ "startColumns": "4,4",
+ "startOffsets": "739,1047",
+ "endLines": "24,29",
+ "endColumns": "19,19",
+ "endOffsets": "1041,1162"
},
"to": {
- "startLines": "30",
- "startColumns": "4",
- "startOffsets": "2881",
- "endColumns": "100",
- "endOffsets": "2977"
+ "startLines": "2,8",
+ "startColumns": "4,4",
+ "startOffsets": "105,412",
+ "endLines": "7,11",
+ "endColumns": "19,19",
+ "endOffsets": "407,527"
}
- }
- ]
- },
- {
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-nl_values-nl.arsc.flat",
- "map": [
+ },
{
- "source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\c9913736ba0af3f26ba50dd9aa679a2b\\transformed\\support-compat-28.0.0\\res\\values-nl\\values-nl.xml",
+ "source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\c9913736ba0af3f26ba50dd9aa679a2b\\transformed\\support-compat-28.0.0\\res\\values\\values.xml",
"from": {
- "startLines": "2",
- "startColumns": "4",
- "startOffsets": "55",
- "endColumns": "100",
- "endOffsets": "151"
+ "startLines": "2,3,132,133,134,135,136,137,138,139,140,141,142,143,144,145,146,147,148,149,150,151,152,153,154,155,156,157,158,159,160,161,162,163,164,165,166,167,171,172,176,177,178,6,13,56,88,125",
+ "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",
+ "startOffsets": "55,124,7725,7795,7863,7935,8005,8066,8140,8213,8274,8335,8397,8461,8523,8584,8652,8752,8812,8878,8951,9020,9077,9129,9191,9263,9339,9374,9409,9459,9520,9577,9611,9646,9681,9751,9822,9939,10140,10250,10451,10580,10652,319,617,3523,5588,7348",
+ "endLines": "2,3,132,133,134,135,136,137,138,139,140,141,142,143,144,145,146,147,148,149,150,151,152,153,154,155,156,157,158,159,160,161,162,163,164,165,166,170,171,175,176,177,178,12,55,87,124,131",
+ "endColumns": "68,62,69,67,71,69,60,73,72,60,60,61,63,61,60,67,99,59,65,72,68,56,51,61,71,75,34,34,49,60,56,33,34,34,69,70,116,12,109,12,128,71,66,24,24,24,24,24",
+ "endOffsets": "119,182,7790,7858,7930,8000,8061,8135,8208,8269,8330,8392,8456,8518,8579,8647,8747,8807,8873,8946,9015,9072,9124,9186,9258,9334,9369,9404,9454,9515,9572,9606,9641,9676,9746,9817,9934,10135,10245,10446,10575,10647,10714,612,3518,5583,7343,7720"
},
"to": {
- "startLines": "30",
- "startColumns": "4",
- "startOffsets": "2921",
- "endColumns": "100",
- "endOffsets": "3017"
+ "startLines": "60,61,158,159,160,161,162,163,164,174,175,176,177,178,179,180,181,182,183,184,185,186,187,188,202,203,209,210,214,215,216,217,218,219,225,362,1703,1704,1708,1709,1713,1878,1879,2544,2694,2737,2769,2806",
+ "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",
+ "startOffsets": "3720,3789,10432,10502,10570,10642,10712,10773,10847,11704,11765,11826,11888,11952,12014,12075,12143,12243,12303,12369,12442,12511,12568,12620,13397,13469,13784,13819,13996,14046,14107,14164,14198,14233,14543,24016,113268,113385,113586,113696,113897,126198,126270,162149,170691,173597,175662,177422",
+ "endLines": "60,61,158,159,160,161,162,163,164,174,175,176,177,178,179,180,181,182,183,184,185,186,187,188,202,203,209,210,214,215,216,217,218,219,225,362,1703,1707,1708,1712,1713,1878,1879,2550,2736,2768,2805,2812",
+ "endColumns": "68,62,69,67,71,69,60,73,72,60,60,61,63,61,60,67,99,59,65,72,68,56,51,61,71,75,34,34,49,60,56,33,34,34,69,70,116,12,109,12,128,71,66,24,24,24,24,24",
+ "endOffsets": "3784,3847,10497,10565,10637,10707,10768,10842,10915,11760,11821,11883,11947,12009,12070,12138,12238,12298,12364,12437,12506,12563,12615,12677,13464,13540,13814,13849,14041,14102,14159,14193,14228,14263,14608,24082,113380,113581,113691,113892,114021,126265,126332,162442,173592,175657,177417,177794"
}
},
{
- "source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\4051cc509ba70441b9465808cc62a56d\\transformed\\appcompat-v7-28.0.0\\res\\values-nl\\values-nl.xml",
+ "source": "D:\\Note-master2\\app\\src\\main\\res\\values\\styles.xml",
"from": {
- "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29",
- "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",
- "startOffsets": "105,223,328,435,521,629,749,826,903,995,1089,1190,1284,1385,1479,1575,1670,1762,1854,1936,2047,2151,2250,2365,2478,2581,2736,2839",
- "endColumns": "117,104,106,85,107,119,76,76,91,93,100,93,100,93,95,94,91,91,81,110,103,98,114,112,102,154,102,81",
- "endOffsets": "218,323,430,516,624,744,821,898,990,1084,1185,1279,1380,1474,1570,1665,1757,1849,1931,2042,2146,2245,2360,2473,2576,2731,2834,2916"
+ "startLines": "50,55,64,60,22,26,30,35,40,18,45",
+ "startColumns": "4,4,4,4,4,4,4,4,4,4,4",
+ "startOffsets": "2062,2267,2640,2479,895,1078,1263,1449,1653,712,1860",
+ "endLines": "53,58,67,62,25,29,33,38,43,21,48",
+ "endColumns": "12,12,12,12,12,12,12,12,12,12,12",
+ "endOffsets": "2261,2473,2843,2634,1073,1258,1443,1647,1854,890,2056"
+ },
+ "to": {
+ "startLines": "1439,1443,1447,1451,1720,1724,1728,1732,1736,1740,1744",
+ "startColumns": "4,4,4,4,4,4,4,4,4,4,4",
+ "startOffsets": "93289,93493,93704,93911,114454,114637,114822,115007,115210,115416,115599",
+ "endLines": "1442,1446,1450,1453,1723,1727,1731,1735,1739,1743,1747",
+ "endColumns": "12,12,12,12,12,12,12,12,12,12,12",
+ "endOffsets": "93488,93699,93906,94066,114632,114817,115002,115205,115411,115594,115795"
}
- }
- ]
- },
- {
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-iw_values-iw.arsc.flat",
- "map": [
+ },
{
- "source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\4051cc509ba70441b9465808cc62a56d\\transformed\\appcompat-v7-28.0.0\\res\\values-iw\\values-iw.xml",
+ "source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\4051cc509ba70441b9465808cc62a56d\\transformed\\appcompat-v7-28.0.0\\res\\values\\values.xml",
"from": {
- "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29",
- "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",
- "startOffsets": "105,209,308,416,500,600,714,792,870,961,1055,1151,1245,1346,1439,1534,1631,1722,1814,1895,1997,2101,2199,2302,2403,2503,2655,2751",
- "endColumns": "103,98,107,83,99,113,77,77,90,93,95,93,100,92,94,96,90,91,80,101,103,97,102,100,99,151,95,80",
- "endOffsets": "204,303,411,495,595,709,787,865,956,1050,1146,1240,1341,1434,1529,1626,1717,1809,1890,1992,2096,2194,2297,2398,2498,2650,2746,2827"
+ "startLines": "2,3,4,5,6,7,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,1303,1304,1305,1306,1307,1308,1309,1310,1311,1312,1313,1314,1315,1316,1317,1318,1319,1320,1321,1322,1323,1324,1325,1326,1327,1328,1329,1330,1331,1332,1333,1334,1335,1336,1337,1338,1339,1340,1341,1342,1343,1344,1345,1346,1347,1348,1349,1350,1351,1352,1353,1354,1355,1356,1357,1358,1359,1360,1361,1362,1363,1364,1365,1366,1367,1368,1369,1370,1371,1372,1373,1374,1375,1376,1377,1378,1379,1380,1381,1382,1383,1384,1385,1386,1387,1388,1389,1390,1391,1392,1393,1394,1395,1396,1397,1398,1399,1400,1401,1402,1403,1404,1405,1406,1407,1408,1409,1410,1411,1412,1413,1414,1415,1416,1417,1418,1419,1420,1421,1422,1423,1424,1425,1426,1427,1428,1429,1430,1431,1432,1433,1434,1435,1436,1437,1438,1439,1440,1441,1442,1443,1444,1445,1446,1447,1448,1449,1450,1451,1452,1453,1461,1462,1466,1470,1474,1479,1485,1492,1496,1500,1505,1509,1513,1517,1521,1525,1529,1535,1539,1545,1549,1555,1559,1564,1568,1571,1575,1581,1585,1591,1595,1601,1604,1608,1612,1616,1620,1624,1625,1626,1627,1630,1633,1636,1639,1643,1644,1645,1646,1647,1650,1652,1654,1656,1661,1662,1666,1672,1676,1677,1679,1690,1691,1695,1701,1705,1706,1707,1711,1738,1742,1743,1747,1775,1943,1969,2138,2164,2195,2203,2209,2223,2245,2250,2255,2265,2274,2283,2287,2294,2302,2309,2310,2319,2322,2325,2329,2333,2337,2340,2341,2345,2349,2359,2364,2371,2377,2378,2381,2385,2390,2392,2394,2397,2400,2402,2406,2409,2416,2419,2422,2426,2428,2432,2434,2436,2438,2442,2450,2458,2470,2476,2485,2488,2499,2502,2507,2508,2513,2571,2630,2631,2641,2650,2651,2653,2657,2660,2663,2666,2669,2672,2675,2678,2682,2685,2688,2691,2695,2698,2702,2706,2707,2708,2709,2710,2711,2712,2713,2714,2715,2716,2717,2718,2719,2720,2721,2722,2723,2724,2725,2726,2728,2730,2731,2732,2733,2734,2735,2736,2737,2739,2740,2742,2743,2745,2747,2748,2750,2751,2752,2753,2754,2755,2757,2758,2759,2760,2761,2762,2764,2766,2768,2769,2770,2771,2772,2773,2774,2775,2776,2777,2778,2779,2780,2782,2783,2784,2785,2786,2787,2789,2793,2797,2798,2799,2800,2801,2802,2803,2804,2806,2808,2810,2812,2814,2815,2816,2817,2819,2821,2823,2824,2825,2826,2827,2828,2829,2830,2831,2832,2833,2834,2837,2838,2839,2840,2842,2844,2845,2847,2848,2850,2852,2854,2855,2856,2857,2858,2859,2860,2861,2862,2863,2864,2865,2867,2868,2869,2870,2872,2873,2874,2875,2876,2878,2880,2882,2884,2885,2886,2887,2888,2889,2890,2891,2892,2893,2894,2895,2896,2897,69,152,155,158,161,175,186,196,223,230,241,271,298,307,344,725,730,756,774,810,816,822,845,986,1006,1012,1016,1022,1059,1071,1098,1103,1169,1184,1249,1268,1294",
+ "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,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,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": "105,160,205,254,295,350,409,471,552,613,688,764,841,919,1004,1086,1162,1238,1315,1393,1499,1605,1684,1764,1821,1879,1953,2028,2093,2159,2219,2280,2352,2425,2492,2560,2619,2678,2737,2796,2855,2909,2963,3016,3070,3124,3178,3232,3306,3385,3458,3532,3603,3675,3747,3820,3877,3935,4008,4082,4156,4231,4303,4376,4446,4517,4577,70911,70980,71049,71119,71193,71269,71333,71410,71486,71563,71628,71697,71774,71849,71918,71986,72063,72129,72190,72287,72352,72421,72520,72591,72650,72708,72765,72824,72888,72959,73031,73103,73175,73247,73314,73382,73450,73509,73572,73636,73726,73817,73877,73943,74010,74076,74146,74210,74263,74376,74434,74497,74562,74627,74702,74775,74847,74896,74957,75018,75079,75141,75205,75269,75333,75398,75461,75521,75582,75648,75707,75767,75829,75900,75960,76028,76114,76201,76291,76378,76466,76548,76631,76721,76812,76864,76922,76967,77033,77097,77154,77211,77265,77322,77370,77419,77470,77504,77551,77600,77646,77678,77742,77804,77864,77921,77995,78065,78143,78197,78267,78352,78400,78446,78517,78595,78673,78745,78819,78893,78967,79047,79120,79189,79261,79338,79399,79462,79528,79592,79663,79726,79791,79855,79916,79977,80029,80102,80176,80245,80320,80394,80468,80609,80679,80732,80810,80900,80988,81084,81174,81756,81845,82092,82373,82625,82910,83303,83780,84002,84224,84500,84727,84957,85187,85417,85647,85874,86293,86519,86944,87174,87602,87821,88104,88312,88443,88670,89096,89321,89748,89969,90394,90514,90790,91091,91415,91706,92020,92157,92288,92393,92635,92802,93006,93214,93485,93597,93709,93814,93931,94145,94291,94431,94517,94865,94953,95199,95617,95866,95948,96046,96663,96763,97015,97439,97694,97788,97877,98114,100166,100408,100510,100763,102947,113668,115184,126004,127532,129289,129915,130335,131396,132661,132917,133153,133700,134194,134799,134997,135577,136141,136516,136634,137172,137329,137525,137798,138054,138224,138365,138429,138711,138997,139673,139937,140275,140628,140722,140908,141214,141476,141601,141728,141967,142178,142297,142490,142667,143122,143303,143425,143684,143797,143984,144086,144193,144322,144597,145105,145601,146478,146772,147342,147491,148223,148395,148731,148823,149101,153445,157932,157994,158624,159238,159329,159442,159671,159831,159983,160154,160320,160489,160656,160819,161062,161232,161405,161576,161850,162049,162254,162584,162668,162764,162860,162958,163058,163160,163262,163364,163466,163568,163668,163764,163876,164005,164128,164259,164390,164488,164602,164696,164836,164970,165066,165178,165278,165394,165490,165602,165702,165842,165978,166142,166272,166430,166580,166721,166865,167000,167112,167262,167390,167518,167654,167786,167916,168046,168158,168298,168444,168588,168726,168792,168882,168958,169062,169152,169254,169362,169470,169570,169650,169742,169840,169950,170028,170134,170226,170330,170440,170562,170725,170882,170962,171062,171152,171262,171356,171462,171554,171654,171766,171880,171996,172112,172206,172320,172432,172534,172654,172776,172858,172962,173082,173208,173306,173400,173488,173600,173716,173838,173950,174125,174241,174327,174419,174531,174655,174722,174848,174916,175044,175188,175316,175385,175480,175595,175708,175807,175916,176027,176138,176239,176344,176444,176574,176665,176788,176882,176994,177080,177184,177280,177368,177486,177590,177694,177820,177908,178016,178116,178206,178316,178400,178502,178586,178640,178704,178810,178920,179004,4638,9782,9900,10015,10147,10862,11554,12071,13718,14103,14700,16299,17832,18220,20527,40045,40305,41697,42730,44743,45005,45361,46191,52973,54107,54401,54624,54951,57001,57649,59282,59552,63403,64004,67813,69028,70437",
+ "endLines": "2,3,4,5,6,7,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,1303,1304,1305,1306,1307,1308,1309,1310,1311,1312,1313,1314,1315,1316,1317,1318,1319,1320,1321,1322,1323,1324,1325,1326,1327,1328,1329,1330,1331,1332,1333,1334,1335,1336,1337,1338,1339,1340,1341,1342,1343,1344,1345,1346,1347,1348,1349,1350,1351,1352,1353,1354,1355,1356,1357,1358,1359,1360,1361,1362,1363,1364,1365,1366,1367,1368,1369,1370,1371,1372,1373,1374,1375,1376,1377,1378,1379,1380,1381,1382,1383,1384,1385,1386,1387,1388,1389,1390,1391,1392,1393,1394,1395,1396,1397,1398,1399,1400,1401,1402,1403,1404,1405,1406,1407,1408,1409,1410,1411,1412,1413,1414,1415,1416,1417,1418,1419,1420,1421,1422,1423,1424,1425,1426,1427,1428,1429,1430,1431,1432,1433,1434,1435,1436,1437,1438,1439,1440,1441,1442,1443,1444,1445,1446,1447,1448,1449,1450,1451,1452,1460,1461,1465,1469,1473,1478,1484,1491,1495,1499,1504,1508,1512,1516,1520,1524,1528,1534,1538,1544,1548,1554,1558,1563,1567,1570,1574,1580,1584,1590,1594,1600,1603,1607,1611,1615,1619,1623,1624,1625,1626,1629,1632,1635,1638,1642,1643,1644,1645,1646,1649,1651,1653,1655,1660,1661,1665,1671,1675,1676,1678,1689,1690,1694,1700,1704,1705,1706,1710,1737,1741,1742,1746,1774,1942,1968,2137,2163,2194,2202,2208,2222,2244,2249,2254,2264,2273,2282,2286,2293,2301,2308,2309,2318,2321,2324,2328,2332,2336,2339,2340,2344,2348,2358,2363,2370,2376,2377,2380,2384,2389,2391,2393,2396,2399,2401,2405,2408,2415,2418,2421,2425,2427,2431,2433,2435,2437,2441,2449,2457,2469,2475,2484,2487,2498,2501,2506,2507,2512,2570,2629,2630,2640,2649,2650,2652,2656,2659,2662,2665,2668,2671,2674,2677,2681,2684,2687,2690,2694,2697,2701,2705,2706,2707,2708,2709,2710,2711,2712,2713,2714,2715,2716,2717,2718,2719,2720,2721,2722,2723,2724,2725,2727,2729,2730,2731,2732,2733,2734,2735,2736,2738,2739,2741,2742,2744,2746,2747,2749,2750,2751,2752,2753,2754,2756,2757,2758,2759,2760,2761,2763,2765,2767,2768,2769,2770,2771,2772,2773,2774,2775,2776,2777,2778,2779,2781,2782,2783,2784,2785,2786,2788,2792,2796,2797,2798,2799,2800,2801,2802,2803,2805,2807,2809,2811,2813,2814,2815,2816,2818,2820,2822,2823,2824,2825,2826,2827,2828,2829,2830,2831,2832,2833,2836,2837,2838,2839,2841,2843,2844,2846,2847,2849,2851,2853,2854,2855,2856,2857,2858,2859,2860,2861,2862,2863,2864,2866,2867,2868,2869,2871,2872,2873,2874,2875,2877,2879,2881,2883,2884,2885,2886,2887,2888,2889,2890,2891,2892,2893,2894,2895,2896,2897,151,154,157,160,174,185,195,222,229,240,270,297,306,343,724,729,755,773,809,815,821,844,985,1005,1011,1015,1021,1058,1070,1097,1102,1168,1183,1248,1267,1293,1302",
+ "endColumns": "54,44,48,40,54,58,61,80,60,74,75,76,77,84,81,75,75,76,77,105,105,78,79,56,57,73,74,64,65,59,60,71,72,66,67,58,58,58,58,58,53,53,52,53,53,53,53,73,78,72,73,70,71,71,72,56,57,72,73,73,74,71,72,69,70,59,60,68,68,69,73,75,63,76,75,76,64,68,76,74,68,67,76,65,60,96,64,68,98,70,58,57,56,58,63,70,71,71,71,71,66,67,67,58,62,63,89,90,59,65,66,65,69,63,52,112,57,62,64,64,74,72,71,48,60,60,60,61,63,63,63,64,62,59,60,65,58,59,61,70,59,67,85,86,89,86,87,81,82,89,90,51,57,44,65,63,56,56,53,56,47,48,50,33,46,48,45,31,63,61,59,56,73,69,77,53,69,84,47,45,70,77,77,71,73,73,73,79,72,68,71,76,60,62,65,63,70,62,64,63,60,60,51,72,73,68,74,73,73,140,69,52,77,89,87,95,89,12,88,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,136,130,104,12,12,12,12,12,111,111,104,116,12,12,12,12,12,87,12,12,12,81,12,12,99,12,12,12,93,88,12,12,12,101,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,117,12,12,12,12,12,12,12,63,12,12,12,12,12,12,93,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,91,12,12,12,61,12,12,90,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,83,95,95,97,99,101,101,101,101,101,99,95,111,128,122,130,130,97,113,93,12,12,95,111,99,115,95,111,99,12,135,12,129,12,12,140,12,134,111,149,127,127,12,131,129,129,111,139,12,12,12,65,89,75,103,89,101,107,107,99,79,91,97,12,77,105,91,103,109,12,12,12,79,99,89,109,93,105,91,12,12,12,12,12,93,113,111,12,12,12,81,103,119,125,97,93,87,111,115,121,111,12,115,85,91,12,12,66,12,67,12,12,12,68,94,114,112,98,108,110,110,100,104,99,12,90,122,93,12,85,103,95,87,12,12,12,12,87,107,99,89,109,83,101,83,53,63,105,109,83,119,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24",
+ "endOffsets": "155,200,249,290,345,404,466,547,608,683,759,836,914,999,1081,1157,1233,1310,1388,1494,1600,1679,1759,1816,1874,1948,2023,2088,2154,2214,2275,2347,2420,2487,2555,2614,2673,2732,2791,2850,2904,2958,3011,3065,3119,3173,3227,3301,3380,3453,3527,3598,3670,3742,3815,3872,3930,4003,4077,4151,4226,4298,4371,4441,4512,4572,4633,70975,71044,71114,71188,71264,71328,71405,71481,71558,71623,71692,71769,71844,71913,71981,72058,72124,72185,72282,72347,72416,72515,72586,72645,72703,72760,72819,72883,72954,73026,73098,73170,73242,73309,73377,73445,73504,73567,73631,73721,73812,73872,73938,74005,74071,74141,74205,74258,74371,74429,74492,74557,74622,74697,74770,74842,74891,74952,75013,75074,75136,75200,75264,75328,75393,75456,75516,75577,75643,75702,75762,75824,75895,75955,76023,76109,76196,76286,76373,76461,76543,76626,76716,76807,76859,76917,76962,77028,77092,77149,77206,77260,77317,77365,77414,77465,77499,77546,77595,77641,77673,77737,77799,77859,77916,77990,78060,78138,78192,78262,78347,78395,78441,78512,78590,78668,78740,78814,78888,78962,79042,79115,79184,79256,79333,79394,79457,79523,79587,79658,79721,79786,79850,79911,79972,80024,80097,80171,80240,80315,80389,80463,80604,80674,80727,80805,80895,80983,81079,81169,81751,81840,82087,82368,82620,82905,83298,83775,83997,84219,84495,84722,84952,85182,85412,85642,85869,86288,86514,86939,87169,87597,87816,88099,88307,88438,88665,89091,89316,89743,89964,90389,90509,90785,91086,91410,91701,92015,92152,92283,92388,92630,92797,93001,93209,93480,93592,93704,93809,93926,94140,94286,94426,94512,94860,94948,95194,95612,95861,95943,96041,96658,96758,97010,97434,97689,97783,97872,98109,100161,100403,100505,100758,102942,113663,115179,125999,127527,129284,129910,130330,131391,132656,132912,133148,133695,134189,134794,134992,135572,136136,136511,136629,137167,137324,137520,137793,138049,138219,138360,138424,138706,138992,139668,139932,140270,140623,140717,140903,141209,141471,141596,141723,141962,142173,142292,142485,142662,143117,143298,143420,143679,143792,143979,144081,144188,144317,144592,145100,145596,146473,146767,147337,147486,148218,148390,148726,148818,149096,153440,157927,157989,158619,159233,159324,159437,159666,159826,159978,160149,160315,160484,160651,160814,161057,161227,161400,161571,161845,162044,162249,162579,162663,162759,162855,162953,163053,163155,163257,163359,163461,163563,163663,163759,163871,164000,164123,164254,164385,164483,164597,164691,164831,164965,165061,165173,165273,165389,165485,165597,165697,165837,165973,166137,166267,166425,166575,166716,166860,166995,167107,167257,167385,167513,167649,167781,167911,168041,168153,168293,168439,168583,168721,168787,168877,168953,169057,169147,169249,169357,169465,169565,169645,169737,169835,169945,170023,170129,170221,170325,170435,170557,170720,170877,170957,171057,171147,171257,171351,171457,171549,171649,171761,171875,171991,172107,172201,172315,172427,172529,172649,172771,172853,172957,173077,173203,173301,173395,173483,173595,173711,173833,173945,174120,174236,174322,174414,174526,174650,174717,174843,174911,175039,175183,175311,175380,175475,175590,175703,175802,175911,176022,176133,176234,176339,176439,176569,176660,176783,176877,176989,177075,177179,177275,177363,177481,177585,177689,177815,177903,178011,178111,178201,178311,178395,178497,178581,178635,178699,178805,178915,178999,179119,9777,9895,10010,10142,10857,11549,12066,13713,14098,14695,16294,17827,18215,20522,40040,40300,41692,42725,44738,45000,45356,46186,52968,54102,54396,54619,54946,56996,57644,59277,59547,63398,63999,67808,69023,70432,70906"
+ },
+ "to": {
+ "startLines": "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,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,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,134,135,136,137,138,139,140,141,142,143,144,145,146,147,148,149,150,151,152,153,154,155,156,157,165,166,167,168,169,170,171,172,173,194,195,196,197,198,199,200,201,204,205,206,207,208,211,212,213,220,221,222,223,224,231,232,233,234,235,236,237,238,239,240,241,242,243,244,245,246,247,248,249,250,251,252,253,254,255,256,257,258,259,260,261,262,263,264,265,266,267,268,269,359,374,375,376,377,378,379,387,388,392,396,400,405,411,418,422,426,431,435,439,443,447,451,455,461,465,471,475,481,485,490,494,497,501,507,511,517,521,527,530,534,538,542,546,550,551,552,553,556,559,562,565,569,570,571,572,573,576,578,580,582,587,588,592,598,602,603,605,616,617,621,627,631,632,633,637,664,668,669,673,701,869,895,1064,1090,1121,1129,1135,1149,1171,1176,1181,1191,1200,1209,1213,1220,1228,1235,1236,1245,1248,1251,1255,1259,1263,1266,1267,1271,1275,1285,1290,1297,1303,1304,1307,1311,1316,1318,1320,1323,1326,1328,1332,1335,1342,1345,1348,1352,1354,1358,1360,1362,1364,1368,1376,1384,1396,1402,1411,1414,1425,1428,1433,1434,1454,1512,1571,1572,1582,1591,1592,1594,1598,1601,1604,1607,1610,1613,1616,1619,1623,1626,1629,1632,1636,1639,1643,1647,1648,1649,1650,1651,1652,1653,1654,1655,1656,1657,1658,1659,1660,1661,1662,1663,1664,1665,1666,1667,1669,1671,1672,1673,1674,1675,1676,1677,1678,1680,1681,1683,1684,1686,1688,1689,1691,1692,1693,1694,1695,1696,1698,1699,1700,1701,1702,1714,1716,1718,1748,1749,1750,1751,1752,1753,1754,1755,1756,1757,1758,1759,1760,1762,1763,1764,1765,1766,1767,1769,1773,1777,1778,1779,1780,1781,1782,1783,1784,1786,1788,1790,1792,1794,1795,1796,1797,1799,1801,1803,1804,1805,1806,1807,1808,1809,1810,1811,1812,1813,1814,1817,1818,1819,1820,1822,1824,1825,1827,1828,1830,1832,1834,1835,1836,1837,1838,1839,1840,1841,1842,1843,1844,1845,1847,1848,1849,1850,1852,1853,1854,1855,1856,1858,1860,1862,1864,1865,1866,1867,1868,1869,1870,1871,1872,1873,1874,1875,1876,1877,1883,1966,1969,1972,1975,1989,2000,2010,2037,2044,2055,2085,2112,2121,2158,2539,2551,2676,2813,2849,2855,2861,2884,3025,3045,3051,3055,3061,3098,3110,3137,3142,3208,3223,3288,3307,3333",
+ "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,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,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": "593,648,693,742,783,838,897,959,1040,1101,1176,1252,1329,1407,1492,1574,1650,1726,1803,1881,1987,2093,2172,2252,2309,2367,2441,2516,2581,2647,2707,2768,2840,2913,2980,3048,3107,3166,3225,3284,3343,3397,3451,3504,3558,3612,3666,3852,3926,4005,4078,4152,4223,4295,4367,4440,4497,4555,4628,4702,4776,4851,4923,4996,5066,5137,5197,5315,5384,5453,5523,5597,5673,5737,5814,5890,5967,6032,6101,6178,6253,6322,6390,6467,6533,6594,6691,6756,6825,6924,6995,7054,7112,7169,7228,7292,7363,7435,7507,7579,7651,7718,7786,7854,7913,7976,8040,8130,8221,8281,8347,8414,8480,8550,8614,8667,8780,8838,8901,8966,9031,9106,9179,9251,9300,9361,9422,9483,9545,9609,9673,9737,9802,9865,9925,9986,10052,10111,10171,10233,10304,10364,10920,11006,11093,11183,11270,11358,11440,11523,11613,12944,12996,13054,13099,13165,13229,13286,13343,13545,13602,13650,13699,13750,13854,13901,13950,14268,14300,14364,14426,14486,15006,15080,15150,15228,15282,15352,15437,15485,15531,15602,15680,15758,15830,15904,15978,16052,16132,16205,16274,16346,16423,16484,16547,16613,16677,16748,16811,16876,16940,17001,17062,17114,17187,17261,17330,17405,17479,17553,17694,23824,24920,24998,25088,25176,25272,25362,25944,26033,26280,26561,26813,27098,27491,27968,28190,28412,28688,28915,29145,29375,29605,29835,30062,30481,30707,31132,31362,31790,32009,32292,32500,32631,32858,33284,33509,33936,34157,34582,34702,34978,35279,35603,35894,36208,36345,36476,36581,36823,36990,37194,37402,37673,37785,37897,38002,38119,38333,38479,38619,38705,39053,39141,39387,39805,40054,40136,40234,40851,40951,41203,41627,41882,41976,42065,42302,44354,44596,44698,44951,47135,57856,59372,70192,71720,73477,74103,74523,75584,76849,77105,77341,77888,78382,78987,79185,79765,80329,80704,80822,81360,81517,81713,81986,82242,82412,82553,82617,82899,83185,83861,84125,84463,84816,84910,85096,85402,85664,85789,85916,86155,86366,86485,86678,86855,87310,87491,87613,87872,87985,88172,88274,88381,88510,88785,89293,89789,90666,90960,91530,91679,92411,92583,92919,93011,94071,98415,102902,102964,103594,104208,104299,104412,104641,104801,104953,105124,105290,105459,105626,105789,106032,106202,106375,106546,106820,107019,107224,107554,107638,107734,107830,107928,108028,108130,108232,108334,108436,108538,108638,108734,108846,108975,109098,109229,109360,109458,109572,109666,109806,109940,110036,110148,110248,110364,110460,110572,110672,110812,110948,111112,111242,111400,111550,111691,111835,111970,112082,112232,112360,112488,112624,112756,112886,113016,113128,114026,114172,114316,115800,115866,115956,116032,116136,116226,116328,116436,116544,116644,116724,116816,116914,117024,117102,117208,117300,117404,117514,117636,117799,117956,118036,118136,118226,118336,118430,118536,118628,118728,118840,118954,119070,119186,119280,119394,119506,119608,119728,119850,119932,120036,120156,120282,120380,120474,120562,120674,120790,120912,121024,121199,121315,121401,121493,121605,121729,121796,121922,121990,122118,122262,122390,122459,122554,122669,122782,122881,122990,123101,123212,123313,123418,123518,123648,123739,123862,123956,124068,124154,124258,124354,124442,124560,124664,124768,124894,124982,125090,125190,125280,125390,125474,125576,125660,125714,125778,125884,125994,126078,126482,131626,131744,131859,131991,132706,133398,133915,135562,135947,136544,138143,139676,140064,142371,161889,162447,169658,177799,179812,180074,180430,181260,188042,189176,189470,189693,190020,192070,192718,194351,194621,198472,199073,202882,204097,205506",
+ "endLines": "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,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,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,134,135,136,137,138,139,140,141,142,143,144,145,146,147,148,149,150,151,152,153,154,155,156,157,165,166,167,168,169,170,171,172,173,194,195,196,197,198,199,200,201,204,205,206,207,208,211,212,213,220,221,222,223,224,231,232,233,234,235,236,237,238,239,240,241,242,243,244,245,246,247,248,249,250,251,252,253,254,255,256,257,258,259,260,261,262,263,264,265,266,267,268,269,359,374,375,376,377,378,386,387,391,395,399,404,410,417,421,425,430,434,438,442,446,450,454,460,464,470,474,480,484,489,493,496,500,506,510,516,520,526,529,533,537,541,545,549,550,551,552,555,558,561,564,568,569,570,571,572,575,577,579,581,586,587,591,597,601,602,604,615,616,620,626,630,631,632,636,663,667,668,672,700,868,894,1063,1089,1120,1128,1134,1148,1170,1175,1180,1190,1199,1208,1212,1219,1227,1234,1235,1244,1247,1250,1254,1258,1262,1265,1266,1270,1274,1284,1289,1296,1302,1303,1306,1310,1315,1317,1319,1322,1325,1327,1331,1334,1341,1344,1347,1351,1353,1357,1359,1361,1363,1367,1375,1383,1395,1401,1410,1413,1424,1427,1432,1433,1438,1511,1570,1571,1581,1590,1591,1593,1597,1600,1603,1606,1609,1612,1615,1618,1622,1625,1628,1631,1635,1638,1642,1646,1647,1648,1649,1650,1651,1652,1653,1654,1655,1656,1657,1658,1659,1660,1661,1662,1663,1664,1665,1666,1668,1670,1671,1672,1673,1674,1675,1676,1677,1679,1680,1682,1683,1685,1687,1688,1690,1691,1692,1693,1694,1695,1697,1698,1699,1700,1701,1702,1715,1717,1719,1748,1749,1750,1751,1752,1753,1754,1755,1756,1757,1758,1759,1761,1762,1763,1764,1765,1766,1768,1772,1776,1777,1778,1779,1780,1781,1782,1783,1785,1787,1789,1791,1793,1794,1795,1796,1798,1800,1802,1803,1804,1805,1806,1807,1808,1809,1810,1811,1812,1813,1816,1817,1818,1819,1821,1823,1824,1826,1827,1829,1831,1833,1834,1835,1836,1837,1838,1839,1840,1841,1842,1843,1844,1846,1847,1848,1849,1851,1852,1853,1854,1855,1857,1859,1861,1863,1864,1865,1866,1867,1868,1869,1870,1871,1872,1873,1874,1875,1876,1877,1965,1968,1971,1974,1988,1999,2009,2036,2043,2054,2084,2111,2120,2157,2538,2543,2576,2693,2848,2854,2860,2883,3024,3044,3050,3054,3060,3097,3109,3136,3141,3207,3222,3287,3306,3332,3341",
+ "endColumns": "54,44,48,40,54,58,61,80,60,74,75,76,77,84,81,75,75,76,77,105,105,78,79,56,57,73,74,64,65,59,60,71,72,66,67,58,58,58,58,58,53,53,52,53,53,53,53,73,78,72,73,70,71,71,72,56,57,72,73,73,74,71,72,69,70,59,60,68,68,69,73,75,63,76,75,76,64,68,76,74,68,67,76,65,60,96,64,68,98,70,58,57,56,58,63,70,71,71,71,71,66,67,67,58,62,63,89,90,59,65,66,65,69,63,52,112,57,62,64,64,74,72,71,48,60,60,60,61,63,63,63,64,62,59,60,65,58,59,61,70,59,67,85,86,89,86,87,81,82,89,90,51,57,44,65,63,56,56,53,56,47,48,50,33,46,48,45,31,63,61,59,56,73,69,77,53,69,84,47,45,70,77,77,71,73,73,73,79,72,68,71,76,60,62,65,63,70,62,64,63,60,60,51,72,73,68,74,73,73,140,69,52,77,89,87,95,89,12,88,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,136,130,104,12,12,12,12,12,111,111,104,116,12,12,12,12,12,87,12,12,12,81,12,12,99,12,12,12,93,88,12,12,12,101,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,117,12,12,12,12,12,12,12,63,12,12,12,12,12,12,93,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,91,12,12,12,61,12,12,90,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,83,95,95,97,99,101,101,101,101,101,99,95,111,128,122,130,130,97,113,93,12,12,95,111,99,115,95,111,99,12,135,12,129,12,12,140,12,134,111,149,127,127,12,131,129,129,111,139,12,12,12,65,89,75,103,89,101,107,107,99,79,91,97,12,77,105,91,103,109,12,12,12,79,99,89,109,93,105,91,12,12,12,12,12,93,113,111,12,12,12,81,103,119,125,97,93,87,111,115,121,111,12,115,85,91,12,12,66,12,67,12,12,12,68,94,114,112,98,108,110,110,100,104,99,12,90,122,93,12,85,103,95,87,12,12,12,12,87,107,99,89,109,83,101,83,53,63,105,109,83,119,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24",
+ "endOffsets": "643,688,737,778,833,892,954,1035,1096,1171,1247,1324,1402,1487,1569,1645,1721,1798,1876,1982,2088,2167,2247,2304,2362,2436,2511,2576,2642,2702,2763,2835,2908,2975,3043,3102,3161,3220,3279,3338,3392,3446,3499,3553,3607,3661,3715,3921,4000,4073,4147,4218,4290,4362,4435,4492,4550,4623,4697,4771,4846,4918,4991,5061,5132,5192,5253,5379,5448,5518,5592,5668,5732,5809,5885,5962,6027,6096,6173,6248,6317,6385,6462,6528,6589,6686,6751,6820,6919,6990,7049,7107,7164,7223,7287,7358,7430,7502,7574,7646,7713,7781,7849,7908,7971,8035,8125,8216,8276,8342,8409,8475,8545,8609,8662,8775,8833,8896,8961,9026,9101,9174,9246,9295,9356,9417,9478,9540,9604,9668,9732,9797,9860,9920,9981,10047,10106,10166,10228,10299,10359,10427,11001,11088,11178,11265,11353,11435,11518,11608,11699,12991,13049,13094,13160,13224,13281,13338,13392,13597,13645,13694,13745,13779,13896,13945,13991,14295,14359,14421,14481,14538,15075,15145,15223,15277,15347,15432,15480,15526,15597,15675,15753,15825,15899,15973,16047,16127,16200,16269,16341,16418,16479,16542,16608,16672,16743,16806,16871,16935,16996,17057,17109,17182,17256,17325,17400,17474,17548,17689,17759,23872,24993,25083,25171,25267,25357,25939,26028,26275,26556,26808,27093,27486,27963,28185,28407,28683,28910,29140,29370,29600,29830,30057,30476,30702,31127,31357,31785,32004,32287,32495,32626,32853,33279,33504,33931,34152,34577,34697,34973,35274,35598,35889,36203,36340,36471,36576,36818,36985,37189,37397,37668,37780,37892,37997,38114,38328,38474,38614,38700,39048,39136,39382,39800,40049,40131,40229,40846,40946,41198,41622,41877,41971,42060,42297,44349,44591,44693,44946,47130,57851,59367,70187,71715,73472,74098,74518,75579,76844,77100,77336,77883,78377,78982,79180,79760,80324,80699,80817,81355,81512,81708,81981,82237,82407,82548,82612,82894,83180,83856,84120,84458,84811,84905,85091,85397,85659,85784,85911,86150,86361,86480,86673,86850,87305,87486,87608,87867,87980,88167,88269,88376,88505,88780,89288,89784,90661,90955,91525,91674,92406,92578,92914,93006,93284,98410,102897,102959,103589,104203,104294,104407,104636,104796,104948,105119,105285,105454,105621,105784,106027,106197,106370,106541,106815,107014,107219,107549,107633,107729,107825,107923,108023,108125,108227,108329,108431,108533,108633,108729,108841,108970,109093,109224,109355,109453,109567,109661,109801,109935,110031,110143,110243,110359,110455,110567,110667,110807,110943,111107,111237,111395,111545,111686,111830,111965,112077,112227,112355,112483,112619,112751,112881,113011,113123,113263,114167,114311,114449,115861,115951,116027,116131,116221,116323,116431,116539,116639,116719,116811,116909,117019,117097,117203,117295,117399,117509,117631,117794,117951,118031,118131,118221,118331,118425,118531,118623,118723,118835,118949,119065,119181,119275,119389,119501,119603,119723,119845,119927,120031,120151,120277,120375,120469,120557,120669,120785,120907,121019,121194,121310,121396,121488,121600,121724,121791,121917,121985,122113,122257,122385,122454,122549,122664,122777,122876,122985,123096,123207,123308,123413,123513,123643,123734,123857,123951,124063,124149,124253,124349,124437,124555,124659,124763,124889,124977,125085,125185,125275,125385,125469,125571,125655,125709,125773,125879,125989,126073,126193,131621,131739,131854,131986,132701,133393,133910,135557,135942,136539,138138,139671,140059,142366,161884,162144,163834,170686,179807,180069,180425,181255,188037,189171,189465,189688,190015,192065,192713,194346,194616,198467,199068,202877,204092,205501,205975"
}
},
{
- "source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\c9913736ba0af3f26ba50dd9aa679a2b\\transformed\\support-compat-28.0.0\\res\\values-iw\\values-iw.xml",
+ "source": "D:\\Note-master2\\app\\src\\main\\res\\values\\dimens.xml",
"from": {
- "startLines": "2",
- "startColumns": "4",
- "startOffsets": "55",
- "endColumns": "100",
- "endOffsets": "151"
+ "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": "30",
- "startColumns": "4",
- "startOffsets": "2832",
- "endColumns": "100",
- "endOffsets": "2928"
+ "startLines": "189,190,191,192,193",
+ "startColumns": "4,4,4,4,4",
+ "startOffsets": "12682,12734,12787,12840,12892",
+ "endColumns": "51,52,52,51,51",
+ "endOffsets": "12729,12782,12835,12887,12939"
}
}
]
},
{
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-fa_values-fa.arsc.flat",
+ "outputFile": "D:\\Note-master2\\app\\build\\intermediates\\merged_res\\debug\\values-th_values-th.arsc.flat",
"map": [
{
- "source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\4051cc509ba70441b9465808cc62a56d\\transformed\\appcompat-v7-28.0.0\\res\\values-fa\\values-fa.xml",
- "from": {
- "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29",
- "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",
- "startOffsets": "105,215,318,429,513,616,731,810,888,981,1076,1172,1266,1369,1464,1561,1660,1753,1843,1924,2036,2139,2237,2347,2451,2560,2721,2822",
- "endColumns": "109,102,110,83,102,114,78,77,92,94,95,93,102,94,96,98,92,89,80,111,102,97,109,103,108,160,100,80",
- "endOffsets": "210,313,424,508,611,726,805,883,976,1071,1167,1261,1364,1459,1556,1655,1748,1838,1919,2031,2134,2232,2342,2446,2555,2716,2817,2898"
- }
- },
- {
- "source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\c9913736ba0af3f26ba50dd9aa679a2b\\transformed\\support-compat-28.0.0\\res\\values-fa\\values-fa.xml",
+ "source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\c9913736ba0af3f26ba50dd9aa679a2b\\transformed\\support-compat-28.0.0\\res\\values-th\\values-th.xml",
"from": {
"startLines": "2",
"startColumns": "4",
@@ -1817,15 +1652,25 @@
"to": {
"startLines": "30",
"startColumns": "4",
- "startOffsets": "2903",
+ "startOffsets": "2845",
"endColumns": "100",
- "endOffsets": "2999"
+ "endOffsets": "2941"
+ }
+ },
+ {
+ "source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\4051cc509ba70441b9465808cc62a56d\\transformed\\appcompat-v7-28.0.0\\res\\values-th\\values-th.xml",
+ "from": {
+ "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29",
+ "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",
+ "startOffsets": "105,210,308,416,505,607,717,794,872,963,1056,1152,1246,1347,1440,1535,1629,1720,1811,1892,2000,2104,2202,2310,2415,2516,2669,2764",
+ "endColumns": "104,97,107,88,101,109,76,77,90,92,95,93,100,92,94,93,90,90,80,107,103,97,107,104,100,152,94,80",
+ "endOffsets": "205,303,411,500,602,712,789,867,958,1051,1147,1241,1342,1435,1530,1624,1715,1806,1887,1995,2099,2197,2305,2410,2511,2664,2759,2840"
}
}
]
},
{
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-mn_values-mn.arsc.flat",
+ "outputFile": "D:\\Note-master2\\app\\build\\intermediates\\merged_res\\debug\\values-mn_values-mn.arsc.flat",
"map": [
{
"source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\4051cc509ba70441b9465808cc62a56d\\transformed\\appcompat-v7-28.0.0\\res\\values-mn\\values-mn.xml",
@@ -1857,10 +1702,10 @@
]
},
{
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-zh-rHK_values-zh-rHK.arsc.flat",
+ "outputFile": "D:\\Note-master2\\app\\build\\intermediates\\merged_res\\debug\\values-hy_values-hy.arsc.flat",
"map": [
{
- "source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\c9913736ba0af3f26ba50dd9aa679a2b\\transformed\\support-compat-28.0.0\\res\\values-zh-rHK\\values-zh-rHK.xml",
+ "source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\c9913736ba0af3f26ba50dd9aa679a2b\\transformed\\support-compat-28.0.0\\res\\values-hy\\values-hy.xml",
"from": {
"startLines": "2",
"startColumns": "4",
@@ -1871,73 +1716,57 @@
"to": {
"startLines": "30",
"startColumns": "4",
- "startOffsets": "2746",
+ "startOffsets": "2884",
"endColumns": "100",
- "endOffsets": "2842"
+ "endOffsets": "2980"
}
},
{
- "source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\4051cc509ba70441b9465808cc62a56d\\transformed\\appcompat-v7-28.0.0\\res\\values-zh-rHK\\values-zh-rHK.xml",
+ "source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\4051cc509ba70441b9465808cc62a56d\\transformed\\appcompat-v7-28.0.0\\res\\values-hy\\values-hy.xml",
"from": {
"startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29",
"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",
- "startOffsets": "105,200,293,393,475,572,680,756,832,924,1018,1110,1206,1302,1396,1492,1584,1676,1768,1846,1942,2038,2133,2230,2325,2423,2574,2668",
- "endColumns": "94,92,99,81,96,107,75,75,91,93,91,95,95,93,95,91,91,91,77,95,95,94,96,94,97,150,93,77",
- "endOffsets": "195,288,388,470,567,675,751,827,919,1013,1105,1201,1297,1391,1487,1579,1671,1763,1841,1937,2033,2128,2225,2320,2418,2569,2663,2741"
+ "startOffsets": "105,208,309,419,508,614,729,811,892,983,1076,1172,1266,1367,1460,1555,1649,1740,1831,1916,2023,2130,2229,2339,2446,2546,2703,2802",
+ "endColumns": "102,100,109,88,105,114,81,80,90,92,95,93,100,92,94,93,90,90,84,106,106,98,109,106,99,156,98,81",
+ "endOffsets": "203,304,414,503,609,724,806,887,978,1071,1167,1261,1362,1455,1550,1644,1735,1826,1911,2018,2125,2224,2334,2441,2541,2698,2797,2879"
}
}
]
},
{
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-bg_values-bg.arsc.flat",
+ "outputFile": "D:\\Note-master2\\app\\build\\intermediates\\merged_res\\debug\\values-ro_values-ro.arsc.flat",
"map": [
{
- "source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\4051cc509ba70441b9465808cc62a56d\\transformed\\appcompat-v7-28.0.0\\res\\values-bg\\values-bg.xml",
+ "source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\4051cc509ba70441b9465808cc62a56d\\transformed\\appcompat-v7-28.0.0\\res\\values-ro\\values-ro.xml",
"from": {
"startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29",
"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",
- "startOffsets": "105,220,327,432,518,623,744,823,901,992,1085,1181,1275,1376,1469,1564,1672,1763,1854,1937,2051,2160,2260,2374,2480,2588,2748,2847",
- "endColumns": "114,106,104,85,104,120,78,77,90,92,95,93,100,92,94,107,90,90,82,113,108,99,113,105,107,159,98,82",
- "endOffsets": "215,322,427,513,618,739,818,896,987,1080,1176,1270,1371,1464,1559,1667,1758,1849,1932,2046,2155,2255,2369,2475,2583,2743,2842,2925"
+ "startOffsets": "105,226,330,443,531,643,764,849,930,1021,1114,1210,1304,1404,1497,1592,1687,1778,1870,1953,2065,2178,2278,2392,2497,2603,2767,2870",
+ "endColumns": "120,103,112,87,111,120,84,80,90,92,95,93,99,92,94,94,90,91,82,111,112,99,113,104,105,163,102,82",
+ "endOffsets": "221,325,438,526,638,759,844,925,1016,1109,1205,1299,1399,1492,1587,1682,1773,1865,1948,2060,2173,2273,2387,2492,2598,2762,2865,2948"
}
},
{
- "source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\c9913736ba0af3f26ba50dd9aa679a2b\\transformed\\support-compat-28.0.0\\res\\values-bg\\values-bg.xml",
- "from": {
- "startLines": "2",
- "startColumns": "4",
- "startOffsets": "55",
- "endColumns": "100",
- "endOffsets": "151"
- },
- "to": {
- "startLines": "30",
- "startColumns": "4",
- "startOffsets": "2930",
- "endColumns": "100",
- "endOffsets": "3026"
- }
- }
- ]
- },
- {
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-v26_values-v26.arsc.flat",
- "map": [
- {
- "source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\4051cc509ba70441b9465808cc62a56d\\transformed\\appcompat-v7-28.0.0\\res\\values-v26\\values-v26.xml",
- "from": {
- "startLines": "2,3,4,8,12,16",
- "startColumns": "4,4,4,4,4,4",
- "startOffsets": "55,130,217,431,657,896",
- "endLines": "2,3,7,11,15,16",
- "endColumns": "74,86,12,12,12,92",
- "endOffsets": "125,212,426,652,891,984"
+ "source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\c9913736ba0af3f26ba50dd9aa679a2b\\transformed\\support-compat-28.0.0\\res\\values-ro\\values-ro.xml",
+ "from": {
+ "startLines": "2",
+ "startColumns": "4",
+ "startOffsets": "55",
+ "endColumns": "100",
+ "endOffsets": "151"
+ },
+ "to": {
+ "startLines": "30",
+ "startColumns": "4",
+ "startOffsets": "2953",
+ "endColumns": "100",
+ "endOffsets": "3049"
}
}
]
},
{
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-el_values-el.arsc.flat",
+ "outputFile": "D:\\Note-master2\\app\\build\\intermediates\\merged_res\\debug\\values-el_values-el.arsc.flat",
"map": [
{
"source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\4051cc509ba70441b9465808cc62a56d\\transformed\\appcompat-v7-28.0.0\\res\\values-el\\values-el.xml",
@@ -1969,7 +1798,7 @@
]
},
{
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-pa_values-pa.arsc.flat",
+ "outputFile": "D:\\Note-master2\\app\\build\\intermediates\\merged_res\\debug\\values-pa_values-pa.arsc.flat",
"map": [
{
"source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\c9913736ba0af3f26ba50dd9aa679a2b\\transformed\\support-compat-28.0.0\\res\\values-pa\\values-pa.xml",
@@ -2001,35 +1830,52 @@
]
},
{
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-large-v4_values-large-v4.arsc.flat",
+ "outputFile": "D:\\Note-master2\\app\\build\\intermediates\\merged_res\\debug\\values-en-rCA_values-en-rCA.arsc.flat",
"map": [
{
- "source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\4051cc509ba70441b9465808cc62a56d\\transformed\\appcompat-v7-28.0.0\\res\\values-large-v4\\values-large-v4.xml",
+ "source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\4051cc509ba70441b9465808cc62a56d\\transformed\\appcompat-v7-28.0.0\\res\\values-en-rCA\\values-en-rCA.xml",
"from": {
- "startLines": "2,3,4,5,6,7,8,9,10",
- "startColumns": "4,4,4,4,4,4,4,4,4",
- "startOffsets": "55,114,185,256,326,396,464,532,636",
- "endColumns": "58,70,70,69,69,67,67,103,115",
- "endOffsets": "109,180,251,321,391,459,527,631,747"
+ "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29",
+ "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",
+ "startOffsets": "105,209,309,417,501,601,716,793,869,960,1053,1149,1243,1344,1437,1532,1626,1717,1808,1890,1993,2097,2196,2301,2404,2508,2664,2764",
+ "endColumns": "103,99,107,83,99,114,76,75,90,92,95,93,100,92,94,93,90,90,81,102,103,98,104,102,103,155,99,81",
+ "endOffsets": "204,304,412,496,596,711,788,864,955,1048,1144,1238,1339,1432,1527,1621,1712,1803,1885,1988,2092,2191,2296,2399,2503,2659,2759,2841"
+ }
+ },
+ {
+ "source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\c9913736ba0af3f26ba50dd9aa679a2b\\transformed\\support-compat-28.0.0\\res\\values-en-rCA\\values-en-rCA.xml",
+ "from": {
+ "startLines": "2",
+ "startColumns": "4",
+ "startOffsets": "55",
+ "endColumns": "100",
+ "endOffsets": "151"
+ },
+ "to": {
+ "startLines": "30",
+ "startColumns": "4",
+ "startOffsets": "2846",
+ "endColumns": "100",
+ "endOffsets": "2942"
}
}
]
},
{
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-sk_values-sk.arsc.flat",
+ "outputFile": "D:\\Note-master2\\app\\build\\intermediates\\merged_res\\debug\\values-es-rUS_values-es-rUS.arsc.flat",
"map": [
{
- "source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\4051cc509ba70441b9465808cc62a56d\\transformed\\appcompat-v7-28.0.0\\res\\values-sk\\values-sk.xml",
+ "source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\4051cc509ba70441b9465808cc62a56d\\transformed\\appcompat-v7-28.0.0\\res\\values-es-rUS\\values-es-rUS.xml",
"from": {
"startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29",
"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",
- "startOffsets": "105,212,312,423,509,617,735,816,897,988,1081,1180,1274,1375,1468,1563,1661,1752,1843,1927,2032,2141,2240,2346,2457,2566,2732,2830",
- "endColumns": "106,99,110,85,107,117,80,80,90,92,98,93,100,92,94,97,90,90,83,104,108,98,105,110,108,165,97,87",
- "endOffsets": "207,307,418,504,612,730,811,892,983,1076,1175,1269,1370,1463,1558,1656,1747,1838,1922,2027,2136,2235,2341,2452,2561,2727,2825,2913"
+ "startOffsets": "105,225,334,442,527,628,751,836,918,1009,1102,1198,1292,1392,1485,1584,1680,1771,1862,1944,2056,2156,2257,2365,2472,2579,2738,2838",
+ "endColumns": "119,108,107,84,100,122,84,81,90,92,95,93,99,92,98,95,90,90,81,111,99,100,107,106,106,158,99,81",
+ "endOffsets": "220,329,437,522,623,746,831,913,1004,1097,1193,1287,1387,1480,1579,1675,1766,1857,1939,2051,2151,2252,2360,2467,2574,2733,2833,2915"
}
},
{
- "source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\c9913736ba0af3f26ba50dd9aa679a2b\\transformed\\support-compat-28.0.0\\res\\values-sk\\values-sk.xml",
+ "source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\c9913736ba0af3f26ba50dd9aa679a2b\\transformed\\support-compat-28.0.0\\res\\values-es-rUS\\values-es-rUS.xml",
"from": {
"startLines": "2",
"startColumns": "4",
@@ -2040,28 +1886,88 @@
"to": {
"startLines": "30",
"startColumns": "4",
- "startOffsets": "2918",
+ "startOffsets": "2920",
"endColumns": "100",
- "endOffsets": "3014"
+ "endOffsets": "3016"
}
}
]
},
{
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-en-rGB_values-en-rGB.arsc.flat",
+ "outputFile": "D:\\Note-master2\\app\\build\\intermediates\\merged_res\\debug\\values-v24_values-v24.arsc.flat",
"map": [
{
- "source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\4051cc509ba70441b9465808cc62a56d\\transformed\\appcompat-v7-28.0.0\\res\\values-en-rGB\\values-en-rGB.xml",
+ "source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\4051cc509ba70441b9465808cc62a56d\\transformed\\appcompat-v7-28.0.0\\res\\values-v24\\values-v24.xml",
+ "from": {
+ "startLines": "2,3",
+ "startColumns": "4,4",
+ "startOffsets": "55,212",
+ "endColumns": "156,134",
+ "endOffsets": "207,342"
+ }
+ }
+ ]
+ },
+ {
+ "outputFile": "D:\\Note-master2\\app\\build\\intermediates\\merged_res\\debug\\values-zh-rTW_values-zh-rTW.arsc.flat",
+ "map": [
+ {
+ "source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\4051cc509ba70441b9465808cc62a56d\\transformed\\appcompat-v7-28.0.0\\res\\values-zh-rTW\\values-zh-rTW.xml",
"from": {
"startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29",
"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",
- "startOffsets": "105,209,309,417,501,601,716,793,869,960,1053,1149,1243,1344,1437,1532,1626,1717,1808,1890,1993,2097,2196,2301,2404,2508,2664,2764",
- "endColumns": "103,99,107,83,99,114,76,75,90,92,95,93,100,92,94,93,90,90,81,102,103,98,104,102,103,155,99,81",
- "endOffsets": "204,304,412,496,596,711,788,864,955,1048,1144,1238,1339,1432,1527,1621,1712,1803,1885,1988,2092,2191,2296,2399,2503,2659,2759,2841"
+ "startOffsets": "105,200,293,393,475,572,680,756,832,924,1018,1116,1212,1308,1402,1498,1590,1682,1774,1852,1948,2044,2139,2236,2331,2431,2581,2675",
+ "endColumns": "94,92,99,81,96,107,75,75,91,93,97,95,95,93,95,91,91,91,77,95,95,94,96,94,99,149,93,77",
+ "endOffsets": "195,288,388,470,567,675,751,827,919,1013,1111,1207,1303,1397,1493,1585,1677,1769,1847,1943,2039,2134,2231,2326,2426,2576,2670,2748"
+ },
+ "to": {
+ "startLines": "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,121",
+ "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",
+ "startOffsets": "384,479,572,672,754,851,959,1035,1111,1203,1297,1395,1491,1587,1681,1777,1869,1961,2053,2131,2227,2323,2418,2515,2610,2710,2860,7815",
+ "endColumns": "94,92,99,81,96,107,75,75,91,93,97,95,95,93,95,91,91,91,77,95,95,94,96,94,99,149,93,77",
+ "endOffsets": "474,567,667,749,846,954,1030,1106,1198,1292,1390,1486,1582,1676,1772,1864,1956,2048,2126,2222,2318,2413,2510,2605,2705,2855,2949,7888"
}
},
{
- "source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\c9913736ba0af3f26ba50dd9aa679a2b\\transformed\\support-compat-28.0.0\\res\\values-en-rGB\\values-en-rGB.xml",
+ "source": "D:\\Note-master2\\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": "D:\\Note-master2\\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,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,122,123,125,126,127,128,129,130,131,132,133,134,135",
+ "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,2954,3026,3092,3165,3215,3255,3303,3351,3396,3453,3507,3557,3619,3687,3764,3823,3889,3952,4007,4067,4130,4184,4244,4297,4359,4443,4523,4573,4632,4675,4728,4771,4822,4872,4932,4985,5036,5082,5130,5178,5224,5271,5321,5366,5425,5477,5529,5572,5619,5675,5730,5785,5829,5871,5912,5962,6021,6072,6121,6170,6217,6264,6311,6356,6407,6460,6535,6594,6651,6725,6789,6858,6936,7046,7150,7223,7289,7344,7409,7474,7523,7606,7684,7722,7767,7893,7955,8113,8168,8227,8294,8352,8414,8462,8507,8555,8606,8672",
+ "endLines": "8,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,122,123,125,126,127,128,129,130,131,132,133,134,135",
+ "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,3021,3087,3160,3210,3250,3298,3346,3391,3448,3502,3552,3614,3682,3759,3818,3884,3947,4002,4062,4125,4179,4239,4292,4354,4438,4518,4568,4627,4670,4723,4766,4817,4867,4927,4980,5031,5077,5125,5173,5219,5266,5316,5361,5420,5472,5524,5567,5614,5670,5725,5780,5824,5866,5907,5957,6016,6067,6116,6165,6212,6259,6306,6351,6402,6455,6530,6589,6646,6720,6784,6853,6931,7041,7145,7218,7284,7339,7404,7469,7518,7601,7679,7717,7762,7810,7950,8007,8163,8222,8289,8347,8409,8457,8502,8550,8601,8667,8733"
+ }
+ },
+ {
+ "source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\c9913736ba0af3f26ba50dd9aa679a2b\\transformed\\support-compat-28.0.0\\res\\values-zh-rTW\\values-zh-rTW.xml",
"from": {
"startLines": "2",
"startColumns": "4",
@@ -2070,17 +1976,17 @@
"endOffsets": "151"
},
"to": {
- "startLines": "30",
+ "startLines": "124",
"startColumns": "4",
- "startOffsets": "2846",
+ "startOffsets": "8012",
"endColumns": "100",
- "endOffsets": "2942"
+ "endOffsets": "8108"
}
}
]
},
{
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-mr_values-mr.arsc.flat",
+ "outputFile": "D:\\Note-master2\\app\\build\\intermediates\\merged_res\\debug\\values-mr_values-mr.arsc.flat",
"map": [
{
"source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\c9913736ba0af3f26ba50dd9aa679a2b\\transformed\\support-compat-28.0.0\\res\\values-mr\\values-mr.xml",
@@ -2112,20 +2018,20 @@
]
},
{
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-gu_values-gu.arsc.flat",
+ "outputFile": "D:\\Note-master2\\app\\build\\intermediates\\merged_res\\debug\\values-sk_values-sk.arsc.flat",
"map": [
{
- "source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\4051cc509ba70441b9465808cc62a56d\\transformed\\appcompat-v7-28.0.0\\res\\values-gu\\values-gu.xml",
+ "source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\4051cc509ba70441b9465808cc62a56d\\transformed\\appcompat-v7-28.0.0\\res\\values-sk\\values-sk.xml",
"from": {
"startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29",
"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",
- "startOffsets": "105,214,318,425,512,613,736,813,891,982,1075,1174,1268,1369,1462,1557,1654,1745,1836,1916,2022,2124,2221,2330,2429,2539,2699,2802",
- "endColumns": "108,103,106,86,100,122,76,77,90,92,98,93,100,92,94,96,90,90,79,105,101,96,108,98,109,159,102,79",
- "endOffsets": "209,313,420,507,608,731,808,886,977,1070,1169,1263,1364,1457,1552,1649,1740,1831,1911,2017,2119,2216,2325,2424,2534,2694,2797,2877"
+ "startOffsets": "105,212,312,423,509,617,735,816,897,988,1081,1180,1274,1375,1468,1563,1661,1752,1843,1927,2032,2141,2240,2346,2457,2566,2732,2830",
+ "endColumns": "106,99,110,85,107,117,80,80,90,92,98,93,100,92,94,97,90,90,83,104,108,98,105,110,108,165,97,87",
+ "endOffsets": "207,307,418,504,612,730,811,892,983,1076,1175,1269,1370,1463,1558,1656,1747,1838,1922,2027,2136,2235,2341,2452,2561,2727,2825,2913"
}
},
{
- "source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\c9913736ba0af3f26ba50dd9aa679a2b\\transformed\\support-compat-28.0.0\\res\\values-gu\\values-gu.xml",
+ "source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\c9913736ba0af3f26ba50dd9aa679a2b\\transformed\\support-compat-28.0.0\\res\\values-sk\\values-sk.xml",
"from": {
"startLines": "2",
"startColumns": "4",
@@ -2136,18 +2042,28 @@
"to": {
"startLines": "30",
"startColumns": "4",
- "startOffsets": "2882",
+ "startOffsets": "2918",
"endColumns": "100",
- "endOffsets": "2978"
+ "endOffsets": "3014"
}
}
]
},
{
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-tl_values-tl.arsc.flat",
+ "outputFile": "D:\\Note-master2\\app\\build\\intermediates\\merged_res\\debug\\values-uk_values-uk.arsc.flat",
"map": [
{
- "source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\c9913736ba0af3f26ba50dd9aa679a2b\\transformed\\support-compat-28.0.0\\res\\values-tl\\values-tl.xml",
+ "source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\4051cc509ba70441b9465808cc62a56d\\transformed\\appcompat-v7-28.0.0\\res\\values-uk\\values-uk.xml",
+ "from": {
+ "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29",
+ "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",
+ "startOffsets": "105,215,317,423,509,617,735,814,894,985,1078,1174,1268,1369,1462,1557,1652,1743,1834,1915,2021,2128,2226,2334,2440,2549,2719,2819",
+ "endColumns": "109,101,105,85,107,117,78,79,90,92,95,93,100,92,94,94,90,90,80,105,106,97,107,105,108,169,99,80",
+ "endOffsets": "210,312,418,504,612,730,809,889,980,1073,1169,1263,1364,1457,1552,1647,1738,1829,1910,2016,2123,2221,2329,2435,2544,2714,2814,2895"
+ }
+ },
+ {
+ "source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\c9913736ba0af3f26ba50dd9aa679a2b\\transformed\\support-compat-28.0.0\\res\\values-uk\\values-uk.xml",
"from": {
"startLines": "2",
"startColumns": "4",
@@ -2158,38 +2074,43 @@
"to": {
"startLines": "30",
"startColumns": "4",
- "startOffsets": "2949",
+ "startOffsets": "2900",
"endColumns": "100",
- "endOffsets": "3045"
+ "endOffsets": "2996"
}
- },
+ }
+ ]
+ },
+ {
+ "outputFile": "D:\\Note-master2\\app\\build\\intermediates\\merged_res\\debug\\values-v18_values-v18.arsc.flat",
+ "map": [
{
- "source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\4051cc509ba70441b9465808cc62a56d\\transformed\\appcompat-v7-28.0.0\\res\\values-tl\\values-tl.xml",
+ "source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\4051cc509ba70441b9465808cc62a56d\\transformed\\appcompat-v7-28.0.0\\res\\values-v18\\values-v18.xml",
"from": {
- "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29",
- "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",
- "startOffsets": "105,224,332,449,537,643,764,843,921,1012,1105,1201,1295,1396,1489,1584,1678,1769,1860,1944,2053,2164,2265,2375,2492,2600,2763,2865",
- "endColumns": "118,107,116,87,105,120,78,77,90,92,95,93,100,92,94,93,90,90,83,108,110,100,109,116,107,162,101,83",
- "endOffsets": "219,327,444,532,638,759,838,916,1007,1100,1196,1290,1391,1484,1579,1673,1764,1855,1939,2048,2159,2260,2370,2487,2595,2758,2860,2944"
+ "startLines": "2",
+ "startColumns": "4",
+ "startOffsets": "55",
+ "endColumns": "48",
+ "endOffsets": "99"
}
}
]
},
{
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-ka_values-ka.arsc.flat",
+ "outputFile": "D:\\Note-master2\\app\\build\\intermediates\\merged_res\\debug\\values-ne_values-ne.arsc.flat",
"map": [
{
- "source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\4051cc509ba70441b9465808cc62a56d\\transformed\\appcompat-v7-28.0.0\\res\\values-ka\\values-ka.xml",
+ "source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\4051cc509ba70441b9465808cc62a56d\\transformed\\appcompat-v7-28.0.0\\res\\values-ne\\values-ne.xml",
"from": {
"startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29",
"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",
- "startOffsets": "105,214,318,429,517,622,735,819,901,992,1085,1180,1276,1377,1470,1565,1659,1750,1841,1924,2037,2144,2242,2355,2459,2563,2720,2818",
- "endColumns": "108,103,110,87,104,112,83,81,90,92,94,95,100,92,94,93,90,90,82,112,106,97,112,103,103,156,97,80",
- "endOffsets": "209,313,424,512,617,730,814,896,987,1080,1175,1271,1372,1465,1560,1654,1745,1836,1919,2032,2139,2237,2350,2454,2558,2715,2813,2894"
+ "startOffsets": "105,210,314,422,513,620,747,841,931,1022,1115,1211,1305,1406,1499,1594,1688,1779,1870,1958,2068,2184,2287,2402,2504,2619,2790,2902",
+ "endColumns": "104,103,107,90,106,126,93,89,90,92,95,93,100,92,94,93,90,90,87,109,115,102,114,101,114,170,111,85",
+ "endOffsets": "205,309,417,508,615,742,836,926,1017,1110,1206,1300,1401,1494,1589,1683,1774,1865,1953,2063,2179,2282,2397,2499,2614,2785,2897,2983"
}
},
{
- "source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\c9913736ba0af3f26ba50dd9aa679a2b\\transformed\\support-compat-28.0.0\\res\\values-ka\\values-ka.xml",
+ "source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\c9913736ba0af3f26ba50dd9aa679a2b\\transformed\\support-compat-28.0.0\\res\\values-ne\\values-ne.xml",
"from": {
"startLines": "2",
"startColumns": "4",
@@ -2200,15 +2121,15 @@
"to": {
"startLines": "30",
"startColumns": "4",
- "startOffsets": "2899",
+ "startOffsets": "2988",
"endColumns": "100",
- "endOffsets": "2995"
+ "endOffsets": "3084"
}
}
]
},
{
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-km_values-km.arsc.flat",
+ "outputFile": "D:\\Note-master2\\app\\build\\intermediates\\merged_res\\debug\\values-km_values-km.arsc.flat",
"map": [
{
"source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\4051cc509ba70441b9465808cc62a56d\\transformed\\appcompat-v7-28.0.0\\res\\values-km\\values-km.xml",
@@ -2240,20 +2161,35 @@
]
},
{
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-pt-rPT_values-pt-rPT.arsc.flat",
+ "outputFile": "D:\\Note-master2\\app\\build\\intermediates\\merged_res\\debug\\values-ldltr-v21_values-ldltr-v21.arsc.flat",
"map": [
{
- "source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\4051cc509ba70441b9465808cc62a56d\\transformed\\appcompat-v7-28.0.0\\res\\values-pt-rPT\\values-pt-rPT.xml",
+ "source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\4051cc509ba70441b9465808cc62a56d\\transformed\\appcompat-v7-28.0.0\\res\\values-ldltr-v21\\values-ldltr-v21.xml",
+ "from": {
+ "startLines": "2",
+ "startColumns": "4",
+ "startOffsets": "55",
+ "endColumns": "112",
+ "endOffsets": "163"
+ }
+ }
+ ]
+ },
+ {
+ "outputFile": "D:\\Note-master2\\app\\build\\intermediates\\merged_res\\debug\\values-hu_values-hu.arsc.flat",
+ "map": [
+ {
+ "source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\4051cc509ba70441b9465808cc62a56d\\transformed\\appcompat-v7-28.0.0\\res\\values-hu\\values-hu.xml",
"from": {
"startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29",
"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",
- "startOffsets": "105,225,331,438,527,628,752,836,917,1009,1103,1201,1295,1395,1489,1585,1680,1772,1864,1951,2058,2170,2272,2380,2487,2594,2765,2864",
- "endColumns": "119,105,106,88,100,123,83,80,91,93,97,93,99,93,95,94,91,91,86,106,111,101,107,106,106,170,98,84",
- "endOffsets": "220,326,433,522,623,747,831,912,1004,1098,1196,1290,1390,1484,1580,1675,1767,1859,1946,2053,2165,2267,2375,2482,2589,2760,2859,2944"
+ "startOffsets": "105,213,318,433,517,629,759,835,911,1002,1095,1191,1285,1386,1479,1574,1669,1760,1851,1934,2044,2155,2255,2366,2474,2593,2775,2878",
+ "endColumns": "107,104,114,83,111,129,75,75,90,92,95,93,100,92,94,94,90,90,82,109,110,99,110,107,118,181,102,82",
+ "endOffsets": "208,313,428,512,624,754,830,906,997,1090,1186,1280,1381,1474,1569,1664,1755,1846,1929,2039,2150,2250,2361,2469,2588,2770,2873,2956"
}
},
{
- "source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\c9913736ba0af3f26ba50dd9aa679a2b\\transformed\\support-compat-28.0.0\\res\\values-pt-rPT\\values-pt-rPT.xml",
+ "source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\c9913736ba0af3f26ba50dd9aa679a2b\\transformed\\support-compat-28.0.0\\res\\values-hu\\values-hu.xml",
"from": {
"startLines": "2",
"startColumns": "4",
@@ -2264,31 +2200,15 @@
"to": {
"startLines": "30",
"startColumns": "4",
- "startOffsets": "2949",
+ "startOffsets": "2961",
"endColumns": "100",
- "endOffsets": "3045"
- }
- }
- ]
- },
- {
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-v17_values-v17.arsc.flat",
- "map": [
- {
- "source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\4051cc509ba70441b9465808cc62a56d\\transformed\\appcompat-v7-28.0.0\\res\\values-v17\\values-v17.xml",
- "from": {
- "startLines": "2,5,9,12,15,18,22,25,29,33,37,40,43,46,50,53,57",
- "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
- "startOffsets": "55,228,456,614,764,936,1161,1331,1559,1783,2025,2196,2370,2539,2812,3012,3216",
- "endLines": "4,8,11,14,17,21,24,28,32,36,39,42,45,49,52,56,60",
- "endColumns": "12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12",
- "endOffsets": "223,451,609,759,931,1156,1326,1554,1778,2020,2191,2365,2534,2807,3007,3211,3540"
+ "endOffsets": "3057"
}
}
]
},
{
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-af_values-af.arsc.flat",
+ "outputFile": "D:\\Note-master2\\app\\build\\intermediates\\merged_res\\debug\\values-af_values-af.arsc.flat",
"map": [
{
"source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\c9913736ba0af3f26ba50dd9aa679a2b\\transformed\\support-compat-28.0.0\\res\\values-af\\values-af.xml",
@@ -2320,35 +2240,52 @@
]
},
{
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-land_values-land.arsc.flat",
+ "outputFile": "D:\\Note-master2\\app\\build\\intermediates\\merged_res\\debug\\values-en-rAU_values-en-rAU.arsc.flat",
"map": [
{
- "source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\4051cc509ba70441b9465808cc62a56d\\transformed\\appcompat-v7-28.0.0\\res\\values-land\\values-land.xml",
+ "source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\c9913736ba0af3f26ba50dd9aa679a2b\\transformed\\support-compat-28.0.0\\res\\values-en-rAU\\values-en-rAU.xml",
"from": {
- "startLines": "2,3,4",
- "startColumns": "4,4,4",
- "startOffsets": "55,125,196",
- "endColumns": "69,70,67",
- "endOffsets": "120,191,259"
+ "startLines": "2",
+ "startColumns": "4",
+ "startOffsets": "55",
+ "endColumns": "100",
+ "endOffsets": "151"
+ },
+ "to": {
+ "startLines": "30",
+ "startColumns": "4",
+ "startOffsets": "2846",
+ "endColumns": "100",
+ "endOffsets": "2942"
+ }
+ },
+ {
+ "source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\4051cc509ba70441b9465808cc62a56d\\transformed\\appcompat-v7-28.0.0\\res\\values-en-rAU\\values-en-rAU.xml",
+ "from": {
+ "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29",
+ "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",
+ "startOffsets": "105,209,309,417,501,601,716,793,869,960,1053,1149,1243,1344,1437,1532,1626,1717,1808,1890,1993,2097,2196,2301,2404,2508,2664,2764",
+ "endColumns": "103,99,107,83,99,114,76,75,90,92,95,93,100,92,94,93,90,90,81,102,103,98,104,102,103,155,99,81",
+ "endOffsets": "204,304,412,496,596,711,788,864,955,1048,1144,1238,1339,1432,1527,1621,1712,1803,1885,1988,2092,2191,2296,2399,2503,2659,2759,2841"
}
}
]
},
{
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-eu_values-eu.arsc.flat",
+ "outputFile": "D:\\Note-master2\\app\\build\\intermediates\\merged_res\\debug\\values-lv_values-lv.arsc.flat",
"map": [
{
- "source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\4051cc509ba70441b9465808cc62a56d\\transformed\\appcompat-v7-28.0.0\\res\\values-eu\\values-eu.xml",
+ "source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\4051cc509ba70441b9465808cc62a56d\\transformed\\appcompat-v7-28.0.0\\res\\values-lv\\values-lv.xml",
"from": {
"startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29",
"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",
- "startOffsets": "105,214,312,422,508,614,738,825,909,1001,1095,1192,1286,1388,1482,1578,1675,1767,1860,1942,2051,2161,2260,2369,2475,2586,2757,2856",
- "endColumns": "108,97,109,85,105,123,86,83,91,93,96,93,101,93,95,96,91,92,81,108,109,98,108,105,110,170,98,81",
- "endOffsets": "209,307,417,503,609,733,820,904,996,1090,1187,1281,1383,1477,1573,1670,1762,1855,1937,2046,2156,2255,2364,2470,2581,2752,2851,2933"
+ "startOffsets": "105,225,333,442,528,632,754,836,918,1028,1136,1243,1352,1464,1567,1679,1786,1891,1991,2076,2185,2297,2396,2507,2616,2721,2895,2994",
+ "endColumns": "119,107,108,85,103,121,81,81,109,107,106,108,111,102,111,106,104,99,84,108,111,98,110,108,104,173,98,81",
+ "endOffsets": "220,328,437,523,627,749,831,913,1023,1131,1238,1347,1459,1562,1674,1781,1886,1986,2071,2180,2292,2391,2502,2611,2716,2890,2989,3071"
}
},
{
- "source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\c9913736ba0af3f26ba50dd9aa679a2b\\transformed\\support-compat-28.0.0\\res\\values-eu\\values-eu.xml",
+ "source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\c9913736ba0af3f26ba50dd9aa679a2b\\transformed\\support-compat-28.0.0\\res\\values-lv\\values-lv.xml",
"from": {
"startLines": "2",
"startColumns": "4",
@@ -2359,15 +2296,15 @@
"to": {
"startLines": "30",
"startColumns": "4",
- "startOffsets": "2938",
+ "startOffsets": "3076",
"endColumns": "100",
- "endOffsets": "3034"
+ "endOffsets": "3172"
}
}
]
},
{
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-gl_values-gl.arsc.flat",
+ "outputFile": "D:\\Note-master2\\app\\build\\intermediates\\merged_res\\debug\\values-gl_values-gl.arsc.flat",
"map": [
{
"source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\c9913736ba0af3f26ba50dd9aa679a2b\\transformed\\support-compat-28.0.0\\res\\values-gl\\values-gl.xml",
@@ -2399,54 +2336,84 @@
]
},
{
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-v16_values-v16.arsc.flat",
+ "outputFile": "D:\\Note-master2\\app\\build\\intermediates\\merged_res\\debug\\values-en-rIN_values-en-rIN.arsc.flat",
"map": [
{
- "source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\4051cc509ba70441b9465808cc62a56d\\transformed\\appcompat-v7-28.0.0\\res\\values-v16\\values-v16.xml",
+ "source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\c9913736ba0af3f26ba50dd9aa679a2b\\transformed\\support-compat-28.0.0\\res\\values-en-rIN\\values-en-rIN.xml",
"from": {
"startLines": "2",
"startColumns": "4",
"startOffsets": "55",
- "endLines": "5",
- "endColumns": "12",
- "endOffsets": "223"
+ "endColumns": "100",
+ "endOffsets": "151"
},
"to": {
- "startLines": "3",
+ "startLines": "30",
"startColumns": "4",
- "startOffsets": "121",
- "endLines": "6",
- "endColumns": "12",
- "endOffsets": "289"
+ "startOffsets": "2846",
+ "endColumns": "100",
+ "endOffsets": "2942"
}
},
{
- "source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\c9913736ba0af3f26ba50dd9aa679a2b\\transformed\\support-compat-28.0.0\\res\\values-v16\\values-v16.xml",
+ "source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\4051cc509ba70441b9465808cc62a56d\\transformed\\appcompat-v7-28.0.0\\res\\values-en-rIN\\values-en-rIN.xml",
+ "from": {
+ "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29",
+ "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",
+ "startOffsets": "105,209,309,417,501,601,716,793,869,960,1053,1149,1243,1344,1437,1532,1626,1717,1808,1890,1993,2097,2196,2301,2404,2508,2664,2764",
+ "endColumns": "103,99,107,83,99,114,76,75,90,92,95,93,100,92,94,93,90,90,81,102,103,98,104,102,103,155,99,81",
+ "endOffsets": "204,304,412,496,596,711,788,864,955,1048,1144,1238,1339,1432,1527,1621,1712,1803,1885,1988,2092,2191,2296,2399,2503,2659,2759,2841"
+ }
+ }
+ ]
+ },
+ {
+ "outputFile": "D:\\Note-master2\\app\\build\\intermediates\\merged_res\\debug\\values-en-rXC_values-en-rXC.arsc.flat",
+ "map": [
+ {
+ "source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\c9913736ba0af3f26ba50dd9aa679a2b\\transformed\\support-compat-28.0.0\\res\\values-en-rXC\\values-en-rXC.xml",
"from": {
"startLines": "2",
"startColumns": "4",
"startOffsets": "55",
- "endColumns": "65",
- "endOffsets": "116"
+ "endColumns": "202",
+ "endOffsets": "253"
+ },
+ "to": {
+ "startLines": "30",
+ "startColumns": "4",
+ "startOffsets": "5682",
+ "endColumns": "202",
+ "endOffsets": "5880"
+ }
+ },
+ {
+ "source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\4051cc509ba70441b9465808cc62a56d\\transformed\\appcompat-v7-28.0.0\\res\\values-en-rXC\\values-en-rXC.xml",
+ "from": {
+ "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29",
+ "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",
+ "startOffsets": "105,310,510,719,904,1106,1321,1494,1671,1862,2055,2253,2449,2652,2847,3044,3239,3432,3623,3807,4011,4216,4417,4624,4826,5031,5303,5503",
+ "endColumns": "204,199,208,184,201,214,172,176,190,192,197,195,202,194,196,194,192,190,183,203,204,200,206,201,204,271,199,178",
+ "endOffsets": "305,505,714,899,1101,1316,1489,1666,1857,2050,2248,2444,2647,2842,3039,3234,3427,3618,3802,4006,4211,4412,4619,4821,5026,5298,5498,5677"
}
}
]
},
{
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-lo_values-lo.arsc.flat",
+ "outputFile": "D:\\Note-master2\\app\\build\\intermediates\\merged_res\\debug\\values-gu_values-gu.arsc.flat",
"map": [
{
- "source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\4051cc509ba70441b9465808cc62a56d\\transformed\\appcompat-v7-28.0.0\\res\\values-lo\\values-lo.xml",
+ "source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\4051cc509ba70441b9465808cc62a56d\\transformed\\appcompat-v7-28.0.0\\res\\values-gu\\values-gu.xml",
"from": {
"startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29",
"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",
- "startOffsets": "105,208,305,412,497,602,714,791,869,960,1053,1149,1243,1344,1437,1532,1626,1717,1808,1888,1995,2092,2190,2295,2398,2502,2659,2755",
- "endColumns": "102,96,106,84,104,111,76,77,90,92,95,93,100,92,94,93,90,90,79,106,96,97,104,102,103,156,95,80",
- "endOffsets": "203,300,407,492,597,709,786,864,955,1048,1144,1238,1339,1432,1527,1621,1712,1803,1883,1990,2087,2185,2290,2393,2497,2654,2750,2831"
+ "startOffsets": "105,214,318,425,512,613,736,813,891,982,1075,1174,1268,1369,1462,1557,1654,1745,1836,1916,2022,2124,2221,2330,2429,2539,2699,2802",
+ "endColumns": "108,103,106,86,100,122,76,77,90,92,98,93,100,92,94,96,90,90,79,105,101,96,108,98,109,159,102,79",
+ "endOffsets": "209,313,420,507,608,731,808,886,977,1070,1169,1263,1364,1457,1552,1649,1740,1831,1911,2017,2119,2216,2325,2424,2534,2694,2797,2877"
}
},
{
- "source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\c9913736ba0af3f26ba50dd9aa679a2b\\transformed\\support-compat-28.0.0\\res\\values-lo\\values-lo.xml",
+ "source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\c9913736ba0af3f26ba50dd9aa679a2b\\transformed\\support-compat-28.0.0\\res\\values-gu\\values-gu.xml",
"from": {
"startLines": "2",
"startColumns": "4",
@@ -2457,15 +2424,31 @@
"to": {
"startLines": "30",
"startColumns": "4",
- "startOffsets": "2836",
+ "startOffsets": "2882",
"endColumns": "100",
- "endOffsets": "2932"
+ "endOffsets": "2978"
+ }
+ }
+ ]
+ },
+ {
+ "outputFile": "D:\\Note-master2\\app\\build\\intermediates\\merged_res\\debug\\values-v28_values-v28.arsc.flat",
+ "map": [
+ {
+ "source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\4051cc509ba70441b9465808cc62a56d\\transformed\\appcompat-v7-28.0.0\\res\\values-v28\\values-v28.xml",
+ "from": {
+ "startLines": "2,3,4,8",
+ "startColumns": "4,4,4,4",
+ "startOffsets": "55,130,217,447",
+ "endLines": "2,3,7,11",
+ "endColumns": "74,86,12,12",
+ "endOffsets": "125,212,442,684"
}
}
]
},
{
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-or_values-or.arsc.flat",
+ "outputFile": "D:\\Note-master2\\app\\build\\intermediates\\merged_res\\debug\\values-or_values-or.arsc.flat",
"map": [
{
"source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\4051cc509ba70441b9465808cc62a56d\\transformed\\appcompat-v7-28.0.0\\res\\values-or\\values-or.xml",
@@ -2497,10 +2480,20 @@
]
},
{
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-fi_values-fi.arsc.flat",
+ "outputFile": "D:\\Note-master2\\app\\build\\intermediates\\merged_res\\debug\\values-eu_values-eu.arsc.flat",
"map": [
{
- "source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\c9913736ba0af3f26ba50dd9aa679a2b\\transformed\\support-compat-28.0.0\\res\\values-fi\\values-fi.xml",
+ "source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\4051cc509ba70441b9465808cc62a56d\\transformed\\appcompat-v7-28.0.0\\res\\values-eu\\values-eu.xml",
+ "from": {
+ "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29",
+ "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",
+ "startOffsets": "105,214,312,422,508,614,738,825,909,1001,1095,1192,1286,1388,1482,1578,1675,1767,1860,1942,2051,2161,2260,2369,2475,2586,2757,2856",
+ "endColumns": "108,97,109,85,105,123,86,83,91,93,96,93,101,93,95,96,91,92,81,108,109,98,108,105,110,170,98,81",
+ "endOffsets": "209,307,417,503,609,733,820,904,996,1090,1187,1281,1383,1477,1573,1670,1762,1855,1937,2046,2156,2255,2364,2470,2581,2752,2851,2933"
+ }
+ },
+ {
+ "source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\c9913736ba0af3f26ba50dd9aa679a2b\\transformed\\support-compat-28.0.0\\res\\values-eu\\values-eu.xml",
"from": {
"startLines": "2",
"startColumns": "4",
@@ -2511,38 +2504,44 @@
"to": {
"startLines": "30",
"startColumns": "4",
- "startOffsets": "2872",
+ "startOffsets": "2938",
"endColumns": "100",
- "endOffsets": "2968"
+ "endOffsets": "3034"
}
- },
+ }
+ ]
+ },
+ {
+ "outputFile": "D:\\Note-master2\\app\\build\\intermediates\\merged_res\\debug\\values-watch-v21_values-watch-v21.arsc.flat",
+ "map": [
{
- "source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\4051cc509ba70441b9465808cc62a56d\\transformed\\appcompat-v7-28.0.0\\res\\values-fi\\values-fi.xml",
+ "source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\4051cc509ba70441b9465808cc62a56d\\transformed\\appcompat-v7-28.0.0\\res\\values-watch-v21\\values-watch-v21.xml",
"from": {
- "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29",
- "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",
- "startOffsets": "105,213,313,414,500,605,723,810,892,983,1076,1172,1266,1361,1454,1550,1649,1740,1834,1914,2021,2124,2221,2327,2426,2530,2693,2792",
- "endColumns": "107,99,100,85,104,117,86,81,90,92,95,93,94,92,95,98,90,93,79,106,102,96,105,98,103,162,98,79",
- "endOffsets": "208,308,409,495,600,718,805,887,978,1071,1167,1261,1356,1449,1545,1644,1735,1829,1909,2016,2119,2216,2322,2421,2525,2688,2787,2867"
+ "startLines": "2,6,10",
+ "startColumns": "4,4,4",
+ "startOffsets": "55,271,499",
+ "endLines": "5,9,13",
+ "endColumns": "12,12,12",
+ "endOffsets": "266,494,724"
}
}
]
},
{
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-as_values-as.arsc.flat",
+ "outputFile": "D:\\Note-master2\\app\\build\\intermediates\\merged_res\\debug\\values-sw_values-sw.arsc.flat",
"map": [
{
- "source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\4051cc509ba70441b9465808cc62a56d\\transformed\\appcompat-v7-28.0.0\\res\\values-as\\values-as.xml",
+ "source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\4051cc509ba70441b9465808cc62a56d\\transformed\\appcompat-v7-28.0.0\\res\\values-sw\\values-sw.xml",
"from": {
"startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29",
"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",
- "startOffsets": "105,213,312,419,515,617,736,816,896,987,1080,1173,1268,1368,1461,1558,1652,1743,1834,1923,2025,2140,2243,2352,2471,2591,2758,2861",
- "endColumns": "107,98,106,95,101,118,79,79,90,92,92,94,99,92,96,93,90,90,88,101,114,102,108,118,119,166,102,88",
- "endOffsets": "208,307,414,510,612,731,811,891,982,1075,1168,1263,1363,1456,1553,1647,1738,1829,1918,2020,2135,2238,2347,2466,2586,2753,2856,2945"
+ "startOffsets": "105,208,306,414,504,609,726,808,891,982,1075,1169,1263,1364,1457,1552,1647,1738,1830,1912,2013,2122,2221,2328,2437,2542,2704,2801",
+ "endColumns": "102,97,107,89,104,116,81,82,90,92,93,93,100,92,94,94,90,91,81,100,108,98,106,108,104,161,96,81",
+ "endOffsets": "203,301,409,499,604,721,803,886,977,1070,1164,1258,1359,1452,1547,1642,1733,1825,1907,2008,2117,2216,2323,2432,2537,2699,2796,2878"
}
},
{
- "source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\c9913736ba0af3f26ba50dd9aa679a2b\\transformed\\support-compat-28.0.0\\res\\values-as\\values-as.xml",
+ "source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\c9913736ba0af3f26ba50dd9aa679a2b\\transformed\\support-compat-28.0.0\\res\\values-sw\\values-sw.xml",
"from": {
"startLines": "2",
"startColumns": "4",
@@ -2553,18 +2552,44 @@
"to": {
"startLines": "30",
"startColumns": "4",
- "startOffsets": "2950",
+ "startOffsets": "2883",
"endColumns": "100",
- "endOffsets": "3046"
+ "endOffsets": "2979"
}
}
]
},
{
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-sl_values-sl.arsc.flat",
+ "outputFile": "D:\\Note-master2\\app\\build\\intermediates\\merged_res\\debug\\values-v23_values-v23.arsc.flat",
"map": [
{
- "source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\c9913736ba0af3f26ba50dd9aa679a2b\\transformed\\support-compat-28.0.0\\res\\values-sl\\values-sl.xml",
+ "source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\4051cc509ba70441b9465808cc62a56d\\transformed\\appcompat-v7-28.0.0\\res\\values-v23\\values-v23.xml",
+ "from": {
+ "startLines": "2,3,4,5,6,19,32,33,34,35,36",
+ "startColumns": "4,4,4,4,4,4,4,4,4,4,4",
+ "startOffsets": "55,190,325,400,487,1277,2079,2206,2311,2426,2533",
+ "endLines": "2,3,4,5,18,31,32,33,34,35,36",
+ "endColumns": "134,134,74,86,12,12,126,104,114,106,112",
+ "endOffsets": "185,320,395,482,1272,2074,2201,2306,2421,2528,2641"
+ }
+ }
+ ]
+ },
+ {
+ "outputFile": "D:\\Note-master2\\app\\build\\intermediates\\merged_res\\debug\\values-pt_values-pt.arsc.flat",
+ "map": [
+ {
+ "source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\4051cc509ba70441b9465808cc62a56d\\transformed\\appcompat-v7-28.0.0\\res\\values-pt\\values-pt.xml",
+ "from": {
+ "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29",
+ "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",
+ "startOffsets": "105,225,331,438,527,628,746,829,909,1000,1093,1189,1283,1384,1477,1572,1667,1758,1849,1936,2043,2155,2257,2365,2472,2582,2744,2844",
+ "endColumns": "119,105,106,88,100,117,82,79,90,92,95,93,100,92,94,94,90,90,86,106,111,101,107,106,109,161,99,84",
+ "endOffsets": "220,326,433,522,623,741,824,904,995,1088,1184,1278,1379,1472,1567,1662,1753,1844,1931,2038,2150,2252,2360,2467,2577,2739,2839,2924"
+ }
+ },
+ {
+ "source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\c9913736ba0af3f26ba50dd9aa679a2b\\transformed\\support-compat-28.0.0\\res\\values-pt\\values-pt.xml",
"from": {
"startLines": "2",
"startColumns": "4",
@@ -2575,38 +2600,89 @@
"to": {
"startLines": "30",
"startColumns": "4",
- "startOffsets": "2936",
+ "startOffsets": "2929",
"endColumns": "100",
- "endOffsets": "3032"
+ "endOffsets": "3025"
}
- },
+ }
+ ]
+ },
+ {
+ "outputFile": "D:\\Note-master2\\app\\build\\intermediates\\merged_res\\debug\\values-v25_values-v25.arsc.flat",
+ "map": [
{
- "source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\4051cc509ba70441b9465808cc62a56d\\transformed\\appcompat-v7-28.0.0\\res\\values-sl\\values-sl.xml",
+ "source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\4051cc509ba70441b9465808cc62a56d\\transformed\\appcompat-v7-28.0.0\\res\\values-v25\\values-v25.xml",
"from": {
- "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29",
- "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",
- "startOffsets": "105,212,319,427,514,617,736,821,905,997,1091,1187,1281,1377,1471,1567,1667,1759,1851,1935,2043,2152,2252,2365,2472,2576,2756,2853",
- "endColumns": "106,106,107,86,102,118,84,83,91,93,95,93,95,93,95,99,91,91,83,107,108,99,112,106,103,179,96,82",
- "endOffsets": "207,314,422,509,612,731,816,900,992,1086,1182,1276,1372,1466,1562,1662,1754,1846,1930,2038,2147,2247,2360,2467,2571,2751,2848,2931"
+ "startLines": "2,3,4,6",
+ "startColumns": "4,4,4,4",
+ "startOffsets": "55,126,209,308",
+ "endLines": "2,3,5,7",
+ "endColumns": "70,82,12,12",
+ "endOffsets": "121,204,303,414"
}
}
]
},
{
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-fr_values-fr.arsc.flat",
+ "outputFile": "D:\\Note-master2\\app\\build\\intermediates\\merged_res\\debug\\values-zh-rCN_values-zh-rCN.arsc.flat",
"map": [
{
- "source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\4051cc509ba70441b9465808cc62a56d\\transformed\\appcompat-v7-28.0.0\\res\\values-fr\\values-fr.xml",
+ "source": "D:\\Note-master2\\app\\src\\main\\res\\values-zh-rCN\\strings.xml",
+ "from": {
+ "startLines": "121,71,70,69,68,19,20,21,112,113,120,119,26,77,78,76,75,74,90,89,88,80,60,29,30,81,72,114,67,63,38,44,49,39,59,58,57,53,52,50,51,54,55,45,66,56,64,43,48,47,46,62,42,61,40,41,65,28,34,36,33,35,32,31,25,24,97,96,99,111,104,103,105,106,108,107,98,102,100,101,95,109,110,118,116,115,117,27,79,87,92,91,93,86,85,84,83,22,23",
+ "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
+ "startOffsets": "6532,3495,3429,3356,3306,827,867,915,6083,6128,6478,6428,1199,3861,3929,3802,3737,3674,4592,4532,4469,4061,2877,1369,1422,4115,3568,6185,3247,3034,1798,2079,2325,1851,2817,2764,2713,2518,2470,2376,2424,2564,2611,2122,3188,2661,3077,2036,2278,2222,2167,2979,1992,2937,1901,1942,3129,1318,1623,1719,1576,1672,1529,1484,1148,1095,4967,4908,5108,6009,5419,5350,5483,5561,5744,5671,5042,5295,5165,5230,4859,5848,5931,6390,6283,6235,6328,1261,4006,4410,4705,4647,4772,4362,4317,4269,4218,963,1029",
+ "endLines": "123,71,70,69,68,19,20,21,112,113,120,119,26,77,78,76,75,74,90,89,88,80,60,29,30,81,72,114,67,63,38,44,49,39,59,58,57,53,52,50,51,54,55,45,66,56,64,43,48,47,46,62,42,61,40,41,65,28,34,36,33,35,32,31,25,24,97,96,99,111,104,103,105,106,108,107,98,102,100,101,95,109,110,118,116,115,117,27,79,87,92,91,93,86,85,84,83,22,23",
+ "endColumns": "14,72,65,72,49,39,47,47,44,56,53,49,61,67,76,58,64,62,54,59,62,53,59,52,61,84,80,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65",
+ "endOffsets": "6704,3563,3490,3424,3351,862,910,958,6123,6180,6527,6473,1256,3924,4001,3856,3797,3732,4642,4587,4527,4110,2932,1417,1479,4195,3644,6230,3301,3072,1846,2117,2371,1896,2872,2812,2759,2559,2513,2419,2465,2606,2656,2162,3242,2708,3124,2074,2320,2273,2217,3029,2031,2974,1937,1987,3183,1364,1667,1763,1618,1714,1571,1524,1194,1143,5037,4962,5160,6078,5478,5414,5556,5666,5843,5739,5103,5345,5225,5290,4903,5926,6004,6423,6323,6278,6385,1313,4056,4464,4767,4700,4829,4405,4357,4312,4264,1024,1090"
+ },
+ "to": {
+ "startLines": "6,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,122,123,125,126,127,128,129,130,131,132,133,134,135",
+ "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,2945,3018,3084,3157,3207,3247,3295,3343,3388,3445,3499,3549,3611,3679,3756,3815,3880,3943,3998,4058,4121,4175,4235,4288,4350,4435,4516,4566,4625,4668,4721,4764,4815,4865,4925,4978,5029,5075,5123,5171,5217,5264,5314,5359,5418,5470,5522,5565,5612,5668,5723,5778,5822,5864,5905,5955,6014,6065,6114,6163,6210,6257,6304,6349,6400,6453,6528,6587,6644,6718,6782,6851,6929,7039,7143,7216,7282,7337,7402,7467,7516,7599,7677,7715,7760,7886,7948,8106,8161,8220,8287,8345,8407,8455,8500,8548,8599,8665",
+ "endLines": "8,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,122,123,125,126,127,128,129,130,131,132,133,134,135",
+ "endColumns": "14,72,65,72,49,39,47,47,44,56,53,49,61,67,76,58,64,62,54,59,62,53,59,52,61,84,80,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65",
+ "endOffsets": "379,3013,3079,3152,3202,3242,3290,3338,3383,3440,3494,3544,3606,3674,3751,3810,3875,3938,3993,4053,4116,4170,4230,4283,4345,4430,4511,4561,4620,4663,4716,4759,4810,4860,4920,4973,5024,5070,5118,5166,5212,5259,5309,5354,5413,5465,5517,5560,5607,5663,5718,5773,5817,5859,5900,5950,6009,6060,6109,6158,6205,6252,6299,6344,6395,6448,6523,6582,6639,6713,6777,6846,6924,7034,7138,7211,7277,7332,7397,7462,7511,7594,7672,7710,7755,7803,7943,8000,8156,8215,8282,8340,8402,8450,8495,8543,8594,8660,8726"
+ }
+ },
+ {
+ "source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\4051cc509ba70441b9465808cc62a56d\\transformed\\appcompat-v7-28.0.0\\res\\values-zh-rCN\\values-zh-rCN.xml",
"from": {
"startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29",
"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",
- "startOffsets": "105,216,331,442,524,630,760,843,923,1014,1107,1206,1301,1402,1495,1588,1683,1774,1865,1951,2061,2173,2276,2387,2494,2601,2760,2859",
- "endColumns": "110,114,110,81,105,129,82,79,90,92,98,94,100,92,92,94,90,90,85,109,111,102,110,106,106,158,98,85",
- "endOffsets": "211,326,437,519,625,755,838,918,1009,1102,1201,1296,1397,1490,1583,1678,1769,1860,1946,2056,2168,2271,2382,2489,2596,2755,2854,2940"
+ "startOffsets": "105,201,296,396,478,575,681,757,833,924,1017,1115,1211,1306,1399,1494,1586,1677,1768,1846,1942,2038,2133,2230,2325,2423,2572,2666",
+ "endColumns": "95,94,99,81,96,105,75,75,90,92,97,95,94,92,94,91,90,90,77,95,95,94,96,94,97,148,93,77",
+ "endOffsets": "196,291,391,473,570,676,752,828,919,1012,1110,1206,1301,1394,1489,1581,1672,1763,1841,1937,2033,2128,2225,2320,2418,2567,2661,2739"
+ },
+ "to": {
+ "startLines": "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,121",
+ "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",
+ "startOffsets": "384,480,575,675,757,854,960,1036,1112,1203,1296,1394,1490,1585,1678,1773,1865,1956,2047,2125,2221,2317,2412,2509,2604,2702,2851,7808",
+ "endColumns": "95,94,99,81,96,105,75,75,90,92,97,95,94,92,94,91,90,90,77,95,95,94,96,94,97,148,93,77",
+ "endOffsets": "475,570,670,752,849,955,1031,1107,1198,1291,1389,1485,1580,1673,1768,1860,1951,2042,2120,2216,2312,2407,2504,2599,2697,2846,2940,7881"
}
},
{
- "source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\c9913736ba0af3f26ba50dd9aa679a2b\\transformed\\support-compat-28.0.0\\res\\values-fr\\values-fr.xml",
+ "source": "D:\\Note-master2\\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\\86155\\.gradle\\caches\\transforms-3\\c9913736ba0af3f26ba50dd9aa679a2b\\transformed\\support-compat-28.0.0\\res\\values-zh-rCN\\values-zh-rCN.xml",
"from": {
"startLines": "2",
"startColumns": "4",
@@ -2615,20 +2691,20 @@
"endOffsets": "151"
},
"to": {
- "startLines": "30",
+ "startLines": "124",
"startColumns": "4",
- "startOffsets": "2945",
+ "startOffsets": "8005",
"endColumns": "100",
- "endOffsets": "3041"
+ "endOffsets": "8101"
}
}
]
},
{
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-pt-rBR_values-pt-rBR.arsc.flat",
+ "outputFile": "D:\\Note-master2\\app\\build\\intermediates\\merged_res\\debug\\values-ta_values-ta.arsc.flat",
"map": [
{
- "source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\c9913736ba0af3f26ba50dd9aa679a2b\\transformed\\support-compat-28.0.0\\res\\values-pt-rBR\\values-pt-rBR.xml",
+ "source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\c9913736ba0af3f26ba50dd9aa679a2b\\transformed\\support-compat-28.0.0\\res\\values-ta\\values-ta.xml",
"from": {
"startLines": "2",
"startColumns": "4",
@@ -2639,38 +2715,28 @@
"to": {
"startLines": "30",
"startColumns": "4",
- "startOffsets": "2929",
+ "startOffsets": "2954",
"endColumns": "100",
- "endOffsets": "3025"
+ "endOffsets": "3050"
}
},
{
- "source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\4051cc509ba70441b9465808cc62a56d\\transformed\\appcompat-v7-28.0.0\\res\\values-pt-rBR\\values-pt-rBR.xml",
+ "source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\4051cc509ba70441b9465808cc62a56d\\transformed\\appcompat-v7-28.0.0\\res\\values-ta\\values-ta.xml",
"from": {
"startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29",
"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",
- "startOffsets": "105,225,331,438,527,628,746,829,909,1000,1093,1189,1283,1384,1477,1572,1667,1758,1849,1936,2043,2155,2257,2365,2472,2582,2744,2844",
- "endColumns": "119,105,106,88,100,117,82,79,90,92,95,93,100,92,94,94,90,90,86,106,111,101,107,106,109,161,99,84",
- "endOffsets": "220,326,433,522,623,741,824,904,995,1088,1184,1278,1379,1472,1567,1662,1753,1844,1931,2038,2150,2252,2360,2467,2577,2739,2839,2924"
+ "startOffsets": "105,219,317,432,521,628,754,832,909,1009,1114,1210,1305,1412,1514,1618,1713,1815,1913,1995,2097,2201,2298,2408,2510,2617,2774,2874",
+ "endColumns": "113,97,114,88,106,125,77,76,99,104,95,94,106,101,103,94,101,97,81,101,103,96,109,101,106,156,99,79",
+ "endOffsets": "214,312,427,516,623,749,827,904,1004,1109,1205,1300,1407,1509,1613,1708,1810,1908,1990,2092,2196,2293,2403,2505,2612,2769,2869,2949"
}
}
]
},
{
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-mk_values-mk.arsc.flat",
+ "outputFile": "D:\\Note-master2\\app\\build\\intermediates\\merged_res\\debug\\values-et_values-et.arsc.flat",
"map": [
{
- "source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\4051cc509ba70441b9465808cc62a56d\\transformed\\appcompat-v7-28.0.0\\res\\values-mk\\values-mk.xml",
- "from": {
- "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29",
- "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",
- "startOffsets": "105,213,317,425,511,616,735,818,900,997,1096,1193,1293,1400,1499,1600,1696,1793,1884,1971,2077,2184,2285,2392,2503,2607,2763,2861",
- "endColumns": "107,103,107,85,104,118,82,81,96,98,96,99,106,98,100,95,96,90,86,105,106,100,106,110,103,155,97,83",
- "endOffsets": "208,312,420,506,611,730,813,895,992,1091,1188,1288,1395,1494,1595,1691,1788,1879,1966,2072,2179,2280,2387,2498,2602,2758,2856,2940"
- }
- },
- {
- "source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\c9913736ba0af3f26ba50dd9aa679a2b\\transformed\\support-compat-28.0.0\\res\\values-mk\\values-mk.xml",
+ "source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\c9913736ba0af3f26ba50dd9aa679a2b\\transformed\\support-compat-28.0.0\\res\\values-et\\values-et.xml",
"from": {
"startLines": "2",
"startColumns": "4",
@@ -2681,44 +2747,54 @@
"to": {
"startLines": "30",
"startColumns": "4",
- "startOffsets": "2945",
+ "startOffsets": "2942",
"endColumns": "100",
- "endOffsets": "3041"
+ "endOffsets": "3038"
+ }
+ },
+ {
+ "source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\4051cc509ba70441b9465808cc62a56d\\transformed\\appcompat-v7-28.0.0\\res\\values-et\\values-et.xml",
+ "from": {
+ "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29",
+ "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",
+ "startOffsets": "105,222,329,440,526,628,745,825,903,995,1089,1194,1296,1406,1500,1601,1695,1787,1880,1963,2074,2179,2278,2388,2489,2592,2758,2860",
+ "endColumns": "116,106,110,85,101,116,79,77,91,93,104,101,109,93,100,93,91,92,82,110,104,98,109,100,102,165,101,81",
+ "endOffsets": "217,324,435,521,623,740,820,898,990,1084,1189,1291,1401,1495,1596,1690,1782,1875,1958,2069,2174,2273,2383,2484,2587,2753,2855,2937"
}
}
]
},
{
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-hdpi-v4_values-hdpi-v4.arsc.flat",
+ "outputFile": "D:\\Note-master2\\app\\build\\intermediates\\merged_res\\debug\\values-watch-v20_values-watch-v20.arsc.flat",
"map": [
{
- "source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\4051cc509ba70441b9465808cc62a56d\\transformed\\appcompat-v7-28.0.0\\res\\values-hdpi-v4\\values-hdpi-v4.xml",
+ "source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\4051cc509ba70441b9465808cc62a56d\\transformed\\appcompat-v7-28.0.0\\res\\values-watch-v20\\values-watch-v20.xml",
"from": {
- "startLines": "2",
- "startColumns": "4",
- "startOffsets": "55",
- "endLines": "6",
- "endColumns": "13",
- "endOffsets": "327"
+ "startLines": "2,5,8",
+ "startColumns": "4,4,4",
+ "startOffsets": "55,214,385",
+ "endLines": "4,7,10",
+ "endColumns": "12,12,12",
+ "endOffsets": "209,380,553"
}
}
]
},
{
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-pt_values-pt.arsc.flat",
+ "outputFile": "D:\\Note-master2\\app\\build\\intermediates\\merged_res\\debug\\values-cs_values-cs.arsc.flat",
"map": [
{
- "source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\4051cc509ba70441b9465808cc62a56d\\transformed\\appcompat-v7-28.0.0\\res\\values-pt\\values-pt.xml",
+ "source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\4051cc509ba70441b9465808cc62a56d\\transformed\\appcompat-v7-28.0.0\\res\\values-cs\\values-cs.xml",
"from": {
"startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29",
"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",
- "startOffsets": "105,225,331,438,527,628,746,829,909,1000,1093,1189,1283,1384,1477,1572,1667,1758,1849,1936,2043,2155,2257,2365,2472,2582,2744,2844",
- "endColumns": "119,105,106,88,100,117,82,79,90,92,95,93,100,92,94,94,90,90,86,106,111,101,107,106,109,161,99,84",
- "endOffsets": "220,326,433,522,623,741,824,904,995,1088,1184,1278,1379,1472,1567,1662,1753,1844,1931,2038,2150,2252,2360,2467,2577,2739,2839,2924"
+ "startOffsets": "105,212,314,423,509,614,731,812,893,984,1077,1173,1267,1362,1455,1550,1647,1738,1829,1913,2017,2126,2225,2331,2441,2548,2711,2809",
+ "endColumns": "106,101,108,85,104,116,80,80,90,92,95,93,94,92,94,96,90,90,83,103,108,98,105,109,106,162,97,81",
+ "endOffsets": "207,309,418,504,609,726,807,888,979,1072,1168,1262,1357,1450,1545,1642,1733,1824,1908,2012,2121,2220,2326,2436,2543,2706,2804,2886"
}
},
{
- "source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\c9913736ba0af3f26ba50dd9aa679a2b\\transformed\\support-compat-28.0.0\\res\\values-pt\\values-pt.xml",
+ "source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\c9913736ba0af3f26ba50dd9aa679a2b\\transformed\\support-compat-28.0.0\\res\\values-cs\\values-cs.xml",
"from": {
"startLines": "2",
"startColumns": "4",
@@ -2729,28 +2805,28 @@
"to": {
"startLines": "30",
"startColumns": "4",
- "startOffsets": "2929",
+ "startOffsets": "2891",
"endColumns": "100",
- "endOffsets": "3025"
+ "endOffsets": "2987"
}
}
]
},
{
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-sq_values-sq.arsc.flat",
+ "outputFile": "D:\\Note-master2\\app\\build\\intermediates\\merged_res\\debug\\values-fr_values-fr.arsc.flat",
"map": [
{
- "source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\4051cc509ba70441b9465808cc62a56d\\transformed\\appcompat-v7-28.0.0\\res\\values-sq\\values-sq.xml",
+ "source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\4051cc509ba70441b9465808cc62a56d\\transformed\\appcompat-v7-28.0.0\\res\\values-fr\\values-fr.xml",
"from": {
"startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29",
"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",
- "startOffsets": "105,219,319,431,518,628,751,832,911,1002,1095,1191,1285,1387,1480,1575,1672,1763,1856,1939,2045,2150,2248,2354,2457,2573,2727,2826",
- "endColumns": "113,99,111,86,109,122,80,78,90,92,95,93,101,92,94,96,90,92,82,105,104,97,105,102,115,153,98,80",
- "endOffsets": "214,314,426,513,623,746,827,906,997,1090,1186,1280,1382,1475,1570,1667,1758,1851,1934,2040,2145,2243,2349,2452,2568,2722,2821,2902"
+ "startOffsets": "105,216,331,442,524,630,760,843,923,1014,1107,1206,1301,1402,1495,1588,1683,1774,1865,1951,2061,2173,2276,2387,2494,2601,2760,2859",
+ "endColumns": "110,114,110,81,105,129,82,79,90,92,98,94,100,92,92,94,90,90,85,109,111,102,110,106,106,158,98,85",
+ "endOffsets": "211,326,437,519,625,755,838,918,1009,1102,1201,1296,1397,1490,1583,1678,1769,1860,1946,2056,2168,2271,2382,2489,2596,2755,2854,2940"
}
},
{
- "source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\c9913736ba0af3f26ba50dd9aa679a2b\\transformed\\support-compat-28.0.0\\res\\values-sq\\values-sq.xml",
+ "source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\c9913736ba0af3f26ba50dd9aa679a2b\\transformed\\support-compat-28.0.0\\res\\values-fr\\values-fr.xml",
"from": {
"startLines": "2",
"startColumns": "4",
@@ -2761,28 +2837,28 @@
"to": {
"startLines": "30",
"startColumns": "4",
- "startOffsets": "2907",
+ "startOffsets": "2945",
"endColumns": "100",
- "endOffsets": "3003"
+ "endOffsets": "3041"
}
}
]
},
{
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-sw_values-sw.arsc.flat",
+ "outputFile": "D:\\Note-master2\\app\\build\\intermediates\\merged_res\\debug\\values-hi_values-hi.arsc.flat",
"map": [
{
- "source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\4051cc509ba70441b9465808cc62a56d\\transformed\\appcompat-v7-28.0.0\\res\\values-sw\\values-sw.xml",
+ "source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\4051cc509ba70441b9465808cc62a56d\\transformed\\appcompat-v7-28.0.0\\res\\values-hi\\values-hi.xml",
"from": {
"startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29",
"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",
- "startOffsets": "105,208,306,414,504,609,726,808,891,982,1075,1169,1263,1364,1457,1552,1647,1738,1830,1912,2013,2122,2221,2328,2437,2542,2704,2801",
- "endColumns": "102,97,107,89,104,116,81,82,90,92,93,93,100,92,94,94,90,91,81,100,108,98,106,108,104,161,96,81",
- "endOffsets": "203,301,409,499,604,721,803,886,977,1070,1164,1258,1359,1452,1547,1642,1733,1825,1907,2008,2117,2216,2323,2432,2537,2699,2796,2878"
+ "startOffsets": "105,211,308,418,504,606,728,805,883,974,1067,1163,1257,1358,1451,1546,1640,1731,1822,1912,2021,2124,2226,2336,2437,2549,2711,2812",
+ "endColumns": "105,96,109,85,101,121,76,77,90,92,95,93,100,92,94,93,90,90,89,108,102,101,109,100,111,161,100,79",
+ "endOffsets": "206,303,413,499,601,723,800,878,969,1062,1158,1252,1353,1446,1541,1635,1726,1817,1907,2016,2119,2221,2331,2432,2544,2706,2807,2887"
}
},
{
- "source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\c9913736ba0af3f26ba50dd9aa679a2b\\transformed\\support-compat-28.0.0\\res\\values-sw\\values-sw.xml",
+ "source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\c9913736ba0af3f26ba50dd9aa679a2b\\transformed\\support-compat-28.0.0\\res\\values-hi\\values-hi.xml",
"from": {
"startLines": "2",
"startColumns": "4",
@@ -2793,181 +2869,135 @@
"to": {
"startLines": "30",
"startColumns": "4",
- "startOffsets": "2883",
+ "startOffsets": "2892",
"endColumns": "100",
- "endOffsets": "2979"
+ "endOffsets": "2988"
}
}
]
},
{
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values_values.arsc.flat",
+ "outputFile": "D:\\Note-master2\\app\\build\\intermediates\\merged_res\\debug\\values-fr-rCA_values-fr-rCA.arsc.flat",
"map": [
{
- "source": "D:\\Notes-master1\\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": "189,190,191,192,193",
- "startColumns": "4,4,4,4,4",
- "startOffsets": "12682,12734,12787,12840,12892",
- "endColumns": "51,52,52,51,51",
- "endOffsets": "12729,12782,12835,12887,12939"
- }
- },
- {
- "source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\a90015b78bf619886c4dbbae347a2742\\transformed\\coordinatorlayout-28.0.0\\res\\values\\values.xml",
+ "source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\c9913736ba0af3f26ba50dd9aa679a2b\\transformed\\support-compat-28.0.0\\res\\values-fr-rCA\\values-fr-rCA.xml",
"from": {
- "startLines": "2,102,3,13",
- "startColumns": "4,4,4,4",
- "startOffsets": "55,5935,116,724",
- "endLines": "2,104,12,101",
- "endColumns": "60,12,24,24",
- "endOffsets": "111,6075,719,5930"
+ "startLines": "2",
+ "startColumns": "4",
+ "startOffsets": "55",
+ "endColumns": "100",
+ "endOffsets": "151"
},
"to": {
- "startLines": "12,1880,2577,2587",
- "startColumns": "4,4,4,4",
- "startOffsets": "532,126337,163839,164447",
- "endLines": "12,1882,2586,2675",
- "endColumns": "60,12,24,24",
- "endOffsets": "588,126477,164442,169653"
+ "startLines": "30",
+ "startColumns": "4",
+ "startOffsets": "2965",
+ "endColumns": "100",
+ "endOffsets": "3061"
}
},
{
- "source": "D:\\Notes-master1\\app\\src\\main\\res\\values\\styles.xml",
+ "source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\4051cc509ba70441b9465808cc62a56d\\transformed\\appcompat-v7-28.0.0\\res\\values-fr-rCA\\values-fr-rCA.xml",
"from": {
- "startLines": "50,55,64,60,22,26,30,35,40,18,45",
- "startColumns": "4,4,4,4,4,4,4,4,4,4,4",
- "startOffsets": "2062,2267,2640,2479,895,1078,1263,1449,1653,712,1860",
- "endLines": "53,58,67,62,25,29,33,38,43,21,48",
- "endColumns": "12,12,12,12,12,12,12,12,12,12,12",
- "endOffsets": "2261,2473,2843,2634,1073,1258,1443,1647,1854,890,2056"
- },
- "to": {
- "startLines": "1439,1443,1447,1451,1720,1724,1728,1732,1736,1740,1744",
- "startColumns": "4,4,4,4,4,4,4,4,4,4,4",
- "startOffsets": "93289,93493,93704,93911,114454,114637,114822,115007,115210,115416,115599",
- "endLines": "1442,1446,1450,1453,1723,1727,1731,1735,1739,1743,1747",
- "endColumns": "12,12,12,12,12,12,12,12,12,12,12",
- "endOffsets": "93488,93699,93906,94066,114632,114817,115002,115205,115411,115594,115795"
+ "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29",
+ "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",
+ "startOffsets": "105,216,331,442,529,645,775,858,938,1029,1122,1221,1316,1417,1510,1603,1698,1789,1880,1976,2086,2198,2301,2412,2519,2621,2780,2879",
+ "endColumns": "110,114,110,86,115,129,82,79,90,92,98,94,100,92,92,94,90,90,95,109,111,102,110,106,101,158,98,85",
+ "endOffsets": "211,326,437,524,640,770,853,933,1024,1117,1216,1311,1412,1505,1598,1693,1784,1875,1971,2081,2193,2296,2407,2514,2616,2775,2874,2960"
}
- },
+ }
+ ]
+ },
+ {
+ "outputFile": "D:\\Note-master2\\app\\build\\intermediates\\merged_res\\debug\\values-sl_values-sl.arsc.flat",
+ "map": [
{
- "source": "D:\\Notes-master1\\app\\src\\main\\res\\values\\colors.xml",
+ "source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\c9913736ba0af3f26ba50dd9aa679a2b\\transformed\\support-compat-28.0.0\\res\\values-sl\\values-sl.xml",
"from": {
- "startLines": "18",
+ "startLines": "2",
"startColumns": "4",
- "startOffsets": "712",
- "endColumns": "56",
- "endOffsets": "764"
+ "startOffsets": "55",
+ "endColumns": "100",
+ "endOffsets": "151"
},
"to": {
- "startLines": "82",
+ "startLines": "30",
"startColumns": "4",
- "startOffsets": "5258",
- "endColumns": "56",
- "endOffsets": "5310"
- }
- },
- {
- "source": "D:\\Notes-master1\\app\\src\\main\\res\\values\\strings.xml",
- "from": {
- "startLines": "128,72,75,74,73,19,20,21,118,119,127,126,26,81,82,80,79,78,94,93,92,84,39,38,64,29,30,85,41,76,120,71,67,42,48,53,43,63,62,61,57,56,54,55,58,59,49,70,60,68,47,52,51,50,66,46,65,44,45,69,28,34,36,33,35,32,31,25,24,101,100,104,116,109,108,110,111,113,112,102,103,107,105,106,99,114,115,125,123,122,124,27,83,91,96,95,97,90,89,88,87,22,23",
- "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
- "startOffsets": "8008,3898,4159,4063,3994,827,870,922,7506,7555,7950,7899,1282,4613,4707,4542,4458,4375,5574,5491,5389,4883,2004,1953,3397,1486,1539,4944,2097,4242,7618,3827,3582,2156,2471,2772,2214,3326,3265,3208,2986,2934,2831,2884,3036,3086,2518,3761,3146,3631,2424,2717,2629,2571,3520,2374,3475,2271,2314,3694,1431,1750,1858,1703,1805,1647,1599,1227,1174,6030,5963,6271,7409,6635,6554,6709,6798,7040,6961,6114,6189,6495,6335,6415,5908,7184,7306,7858,7731,7674,7784,1366,4815,5303,5709,5640,5789,5244,5189,5127,5067,974,1084",
- "endLines": "132,72,75,74,73,19,20,21,118,119,127,126,26,81,82,80,79,78,94,93,92,84,39,38,64,29,30,85,41,76,120,71,67,42,48,53,43,63,62,61,57,56,54,55,58,59,49,70,60,68,47,52,51,50,66,46,65,44,45,69,28,34,36,33,35,32,31,25,24,101,100,104,116,109,108,110,111,113,112,102,103,107,105,106,99,114,115,125,123,122,124,27,83,91,96,95,97,90,89,88,87,22,23",
- "endColumns": "14,95,82,95,68,42,51,51,48,62,57,50,83,93,107,70,83,82,65,82,101,60,61,50,77,52,59,104,58,101,54,70,48,57,46,58,56,70,60,56,49,51,52,49,49,59,52,65,61,62,46,54,87,57,61,49,44,42,59,66,54,54,52,46,52,55,47,54,52,83,66,63,95,73,80,88,162,143,78,74,81,58,79,79,54,121,102,40,52,56,73,64,67,85,79,68,93,58,54,61,59,109,89",
- "endOffsets": "8412,3989,4237,4154,4058,865,917,969,7550,7613,8003,7945,1361,4702,4810,4608,4537,4453,5635,5569,5486,4939,2061,1999,3470,1534,1594,5044,2151,4339,7668,3893,3626,2209,2513,2826,2266,3392,3321,3260,3031,2981,2879,2929,3081,3141,2566,3822,3203,3689,2466,2767,2712,2624,3577,2419,3515,2309,2369,3756,1481,1800,1906,1745,1853,1698,1642,1277,1222,6109,6025,6330,7500,6704,6630,6793,6956,7179,7035,6184,6266,6549,6410,6490,5958,7301,7404,7894,7779,7726,7853,1426,4878,5384,5784,5704,5878,5298,5239,5184,5122,1079,1169"
- },
- "to": {
- "startLines": "226,270,271,272,273,274,275,276,277,278,279,280,281,282,283,284,285,286,287,288,289,290,291,292,293,294,295,296,297,298,299,300,301,302,303,304,305,306,307,308,309,310,311,312,313,314,315,316,317,318,319,320,321,322,323,324,325,326,327,328,329,330,331,332,333,334,335,336,337,338,339,340,341,342,343,344,345,346,347,348,349,350,351,352,353,354,355,356,357,358,360,361,363,364,365,366,367,368,369,370,371,372,373",
- "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
- "startOffsets": "14613,17764,17860,17943,18039,18108,18151,18203,18255,18304,18367,18425,18476,18560,18654,18762,18833,18917,19000,19066,19149,19251,19312,19374,19425,19503,19556,19616,19721,19780,19882,19937,20008,20057,20115,20162,20221,20278,20349,20410,20467,20517,20569,20622,20672,20722,20782,20835,20901,20963,21026,21073,21128,21216,21274,21336,21386,21431,21474,21534,21601,21656,21711,21764,21811,21864,21920,21968,22023,22076,22160,22227,22291,22387,22461,22542,22631,22794,22938,23017,23092,23174,23233,23313,23393,23448,23570,23673,23714,23767,23877,23951,24087,24155,24241,24321,24390,24484,24543,24598,24660,24720,24830",
- "endLines": "230,270,271,272,273,274,275,276,277,278,279,280,281,282,283,284,285,286,287,288,289,290,291,292,293,294,295,296,297,298,299,300,301,302,303,304,305,306,307,308,309,310,311,312,313,314,315,316,317,318,319,320,321,322,323,324,325,326,327,328,329,330,331,332,333,334,335,336,337,338,339,340,341,342,343,344,345,346,347,348,349,350,351,352,353,354,355,356,357,358,360,361,363,364,365,366,367,368,369,370,371,372,373",
- "endColumns": "14,95,82,95,68,42,51,51,48,62,57,50,83,93,107,70,83,82,65,82,101,60,61,50,77,52,59,104,58,101,54,70,48,57,46,58,56,70,60,56,49,51,52,49,49,59,52,65,61,62,46,54,87,57,61,49,44,42,59,66,54,54,52,46,52,55,47,54,52,83,66,63,95,73,80,88,162,143,78,74,81,58,79,79,54,121,102,40,52,56,73,64,67,85,79,68,93,58,54,61,59,109,89",
- "endOffsets": "15001,17855,17938,18034,18103,18146,18198,18250,18299,18362,18420,18471,18555,18649,18757,18828,18912,18995,19061,19144,19246,19307,19369,19420,19498,19551,19611,19716,19775,19877,19932,20003,20052,20110,20157,20216,20273,20344,20405,20462,20512,20564,20617,20667,20717,20777,20830,20896,20958,21021,21068,21123,21211,21269,21331,21381,21426,21469,21529,21596,21651,21706,21759,21806,21859,21915,21963,22018,22071,22155,22222,22286,22382,22456,22537,22626,22789,22933,23012,23087,23169,23228,23308,23388,23443,23565,23668,23709,23762,23819,23946,24011,24150,24236,24316,24385,24479,24538,24593,24655,24715,24825,24915"
+ "startOffsets": "2936",
+ "endColumns": "100",
+ "endOffsets": "3032"
}
},
{
- "source": "D:\\Notes-master1\\app\\src\\main\\res\\values\\arrays.xml",
+ "source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\4051cc509ba70441b9465808cc62a56d\\transformed\\appcompat-v7-28.0.0\\res\\values-sl\\values-sl.xml",
"from": {
- "startLines": "19,26",
- "startColumns": "4,4",
- "startOffsets": "739,1047",
- "endLines": "24,29",
- "endColumns": "19,19",
- "endOffsets": "1041,1162"
- },
- "to": {
- "startLines": "2,8",
- "startColumns": "4,4",
- "startOffsets": "105,412",
- "endLines": "7,11",
- "endColumns": "19,19",
- "endOffsets": "407,527"
+ "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29",
+ "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",
+ "startOffsets": "105,212,319,427,514,617,736,821,905,997,1091,1187,1281,1377,1471,1567,1667,1759,1851,1935,2043,2152,2252,2365,2472,2576,2756,2853",
+ "endColumns": "106,106,107,86,102,118,84,83,91,93,95,93,95,93,95,99,91,91,83,107,108,99,112,106,103,179,96,82",
+ "endOffsets": "207,314,422,509,612,731,816,900,992,1086,1182,1276,1372,1466,1562,1662,1754,1846,1930,2038,2147,2247,2360,2467,2571,2751,2848,2931"
}
- },
+ }
+ ]
+ },
+ {
+ "outputFile": "D:\\Note-master2\\app\\build\\intermediates\\merged_res\\debug\\values-v21_values-v21.arsc.flat",
+ "map": [
{
- "source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\c9913736ba0af3f26ba50dd9aa679a2b\\transformed\\support-compat-28.0.0\\res\\values\\values.xml",
+ "source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\c9913736ba0af3f26ba50dd9aa679a2b\\transformed\\support-compat-28.0.0\\res\\values-v21\\values-v21.xml",
"from": {
- "startLines": "2,3,132,133,134,135,136,137,138,139,140,141,142,143,144,145,146,147,148,149,150,151,152,153,154,155,156,157,158,159,160,161,162,163,164,165,166,167,171,172,176,177,178,6,13,56,88,125",
- "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",
- "startOffsets": "55,124,7725,7795,7863,7935,8005,8066,8140,8213,8274,8335,8397,8461,8523,8584,8652,8752,8812,8878,8951,9020,9077,9129,9191,9263,9339,9374,9409,9459,9520,9577,9611,9646,9681,9751,9822,9939,10140,10250,10451,10580,10652,319,617,3523,5588,7348",
- "endLines": "2,3,132,133,134,135,136,137,138,139,140,141,142,143,144,145,146,147,148,149,150,151,152,153,154,155,156,157,158,159,160,161,162,163,164,165,166,170,171,175,176,177,178,12,55,87,124,131",
- "endColumns": "68,62,69,67,71,69,60,73,72,60,60,61,63,61,60,67,99,59,65,72,68,56,51,61,71,75,34,34,49,60,56,33,34,34,69,70,116,12,109,12,128,71,66,24,24,24,24,24",
- "endOffsets": "119,182,7790,7858,7930,8000,8061,8135,8208,8269,8330,8392,8456,8518,8579,8647,8747,8807,8873,8946,9015,9072,9124,9186,9258,9334,9369,9404,9454,9515,9572,9606,9641,9676,9746,9817,9934,10135,10245,10446,10575,10647,10714,612,3518,5583,7343,7720"
+ "startLines": "2,3,4,5,6,7,8,9,10,13",
+ "startColumns": "4,4,4,4,4,4,4,4,4,4",
+ "startOffsets": "55,159,223,290,354,470,596,722,850,1022",
+ "endLines": "2,3,4,5,6,7,8,9,12,17",
+ "endColumns": "103,63,66,63,115,125,125,127,12,12",
+ "endOffsets": "154,218,285,349,465,591,717,845,1017,1355"
},
"to": {
- "startLines": "60,61,158,159,160,161,162,163,164,174,175,176,177,178,179,180,181,182,183,184,185,186,187,188,202,203,209,210,214,215,216,217,218,219,225,362,1703,1704,1708,1709,1713,1878,1879,2544,2694,2737,2769,2806",
- "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",
- "startOffsets": "3720,3789,10432,10502,10570,10642,10712,10773,10847,11704,11765,11826,11888,11952,12014,12075,12143,12243,12303,12369,12442,12511,12568,12620,13397,13469,13784,13819,13996,14046,14107,14164,14198,14233,14543,24016,113268,113385,113586,113696,113897,126198,126270,162149,170691,173597,175662,177422",
- "endLines": "60,61,158,159,160,161,162,163,164,174,175,176,177,178,179,180,181,182,183,184,185,186,187,188,202,203,209,210,214,215,216,217,218,219,225,362,1703,1707,1708,1712,1713,1878,1879,2550,2736,2768,2805,2812",
- "endColumns": "68,62,69,67,71,69,60,73,72,60,60,61,63,61,60,67,99,59,65,72,68,56,51,61,71,75,34,34,49,60,56,33,34,34,69,70,116,12,109,12,128,71,66,24,24,24,24,24",
- "endOffsets": "3784,3847,10497,10565,10637,10707,10768,10842,10915,11760,11821,11883,11947,12009,12070,12138,12238,12298,12364,12437,12506,12563,12615,12677,13464,13540,13814,13849,14041,14102,14159,14193,14228,14263,14608,24082,113380,113581,113691,113892,114021,126265,126332,162442,173592,175657,177417,177794"
+ "startLines": "2,3,4,5,263,264,265,266,267,270",
+ "startColumns": "4,4,4,4,4,4,4,4,4,4",
+ "startOffsets": "55,159,223,290,19262,19378,19504,19630,19758,19930",
+ "endLines": "2,3,4,5,263,264,265,266,269,274",
+ "endColumns": "103,63,66,63,115,125,125,127,12,12",
+ "endOffsets": "154,218,285,349,19373,19499,19625,19753,19925,20263"
}
},
{
- "source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\4051cc509ba70441b9465808cc62a56d\\transformed\\appcompat-v7-28.0.0\\res\\values\\values.xml",
+ "source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\4051cc509ba70441b9465808cc62a56d\\transformed\\appcompat-v7-28.0.0\\res\\values-v21\\values-v21.xml",
"from": {
- "startLines": "2,3,4,5,6,7,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,1303,1304,1305,1306,1307,1308,1309,1310,1311,1312,1313,1314,1315,1316,1317,1318,1319,1320,1321,1322,1323,1324,1325,1326,1327,1328,1329,1330,1331,1332,1333,1334,1335,1336,1337,1338,1339,1340,1341,1342,1343,1344,1345,1346,1347,1348,1349,1350,1351,1352,1353,1354,1355,1356,1357,1358,1359,1360,1361,1362,1363,1364,1365,1366,1367,1368,1369,1370,1371,1372,1373,1374,1375,1376,1377,1378,1379,1380,1381,1382,1383,1384,1385,1386,1387,1388,1389,1390,1391,1392,1393,1394,1395,1396,1397,1398,1399,1400,1401,1402,1403,1404,1405,1406,1407,1408,1409,1410,1411,1412,1413,1414,1415,1416,1417,1418,1419,1420,1421,1422,1423,1424,1425,1426,1427,1428,1429,1430,1431,1432,1433,1434,1435,1436,1437,1438,1439,1440,1441,1442,1443,1444,1445,1446,1447,1448,1449,1450,1451,1452,1453,1461,1462,1466,1470,1474,1479,1485,1492,1496,1500,1505,1509,1513,1517,1521,1525,1529,1535,1539,1545,1549,1555,1559,1564,1568,1571,1575,1581,1585,1591,1595,1601,1604,1608,1612,1616,1620,1624,1625,1626,1627,1630,1633,1636,1639,1643,1644,1645,1646,1647,1650,1652,1654,1656,1661,1662,1666,1672,1676,1677,1679,1690,1691,1695,1701,1705,1706,1707,1711,1738,1742,1743,1747,1775,1943,1969,2138,2164,2195,2203,2209,2223,2245,2250,2255,2265,2274,2283,2287,2294,2302,2309,2310,2319,2322,2325,2329,2333,2337,2340,2341,2345,2349,2359,2364,2371,2377,2378,2381,2385,2390,2392,2394,2397,2400,2402,2406,2409,2416,2419,2422,2426,2428,2432,2434,2436,2438,2442,2450,2458,2470,2476,2485,2488,2499,2502,2507,2508,2513,2571,2630,2631,2641,2650,2651,2653,2657,2660,2663,2666,2669,2672,2675,2678,2682,2685,2688,2691,2695,2698,2702,2706,2707,2708,2709,2710,2711,2712,2713,2714,2715,2716,2717,2718,2719,2720,2721,2722,2723,2724,2725,2726,2728,2730,2731,2732,2733,2734,2735,2736,2737,2739,2740,2742,2743,2745,2747,2748,2750,2751,2752,2753,2754,2755,2757,2758,2759,2760,2761,2762,2764,2766,2768,2769,2770,2771,2772,2773,2774,2775,2776,2777,2778,2779,2780,2782,2783,2784,2785,2786,2787,2789,2793,2797,2798,2799,2800,2801,2802,2803,2804,2806,2808,2810,2812,2814,2815,2816,2817,2819,2821,2823,2824,2825,2826,2827,2828,2829,2830,2831,2832,2833,2834,2837,2838,2839,2840,2842,2844,2845,2847,2848,2850,2852,2854,2855,2856,2857,2858,2859,2860,2861,2862,2863,2864,2865,2867,2868,2869,2870,2872,2873,2874,2875,2876,2878,2880,2882,2884,2885,2886,2887,2888,2889,2890,2891,2892,2893,2894,2895,2896,2897,69,152,155,158,161,175,186,196,223,230,241,271,298,307,344,725,730,756,774,810,816,822,845,986,1006,1012,1016,1022,1059,1071,1098,1103,1169,1184,1249,1268,1294",
- "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,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,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": "105,160,205,254,295,350,409,471,552,613,688,764,841,919,1004,1086,1162,1238,1315,1393,1499,1605,1684,1764,1821,1879,1953,2028,2093,2159,2219,2280,2352,2425,2492,2560,2619,2678,2737,2796,2855,2909,2963,3016,3070,3124,3178,3232,3306,3385,3458,3532,3603,3675,3747,3820,3877,3935,4008,4082,4156,4231,4303,4376,4446,4517,4577,70911,70980,71049,71119,71193,71269,71333,71410,71486,71563,71628,71697,71774,71849,71918,71986,72063,72129,72190,72287,72352,72421,72520,72591,72650,72708,72765,72824,72888,72959,73031,73103,73175,73247,73314,73382,73450,73509,73572,73636,73726,73817,73877,73943,74010,74076,74146,74210,74263,74376,74434,74497,74562,74627,74702,74775,74847,74896,74957,75018,75079,75141,75205,75269,75333,75398,75461,75521,75582,75648,75707,75767,75829,75900,75960,76028,76114,76201,76291,76378,76466,76548,76631,76721,76812,76864,76922,76967,77033,77097,77154,77211,77265,77322,77370,77419,77470,77504,77551,77600,77646,77678,77742,77804,77864,77921,77995,78065,78143,78197,78267,78352,78400,78446,78517,78595,78673,78745,78819,78893,78967,79047,79120,79189,79261,79338,79399,79462,79528,79592,79663,79726,79791,79855,79916,79977,80029,80102,80176,80245,80320,80394,80468,80609,80679,80732,80810,80900,80988,81084,81174,81756,81845,82092,82373,82625,82910,83303,83780,84002,84224,84500,84727,84957,85187,85417,85647,85874,86293,86519,86944,87174,87602,87821,88104,88312,88443,88670,89096,89321,89748,89969,90394,90514,90790,91091,91415,91706,92020,92157,92288,92393,92635,92802,93006,93214,93485,93597,93709,93814,93931,94145,94291,94431,94517,94865,94953,95199,95617,95866,95948,96046,96663,96763,97015,97439,97694,97788,97877,98114,100166,100408,100510,100763,102947,113668,115184,126004,127532,129289,129915,130335,131396,132661,132917,133153,133700,134194,134799,134997,135577,136141,136516,136634,137172,137329,137525,137798,138054,138224,138365,138429,138711,138997,139673,139937,140275,140628,140722,140908,141214,141476,141601,141728,141967,142178,142297,142490,142667,143122,143303,143425,143684,143797,143984,144086,144193,144322,144597,145105,145601,146478,146772,147342,147491,148223,148395,148731,148823,149101,153445,157932,157994,158624,159238,159329,159442,159671,159831,159983,160154,160320,160489,160656,160819,161062,161232,161405,161576,161850,162049,162254,162584,162668,162764,162860,162958,163058,163160,163262,163364,163466,163568,163668,163764,163876,164005,164128,164259,164390,164488,164602,164696,164836,164970,165066,165178,165278,165394,165490,165602,165702,165842,165978,166142,166272,166430,166580,166721,166865,167000,167112,167262,167390,167518,167654,167786,167916,168046,168158,168298,168444,168588,168726,168792,168882,168958,169062,169152,169254,169362,169470,169570,169650,169742,169840,169950,170028,170134,170226,170330,170440,170562,170725,170882,170962,171062,171152,171262,171356,171462,171554,171654,171766,171880,171996,172112,172206,172320,172432,172534,172654,172776,172858,172962,173082,173208,173306,173400,173488,173600,173716,173838,173950,174125,174241,174327,174419,174531,174655,174722,174848,174916,175044,175188,175316,175385,175480,175595,175708,175807,175916,176027,176138,176239,176344,176444,176574,176665,176788,176882,176994,177080,177184,177280,177368,177486,177590,177694,177820,177908,178016,178116,178206,178316,178400,178502,178586,178640,178704,178810,178920,179004,4638,9782,9900,10015,10147,10862,11554,12071,13718,14103,14700,16299,17832,18220,20527,40045,40305,41697,42730,44743,45005,45361,46191,52973,54107,54401,54624,54951,57001,57649,59282,59552,63403,64004,67813,69028,70437",
- "endLines": "2,3,4,5,6,7,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,1303,1304,1305,1306,1307,1308,1309,1310,1311,1312,1313,1314,1315,1316,1317,1318,1319,1320,1321,1322,1323,1324,1325,1326,1327,1328,1329,1330,1331,1332,1333,1334,1335,1336,1337,1338,1339,1340,1341,1342,1343,1344,1345,1346,1347,1348,1349,1350,1351,1352,1353,1354,1355,1356,1357,1358,1359,1360,1361,1362,1363,1364,1365,1366,1367,1368,1369,1370,1371,1372,1373,1374,1375,1376,1377,1378,1379,1380,1381,1382,1383,1384,1385,1386,1387,1388,1389,1390,1391,1392,1393,1394,1395,1396,1397,1398,1399,1400,1401,1402,1403,1404,1405,1406,1407,1408,1409,1410,1411,1412,1413,1414,1415,1416,1417,1418,1419,1420,1421,1422,1423,1424,1425,1426,1427,1428,1429,1430,1431,1432,1433,1434,1435,1436,1437,1438,1439,1440,1441,1442,1443,1444,1445,1446,1447,1448,1449,1450,1451,1452,1460,1461,1465,1469,1473,1478,1484,1491,1495,1499,1504,1508,1512,1516,1520,1524,1528,1534,1538,1544,1548,1554,1558,1563,1567,1570,1574,1580,1584,1590,1594,1600,1603,1607,1611,1615,1619,1623,1624,1625,1626,1629,1632,1635,1638,1642,1643,1644,1645,1646,1649,1651,1653,1655,1660,1661,1665,1671,1675,1676,1678,1689,1690,1694,1700,1704,1705,1706,1710,1737,1741,1742,1746,1774,1942,1968,2137,2163,2194,2202,2208,2222,2244,2249,2254,2264,2273,2282,2286,2293,2301,2308,2309,2318,2321,2324,2328,2332,2336,2339,2340,2344,2348,2358,2363,2370,2376,2377,2380,2384,2389,2391,2393,2396,2399,2401,2405,2408,2415,2418,2421,2425,2427,2431,2433,2435,2437,2441,2449,2457,2469,2475,2484,2487,2498,2501,2506,2507,2512,2570,2629,2630,2640,2649,2650,2652,2656,2659,2662,2665,2668,2671,2674,2677,2681,2684,2687,2690,2694,2697,2701,2705,2706,2707,2708,2709,2710,2711,2712,2713,2714,2715,2716,2717,2718,2719,2720,2721,2722,2723,2724,2725,2727,2729,2730,2731,2732,2733,2734,2735,2736,2738,2739,2741,2742,2744,2746,2747,2749,2750,2751,2752,2753,2754,2756,2757,2758,2759,2760,2761,2763,2765,2767,2768,2769,2770,2771,2772,2773,2774,2775,2776,2777,2778,2779,2781,2782,2783,2784,2785,2786,2788,2792,2796,2797,2798,2799,2800,2801,2802,2803,2805,2807,2809,2811,2813,2814,2815,2816,2818,2820,2822,2823,2824,2825,2826,2827,2828,2829,2830,2831,2832,2833,2836,2837,2838,2839,2841,2843,2844,2846,2847,2849,2851,2853,2854,2855,2856,2857,2858,2859,2860,2861,2862,2863,2864,2866,2867,2868,2869,2871,2872,2873,2874,2875,2877,2879,2881,2883,2884,2885,2886,2887,2888,2889,2890,2891,2892,2893,2894,2895,2896,2897,151,154,157,160,174,185,195,222,229,240,270,297,306,343,724,729,755,773,809,815,821,844,985,1005,1011,1015,1021,1058,1070,1097,1102,1168,1183,1248,1267,1293,1302",
- "endColumns": "54,44,48,40,54,58,61,80,60,74,75,76,77,84,81,75,75,76,77,105,105,78,79,56,57,73,74,64,65,59,60,71,72,66,67,58,58,58,58,58,53,53,52,53,53,53,53,73,78,72,73,70,71,71,72,56,57,72,73,73,74,71,72,69,70,59,60,68,68,69,73,75,63,76,75,76,64,68,76,74,68,67,76,65,60,96,64,68,98,70,58,57,56,58,63,70,71,71,71,71,66,67,67,58,62,63,89,90,59,65,66,65,69,63,52,112,57,62,64,64,74,72,71,48,60,60,60,61,63,63,63,64,62,59,60,65,58,59,61,70,59,67,85,86,89,86,87,81,82,89,90,51,57,44,65,63,56,56,53,56,47,48,50,33,46,48,45,31,63,61,59,56,73,69,77,53,69,84,47,45,70,77,77,71,73,73,73,79,72,68,71,76,60,62,65,63,70,62,64,63,60,60,51,72,73,68,74,73,73,140,69,52,77,89,87,95,89,12,88,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,136,130,104,12,12,12,12,12,111,111,104,116,12,12,12,12,12,87,12,12,12,81,12,12,99,12,12,12,93,88,12,12,12,101,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,117,12,12,12,12,12,12,12,63,12,12,12,12,12,12,93,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,91,12,12,12,61,12,12,90,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,83,95,95,97,99,101,101,101,101,101,99,95,111,128,122,130,130,97,113,93,12,12,95,111,99,115,95,111,99,12,135,12,129,12,12,140,12,134,111,149,127,127,12,131,129,129,111,139,12,12,12,65,89,75,103,89,101,107,107,99,79,91,97,12,77,105,91,103,109,12,12,12,79,99,89,109,93,105,91,12,12,12,12,12,93,113,111,12,12,12,81,103,119,125,97,93,87,111,115,121,111,12,115,85,91,12,12,66,12,67,12,12,12,68,94,114,112,98,108,110,110,100,104,99,12,90,122,93,12,85,103,95,87,12,12,12,12,87,107,99,89,109,83,101,83,53,63,105,109,83,119,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24",
- "endOffsets": "155,200,249,290,345,404,466,547,608,683,759,836,914,999,1081,1157,1233,1310,1388,1494,1600,1679,1759,1816,1874,1948,2023,2088,2154,2214,2275,2347,2420,2487,2555,2614,2673,2732,2791,2850,2904,2958,3011,3065,3119,3173,3227,3301,3380,3453,3527,3598,3670,3742,3815,3872,3930,4003,4077,4151,4226,4298,4371,4441,4512,4572,4633,70975,71044,71114,71188,71264,71328,71405,71481,71558,71623,71692,71769,71844,71913,71981,72058,72124,72185,72282,72347,72416,72515,72586,72645,72703,72760,72819,72883,72954,73026,73098,73170,73242,73309,73377,73445,73504,73567,73631,73721,73812,73872,73938,74005,74071,74141,74205,74258,74371,74429,74492,74557,74622,74697,74770,74842,74891,74952,75013,75074,75136,75200,75264,75328,75393,75456,75516,75577,75643,75702,75762,75824,75895,75955,76023,76109,76196,76286,76373,76461,76543,76626,76716,76807,76859,76917,76962,77028,77092,77149,77206,77260,77317,77365,77414,77465,77499,77546,77595,77641,77673,77737,77799,77859,77916,77990,78060,78138,78192,78262,78347,78395,78441,78512,78590,78668,78740,78814,78888,78962,79042,79115,79184,79256,79333,79394,79457,79523,79587,79658,79721,79786,79850,79911,79972,80024,80097,80171,80240,80315,80389,80463,80604,80674,80727,80805,80895,80983,81079,81169,81751,81840,82087,82368,82620,82905,83298,83775,83997,84219,84495,84722,84952,85182,85412,85642,85869,86288,86514,86939,87169,87597,87816,88099,88307,88438,88665,89091,89316,89743,89964,90389,90509,90785,91086,91410,91701,92015,92152,92283,92388,92630,92797,93001,93209,93480,93592,93704,93809,93926,94140,94286,94426,94512,94860,94948,95194,95612,95861,95943,96041,96658,96758,97010,97434,97689,97783,97872,98109,100161,100403,100505,100758,102942,113663,115179,125999,127527,129284,129910,130330,131391,132656,132912,133148,133695,134189,134794,134992,135572,136136,136511,136629,137167,137324,137520,137793,138049,138219,138360,138424,138706,138992,139668,139932,140270,140623,140717,140903,141209,141471,141596,141723,141962,142173,142292,142485,142662,143117,143298,143420,143679,143792,143979,144081,144188,144317,144592,145100,145596,146473,146767,147337,147486,148218,148390,148726,148818,149096,153440,157927,157989,158619,159233,159324,159437,159666,159826,159978,160149,160315,160484,160651,160814,161057,161227,161400,161571,161845,162044,162249,162579,162663,162759,162855,162953,163053,163155,163257,163359,163461,163563,163663,163759,163871,164000,164123,164254,164385,164483,164597,164691,164831,164965,165061,165173,165273,165389,165485,165597,165697,165837,165973,166137,166267,166425,166575,166716,166860,166995,167107,167257,167385,167513,167649,167781,167911,168041,168153,168293,168439,168583,168721,168787,168877,168953,169057,169147,169249,169357,169465,169565,169645,169737,169835,169945,170023,170129,170221,170325,170435,170557,170720,170877,170957,171057,171147,171257,171351,171457,171549,171649,171761,171875,171991,172107,172201,172315,172427,172529,172649,172771,172853,172957,173077,173203,173301,173395,173483,173595,173711,173833,173945,174120,174236,174322,174414,174526,174650,174717,174843,174911,175039,175183,175311,175380,175475,175590,175703,175802,175911,176022,176133,176234,176339,176439,176569,176660,176783,176877,176989,177075,177179,177275,177363,177481,177585,177689,177815,177903,178011,178111,178201,178311,178395,178497,178581,178635,178699,178805,178915,178999,179119,9777,9895,10010,10142,10857,11549,12066,13713,14098,14695,16294,17827,18215,20522,40040,40300,41692,42725,44738,45000,45356,46186,52968,54102,54396,54619,54946,56996,57644,59277,59547,63398,63999,67808,69023,70432,70906"
+ "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,17,19,20,21,22,24,26,27,28,29,30,32,34,36,38,40,42,43,48,50,52,53,54,56,58,59,60,61,62,63,107,110,154,157,160,162,164,166,169,171,174,175,176,179,180,181,182,183,184,187,188,190,192,194,196,200,202,203,204,205,207,211,213,215,216,217,218,219,221,222,223,233,234,235,247",
+ "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",
+ "startOffsets": "55,146,249,352,457,564,673,782,891,1000,1109,1216,1319,1438,1593,1748,1853,1974,2075,2222,2363,2466,2585,2692,2795,2950,3121,3270,3435,3592,3743,3862,4234,4383,4532,4644,4791,4944,5091,5166,5255,5342,5443,5546,8614,8799,11879,12076,12275,12398,12521,12634,12817,12948,13149,13238,13349,13582,13683,13778,13901,14030,14147,14324,14423,14558,14701,14836,14955,15156,15275,15368,15479,15535,15642,15837,15948,16081,16176,16267,16358,16475,16614,16685,16768,17448,17505,17563,18257",
+ "endLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,16,18,19,20,21,23,25,26,27,28,29,31,33,35,37,39,41,42,47,49,51,52,53,55,57,58,59,60,61,62,106,109,153,156,159,161,163,165,168,170,173,174,175,178,179,180,181,182,183,186,187,189,191,193,195,199,201,202,203,204,206,210,212,214,215,216,217,218,220,221,222,232,233,234,246,258",
+ "endColumns": "90,102,102,104,106,108,108,108,108,108,106,102,118,12,12,104,120,100,12,12,102,118,106,102,12,12,12,12,12,12,118,12,12,12,111,146,12,12,74,88,86,100,102,12,12,12,12,12,12,12,12,12,12,12,88,110,12,100,94,122,128,116,12,98,12,12,12,12,12,12,92,110,55,12,12,12,12,94,90,90,116,12,70,82,12,56,57,12,12",
+ "endOffsets": "141,244,347,452,559,668,777,886,995,1104,1211,1314,1433,1588,1743,1848,1969,2070,2217,2358,2461,2580,2687,2790,2945,3116,3265,3430,3587,3738,3857,4229,4378,4527,4639,4786,4939,5086,5161,5250,5337,5438,5541,8609,8794,11874,12071,12270,12393,12516,12629,12812,12943,13144,13233,13344,13577,13678,13773,13896,14025,14142,14319,14418,14553,14696,14831,14950,15151,15270,15363,15474,15530,15637,15832,15943,16076,16171,16262,16353,16470,16609,16680,16763,17443,17500,17558,18252,18958"
},
"to": {
- "startLines": "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,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,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,134,135,136,137,138,139,140,141,142,143,144,145,146,147,148,149,150,151,152,153,154,155,156,157,165,166,167,168,169,170,171,172,173,194,195,196,197,198,199,200,201,204,205,206,207,208,211,212,213,220,221,222,223,224,231,232,233,234,235,236,237,238,239,240,241,242,243,244,245,246,247,248,249,250,251,252,253,254,255,256,257,258,259,260,261,262,263,264,265,266,267,268,269,359,374,375,376,377,378,379,387,388,392,396,400,405,411,418,422,426,431,435,439,443,447,451,455,461,465,471,475,481,485,490,494,497,501,507,511,517,521,527,530,534,538,542,546,550,551,552,553,556,559,562,565,569,570,571,572,573,576,578,580,582,587,588,592,598,602,603,605,616,617,621,627,631,632,633,637,664,668,669,673,701,869,895,1064,1090,1121,1129,1135,1149,1171,1176,1181,1191,1200,1209,1213,1220,1228,1235,1236,1245,1248,1251,1255,1259,1263,1266,1267,1271,1275,1285,1290,1297,1303,1304,1307,1311,1316,1318,1320,1323,1326,1328,1332,1335,1342,1345,1348,1352,1354,1358,1360,1362,1364,1368,1376,1384,1396,1402,1411,1414,1425,1428,1433,1434,1454,1512,1571,1572,1582,1591,1592,1594,1598,1601,1604,1607,1610,1613,1616,1619,1623,1626,1629,1632,1636,1639,1643,1647,1648,1649,1650,1651,1652,1653,1654,1655,1656,1657,1658,1659,1660,1661,1662,1663,1664,1665,1666,1667,1669,1671,1672,1673,1674,1675,1676,1677,1678,1680,1681,1683,1684,1686,1688,1689,1691,1692,1693,1694,1695,1696,1698,1699,1700,1701,1702,1714,1716,1718,1748,1749,1750,1751,1752,1753,1754,1755,1756,1757,1758,1759,1760,1762,1763,1764,1765,1766,1767,1769,1773,1777,1778,1779,1780,1781,1782,1783,1784,1786,1788,1790,1792,1794,1795,1796,1797,1799,1801,1803,1804,1805,1806,1807,1808,1809,1810,1811,1812,1813,1814,1817,1818,1819,1820,1822,1824,1825,1827,1828,1830,1832,1834,1835,1836,1837,1838,1839,1840,1841,1842,1843,1844,1845,1847,1848,1849,1850,1852,1853,1854,1855,1856,1858,1860,1862,1864,1865,1866,1867,1868,1869,1870,1871,1872,1873,1874,1875,1876,1877,1883,1966,1969,1972,1975,1989,2000,2010,2037,2044,2055,2085,2112,2121,2158,2539,2551,2676,2813,2849,2855,2861,2884,3025,3045,3051,3055,3061,3098,3110,3137,3142,3208,3223,3288,3307,3333",
- "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,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,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": "593,648,693,742,783,838,897,959,1040,1101,1176,1252,1329,1407,1492,1574,1650,1726,1803,1881,1987,2093,2172,2252,2309,2367,2441,2516,2581,2647,2707,2768,2840,2913,2980,3048,3107,3166,3225,3284,3343,3397,3451,3504,3558,3612,3666,3852,3926,4005,4078,4152,4223,4295,4367,4440,4497,4555,4628,4702,4776,4851,4923,4996,5066,5137,5197,5315,5384,5453,5523,5597,5673,5737,5814,5890,5967,6032,6101,6178,6253,6322,6390,6467,6533,6594,6691,6756,6825,6924,6995,7054,7112,7169,7228,7292,7363,7435,7507,7579,7651,7718,7786,7854,7913,7976,8040,8130,8221,8281,8347,8414,8480,8550,8614,8667,8780,8838,8901,8966,9031,9106,9179,9251,9300,9361,9422,9483,9545,9609,9673,9737,9802,9865,9925,9986,10052,10111,10171,10233,10304,10364,10920,11006,11093,11183,11270,11358,11440,11523,11613,12944,12996,13054,13099,13165,13229,13286,13343,13545,13602,13650,13699,13750,13854,13901,13950,14268,14300,14364,14426,14486,15006,15080,15150,15228,15282,15352,15437,15485,15531,15602,15680,15758,15830,15904,15978,16052,16132,16205,16274,16346,16423,16484,16547,16613,16677,16748,16811,16876,16940,17001,17062,17114,17187,17261,17330,17405,17479,17553,17694,23824,24920,24998,25088,25176,25272,25362,25944,26033,26280,26561,26813,27098,27491,27968,28190,28412,28688,28915,29145,29375,29605,29835,30062,30481,30707,31132,31362,31790,32009,32292,32500,32631,32858,33284,33509,33936,34157,34582,34702,34978,35279,35603,35894,36208,36345,36476,36581,36823,36990,37194,37402,37673,37785,37897,38002,38119,38333,38479,38619,38705,39053,39141,39387,39805,40054,40136,40234,40851,40951,41203,41627,41882,41976,42065,42302,44354,44596,44698,44951,47135,57856,59372,70192,71720,73477,74103,74523,75584,76849,77105,77341,77888,78382,78987,79185,79765,80329,80704,80822,81360,81517,81713,81986,82242,82412,82553,82617,82899,83185,83861,84125,84463,84816,84910,85096,85402,85664,85789,85916,86155,86366,86485,86678,86855,87310,87491,87613,87872,87985,88172,88274,88381,88510,88785,89293,89789,90666,90960,91530,91679,92411,92583,92919,93011,94071,98415,102902,102964,103594,104208,104299,104412,104641,104801,104953,105124,105290,105459,105626,105789,106032,106202,106375,106546,106820,107019,107224,107554,107638,107734,107830,107928,108028,108130,108232,108334,108436,108538,108638,108734,108846,108975,109098,109229,109360,109458,109572,109666,109806,109940,110036,110148,110248,110364,110460,110572,110672,110812,110948,111112,111242,111400,111550,111691,111835,111970,112082,112232,112360,112488,112624,112756,112886,113016,113128,114026,114172,114316,115800,115866,115956,116032,116136,116226,116328,116436,116544,116644,116724,116816,116914,117024,117102,117208,117300,117404,117514,117636,117799,117956,118036,118136,118226,118336,118430,118536,118628,118728,118840,118954,119070,119186,119280,119394,119506,119608,119728,119850,119932,120036,120156,120282,120380,120474,120562,120674,120790,120912,121024,121199,121315,121401,121493,121605,121729,121796,121922,121990,122118,122262,122390,122459,122554,122669,122782,122881,122990,123101,123212,123313,123418,123518,123648,123739,123862,123956,124068,124154,124258,124354,124442,124560,124664,124768,124894,124982,125090,125190,125280,125390,125474,125576,125660,125714,125778,125884,125994,126078,126482,131626,131744,131859,131991,132706,133398,133915,135562,135947,136544,138143,139676,140064,142371,161889,162447,169658,177799,179812,180074,180430,181260,188042,189176,189470,189693,190020,192070,192718,194351,194621,198472,199073,202882,204097,205506",
- "endLines": "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,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,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,134,135,136,137,138,139,140,141,142,143,144,145,146,147,148,149,150,151,152,153,154,155,156,157,165,166,167,168,169,170,171,172,173,194,195,196,197,198,199,200,201,204,205,206,207,208,211,212,213,220,221,222,223,224,231,232,233,234,235,236,237,238,239,240,241,242,243,244,245,246,247,248,249,250,251,252,253,254,255,256,257,258,259,260,261,262,263,264,265,266,267,268,269,359,374,375,376,377,378,386,387,391,395,399,404,410,417,421,425,430,434,438,442,446,450,454,460,464,470,474,480,484,489,493,496,500,506,510,516,520,526,529,533,537,541,545,549,550,551,552,555,558,561,564,568,569,570,571,572,575,577,579,581,586,587,591,597,601,602,604,615,616,620,626,630,631,632,636,663,667,668,672,700,868,894,1063,1089,1120,1128,1134,1148,1170,1175,1180,1190,1199,1208,1212,1219,1227,1234,1235,1244,1247,1250,1254,1258,1262,1265,1266,1270,1274,1284,1289,1296,1302,1303,1306,1310,1315,1317,1319,1322,1325,1327,1331,1334,1341,1344,1347,1351,1353,1357,1359,1361,1363,1367,1375,1383,1395,1401,1410,1413,1424,1427,1432,1433,1438,1511,1570,1571,1581,1590,1591,1593,1597,1600,1603,1606,1609,1612,1615,1618,1622,1625,1628,1631,1635,1638,1642,1646,1647,1648,1649,1650,1651,1652,1653,1654,1655,1656,1657,1658,1659,1660,1661,1662,1663,1664,1665,1666,1668,1670,1671,1672,1673,1674,1675,1676,1677,1679,1680,1682,1683,1685,1687,1688,1690,1691,1692,1693,1694,1695,1697,1698,1699,1700,1701,1702,1715,1717,1719,1748,1749,1750,1751,1752,1753,1754,1755,1756,1757,1758,1759,1761,1762,1763,1764,1765,1766,1768,1772,1776,1777,1778,1779,1780,1781,1782,1783,1785,1787,1789,1791,1793,1794,1795,1796,1798,1800,1802,1803,1804,1805,1806,1807,1808,1809,1810,1811,1812,1813,1816,1817,1818,1819,1821,1823,1824,1826,1827,1829,1831,1833,1834,1835,1836,1837,1838,1839,1840,1841,1842,1843,1844,1846,1847,1848,1849,1851,1852,1853,1854,1855,1857,1859,1861,1863,1864,1865,1866,1867,1868,1869,1870,1871,1872,1873,1874,1875,1876,1877,1965,1968,1971,1974,1988,1999,2009,2036,2043,2054,2084,2111,2120,2157,2538,2543,2576,2693,2848,2854,2860,2883,3024,3044,3050,3054,3060,3097,3109,3136,3141,3207,3222,3287,3306,3332,3341",
- "endColumns": "54,44,48,40,54,58,61,80,60,74,75,76,77,84,81,75,75,76,77,105,105,78,79,56,57,73,74,64,65,59,60,71,72,66,67,58,58,58,58,58,53,53,52,53,53,53,53,73,78,72,73,70,71,71,72,56,57,72,73,73,74,71,72,69,70,59,60,68,68,69,73,75,63,76,75,76,64,68,76,74,68,67,76,65,60,96,64,68,98,70,58,57,56,58,63,70,71,71,71,71,66,67,67,58,62,63,89,90,59,65,66,65,69,63,52,112,57,62,64,64,74,72,71,48,60,60,60,61,63,63,63,64,62,59,60,65,58,59,61,70,59,67,85,86,89,86,87,81,82,89,90,51,57,44,65,63,56,56,53,56,47,48,50,33,46,48,45,31,63,61,59,56,73,69,77,53,69,84,47,45,70,77,77,71,73,73,73,79,72,68,71,76,60,62,65,63,70,62,64,63,60,60,51,72,73,68,74,73,73,140,69,52,77,89,87,95,89,12,88,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,136,130,104,12,12,12,12,12,111,111,104,116,12,12,12,12,12,87,12,12,12,81,12,12,99,12,12,12,93,88,12,12,12,101,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,117,12,12,12,12,12,12,12,63,12,12,12,12,12,12,93,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,91,12,12,12,61,12,12,90,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,83,95,95,97,99,101,101,101,101,101,99,95,111,128,122,130,130,97,113,93,12,12,95,111,99,115,95,111,99,12,135,12,129,12,12,140,12,134,111,149,127,127,12,131,129,129,111,139,12,12,12,65,89,75,103,89,101,107,107,99,79,91,97,12,77,105,91,103,109,12,12,12,79,99,89,109,93,105,91,12,12,12,12,12,93,113,111,12,12,12,81,103,119,125,97,93,87,111,115,121,111,12,115,85,91,12,12,66,12,67,12,12,12,68,94,114,112,98,108,110,110,100,104,99,12,90,122,93,12,85,103,95,87,12,12,12,12,87,107,99,89,109,83,101,83,53,63,105,109,83,119,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24",
- "endOffsets": "643,688,737,778,833,892,954,1035,1096,1171,1247,1324,1402,1487,1569,1645,1721,1798,1876,1982,2088,2167,2247,2304,2362,2436,2511,2576,2642,2702,2763,2835,2908,2975,3043,3102,3161,3220,3279,3338,3392,3446,3499,3553,3607,3661,3715,3921,4000,4073,4147,4218,4290,4362,4435,4492,4550,4623,4697,4771,4846,4918,4991,5061,5132,5192,5253,5379,5448,5518,5592,5668,5732,5809,5885,5962,6027,6096,6173,6248,6317,6385,6462,6528,6589,6686,6751,6820,6919,6990,7049,7107,7164,7223,7287,7358,7430,7502,7574,7646,7713,7781,7849,7908,7971,8035,8125,8216,8276,8342,8409,8475,8545,8609,8662,8775,8833,8896,8961,9026,9101,9174,9246,9295,9356,9417,9478,9540,9604,9668,9732,9797,9860,9920,9981,10047,10106,10166,10228,10299,10359,10427,11001,11088,11178,11265,11353,11435,11518,11608,11699,12991,13049,13094,13160,13224,13281,13338,13392,13597,13645,13694,13745,13779,13896,13945,13991,14295,14359,14421,14481,14538,15075,15145,15223,15277,15347,15432,15480,15526,15597,15675,15753,15825,15899,15973,16047,16127,16200,16269,16341,16418,16479,16542,16608,16672,16743,16806,16871,16935,16996,17057,17109,17182,17256,17325,17400,17474,17548,17689,17759,23872,24993,25083,25171,25267,25357,25939,26028,26275,26556,26808,27093,27486,27963,28185,28407,28683,28910,29140,29370,29600,29830,30057,30476,30702,31127,31357,31785,32004,32287,32495,32626,32853,33279,33504,33931,34152,34577,34697,34973,35274,35598,35889,36203,36340,36471,36576,36818,36985,37189,37397,37668,37780,37892,37997,38114,38328,38474,38614,38700,39048,39136,39382,39800,40049,40131,40229,40846,40946,41198,41622,41877,41971,42060,42297,44349,44591,44693,44946,47130,57851,59367,70187,71715,73472,74098,74518,75579,76844,77100,77336,77883,78377,78982,79180,79760,80324,80699,80817,81355,81512,81708,81981,82237,82407,82548,82612,82894,83180,83856,84120,84458,84811,84905,85091,85397,85659,85784,85911,86150,86361,86480,86673,86850,87305,87486,87608,87867,87980,88167,88269,88376,88505,88780,89288,89784,90661,90955,91525,91674,92406,92578,92914,93006,93284,98410,102897,102959,103589,104203,104294,104407,104636,104796,104948,105119,105285,105454,105621,105784,106027,106197,106370,106541,106815,107014,107219,107549,107633,107729,107825,107923,108023,108125,108227,108329,108431,108533,108633,108729,108841,108970,109093,109224,109355,109453,109567,109661,109801,109935,110031,110143,110243,110359,110455,110567,110667,110807,110943,111107,111237,111395,111545,111686,111830,111965,112077,112227,112355,112483,112619,112751,112881,113011,113123,113263,114167,114311,114449,115861,115951,116027,116131,116221,116323,116431,116539,116639,116719,116811,116909,117019,117097,117203,117295,117399,117509,117631,117794,117951,118031,118131,118221,118331,118425,118531,118623,118723,118835,118949,119065,119181,119275,119389,119501,119603,119723,119845,119927,120031,120151,120277,120375,120469,120557,120669,120785,120907,121019,121194,121310,121396,121488,121600,121724,121791,121917,121985,122113,122257,122385,122454,122549,122664,122777,122876,122985,123096,123207,123308,123413,123513,123643,123734,123857,123951,124063,124149,124253,124349,124437,124555,124659,124763,124889,124977,125085,125185,125275,125385,125469,125571,125655,125709,125773,125879,125989,126073,126193,131621,131739,131854,131986,132701,133393,133910,135557,135942,136539,138138,139671,140059,142366,161884,162144,163834,170686,179807,180069,180425,181255,188037,189171,189465,189688,190015,192065,192713,194346,194616,198467,199068,202877,204092,205501,205975"
+ "startLines": "6,7,8,9,10,11,12,13,14,15,16,17,18,19,21,23,24,25,26,28,30,31,32,33,34,36,38,40,42,44,46,47,52,54,56,57,58,60,62,63,64,65,66,67,111,114,158,161,164,166,168,170,173,175,178,179,180,183,184,185,186,187,188,191,192,194,196,198,200,204,206,207,208,209,211,215,217,219,220,221,222,223,225,226,227,237,238,239,251",
+ "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",
+ "startOffsets": "354,445,548,651,756,863,972,1081,1190,1299,1408,1515,1618,1737,1892,2047,2152,2273,2374,2521,2662,2765,2884,2991,3094,3249,3420,3569,3734,3891,4042,4161,4533,4682,4831,4943,5090,5243,5390,5465,5554,5641,5742,5845,8913,9098,12178,12375,12574,12697,12820,12933,13116,13247,13448,13537,13648,13881,13982,14077,14200,14329,14446,14623,14722,14857,15000,15135,15254,15455,15574,15667,15778,15834,15941,16136,16247,16380,16475,16566,16657,16774,16913,16984,17067,17747,17804,17862,18556",
+ "endLines": "6,7,8,9,10,11,12,13,14,15,16,17,18,20,22,23,24,25,27,29,30,31,32,33,35,37,39,41,43,45,46,51,53,55,56,57,59,61,62,63,64,65,66,110,113,157,160,163,165,167,169,172,174,177,178,179,182,183,184,185,186,187,190,191,193,195,197,199,203,205,206,207,208,210,214,216,218,219,220,221,222,224,225,226,236,237,238,250,262",
+ "endColumns": "90,102,102,104,106,108,108,108,108,108,106,102,118,12,12,104,120,100,12,12,102,118,106,102,12,12,12,12,12,12,118,12,12,12,111,146,12,12,74,88,86,100,102,12,12,12,12,12,12,12,12,12,12,12,88,110,12,100,94,122,128,116,12,98,12,12,12,12,12,12,92,110,55,12,12,12,12,94,90,90,116,12,70,82,12,56,57,12,12",
+ "endOffsets": "440,543,646,751,858,967,1076,1185,1294,1403,1510,1613,1732,1887,2042,2147,2268,2369,2516,2657,2760,2879,2986,3089,3244,3415,3564,3729,3886,4037,4156,4528,4677,4826,4938,5085,5238,5385,5460,5549,5636,5737,5840,8908,9093,12173,12370,12569,12692,12815,12928,13111,13242,13443,13532,13643,13876,13977,14072,14195,14324,14441,14618,14717,14852,14995,15130,15249,15450,15569,15662,15773,15829,15936,16131,16242,16375,16470,16561,16652,16769,16908,16979,17062,17742,17799,17857,18551,19257"
}
}
]
},
{
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-hi_values-hi.arsc.flat",
+ "outputFile": "D:\\Note-master2\\app\\build\\intermediates\\merged_res\\debug\\values-te_values-te.arsc.flat",
"map": [
{
- "source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\4051cc509ba70441b9465808cc62a56d\\transformed\\appcompat-v7-28.0.0\\res\\values-hi\\values-hi.xml",
+ "source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\4051cc509ba70441b9465808cc62a56d\\transformed\\appcompat-v7-28.0.0\\res\\values-te\\values-te.xml",
"from": {
"startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29",
"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",
- "startOffsets": "105,211,308,418,504,606,728,805,883,974,1067,1163,1257,1358,1451,1546,1640,1731,1822,1912,2021,2124,2226,2336,2437,2549,2711,2812",
- "endColumns": "105,96,109,85,101,121,76,77,90,92,95,93,100,92,94,93,90,90,89,108,102,101,109,100,111,161,100,79",
- "endOffsets": "206,303,413,499,601,723,800,878,969,1062,1158,1252,1353,1446,1541,1635,1726,1817,1907,2016,2119,2221,2331,2432,2544,2706,2807,2887"
+ "startOffsets": "105,219,328,439,529,634,759,841,923,1014,1107,1203,1297,1398,1491,1586,1681,1772,1863,1947,2060,2168,2267,2378,2480,2597,2763,2864",
+ "endColumns": "113,108,110,89,104,124,81,81,90,92,95,93,100,92,94,94,90,90,83,112,107,98,110,101,116,165,100,81",
+ "endOffsets": "214,323,434,524,629,754,836,918,1009,1102,1198,1292,1393,1486,1581,1676,1767,1858,1942,2055,2163,2262,2373,2475,2592,2758,2859,2941"
}
},
{
- "source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\c9913736ba0af3f26ba50dd9aa679a2b\\transformed\\support-compat-28.0.0\\res\\values-hi\\values-hi.xml",
+ "source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\c9913736ba0af3f26ba50dd9aa679a2b\\transformed\\support-compat-28.0.0\\res\\values-te\\values-te.xml",
"from": {
"startLines": "2",
"startColumns": "4",
@@ -2978,28 +3008,44 @@
"to": {
"startLines": "30",
"startColumns": "4",
- "startOffsets": "2892",
+ "startOffsets": "2946",
"endColumns": "100",
- "endOffsets": "2988"
+ "endOffsets": "3042"
}
}
]
},
{
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-hr_values-hr.arsc.flat",
+ "outputFile": "D:\\Note-master2\\app\\build\\intermediates\\merged_res\\debug\\values-hdpi-v4_values-hdpi-v4.arsc.flat",
"map": [
{
- "source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\4051cc509ba70441b9465808cc62a56d\\transformed\\appcompat-v7-28.0.0\\res\\values-hr\\values-hr.xml",
+ "source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\4051cc509ba70441b9465808cc62a56d\\transformed\\appcompat-v7-28.0.0\\res\\values-hdpi-v4\\values-hdpi-v4.xml",
+ "from": {
+ "startLines": "2",
+ "startColumns": "4",
+ "startOffsets": "55",
+ "endLines": "6",
+ "endColumns": "13",
+ "endOffsets": "327"
+ }
+ }
+ ]
+ },
+ {
+ "outputFile": "D:\\Note-master2\\app\\build\\intermediates\\merged_res\\debug\\values-ka_values-ka.arsc.flat",
+ "map": [
+ {
+ "source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\4051cc509ba70441b9465808cc62a56d\\transformed\\appcompat-v7-28.0.0\\res\\values-ka\\values-ka.xml",
"from": {
"startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29",
"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",
- "startOffsets": "105,210,307,417,503,607,726,810,893,984,1077,1173,1267,1368,1461,1556,1655,1746,1837,1923,2027,2140,2246,2351,2464,2571,2740,2837",
- "endColumns": "104,96,109,85,103,118,83,82,90,92,95,93,100,92,94,98,90,90,85,103,112,105,104,112,106,168,96,88",
- "endOffsets": "205,302,412,498,602,721,805,888,979,1072,1168,1262,1363,1456,1551,1650,1741,1832,1918,2022,2135,2241,2346,2459,2566,2735,2832,2921"
+ "startOffsets": "105,214,318,429,517,622,735,819,901,992,1085,1180,1276,1377,1470,1565,1659,1750,1841,1924,2037,2144,2242,2355,2459,2563,2720,2818",
+ "endColumns": "108,103,110,87,104,112,83,81,90,92,94,95,100,92,94,93,90,90,82,112,106,97,112,103,103,156,97,80",
+ "endOffsets": "209,313,424,512,617,730,814,896,987,1080,1175,1271,1372,1465,1560,1654,1745,1836,1919,2032,2139,2237,2350,2454,2558,2715,2813,2894"
}
},
{
- "source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\c9913736ba0af3f26ba50dd9aa679a2b\\transformed\\support-compat-28.0.0\\res\\values-hr\\values-hr.xml",
+ "source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\c9913736ba0af3f26ba50dd9aa679a2b\\transformed\\support-compat-28.0.0\\res\\values-ka\\values-ka.xml",
"from": {
"startLines": "2",
"startColumns": "4",
@@ -3010,49 +3056,43 @@
"to": {
"startLines": "30",
"startColumns": "4",
- "startOffsets": "2926",
+ "startOffsets": "2899",
"endColumns": "100",
- "endOffsets": "3022"
+ "endOffsets": "2995"
}
}
]
},
{
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-v22_values-v22.arsc.flat",
+ "outputFile": "D:\\Note-master2\\app\\build\\intermediates\\merged_res\\debug\\values-xlarge-v4_values-xlarge-v4.arsc.flat",
"map": [
{
- "source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\4051cc509ba70441b9465808cc62a56d\\transformed\\appcompat-v7-28.0.0\\res\\values-v22\\values-v22.xml",
+ "source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\4051cc509ba70441b9465808cc62a56d\\transformed\\appcompat-v7-28.0.0\\res\\values-xlarge-v4\\values-xlarge-v4.xml",
"from": {
- "startLines": "2,3,4,9",
- "startColumns": "4,4,4,4",
- "startOffsets": "55,130,217,553",
- "endLines": "2,3,8,13",
- "endColumns": "74,86,12,12",
- "endOffsets": "125,212,548,896"
+ "startLines": "2,3,4,5,6,7",
+ "startColumns": "4,4,4,4,4,4",
+ "startOffsets": "55,126,197,267,337,405",
+ "endColumns": "70,70,69,69,67,67",
+ "endOffsets": "121,192,262,332,400,468"
}
}
]
},
{
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-ldltr-v21_values-ldltr-v21.arsc.flat",
+ "outputFile": "D:\\Note-master2\\app\\build\\intermediates\\merged_res\\debug\\values-mk_values-mk.arsc.flat",
"map": [
{
- "source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\4051cc509ba70441b9465808cc62a56d\\transformed\\appcompat-v7-28.0.0\\res\\values-ldltr-v21\\values-ldltr-v21.xml",
+ "source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\4051cc509ba70441b9465808cc62a56d\\transformed\\appcompat-v7-28.0.0\\res\\values-mk\\values-mk.xml",
"from": {
- "startLines": "2",
- "startColumns": "4",
- "startOffsets": "55",
- "endColumns": "112",
- "endOffsets": "163"
+ "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29",
+ "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",
+ "startOffsets": "105,213,317,425,511,616,735,818,900,997,1096,1193,1293,1400,1499,1600,1696,1793,1884,1971,2077,2184,2285,2392,2503,2607,2763,2861",
+ "endColumns": "107,103,107,85,104,118,82,81,96,98,96,99,106,98,100,95,96,90,86,105,106,100,106,110,103,155,97,83",
+ "endOffsets": "208,312,420,506,611,730,813,895,992,1091,1188,1288,1395,1494,1595,1691,1788,1879,1966,2072,2179,2280,2387,2498,2602,2758,2856,2940"
}
- }
- ]
- },
- {
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-kk_values-kk.arsc.flat",
- "map": [
+ },
{
- "source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\c9913736ba0af3f26ba50dd9aa679a2b\\transformed\\support-compat-28.0.0\\res\\values-kk\\values-kk.xml",
+ "source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\c9913736ba0af3f26ba50dd9aa679a2b\\transformed\\support-compat-28.0.0\\res\\values-mk\\values-mk.xml",
"from": {
"startLines": "2",
"startColumns": "4",
@@ -3063,38 +3103,28 @@
"to": {
"startLines": "30",
"startColumns": "4",
- "startOffsets": "2893",
+ "startOffsets": "2945",
"endColumns": "100",
- "endOffsets": "2989"
- }
- },
- {
- "source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\4051cc509ba70441b9465808cc62a56d\\transformed\\appcompat-v7-28.0.0\\res\\values-kk\\values-kk.xml",
- "from": {
- "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29",
- "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",
- "startOffsets": "105,217,320,430,515,621,740,821,901,992,1085,1181,1275,1376,1469,1564,1661,1752,1844,1925,2028,2133,2231,2338,2447,2547,2713,2812",
- "endColumns": "111,102,109,84,105,118,80,79,90,92,95,93,100,92,94,96,90,91,80,102,104,97,106,108,99,165,98,80",
- "endOffsets": "212,315,425,510,616,735,816,896,987,1080,1176,1270,1371,1464,1559,1656,1747,1839,1920,2023,2128,2226,2333,2442,2542,2708,2807,2888"
+ "endOffsets": "3041"
}
}
]
},
{
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-ne_values-ne.arsc.flat",
+ "outputFile": "D:\\Note-master2\\app\\build\\intermediates\\merged_res\\debug\\values-it_values-it.arsc.flat",
"map": [
{
- "source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\4051cc509ba70441b9465808cc62a56d\\transformed\\appcompat-v7-28.0.0\\res\\values-ne\\values-ne.xml",
+ "source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\4051cc509ba70441b9465808cc62a56d\\transformed\\appcompat-v7-28.0.0\\res\\values-it\\values-it.xml",
"from": {
"startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29",
"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",
- "startOffsets": "105,210,314,422,513,620,747,841,931,1022,1115,1211,1305,1406,1499,1594,1688,1779,1870,1958,2068,2184,2287,2402,2504,2619,2790,2902",
- "endColumns": "104,103,107,90,106,126,93,89,90,92,95,93,100,92,94,93,90,90,87,109,115,102,114,101,114,170,111,85",
- "endOffsets": "205,309,417,508,615,742,836,926,1017,1110,1206,1300,1401,1494,1589,1683,1774,1865,1953,2063,2179,2282,2397,2499,2614,2785,2897,2983"
+ "startOffsets": "105,214,314,423,507,616,741,818,894,986,1080,1174,1268,1370,1464,1561,1667,1759,1851,1932,2038,2146,2244,2348,2453,2560,2723,2823",
+ "endColumns": "108,99,108,83,108,124,76,75,91,93,93,93,101,93,96,105,91,91,80,105,107,97,103,104,106,162,99,82",
+ "endOffsets": "209,309,418,502,611,736,813,889,981,1075,1169,1263,1365,1459,1556,1662,1754,1846,1927,2033,2141,2239,2343,2448,2555,2718,2818,2901"
}
},
{
- "source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\c9913736ba0af3f26ba50dd9aa679a2b\\transformed\\support-compat-28.0.0\\res\\values-ne\\values-ne.xml",
+ "source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\c9913736ba0af3f26ba50dd9aa679a2b\\transformed\\support-compat-28.0.0\\res\\values-it\\values-it.xml",
"from": {
"startLines": "2",
"startColumns": "4",
@@ -3105,15 +3135,15 @@
"to": {
"startLines": "30",
"startColumns": "4",
- "startOffsets": "2988",
+ "startOffsets": "2906",
"endColumns": "100",
- "endOffsets": "3084"
+ "endOffsets": "3002"
}
}
]
},
{
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-b+sr+Latn_values-b+sr+Latn.arsc.flat",
+ "outputFile": "D:\\Note-master2\\app\\build\\intermediates\\merged_res\\debug\\values-b+sr+Latn_values-b+sr+Latn.arsc.flat",
"map": [
{
"source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\c9913736ba0af3f26ba50dd9aa679a2b\\transformed\\support-compat-28.0.0\\res\\values-b+sr+Latn\\values-b+sr+Latn.xml",
@@ -3145,10 +3175,20 @@
]
},
{
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-zu_values-zu.arsc.flat",
+ "outputFile": "D:\\Note-master2\\app\\build\\intermediates\\merged_res\\debug\\values-sq_values-sq.arsc.flat",
"map": [
{
- "source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\c9913736ba0af3f26ba50dd9aa679a2b\\transformed\\support-compat-28.0.0\\res\\values-zu\\values-zu.xml",
+ "source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\4051cc509ba70441b9465808cc62a56d\\transformed\\appcompat-v7-28.0.0\\res\\values-sq\\values-sq.xml",
+ "from": {
+ "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29",
+ "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",
+ "startOffsets": "105,219,319,431,518,628,751,832,911,1002,1095,1191,1285,1387,1480,1575,1672,1763,1856,1939,2045,2150,2248,2354,2457,2573,2727,2826",
+ "endColumns": "113,99,111,86,109,122,80,78,90,92,95,93,101,92,94,96,90,92,82,105,104,97,105,102,115,153,98,80",
+ "endOffsets": "214,314,426,513,623,746,827,906,997,1090,1186,1280,1382,1475,1570,1667,1758,1851,1934,2040,2145,2243,2349,2452,2568,2722,2821,2902"
+ }
+ },
+ {
+ "source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\c9913736ba0af3f26ba50dd9aa679a2b\\transformed\\support-compat-28.0.0\\res\\values-sq\\values-sq.xml",
"from": {
"startLines": "2",
"startColumns": "4",
@@ -3159,53 +3199,28 @@
"to": {
"startLines": "30",
"startColumns": "4",
- "startOffsets": "2898",
+ "startOffsets": "2907",
"endColumns": "100",
- "endOffsets": "2994"
- }
- },
- {
- "source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\4051cc509ba70441b9465808cc62a56d\\transformed\\appcompat-v7-28.0.0\\res\\values-zu\\values-zu.xml",
- "from": {
- "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29",
- "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",
- "startOffsets": "105,213,320,434,522,625,752,832,912,1003,1096,1190,1284,1385,1478,1573,1667,1758,1851,1937,2041,2147,2245,2352,2458,2564,2721,2817",
- "endColumns": "107,106,113,87,102,126,79,79,90,92,93,93,100,92,94,93,90,92,85,103,105,97,106,105,105,156,95,80",
- "endOffsets": "208,315,429,517,620,747,827,907,998,1091,1185,1279,1380,1473,1568,1662,1753,1846,1932,2036,2142,2240,2347,2453,2559,2716,2812,2893"
- }
- }
- ]
- },
- {
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-h720dp-v13_values-h720dp-v13.arsc.flat",
- "map": [
- {
- "source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\4051cc509ba70441b9465808cc62a56d\\transformed\\appcompat-v7-28.0.0\\res\\values-h720dp-v13\\values-h720dp-v13.xml",
- "from": {
- "startLines": "2",
- "startColumns": "4",
- "startOffsets": "55",
- "endColumns": "66",
- "endOffsets": "117"
+ "endOffsets": "3003"
}
}
]
},
{
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-ro_values-ro.arsc.flat",
+ "outputFile": "D:\\Note-master2\\app\\build\\intermediates\\merged_res\\debug\\values-hr_values-hr.arsc.flat",
"map": [
{
- "source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\4051cc509ba70441b9465808cc62a56d\\transformed\\appcompat-v7-28.0.0\\res\\values-ro\\values-ro.xml",
+ "source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\4051cc509ba70441b9465808cc62a56d\\transformed\\appcompat-v7-28.0.0\\res\\values-hr\\values-hr.xml",
"from": {
"startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29",
"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",
- "startOffsets": "105,226,330,443,531,643,764,849,930,1021,1114,1210,1304,1404,1497,1592,1687,1778,1870,1953,2065,2178,2278,2392,2497,2603,2767,2870",
- "endColumns": "120,103,112,87,111,120,84,80,90,92,95,93,99,92,94,94,90,91,82,111,112,99,113,104,105,163,102,82",
- "endOffsets": "221,325,438,526,638,759,844,925,1016,1109,1205,1299,1399,1492,1587,1682,1773,1865,1948,2060,2173,2273,2387,2492,2598,2762,2865,2948"
+ "startOffsets": "105,210,307,417,503,607,726,810,893,984,1077,1173,1267,1368,1461,1556,1655,1746,1837,1923,2027,2140,2246,2351,2464,2571,2740,2837",
+ "endColumns": "104,96,109,85,103,118,83,82,90,92,95,93,100,92,94,98,90,90,85,103,112,105,104,112,106,168,96,88",
+ "endOffsets": "205,302,412,498,602,721,805,888,979,1072,1168,1262,1363,1456,1551,1650,1741,1832,1918,2022,2135,2241,2346,2459,2566,2735,2832,2921"
}
},
{
- "source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\c9913736ba0af3f26ba50dd9aa679a2b\\transformed\\support-compat-28.0.0\\res\\values-ro\\values-ro.xml",
+ "source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\c9913736ba0af3f26ba50dd9aa679a2b\\transformed\\support-compat-28.0.0\\res\\values-hr\\values-hr.xml",
"from": {
"startLines": "2",
"startColumns": "4",
@@ -3216,33 +3231,28 @@
"to": {
"startLines": "30",
"startColumns": "4",
- "startOffsets": "2953",
+ "startOffsets": "2926",
"endColumns": "100",
- "endOffsets": "3049"
+ "endOffsets": "3022"
}
}
]
},
{
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-xlarge-v4_values-xlarge-v4.arsc.flat",
+ "outputFile": "D:\\Note-master2\\app\\build\\intermediates\\merged_res\\debug\\values-bg_values-bg.arsc.flat",
"map": [
{
- "source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\4051cc509ba70441b9465808cc62a56d\\transformed\\appcompat-v7-28.0.0\\res\\values-xlarge-v4\\values-xlarge-v4.xml",
+ "source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\4051cc509ba70441b9465808cc62a56d\\transformed\\appcompat-v7-28.0.0\\res\\values-bg\\values-bg.xml",
"from": {
- "startLines": "2,3,4,5,6,7",
- "startColumns": "4,4,4,4,4,4",
- "startOffsets": "55,126,197,267,337,405",
- "endColumns": "70,70,69,69,67,67",
- "endOffsets": "121,192,262,332,400,468"
+ "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29",
+ "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",
+ "startOffsets": "105,220,327,432,518,623,744,823,901,992,1085,1181,1275,1376,1469,1564,1672,1763,1854,1937,2051,2160,2260,2374,2480,2588,2748,2847",
+ "endColumns": "114,106,104,85,104,120,78,77,90,92,95,93,100,92,94,107,90,90,82,113,108,99,113,105,107,159,98,82",
+ "endOffsets": "215,322,427,513,618,739,818,896,987,1080,1176,1270,1371,1464,1559,1667,1758,1849,1932,2046,2155,2255,2369,2475,2583,2743,2842,2925"
}
- }
- ]
- },
- {
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-ur_values-ur.arsc.flat",
- "map": [
+ },
{
- "source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\c9913736ba0af3f26ba50dd9aa679a2b\\transformed\\support-compat-28.0.0\\res\\values-ur\\values-ur.xml",
+ "source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\c9913736ba0af3f26ba50dd9aa679a2b\\transformed\\support-compat-28.0.0\\res\\values-bg\\values-bg.xml",
"from": {
"startLines": "2",
"startColumns": "4",
@@ -3253,28 +3263,28 @@
"to": {
"startLines": "30",
"startColumns": "4",
- "startOffsets": "2904",
+ "startOffsets": "2930",
"endColumns": "100",
- "endOffsets": "3000"
- }
- },
- {
- "source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\4051cc509ba70441b9465808cc62a56d\\transformed\\appcompat-v7-28.0.0\\res\\values-ur\\values-ur.xml",
- "from": {
- "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29",
- "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",
- "startOffsets": "105,215,321,430,516,620,740,816,892,984,1078,1174,1268,1370,1464,1560,1654,1746,1838,1923,2031,2140,2242,2353,2453,2561,2726,2824",
- "endColumns": "109,105,108,85,103,119,75,75,91,93,95,93,101,93,95,93,91,91,84,107,108,101,110,99,107,164,97,79",
- "endOffsets": "210,316,425,511,615,735,811,887,979,1073,1169,1263,1365,1459,1555,1649,1741,1833,1918,2026,2135,2237,2348,2448,2556,2721,2819,2899"
+ "endOffsets": "3026"
}
}
]
},
{
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-et_values-et.arsc.flat",
+ "outputFile": "D:\\Note-master2\\app\\build\\intermediates\\merged_res\\debug\\values-as_values-as.arsc.flat",
"map": [
{
- "source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\c9913736ba0af3f26ba50dd9aa679a2b\\transformed\\support-compat-28.0.0\\res\\values-et\\values-et.xml",
+ "source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\4051cc509ba70441b9465808cc62a56d\\transformed\\appcompat-v7-28.0.0\\res\\values-as\\values-as.xml",
+ "from": {
+ "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29",
+ "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",
+ "startOffsets": "105,213,312,419,515,617,736,816,896,987,1080,1173,1268,1368,1461,1558,1652,1743,1834,1923,2025,2140,2243,2352,2471,2591,2758,2861",
+ "endColumns": "107,98,106,95,101,118,79,79,90,92,92,94,99,92,96,93,90,90,88,101,114,102,108,118,119,166,102,88",
+ "endOffsets": "208,307,414,510,612,731,811,891,982,1075,1168,1263,1363,1456,1553,1647,1738,1829,1918,2020,2135,2238,2347,2466,2586,2753,2856,2945"
+ }
+ },
+ {
+ "source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\c9913736ba0af3f26ba50dd9aa679a2b\\transformed\\support-compat-28.0.0\\res\\values-as\\values-as.xml",
"from": {
"startLines": "2",
"startColumns": "4",
@@ -3285,28 +3295,18 @@
"to": {
"startLines": "30",
"startColumns": "4",
- "startOffsets": "2942",
+ "startOffsets": "2950",
"endColumns": "100",
- "endOffsets": "3038"
- }
- },
- {
- "source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\4051cc509ba70441b9465808cc62a56d\\transformed\\appcompat-v7-28.0.0\\res\\values-et\\values-et.xml",
- "from": {
- "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29",
- "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",
- "startOffsets": "105,222,329,440,526,628,745,825,903,995,1089,1194,1296,1406,1500,1601,1695,1787,1880,1963,2074,2179,2278,2388,2489,2592,2758,2860",
- "endColumns": "116,106,110,85,101,116,79,77,91,93,104,101,109,93,100,93,91,92,82,110,104,98,109,100,102,165,101,81",
- "endOffsets": "217,324,435,521,623,740,820,898,990,1084,1189,1291,1401,1495,1596,1690,1782,1875,1958,2069,2174,2273,2383,2484,2587,2753,2855,2937"
+ "endOffsets": "3046"
}
}
]
},
{
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-ta_values-ta.arsc.flat",
+ "outputFile": "D:\\Note-master2\\app\\build\\intermediates\\merged_res\\debug\\values-zu_values-zu.arsc.flat",
"map": [
{
- "source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\c9913736ba0af3f26ba50dd9aa679a2b\\transformed\\support-compat-28.0.0\\res\\values-ta\\values-ta.xml",
+ "source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\c9913736ba0af3f26ba50dd9aa679a2b\\transformed\\support-compat-28.0.0\\res\\values-zu\\values-zu.xml",
"from": {
"startLines": "2",
"startColumns": "4",
@@ -3317,19 +3317,19 @@
"to": {
"startLines": "30",
"startColumns": "4",
- "startOffsets": "2954",
+ "startOffsets": "2898",
"endColumns": "100",
- "endOffsets": "3050"
+ "endOffsets": "2994"
}
},
{
- "source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\4051cc509ba70441b9465808cc62a56d\\transformed\\appcompat-v7-28.0.0\\res\\values-ta\\values-ta.xml",
+ "source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\4051cc509ba70441b9465808cc62a56d\\transformed\\appcompat-v7-28.0.0\\res\\values-zu\\values-zu.xml",
"from": {
"startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29",
"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",
- "startOffsets": "105,219,317,432,521,628,754,832,909,1009,1114,1210,1305,1412,1514,1618,1713,1815,1913,1995,2097,2201,2298,2408,2510,2617,2774,2874",
- "endColumns": "113,97,114,88,106,125,77,76,99,104,95,94,106,101,103,94,101,97,81,101,103,96,109,101,106,156,99,79",
- "endOffsets": "214,312,427,516,623,749,827,904,1004,1109,1205,1300,1407,1509,1613,1708,1810,1908,1990,2092,2196,2293,2403,2505,2612,2769,2869,2949"
+ "startOffsets": "105,213,320,434,522,625,752,832,912,1003,1096,1190,1284,1385,1478,1573,1667,1758,1851,1937,2041,2147,2245,2352,2458,2564,2721,2817",
+ "endColumns": "107,106,113,87,102,126,79,79,90,92,93,93,100,92,94,93,90,92,85,103,105,97,106,105,105,156,95,80",
+ "endOffsets": "208,315,429,517,620,747,827,907,998,1091,1185,1279,1380,1473,1568,1662,1753,1846,1932,2036,2142,2240,2347,2453,2559,2716,2812,2893"
}
}
]
diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-af.json b/src/Note-master2/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-af.json
similarity index 92%
rename from src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-af.json
rename to src/Note-master2/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-af.json
index 070b1e7..7b4b01e 100644
--- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-af.json
+++ b/src/Note-master2/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-af.json
@@ -1,7 +1,7 @@
{
"logs": [
{
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-af\\values-af.xml",
+ "outputFile": "D:\\Note-master2\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-af\\values-af.xml",
"map": [
{
"source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\c9913736ba0af3f26ba50dd9aa679a2b\\transformed\\support-compat-28.0.0\\res\\values-af\\values-af.xml",
diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-am.json b/src/Note-master2/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-am.json
similarity index 92%
rename from src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-am.json
rename to src/Note-master2/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-am.json
index 5143b0b..89638b5 100644
--- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-am.json
+++ b/src/Note-master2/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-am.json
@@ -1,7 +1,7 @@
{
"logs": [
{
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-am\\values-am.xml",
+ "outputFile": "D:\\Note-master2\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-am\\values-am.xml",
"map": [
{
"source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\c9913736ba0af3f26ba50dd9aa679a2b\\transformed\\support-compat-28.0.0\\res\\values-am\\values-am.xml",
diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ar.json b/src/Note-master2/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ar.json
similarity index 92%
rename from src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ar.json
rename to src/Note-master2/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ar.json
index 9692a66..b8fe39e 100644
--- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ar.json
+++ b/src/Note-master2/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ar.json
@@ -1,7 +1,7 @@
{
"logs": [
{
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-ar\\values-ar.xml",
+ "outputFile": "D:\\Note-master2\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-ar\\values-ar.xml",
"map": [
{
"source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\c9913736ba0af3f26ba50dd9aa679a2b\\transformed\\support-compat-28.0.0\\res\\values-ar\\values-ar.xml",
diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-as.json b/src/Note-master2/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-as.json
similarity index 92%
rename from src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-as.json
rename to src/Note-master2/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-as.json
index 080ca9d..36098be 100644
--- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-as.json
+++ b/src/Note-master2/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-as.json
@@ -1,7 +1,7 @@
{
"logs": [
{
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-as\\values-as.xml",
+ "outputFile": "D:\\Note-master2\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-as\\values-as.xml",
"map": [
{
"source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\4051cc509ba70441b9465808cc62a56d\\transformed\\appcompat-v7-28.0.0\\res\\values-as\\values-as.xml",
diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-az.json b/src/Note-master2/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-az.json
similarity index 92%
rename from src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-az.json
rename to src/Note-master2/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-az.json
index b009e28..458f844 100644
--- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-az.json
+++ b/src/Note-master2/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-az.json
@@ -1,7 +1,7 @@
{
"logs": [
{
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-az\\values-az.xml",
+ "outputFile": "D:\\Note-master2\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-az\\values-az.xml",
"map": [
{
"source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\4051cc509ba70441b9465808cc62a56d\\transformed\\appcompat-v7-28.0.0\\res\\values-az\\values-az.xml",
diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-b+sr+Latn.json b/src/Note-master2/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-b+sr+Latn.json
similarity index 91%
rename from src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-b+sr+Latn.json
rename to src/Note-master2/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-b+sr+Latn.json
index 0b1a1b6..10b6f03 100644
--- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-b+sr+Latn.json
+++ b/src/Note-master2/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-b+sr+Latn.json
@@ -1,7 +1,7 @@
{
"logs": [
{
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-b+sr+Latn\\values-b+sr+Latn.xml",
+ "outputFile": "D:\\Note-master2\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-b+sr+Latn\\values-b+sr+Latn.xml",
"map": [
{
"source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\c9913736ba0af3f26ba50dd9aa679a2b\\transformed\\support-compat-28.0.0\\res\\values-b+sr+Latn\\values-b+sr+Latn.xml",
diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-be.json b/src/Note-master2/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-be.json
similarity index 92%
rename from src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-be.json
rename to src/Note-master2/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-be.json
index 8048f30..c242f4b 100644
--- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-be.json
+++ b/src/Note-master2/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-be.json
@@ -1,7 +1,7 @@
{
"logs": [
{
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-be\\values-be.xml",
+ "outputFile": "D:\\Note-master2\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-be\\values-be.xml",
"map": [
{
"source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\c9913736ba0af3f26ba50dd9aa679a2b\\transformed\\support-compat-28.0.0\\res\\values-be\\values-be.xml",
diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-bg.json b/src/Note-master2/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-bg.json
similarity index 92%
rename from src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-bg.json
rename to src/Note-master2/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-bg.json
index 1704edd..2e1cae4 100644
--- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-bg.json
+++ b/src/Note-master2/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-bg.json
@@ -1,7 +1,7 @@
{
"logs": [
{
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-bg\\values-bg.xml",
+ "outputFile": "D:\\Note-master2\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-bg\\values-bg.xml",
"map": [
{
"source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\4051cc509ba70441b9465808cc62a56d\\transformed\\appcompat-v7-28.0.0\\res\\values-bg\\values-bg.xml",
diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-bn.json b/src/Note-master2/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-bn.json
similarity index 92%
rename from src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-bn.json
rename to src/Note-master2/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-bn.json
index 6071f5d..5e9bed3 100644
--- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-bn.json
+++ b/src/Note-master2/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-bn.json
@@ -1,7 +1,7 @@
{
"logs": [
{
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-bn\\values-bn.xml",
+ "outputFile": "D:\\Note-master2\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-bn\\values-bn.xml",
"map": [
{
"source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\c9913736ba0af3f26ba50dd9aa679a2b\\transformed\\support-compat-28.0.0\\res\\values-bn\\values-bn.xml",
diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-bs.json b/src/Note-master2/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-bs.json
similarity index 92%
rename from src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-bs.json
rename to src/Note-master2/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-bs.json
index 22ae889..b620a81 100644
--- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-bs.json
+++ b/src/Note-master2/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-bs.json
@@ -1,7 +1,7 @@
{
"logs": [
{
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-bs\\values-bs.xml",
+ "outputFile": "D:\\Note-master2\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-bs\\values-bs.xml",
"map": [
{
"source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\c9913736ba0af3f26ba50dd9aa679a2b\\transformed\\support-compat-28.0.0\\res\\values-bs\\values-bs.xml",
diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ca.json b/src/Note-master2/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ca.json
similarity index 92%
rename from src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ca.json
rename to src/Note-master2/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ca.json
index ddfd65d..f85fd7f 100644
--- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ca.json
+++ b/src/Note-master2/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ca.json
@@ -1,7 +1,7 @@
{
"logs": [
{
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-ca\\values-ca.xml",
+ "outputFile": "D:\\Note-master2\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-ca\\values-ca.xml",
"map": [
{
"source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\c9913736ba0af3f26ba50dd9aa679a2b\\transformed\\support-compat-28.0.0\\res\\values-ca\\values-ca.xml",
diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-cs.json b/src/Note-master2/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-cs.json
similarity index 92%
rename from src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-cs.json
rename to src/Note-master2/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-cs.json
index 06522ce..44beb4a 100644
--- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-cs.json
+++ b/src/Note-master2/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-cs.json
@@ -1,7 +1,7 @@
{
"logs": [
{
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-cs\\values-cs.xml",
+ "outputFile": "D:\\Note-master2\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-cs\\values-cs.xml",
"map": [
{
"source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\4051cc509ba70441b9465808cc62a56d\\transformed\\appcompat-v7-28.0.0\\res\\values-cs\\values-cs.xml",
diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-da.json b/src/Note-master2/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-da.json
similarity index 92%
rename from src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-da.json
rename to src/Note-master2/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-da.json
index 8971bed..a53ae3b 100644
--- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-da.json
+++ b/src/Note-master2/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-da.json
@@ -1,7 +1,7 @@
{
"logs": [
{
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-da\\values-da.xml",
+ "outputFile": "D:\\Note-master2\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-da\\values-da.xml",
"map": [
{
"source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\4051cc509ba70441b9465808cc62a56d\\transformed\\appcompat-v7-28.0.0\\res\\values-da\\values-da.xml",
diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-de.json b/src/Note-master2/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-de.json
similarity index 92%
rename from src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-de.json
rename to src/Note-master2/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-de.json
index c55b4e0..9b24f21 100644
--- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-de.json
+++ b/src/Note-master2/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-de.json
@@ -1,7 +1,7 @@
{
"logs": [
{
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-de\\values-de.xml",
+ "outputFile": "D:\\Note-master2\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-de\\values-de.xml",
"map": [
{
"source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\c9913736ba0af3f26ba50dd9aa679a2b\\transformed\\support-compat-28.0.0\\res\\values-de\\values-de.xml",
diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-el.json b/src/Note-master2/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-el.json
similarity index 92%
rename from src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-el.json
rename to src/Note-master2/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-el.json
index a7b0110..18bcfa8 100644
--- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-el.json
+++ b/src/Note-master2/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-el.json
@@ -1,7 +1,7 @@
{
"logs": [
{
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-el\\values-el.xml",
+ "outputFile": "D:\\Note-master2\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-el\\values-el.xml",
"map": [
{
"source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\4051cc509ba70441b9465808cc62a56d\\transformed\\appcompat-v7-28.0.0\\res\\values-el\\values-el.xml",
diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-en-rAU.json b/src/Note-master2/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-en-rAU.json
similarity index 92%
rename from src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-en-rAU.json
rename to src/Note-master2/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-en-rAU.json
index b36bb10..1d0a5c0 100644
--- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-en-rAU.json
+++ b/src/Note-master2/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-en-rAU.json
@@ -1,7 +1,7 @@
{
"logs": [
{
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-en-rAU\\values-en-rAU.xml",
+ "outputFile": "D:\\Note-master2\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-en-rAU\\values-en-rAU.xml",
"map": [
{
"source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\c9913736ba0af3f26ba50dd9aa679a2b\\transformed\\support-compat-28.0.0\\res\\values-en-rAU\\values-en-rAU.xml",
diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-en-rCA.json b/src/Note-master2/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-en-rCA.json
similarity index 92%
rename from src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-en-rCA.json
rename to src/Note-master2/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-en-rCA.json
index e73ecf4..b1a5680 100644
--- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-en-rCA.json
+++ b/src/Note-master2/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-en-rCA.json
@@ -1,7 +1,7 @@
{
"logs": [
{
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-en-rCA\\values-en-rCA.xml",
+ "outputFile": "D:\\Note-master2\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-en-rCA\\values-en-rCA.xml",
"map": [
{
"source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\4051cc509ba70441b9465808cc62a56d\\transformed\\appcompat-v7-28.0.0\\res\\values-en-rCA\\values-en-rCA.xml",
diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-en-rGB.json b/src/Note-master2/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-en-rGB.json
similarity index 92%
rename from src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-en-rGB.json
rename to src/Note-master2/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-en-rGB.json
index 353774b..2fe332c 100644
--- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-en-rGB.json
+++ b/src/Note-master2/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-en-rGB.json
@@ -1,7 +1,7 @@
{
"logs": [
{
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-en-rGB\\values-en-rGB.xml",
+ "outputFile": "D:\\Note-master2\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-en-rGB\\values-en-rGB.xml",
"map": [
{
"source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\4051cc509ba70441b9465808cc62a56d\\transformed\\appcompat-v7-28.0.0\\res\\values-en-rGB\\values-en-rGB.xml",
diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-en-rIN.json b/src/Note-master2/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-en-rIN.json
similarity index 92%
rename from src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-en-rIN.json
rename to src/Note-master2/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-en-rIN.json
index ebbdda3..2114240 100644
--- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-en-rIN.json
+++ b/src/Note-master2/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-en-rIN.json
@@ -1,7 +1,7 @@
{
"logs": [
{
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-en-rIN\\values-en-rIN.xml",
+ "outputFile": "D:\\Note-master2\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-en-rIN\\values-en-rIN.xml",
"map": [
{
"source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\c9913736ba0af3f26ba50dd9aa679a2b\\transformed\\support-compat-28.0.0\\res\\values-en-rIN\\values-en-rIN.xml",
diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-en-rXC.json b/src/Note-master2/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-en-rXC.json
similarity index 92%
rename from src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-en-rXC.json
rename to src/Note-master2/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-en-rXC.json
index 8997bb6..777ff46 100644
--- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-en-rXC.json
+++ b/src/Note-master2/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-en-rXC.json
@@ -1,7 +1,7 @@
{
"logs": [
{
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-en-rXC\\values-en-rXC.xml",
+ "outputFile": "D:\\Note-master2\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-en-rXC\\values-en-rXC.xml",
"map": [
{
"source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\c9913736ba0af3f26ba50dd9aa679a2b\\transformed\\support-compat-28.0.0\\res\\values-en-rXC\\values-en-rXC.xml",
diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-es-rUS.json b/src/Note-master2/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-es-rUS.json
similarity index 92%
rename from src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-es-rUS.json
rename to src/Note-master2/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-es-rUS.json
index 3df421e..1a9f081 100644
--- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-es-rUS.json
+++ b/src/Note-master2/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-es-rUS.json
@@ -1,7 +1,7 @@
{
"logs": [
{
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-es-rUS\\values-es-rUS.xml",
+ "outputFile": "D:\\Note-master2\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-es-rUS\\values-es-rUS.xml",
"map": [
{
"source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\4051cc509ba70441b9465808cc62a56d\\transformed\\appcompat-v7-28.0.0\\res\\values-es-rUS\\values-es-rUS.xml",
diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-es.json b/src/Note-master2/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-es.json
similarity index 92%
rename from src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-es.json
rename to src/Note-master2/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-es.json
index d8e4433..01341ad 100644
--- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-es.json
+++ b/src/Note-master2/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-es.json
@@ -1,7 +1,7 @@
{
"logs": [
{
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-es\\values-es.xml",
+ "outputFile": "D:\\Note-master2\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-es\\values-es.xml",
"map": [
{
"source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\4051cc509ba70441b9465808cc62a56d\\transformed\\appcompat-v7-28.0.0\\res\\values-es\\values-es.xml",
diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-et.json b/src/Note-master2/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-et.json
similarity index 92%
rename from src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-et.json
rename to src/Note-master2/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-et.json
index 3aadea0..a58998b 100644
--- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-et.json
+++ b/src/Note-master2/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-et.json
@@ -1,7 +1,7 @@
{
"logs": [
{
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-et\\values-et.xml",
+ "outputFile": "D:\\Note-master2\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-et\\values-et.xml",
"map": [
{
"source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\c9913736ba0af3f26ba50dd9aa679a2b\\transformed\\support-compat-28.0.0\\res\\values-et\\values-et.xml",
diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-eu.json b/src/Note-master2/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-eu.json
similarity index 92%
rename from src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-eu.json
rename to src/Note-master2/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-eu.json
index a3c1493..df24ddc 100644
--- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-eu.json
+++ b/src/Note-master2/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-eu.json
@@ -1,7 +1,7 @@
{
"logs": [
{
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-eu\\values-eu.xml",
+ "outputFile": "D:\\Note-master2\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-eu\\values-eu.xml",
"map": [
{
"source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\4051cc509ba70441b9465808cc62a56d\\transformed\\appcompat-v7-28.0.0\\res\\values-eu\\values-eu.xml",
diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-fa.json b/src/Note-master2/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-fa.json
similarity index 92%
rename from src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-fa.json
rename to src/Note-master2/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-fa.json
index 647a349..694b61d 100644
--- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-fa.json
+++ b/src/Note-master2/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-fa.json
@@ -1,7 +1,7 @@
{
"logs": [
{
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-fa\\values-fa.xml",
+ "outputFile": "D:\\Note-master2\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-fa\\values-fa.xml",
"map": [
{
"source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\4051cc509ba70441b9465808cc62a56d\\transformed\\appcompat-v7-28.0.0\\res\\values-fa\\values-fa.xml",
diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-fi.json b/src/Note-master2/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-fi.json
similarity index 92%
rename from src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-fi.json
rename to src/Note-master2/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-fi.json
index 8443439..0af3e35 100644
--- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-fi.json
+++ b/src/Note-master2/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-fi.json
@@ -1,7 +1,7 @@
{
"logs": [
{
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-fi\\values-fi.xml",
+ "outputFile": "D:\\Note-master2\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-fi\\values-fi.xml",
"map": [
{
"source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\c9913736ba0af3f26ba50dd9aa679a2b\\transformed\\support-compat-28.0.0\\res\\values-fi\\values-fi.xml",
diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-fr-rCA.json b/src/Note-master2/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-fr-rCA.json
similarity index 92%
rename from src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-fr-rCA.json
rename to src/Note-master2/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-fr-rCA.json
index ea4d836..159d86e 100644
--- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-fr-rCA.json
+++ b/src/Note-master2/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-fr-rCA.json
@@ -1,7 +1,7 @@
{
"logs": [
{
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-fr-rCA\\values-fr-rCA.xml",
+ "outputFile": "D:\\Note-master2\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-fr-rCA\\values-fr-rCA.xml",
"map": [
{
"source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\c9913736ba0af3f26ba50dd9aa679a2b\\transformed\\support-compat-28.0.0\\res\\values-fr-rCA\\values-fr-rCA.xml",
diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-fr.json b/src/Note-master2/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-fr.json
similarity index 92%
rename from src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-fr.json
rename to src/Note-master2/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-fr.json
index 4cae485..921a7df 100644
--- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-fr.json
+++ b/src/Note-master2/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-fr.json
@@ -1,7 +1,7 @@
{
"logs": [
{
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-fr\\values-fr.xml",
+ "outputFile": "D:\\Note-master2\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-fr\\values-fr.xml",
"map": [
{
"source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\4051cc509ba70441b9465808cc62a56d\\transformed\\appcompat-v7-28.0.0\\res\\values-fr\\values-fr.xml",
diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-gl.json b/src/Note-master2/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-gl.json
similarity index 92%
rename from src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-gl.json
rename to src/Note-master2/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-gl.json
index ddd6e16..0fa8910 100644
--- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-gl.json
+++ b/src/Note-master2/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-gl.json
@@ -1,7 +1,7 @@
{
"logs": [
{
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-gl\\values-gl.xml",
+ "outputFile": "D:\\Note-master2\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-gl\\values-gl.xml",
"map": [
{
"source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\c9913736ba0af3f26ba50dd9aa679a2b\\transformed\\support-compat-28.0.0\\res\\values-gl\\values-gl.xml",
diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-gu.json b/src/Note-master2/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-gu.json
similarity index 92%
rename from src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-gu.json
rename to src/Note-master2/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-gu.json
index 8732c60..dabc6a4 100644
--- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-gu.json
+++ b/src/Note-master2/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-gu.json
@@ -1,7 +1,7 @@
{
"logs": [
{
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-gu\\values-gu.xml",
+ "outputFile": "D:\\Note-master2\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-gu\\values-gu.xml",
"map": [
{
"source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\4051cc509ba70441b9465808cc62a56d\\transformed\\appcompat-v7-28.0.0\\res\\values-gu\\values-gu.xml",
diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-h720dp-v13.json b/src/Note-master2/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-h720dp-v13.json
similarity index 78%
rename from src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-h720dp-v13.json
rename to src/Note-master2/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-h720dp-v13.json
index e449cf8..dd87b85 100644
--- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-h720dp-v13.json
+++ b/src/Note-master2/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-h720dp-v13.json
@@ -1,7 +1,7 @@
{
"logs": [
{
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-h720dp-v13\\values-h720dp-v13.xml",
+ "outputFile": "D:\\Note-master2\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-h720dp-v13\\values-h720dp-v13.xml",
"map": [
{
"source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\4051cc509ba70441b9465808cc62a56d\\transformed\\appcompat-v7-28.0.0\\res\\values-h720dp-v13\\values-h720dp-v13.xml",
diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-hdpi-v4.json b/src/Note-master2/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-hdpi-v4.json
similarity index 79%
rename from src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-hdpi-v4.json
rename to src/Note-master2/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-hdpi-v4.json
index 58b1abb..ef08f54 100644
--- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-hdpi-v4.json
+++ b/src/Note-master2/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-hdpi-v4.json
@@ -1,7 +1,7 @@
{
"logs": [
{
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-hdpi-v4\\values-hdpi-v4.xml",
+ "outputFile": "D:\\Note-master2\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-hdpi-v4\\values-hdpi-v4.xml",
"map": [
{
"source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\4051cc509ba70441b9465808cc62a56d\\transformed\\appcompat-v7-28.0.0\\res\\values-hdpi-v4\\values-hdpi-v4.xml",
diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-hi.json b/src/Note-master2/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-hi.json
similarity index 92%
rename from src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-hi.json
rename to src/Note-master2/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-hi.json
index c61681b..8db2561 100644
--- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-hi.json
+++ b/src/Note-master2/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-hi.json
@@ -1,7 +1,7 @@
{
"logs": [
{
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-hi\\values-hi.xml",
+ "outputFile": "D:\\Note-master2\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-hi\\values-hi.xml",
"map": [
{
"source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\4051cc509ba70441b9465808cc62a56d\\transformed\\appcompat-v7-28.0.0\\res\\values-hi\\values-hi.xml",
diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-hr.json b/src/Note-master2/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-hr.json
similarity index 92%
rename from src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-hr.json
rename to src/Note-master2/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-hr.json
index 85f58a4..85c4c40 100644
--- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-hr.json
+++ b/src/Note-master2/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-hr.json
@@ -1,7 +1,7 @@
{
"logs": [
{
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-hr\\values-hr.xml",
+ "outputFile": "D:\\Note-master2\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-hr\\values-hr.xml",
"map": [
{
"source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\4051cc509ba70441b9465808cc62a56d\\transformed\\appcompat-v7-28.0.0\\res\\values-hr\\values-hr.xml",
diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-hu.json b/src/Note-master2/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-hu.json
similarity index 92%
rename from src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-hu.json
rename to src/Note-master2/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-hu.json
index 592726a..c9def9a 100644
--- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-hu.json
+++ b/src/Note-master2/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-hu.json
@@ -1,7 +1,7 @@
{
"logs": [
{
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-hu\\values-hu.xml",
+ "outputFile": "D:\\Note-master2\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-hu\\values-hu.xml",
"map": [
{
"source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\4051cc509ba70441b9465808cc62a56d\\transformed\\appcompat-v7-28.0.0\\res\\values-hu\\values-hu.xml",
diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-hy.json b/src/Note-master2/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-hy.json
similarity index 92%
rename from src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-hy.json
rename to src/Note-master2/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-hy.json
index b403f16..d9952b6 100644
--- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-hy.json
+++ b/src/Note-master2/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-hy.json
@@ -1,7 +1,7 @@
{
"logs": [
{
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-hy\\values-hy.xml",
+ "outputFile": "D:\\Note-master2\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-hy\\values-hy.xml",
"map": [
{
"source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\c9913736ba0af3f26ba50dd9aa679a2b\\transformed\\support-compat-28.0.0\\res\\values-hy\\values-hy.xml",
diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-in.json b/src/Note-master2/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-in.json
similarity index 92%
rename from src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-in.json
rename to src/Note-master2/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-in.json
index 2be85e0..7e104f8 100644
--- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-in.json
+++ b/src/Note-master2/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-in.json
@@ -1,7 +1,7 @@
{
"logs": [
{
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-in\\values-in.xml",
+ "outputFile": "D:\\Note-master2\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-in\\values-in.xml",
"map": [
{
"source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\4051cc509ba70441b9465808cc62a56d\\transformed\\appcompat-v7-28.0.0\\res\\values-in\\values-in.xml",
diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-is.json b/src/Note-master2/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-is.json
similarity index 92%
rename from src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-is.json
rename to src/Note-master2/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-is.json
index 1fd6323..d0eba71 100644
--- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-is.json
+++ b/src/Note-master2/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-is.json
@@ -1,7 +1,7 @@
{
"logs": [
{
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-is\\values-is.xml",
+ "outputFile": "D:\\Note-master2\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-is\\values-is.xml",
"map": [
{
"source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\4051cc509ba70441b9465808cc62a56d\\transformed\\appcompat-v7-28.0.0\\res\\values-is\\values-is.xml",
diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-it.json b/src/Note-master2/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-it.json
similarity index 92%
rename from src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-it.json
rename to src/Note-master2/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-it.json
index 189e356..774e1ea 100644
--- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-it.json
+++ b/src/Note-master2/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-it.json
@@ -1,7 +1,7 @@
{
"logs": [
{
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-it\\values-it.xml",
+ "outputFile": "D:\\Note-master2\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-it\\values-it.xml",
"map": [
{
"source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\4051cc509ba70441b9465808cc62a56d\\transformed\\appcompat-v7-28.0.0\\res\\values-it\\values-it.xml",
diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-iw.json b/src/Note-master2/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-iw.json
similarity index 92%
rename from src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-iw.json
rename to src/Note-master2/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-iw.json
index 2debc32..e826261 100644
--- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-iw.json
+++ b/src/Note-master2/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-iw.json
@@ -1,7 +1,7 @@
{
"logs": [
{
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-iw\\values-iw.xml",
+ "outputFile": "D:\\Note-master2\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-iw\\values-iw.xml",
"map": [
{
"source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\4051cc509ba70441b9465808cc62a56d\\transformed\\appcompat-v7-28.0.0\\res\\values-iw\\values-iw.xml",
diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ja.json b/src/Note-master2/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ja.json
similarity index 92%
rename from src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ja.json
rename to src/Note-master2/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ja.json
index c8cb2a6..0c06173 100644
--- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ja.json
+++ b/src/Note-master2/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ja.json
@@ -1,7 +1,7 @@
{
"logs": [
{
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-ja\\values-ja.xml",
+ "outputFile": "D:\\Note-master2\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-ja\\values-ja.xml",
"map": [
{
"source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\c9913736ba0af3f26ba50dd9aa679a2b\\transformed\\support-compat-28.0.0\\res\\values-ja\\values-ja.xml",
diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ka.json b/src/Note-master2/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ka.json
similarity index 92%
rename from src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ka.json
rename to src/Note-master2/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ka.json
index 979b310..f152253 100644
--- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ka.json
+++ b/src/Note-master2/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ka.json
@@ -1,7 +1,7 @@
{
"logs": [
{
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-ka\\values-ka.xml",
+ "outputFile": "D:\\Note-master2\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-ka\\values-ka.xml",
"map": [
{
"source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\4051cc509ba70441b9465808cc62a56d\\transformed\\appcompat-v7-28.0.0\\res\\values-ka\\values-ka.xml",
diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-kk.json b/src/Note-master2/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-kk.json
similarity index 92%
rename from src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-kk.json
rename to src/Note-master2/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-kk.json
index 21a5348..4f7e99d 100644
--- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-kk.json
+++ b/src/Note-master2/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-kk.json
@@ -1,7 +1,7 @@
{
"logs": [
{
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-kk\\values-kk.xml",
+ "outputFile": "D:\\Note-master2\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-kk\\values-kk.xml",
"map": [
{
"source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\c9913736ba0af3f26ba50dd9aa679a2b\\transformed\\support-compat-28.0.0\\res\\values-kk\\values-kk.xml",
diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-km.json b/src/Note-master2/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-km.json
similarity index 92%
rename from src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-km.json
rename to src/Note-master2/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-km.json
index d89076f..1003e26 100644
--- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-km.json
+++ b/src/Note-master2/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-km.json
@@ -1,7 +1,7 @@
{
"logs": [
{
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-km\\values-km.xml",
+ "outputFile": "D:\\Note-master2\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-km\\values-km.xml",
"map": [
{
"source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\4051cc509ba70441b9465808cc62a56d\\transformed\\appcompat-v7-28.0.0\\res\\values-km\\values-km.xml",
diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-kn.json b/src/Note-master2/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-kn.json
similarity index 92%
rename from src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-kn.json
rename to src/Note-master2/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-kn.json
index 8fb762e..105de41 100644
--- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-kn.json
+++ b/src/Note-master2/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-kn.json
@@ -1,7 +1,7 @@
{
"logs": [
{
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-kn\\values-kn.xml",
+ "outputFile": "D:\\Note-master2\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-kn\\values-kn.xml",
"map": [
{
"source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\c9913736ba0af3f26ba50dd9aa679a2b\\transformed\\support-compat-28.0.0\\res\\values-kn\\values-kn.xml",
diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ko.json b/src/Note-master2/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ko.json
similarity index 92%
rename from src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ko.json
rename to src/Note-master2/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ko.json
index c89e7e8..3dd027f 100644
--- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ko.json
+++ b/src/Note-master2/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ko.json
@@ -1,7 +1,7 @@
{
"logs": [
{
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-ko\\values-ko.xml",
+ "outputFile": "D:\\Note-master2\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-ko\\values-ko.xml",
"map": [
{
"source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\c9913736ba0af3f26ba50dd9aa679a2b\\transformed\\support-compat-28.0.0\\res\\values-ko\\values-ko.xml",
diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ky.json b/src/Note-master2/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ky.json
similarity index 92%
rename from src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ky.json
rename to src/Note-master2/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ky.json
index fb414dd..9a0454a 100644
--- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ky.json
+++ b/src/Note-master2/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ky.json
@@ -1,7 +1,7 @@
{
"logs": [
{
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-ky\\values-ky.xml",
+ "outputFile": "D:\\Note-master2\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-ky\\values-ky.xml",
"map": [
{
"source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\4051cc509ba70441b9465808cc62a56d\\transformed\\appcompat-v7-28.0.0\\res\\values-ky\\values-ky.xml",
diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-land.json b/src/Note-master2/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-land.json
similarity index 79%
rename from src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-land.json
rename to src/Note-master2/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-land.json
index a14fc5e..37910fe 100644
--- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-land.json
+++ b/src/Note-master2/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-land.json
@@ -1,7 +1,7 @@
{
"logs": [
{
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-land\\values-land.xml",
+ "outputFile": "D:\\Note-master2\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-land\\values-land.xml",
"map": [
{
"source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\4051cc509ba70441b9465808cc62a56d\\transformed\\appcompat-v7-28.0.0\\res\\values-land\\values-land.xml",
diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-large-v4.json b/src/Note-master2/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-large-v4.json
similarity index 81%
rename from src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-large-v4.json
rename to src/Note-master2/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-large-v4.json
index 100d669..676387b 100644
--- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-large-v4.json
+++ b/src/Note-master2/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-large-v4.json
@@ -1,7 +1,7 @@
{
"logs": [
{
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-large-v4\\values-large-v4.xml",
+ "outputFile": "D:\\Note-master2\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-large-v4\\values-large-v4.xml",
"map": [
{
"source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\4051cc509ba70441b9465808cc62a56d\\transformed\\appcompat-v7-28.0.0\\res\\values-large-v4\\values-large-v4.xml",
diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ldltr-v21.json b/src/Note-master2/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ldltr-v21.json
similarity index 78%
rename from src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ldltr-v21.json
rename to src/Note-master2/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ldltr-v21.json
index ec621bb..b7efde4 100644
--- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ldltr-v21.json
+++ b/src/Note-master2/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ldltr-v21.json
@@ -1,7 +1,7 @@
{
"logs": [
{
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-ldltr-v21\\values-ldltr-v21.xml",
+ "outputFile": "D:\\Note-master2\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-ldltr-v21\\values-ldltr-v21.xml",
"map": [
{
"source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\4051cc509ba70441b9465808cc62a56d\\transformed\\appcompat-v7-28.0.0\\res\\values-ldltr-v21\\values-ldltr-v21.xml",
diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-lo.json b/src/Note-master2/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-lo.json
similarity index 92%
rename from src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-lo.json
rename to src/Note-master2/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-lo.json
index f9cde72..7db42e8 100644
--- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-lo.json
+++ b/src/Note-master2/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-lo.json
@@ -1,7 +1,7 @@
{
"logs": [
{
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-lo\\values-lo.xml",
+ "outputFile": "D:\\Note-master2\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-lo\\values-lo.xml",
"map": [
{
"source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\4051cc509ba70441b9465808cc62a56d\\transformed\\appcompat-v7-28.0.0\\res\\values-lo\\values-lo.xml",
diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-lt.json b/src/Note-master2/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-lt.json
similarity index 92%
rename from src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-lt.json
rename to src/Note-master2/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-lt.json
index c6da5f3..8deb26a 100644
--- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-lt.json
+++ b/src/Note-master2/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-lt.json
@@ -1,7 +1,7 @@
{
"logs": [
{
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-lt\\values-lt.xml",
+ "outputFile": "D:\\Note-master2\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-lt\\values-lt.xml",
"map": [
{
"source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\c9913736ba0af3f26ba50dd9aa679a2b\\transformed\\support-compat-28.0.0\\res\\values-lt\\values-lt.xml",
diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-lv.json b/src/Note-master2/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-lv.json
similarity index 92%
rename from src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-lv.json
rename to src/Note-master2/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-lv.json
index f9cf15f..e156123 100644
--- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-lv.json
+++ b/src/Note-master2/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-lv.json
@@ -1,7 +1,7 @@
{
"logs": [
{
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-lv\\values-lv.xml",
+ "outputFile": "D:\\Note-master2\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-lv\\values-lv.xml",
"map": [
{
"source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\4051cc509ba70441b9465808cc62a56d\\transformed\\appcompat-v7-28.0.0\\res\\values-lv\\values-lv.xml",
diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-mk.json b/src/Note-master2/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-mk.json
similarity index 92%
rename from src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-mk.json
rename to src/Note-master2/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-mk.json
index 4485768..72c6088 100644
--- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-mk.json
+++ b/src/Note-master2/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-mk.json
@@ -1,7 +1,7 @@
{
"logs": [
{
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-mk\\values-mk.xml",
+ "outputFile": "D:\\Note-master2\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-mk\\values-mk.xml",
"map": [
{
"source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\4051cc509ba70441b9465808cc62a56d\\transformed\\appcompat-v7-28.0.0\\res\\values-mk\\values-mk.xml",
diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ml.json b/src/Note-master2/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ml.json
similarity index 92%
rename from src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ml.json
rename to src/Note-master2/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ml.json
index 844a153..42adb01 100644
--- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ml.json
+++ b/src/Note-master2/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ml.json
@@ -1,7 +1,7 @@
{
"logs": [
{
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-ml\\values-ml.xml",
+ "outputFile": "D:\\Note-master2\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-ml\\values-ml.xml",
"map": [
{
"source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\4051cc509ba70441b9465808cc62a56d\\transformed\\appcompat-v7-28.0.0\\res\\values-ml\\values-ml.xml",
diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-mn.json b/src/Note-master2/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-mn.json
similarity index 92%
rename from src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-mn.json
rename to src/Note-master2/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-mn.json
index 7edbaa9..1f9e9ee 100644
--- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-mn.json
+++ b/src/Note-master2/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-mn.json
@@ -1,7 +1,7 @@
{
"logs": [
{
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-mn\\values-mn.xml",
+ "outputFile": "D:\\Note-master2\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-mn\\values-mn.xml",
"map": [
{
"source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\4051cc509ba70441b9465808cc62a56d\\transformed\\appcompat-v7-28.0.0\\res\\values-mn\\values-mn.xml",
diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-mr.json b/src/Note-master2/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-mr.json
similarity index 92%
rename from src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-mr.json
rename to src/Note-master2/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-mr.json
index 800a34c..622e66e 100644
--- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-mr.json
+++ b/src/Note-master2/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-mr.json
@@ -1,7 +1,7 @@
{
"logs": [
{
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-mr\\values-mr.xml",
+ "outputFile": "D:\\Note-master2\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-mr\\values-mr.xml",
"map": [
{
"source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\c9913736ba0af3f26ba50dd9aa679a2b\\transformed\\support-compat-28.0.0\\res\\values-mr\\values-mr.xml",
diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ms.json b/src/Note-master2/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ms.json
similarity index 92%
rename from src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ms.json
rename to src/Note-master2/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ms.json
index e89892f..6770f41 100644
--- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ms.json
+++ b/src/Note-master2/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ms.json
@@ -1,7 +1,7 @@
{
"logs": [
{
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-ms\\values-ms.xml",
+ "outputFile": "D:\\Note-master2\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-ms\\values-ms.xml",
"map": [
{
"source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\4051cc509ba70441b9465808cc62a56d\\transformed\\appcompat-v7-28.0.0\\res\\values-ms\\values-ms.xml",
diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-my.json b/src/Note-master2/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-my.json
similarity index 92%
rename from src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-my.json
rename to src/Note-master2/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-my.json
index 652a27e..55b8589 100644
--- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-my.json
+++ b/src/Note-master2/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-my.json
@@ -1,7 +1,7 @@
{
"logs": [
{
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-my\\values-my.xml",
+ "outputFile": "D:\\Note-master2\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-my\\values-my.xml",
"map": [
{
"source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\4051cc509ba70441b9465808cc62a56d\\transformed\\appcompat-v7-28.0.0\\res\\values-my\\values-my.xml",
diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-nb.json b/src/Note-master2/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-nb.json
similarity index 92%
rename from src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-nb.json
rename to src/Note-master2/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-nb.json
index 2d3ba7e..c2c0b46 100644
--- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-nb.json
+++ b/src/Note-master2/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-nb.json
@@ -1,7 +1,7 @@
{
"logs": [
{
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-nb\\values-nb.xml",
+ "outputFile": "D:\\Note-master2\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-nb\\values-nb.xml",
"map": [
{
"source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\c9913736ba0af3f26ba50dd9aa679a2b\\transformed\\support-compat-28.0.0\\res\\values-nb\\values-nb.xml",
diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ne.json b/src/Note-master2/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ne.json
similarity index 92%
rename from src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ne.json
rename to src/Note-master2/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ne.json
index 5d8465d..986d56a 100644
--- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ne.json
+++ b/src/Note-master2/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ne.json
@@ -1,7 +1,7 @@
{
"logs": [
{
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-ne\\values-ne.xml",
+ "outputFile": "D:\\Note-master2\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-ne\\values-ne.xml",
"map": [
{
"source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\4051cc509ba70441b9465808cc62a56d\\transformed\\appcompat-v7-28.0.0\\res\\values-ne\\values-ne.xml",
diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-night-v8.json b/src/Note-master2/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-night-v8.json
similarity index 80%
rename from src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-night-v8.json
rename to src/Note-master2/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-night-v8.json
index 57ba121..eb60851 100644
--- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-night-v8.json
+++ b/src/Note-master2/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-night-v8.json
@@ -1,7 +1,7 @@
{
"logs": [
{
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-night-v8\\values-night-v8.xml",
+ "outputFile": "D:\\Note-master2\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-night-v8\\values-night-v8.xml",
"map": [
{
"source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\4051cc509ba70441b9465808cc62a56d\\transformed\\appcompat-v7-28.0.0\\res\\values-night-v8\\values-night-v8.xml",
diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-nl.json b/src/Note-master2/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-nl.json
similarity index 92%
rename from src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-nl.json
rename to src/Note-master2/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-nl.json
index 2986e49..d600f5d 100644
--- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-nl.json
+++ b/src/Note-master2/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-nl.json
@@ -1,7 +1,7 @@
{
"logs": [
{
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-nl\\values-nl.xml",
+ "outputFile": "D:\\Note-master2\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-nl\\values-nl.xml",
"map": [
{
"source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\c9913736ba0af3f26ba50dd9aa679a2b\\transformed\\support-compat-28.0.0\\res\\values-nl\\values-nl.xml",
diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-or.json b/src/Note-master2/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-or.json
similarity index 92%
rename from src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-or.json
rename to src/Note-master2/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-or.json
index 193e85c..1d58985 100644
--- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-or.json
+++ b/src/Note-master2/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-or.json
@@ -1,7 +1,7 @@
{
"logs": [
{
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-or\\values-or.xml",
+ "outputFile": "D:\\Note-master2\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-or\\values-or.xml",
"map": [
{
"source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\4051cc509ba70441b9465808cc62a56d\\transformed\\appcompat-v7-28.0.0\\res\\values-or\\values-or.xml",
diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-pa.json b/src/Note-master2/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-pa.json
similarity index 92%
rename from src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-pa.json
rename to src/Note-master2/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-pa.json
index bbaa8ac..ef9478d 100644
--- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-pa.json
+++ b/src/Note-master2/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-pa.json
@@ -1,7 +1,7 @@
{
"logs": [
{
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-pa\\values-pa.xml",
+ "outputFile": "D:\\Note-master2\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-pa\\values-pa.xml",
"map": [
{
"source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\c9913736ba0af3f26ba50dd9aa679a2b\\transformed\\support-compat-28.0.0\\res\\values-pa\\values-pa.xml",
diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-pl.json b/src/Note-master2/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-pl.json
similarity index 92%
rename from src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-pl.json
rename to src/Note-master2/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-pl.json
index a511859..0f99a6e 100644
--- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-pl.json
+++ b/src/Note-master2/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-pl.json
@@ -1,7 +1,7 @@
{
"logs": [
{
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-pl\\values-pl.xml",
+ "outputFile": "D:\\Note-master2\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-pl\\values-pl.xml",
"map": [
{
"source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\c9913736ba0af3f26ba50dd9aa679a2b\\transformed\\support-compat-28.0.0\\res\\values-pl\\values-pl.xml",
diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-port.json b/src/Note-master2/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-port.json
similarity index 79%
rename from src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-port.json
rename to src/Note-master2/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-port.json
index 1264b7b..69a5fd0 100644
--- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-port.json
+++ b/src/Note-master2/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-port.json
@@ -1,7 +1,7 @@
{
"logs": [
{
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-port\\values-port.xml",
+ "outputFile": "D:\\Note-master2\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-port\\values-port.xml",
"map": [
{
"source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\4051cc509ba70441b9465808cc62a56d\\transformed\\appcompat-v7-28.0.0\\res\\values-port\\values-port.xml",
diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-pt-rBR.json b/src/Note-master2/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-pt-rBR.json
similarity index 92%
rename from src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-pt-rBR.json
rename to src/Note-master2/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-pt-rBR.json
index 0043380..c050f65 100644
--- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-pt-rBR.json
+++ b/src/Note-master2/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-pt-rBR.json
@@ -1,7 +1,7 @@
{
"logs": [
{
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-pt-rBR\\values-pt-rBR.xml",
+ "outputFile": "D:\\Note-master2\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-pt-rBR\\values-pt-rBR.xml",
"map": [
{
"source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\c9913736ba0af3f26ba50dd9aa679a2b\\transformed\\support-compat-28.0.0\\res\\values-pt-rBR\\values-pt-rBR.xml",
diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-pt-rPT.json b/src/Note-master2/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-pt-rPT.json
similarity index 92%
rename from src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-pt-rPT.json
rename to src/Note-master2/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-pt-rPT.json
index cf70c03..245e7b9 100644
--- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-pt-rPT.json
+++ b/src/Note-master2/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-pt-rPT.json
@@ -1,7 +1,7 @@
{
"logs": [
{
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-pt-rPT\\values-pt-rPT.xml",
+ "outputFile": "D:\\Note-master2\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-pt-rPT\\values-pt-rPT.xml",
"map": [
{
"source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\4051cc509ba70441b9465808cc62a56d\\transformed\\appcompat-v7-28.0.0\\res\\values-pt-rPT\\values-pt-rPT.xml",
diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-pt.json b/src/Note-master2/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-pt.json
similarity index 92%
rename from src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-pt.json
rename to src/Note-master2/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-pt.json
index 4cb8e85..bc57bf4 100644
--- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-pt.json
+++ b/src/Note-master2/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-pt.json
@@ -1,7 +1,7 @@
{
"logs": [
{
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-pt\\values-pt.xml",
+ "outputFile": "D:\\Note-master2\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-pt\\values-pt.xml",
"map": [
{
"source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\4051cc509ba70441b9465808cc62a56d\\transformed\\appcompat-v7-28.0.0\\res\\values-pt\\values-pt.xml",
diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ro.json b/src/Note-master2/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ro.json
similarity index 92%
rename from src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ro.json
rename to src/Note-master2/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ro.json
index c302f8a..d132a6d 100644
--- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ro.json
+++ b/src/Note-master2/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ro.json
@@ -1,7 +1,7 @@
{
"logs": [
{
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-ro\\values-ro.xml",
+ "outputFile": "D:\\Note-master2\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-ro\\values-ro.xml",
"map": [
{
"source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\4051cc509ba70441b9465808cc62a56d\\transformed\\appcompat-v7-28.0.0\\res\\values-ro\\values-ro.xml",
diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ru.json b/src/Note-master2/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ru.json
similarity index 92%
rename from src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ru.json
rename to src/Note-master2/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ru.json
index 3080f1c..454f135 100644
--- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ru.json
+++ b/src/Note-master2/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ru.json
@@ -1,7 +1,7 @@
{
"logs": [
{
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-ru\\values-ru.xml",
+ "outputFile": "D:\\Note-master2\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-ru\\values-ru.xml",
"map": [
{
"source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\c9913736ba0af3f26ba50dd9aa679a2b\\transformed\\support-compat-28.0.0\\res\\values-ru\\values-ru.xml",
diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-si.json b/src/Note-master2/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-si.json
similarity index 92%
rename from src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-si.json
rename to src/Note-master2/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-si.json
index 255fb8d..2e67af5 100644
--- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-si.json
+++ b/src/Note-master2/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-si.json
@@ -1,7 +1,7 @@
{
"logs": [
{
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-si\\values-si.xml",
+ "outputFile": "D:\\Note-master2\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-si\\values-si.xml",
"map": [
{
"source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\c9913736ba0af3f26ba50dd9aa679a2b\\transformed\\support-compat-28.0.0\\res\\values-si\\values-si.xml",
diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-sk.json b/src/Note-master2/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-sk.json
similarity index 92%
rename from src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-sk.json
rename to src/Note-master2/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-sk.json
index 4fcccea..24c78b2 100644
--- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-sk.json
+++ b/src/Note-master2/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-sk.json
@@ -1,7 +1,7 @@
{
"logs": [
{
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-sk\\values-sk.xml",
+ "outputFile": "D:\\Note-master2\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-sk\\values-sk.xml",
"map": [
{
"source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\4051cc509ba70441b9465808cc62a56d\\transformed\\appcompat-v7-28.0.0\\res\\values-sk\\values-sk.xml",
diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-sl.json b/src/Note-master2/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-sl.json
similarity index 92%
rename from src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-sl.json
rename to src/Note-master2/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-sl.json
index 3ec9f8e..72fa067 100644
--- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-sl.json
+++ b/src/Note-master2/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-sl.json
@@ -1,7 +1,7 @@
{
"logs": [
{
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-sl\\values-sl.xml",
+ "outputFile": "D:\\Note-master2\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-sl\\values-sl.xml",
"map": [
{
"source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\c9913736ba0af3f26ba50dd9aa679a2b\\transformed\\support-compat-28.0.0\\res\\values-sl\\values-sl.xml",
diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-sq.json b/src/Note-master2/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-sq.json
similarity index 92%
rename from src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-sq.json
rename to src/Note-master2/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-sq.json
index 141e347..97d4724 100644
--- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-sq.json
+++ b/src/Note-master2/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-sq.json
@@ -1,7 +1,7 @@
{
"logs": [
{
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-sq\\values-sq.xml",
+ "outputFile": "D:\\Note-master2\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-sq\\values-sq.xml",
"map": [
{
"source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\4051cc509ba70441b9465808cc62a56d\\transformed\\appcompat-v7-28.0.0\\res\\values-sq\\values-sq.xml",
diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-sr.json b/src/Note-master2/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-sr.json
similarity index 92%
rename from src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-sr.json
rename to src/Note-master2/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-sr.json
index c917584..ce7b21d 100644
--- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-sr.json
+++ b/src/Note-master2/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-sr.json
@@ -1,7 +1,7 @@
{
"logs": [
{
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-sr\\values-sr.xml",
+ "outputFile": "D:\\Note-master2\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-sr\\values-sr.xml",
"map": [
{
"source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\c9913736ba0af3f26ba50dd9aa679a2b\\transformed\\support-compat-28.0.0\\res\\values-sr\\values-sr.xml",
diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-sv.json b/src/Note-master2/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-sv.json
similarity index 92%
rename from src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-sv.json
rename to src/Note-master2/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-sv.json
index 443fd78..2ecbe03 100644
--- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-sv.json
+++ b/src/Note-master2/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-sv.json
@@ -1,7 +1,7 @@
{
"logs": [
{
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-sv\\values-sv.xml",
+ "outputFile": "D:\\Note-master2\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-sv\\values-sv.xml",
"map": [
{
"source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\4051cc509ba70441b9465808cc62a56d\\transformed\\appcompat-v7-28.0.0\\res\\values-sv\\values-sv.xml",
diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-sw.json b/src/Note-master2/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-sw.json
similarity index 92%
rename from src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-sw.json
rename to src/Note-master2/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-sw.json
index 789b884..967d4a8 100644
--- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-sw.json
+++ b/src/Note-master2/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-sw.json
@@ -1,7 +1,7 @@
{
"logs": [
{
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-sw\\values-sw.xml",
+ "outputFile": "D:\\Note-master2\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-sw\\values-sw.xml",
"map": [
{
"source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\4051cc509ba70441b9465808cc62a56d\\transformed\\appcompat-v7-28.0.0\\res\\values-sw\\values-sw.xml",
diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-sw600dp-v13.json b/src/Note-master2/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-sw600dp-v13.json
similarity index 80%
rename from src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-sw600dp-v13.json
rename to src/Note-master2/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-sw600dp-v13.json
index 3910f5d..6edfb4d 100644
--- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-sw600dp-v13.json
+++ b/src/Note-master2/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-sw600dp-v13.json
@@ -1,7 +1,7 @@
{
"logs": [
{
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-sw600dp-v13\\values-sw600dp-v13.xml",
+ "outputFile": "D:\\Note-master2\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-sw600dp-v13\\values-sw600dp-v13.xml",
"map": [
{
"source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\4051cc509ba70441b9465808cc62a56d\\transformed\\appcompat-v7-28.0.0\\res\\values-sw600dp-v13\\values-sw600dp-v13.xml",
diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ta.json b/src/Note-master2/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ta.json
similarity index 92%
rename from src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ta.json
rename to src/Note-master2/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ta.json
index 6b9c45a..b4ab73d 100644
--- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ta.json
+++ b/src/Note-master2/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ta.json
@@ -1,7 +1,7 @@
{
"logs": [
{
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-ta\\values-ta.xml",
+ "outputFile": "D:\\Note-master2\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-ta\\values-ta.xml",
"map": [
{
"source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\c9913736ba0af3f26ba50dd9aa679a2b\\transformed\\support-compat-28.0.0\\res\\values-ta\\values-ta.xml",
diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-te.json b/src/Note-master2/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-te.json
similarity index 92%
rename from src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-te.json
rename to src/Note-master2/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-te.json
index 0111453..9e61e76 100644
--- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-te.json
+++ b/src/Note-master2/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-te.json
@@ -1,7 +1,7 @@
{
"logs": [
{
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-te\\values-te.xml",
+ "outputFile": "D:\\Note-master2\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-te\\values-te.xml",
"map": [
{
"source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\4051cc509ba70441b9465808cc62a56d\\transformed\\appcompat-v7-28.0.0\\res\\values-te\\values-te.xml",
diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-th.json b/src/Note-master2/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-th.json
similarity index 92%
rename from src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-th.json
rename to src/Note-master2/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-th.json
index 1b66c2f..f495a9d 100644
--- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-th.json
+++ b/src/Note-master2/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-th.json
@@ -1,7 +1,7 @@
{
"logs": [
{
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-th\\values-th.xml",
+ "outputFile": "D:\\Note-master2\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-th\\values-th.xml",
"map": [
{
"source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\c9913736ba0af3f26ba50dd9aa679a2b\\transformed\\support-compat-28.0.0\\res\\values-th\\values-th.xml",
diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-tl.json b/src/Note-master2/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-tl.json
similarity index 92%
rename from src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-tl.json
rename to src/Note-master2/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-tl.json
index d3431a8..fe3dd78 100644
--- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-tl.json
+++ b/src/Note-master2/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-tl.json
@@ -1,7 +1,7 @@
{
"logs": [
{
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-tl\\values-tl.xml",
+ "outputFile": "D:\\Note-master2\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-tl\\values-tl.xml",
"map": [
{
"source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\c9913736ba0af3f26ba50dd9aa679a2b\\transformed\\support-compat-28.0.0\\res\\values-tl\\values-tl.xml",
diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-tr.json b/src/Note-master2/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-tr.json
similarity index 92%
rename from src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-tr.json
rename to src/Note-master2/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-tr.json
index dd6892f..15747ef 100644
--- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-tr.json
+++ b/src/Note-master2/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-tr.json
@@ -1,7 +1,7 @@
{
"logs": [
{
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-tr\\values-tr.xml",
+ "outputFile": "D:\\Note-master2\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-tr\\values-tr.xml",
"map": [
{
"source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\c9913736ba0af3f26ba50dd9aa679a2b\\transformed\\support-compat-28.0.0\\res\\values-tr\\values-tr.xml",
diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-uk.json b/src/Note-master2/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-uk.json
similarity index 92%
rename from src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-uk.json
rename to src/Note-master2/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-uk.json
index 0ef65ca..b88ad89 100644
--- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-uk.json
+++ b/src/Note-master2/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-uk.json
@@ -1,7 +1,7 @@
{
"logs": [
{
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-uk\\values-uk.xml",
+ "outputFile": "D:\\Note-master2\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-uk\\values-uk.xml",
"map": [
{
"source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\4051cc509ba70441b9465808cc62a56d\\transformed\\appcompat-v7-28.0.0\\res\\values-uk\\values-uk.xml",
diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ur.json b/src/Note-master2/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ur.json
similarity index 92%
rename from src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ur.json
rename to src/Note-master2/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ur.json
index 91bea5a..2cb670f 100644
--- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ur.json
+++ b/src/Note-master2/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ur.json
@@ -1,7 +1,7 @@
{
"logs": [
{
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-ur\\values-ur.xml",
+ "outputFile": "D:\\Note-master2\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-ur\\values-ur.xml",
"map": [
{
"source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\c9913736ba0af3f26ba50dd9aa679a2b\\transformed\\support-compat-28.0.0\\res\\values-ur\\values-ur.xml",
diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-uz.json b/src/Note-master2/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-uz.json
similarity index 92%
rename from src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-uz.json
rename to src/Note-master2/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-uz.json
index 6bf2d16..ebe21dd 100644
--- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-uz.json
+++ b/src/Note-master2/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-uz.json
@@ -1,7 +1,7 @@
{
"logs": [
{
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-uz\\values-uz.xml",
+ "outputFile": "D:\\Note-master2\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-uz\\values-uz.xml",
"map": [
{
"source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\c9913736ba0af3f26ba50dd9aa679a2b\\transformed\\support-compat-28.0.0\\res\\values-uz\\values-uz.xml",
diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-v16.json b/src/Note-master2/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-v16.json
similarity index 90%
rename from src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-v16.json
rename to src/Note-master2/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-v16.json
index 21ed125..37bc43c 100644
--- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-v16.json
+++ b/src/Note-master2/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-v16.json
@@ -1,7 +1,7 @@
{
"logs": [
{
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-v16\\values-v16.xml",
+ "outputFile": "D:\\Note-master2\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-v16\\values-v16.xml",
"map": [
{
"source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\4051cc509ba70441b9465808cc62a56d\\transformed\\appcompat-v7-28.0.0\\res\\values-v16\\values-v16.xml",
diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-v17.json b/src/Note-master2/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-v17.json
similarity index 86%
rename from src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-v17.json
rename to src/Note-master2/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-v17.json
index dd1e0ed..1e0ee0e 100644
--- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-v17.json
+++ b/src/Note-master2/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-v17.json
@@ -1,7 +1,7 @@
{
"logs": [
{
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-v17\\values-v17.xml",
+ "outputFile": "D:\\Note-master2\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-v17\\values-v17.xml",
"map": [
{
"source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\4051cc509ba70441b9465808cc62a56d\\transformed\\appcompat-v7-28.0.0\\res\\values-v17\\values-v17.xml",
diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-v18.json b/src/Note-master2/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-v18.json
similarity index 79%
rename from src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-v18.json
rename to src/Note-master2/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-v18.json
index 06a671c..c085e2d 100644
--- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-v18.json
+++ b/src/Note-master2/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-v18.json
@@ -1,7 +1,7 @@
{
"logs": [
{
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-v18\\values-v18.xml",
+ "outputFile": "D:\\Note-master2\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-v18\\values-v18.xml",
"map": [
{
"source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\4051cc509ba70441b9465808cc62a56d\\transformed\\appcompat-v7-28.0.0\\res\\values-v18\\values-v18.xml",
diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-v21.json b/src/Note-master2/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-v21.json
similarity index 97%
rename from src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-v21.json
rename to src/Note-master2/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-v21.json
index df02305..1d7ba72 100644
--- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-v21.json
+++ b/src/Note-master2/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-v21.json
@@ -1,7 +1,7 @@
{
"logs": [
{
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-v21\\values-v21.xml",
+ "outputFile": "D:\\Note-master2\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-v21\\values-v21.xml",
"map": [
{
"source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\c9913736ba0af3f26ba50dd9aa679a2b\\transformed\\support-compat-28.0.0\\res\\values-v21\\values-v21.xml",
diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-v22.json b/src/Note-master2/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-v22.json
similarity index 81%
rename from src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-v22.json
rename to src/Note-master2/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-v22.json
index 2777877..21c4e8e 100644
--- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-v22.json
+++ b/src/Note-master2/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-v22.json
@@ -1,7 +1,7 @@
{
"logs": [
{
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-v22\\values-v22.xml",
+ "outputFile": "D:\\Note-master2\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-v22\\values-v22.xml",
"map": [
{
"source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\4051cc509ba70441b9465808cc62a56d\\transformed\\appcompat-v7-28.0.0\\res\\values-v22\\values-v22.xml",
diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-v23.json b/src/Note-master2/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-v23.json
similarity index 84%
rename from src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-v23.json
rename to src/Note-master2/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-v23.json
index 4d38a39..bfc2957 100644
--- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-v23.json
+++ b/src/Note-master2/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-v23.json
@@ -1,7 +1,7 @@
{
"logs": [
{
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-v23\\values-v23.xml",
+ "outputFile": "D:\\Note-master2\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-v23\\values-v23.xml",
"map": [
{
"source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\4051cc509ba70441b9465808cc62a56d\\transformed\\appcompat-v7-28.0.0\\res\\values-v23\\values-v23.xml",
diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-v24.json b/src/Note-master2/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-v24.json
similarity index 79%
rename from src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-v24.json
rename to src/Note-master2/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-v24.json
index c875ee6..9e71ef5 100644
--- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-v24.json
+++ b/src/Note-master2/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-v24.json
@@ -1,7 +1,7 @@
{
"logs": [
{
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-v24\\values-v24.xml",
+ "outputFile": "D:\\Note-master2\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-v24\\values-v24.xml",
"map": [
{
"source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\4051cc509ba70441b9465808cc62a56d\\transformed\\appcompat-v7-28.0.0\\res\\values-v24\\values-v24.xml",
diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-v25.json b/src/Note-master2/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-v25.json
similarity index 81%
rename from src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-v25.json
rename to src/Note-master2/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-v25.json
index 9f0f61b..b60a742 100644
--- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-v25.json
+++ b/src/Note-master2/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-v25.json
@@ -1,7 +1,7 @@
{
"logs": [
{
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-v25\\values-v25.xml",
+ "outputFile": "D:\\Note-master2\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-v25\\values-v25.xml",
"map": [
{
"source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\4051cc509ba70441b9465808cc62a56d\\transformed\\appcompat-v7-28.0.0\\res\\values-v25\\values-v25.xml",
diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-v26.json b/src/Note-master2/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-v26.json
similarity index 82%
rename from src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-v26.json
rename to src/Note-master2/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-v26.json
index 3cba77e..ca520cd 100644
--- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-v26.json
+++ b/src/Note-master2/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-v26.json
@@ -1,7 +1,7 @@
{
"logs": [
{
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-v26\\values-v26.xml",
+ "outputFile": "D:\\Note-master2\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-v26\\values-v26.xml",
"map": [
{
"source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\4051cc509ba70441b9465808cc62a56d\\transformed\\appcompat-v7-28.0.0\\res\\values-v26\\values-v26.xml",
diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-v28.json b/src/Note-master2/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-v28.json
similarity index 81%
rename from src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-v28.json
rename to src/Note-master2/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-v28.json
index abb4224..6216738 100644
--- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-v28.json
+++ b/src/Note-master2/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-v28.json
@@ -1,7 +1,7 @@
{
"logs": [
{
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-v28\\values-v28.xml",
+ "outputFile": "D:\\Note-master2\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-v28\\values-v28.xml",
"map": [
{
"source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\4051cc509ba70441b9465808cc62a56d\\transformed\\appcompat-v7-28.0.0\\res\\values-v28\\values-v28.xml",
diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-vi.json b/src/Note-master2/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-vi.json
similarity index 92%
rename from src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-vi.json
rename to src/Note-master2/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-vi.json
index 648ab0d..c5f56e6 100644
--- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-vi.json
+++ b/src/Note-master2/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-vi.json
@@ -1,7 +1,7 @@
{
"logs": [
{
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-vi\\values-vi.xml",
+ "outputFile": "D:\\Note-master2\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-vi\\values-vi.xml",
"map": [
{
"source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\c9913736ba0af3f26ba50dd9aa679a2b\\transformed\\support-compat-28.0.0\\res\\values-vi\\values-vi.xml",
diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-watch-v20.json b/src/Note-master2/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-watch-v20.json
similarity index 80%
rename from src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-watch-v20.json
rename to src/Note-master2/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-watch-v20.json
index e2e6f20..f73cb38 100644
--- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-watch-v20.json
+++ b/src/Note-master2/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-watch-v20.json
@@ -1,7 +1,7 @@
{
"logs": [
{
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-watch-v20\\values-watch-v20.xml",
+ "outputFile": "D:\\Note-master2\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-watch-v20\\values-watch-v20.xml",
"map": [
{
"source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\4051cc509ba70441b9465808cc62a56d\\transformed\\appcompat-v7-28.0.0\\res\\values-watch-v20\\values-watch-v20.xml",
diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-watch-v21.json b/src/Note-master2/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-watch-v21.json
similarity index 80%
rename from src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-watch-v21.json
rename to src/Note-master2/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-watch-v21.json
index 0a1cfff..de5be44 100644
--- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-watch-v21.json
+++ b/src/Note-master2/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-watch-v21.json
@@ -1,7 +1,7 @@
{
"logs": [
{
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-watch-v21\\values-watch-v21.xml",
+ "outputFile": "D:\\Note-master2\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-watch-v21\\values-watch-v21.xml",
"map": [
{
"source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\4051cc509ba70441b9465808cc62a56d\\transformed\\appcompat-v7-28.0.0\\res\\values-watch-v21\\values-watch-v21.xml",
diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-xlarge-v4.json b/src/Note-master2/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-xlarge-v4.json
similarity index 80%
rename from src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-xlarge-v4.json
rename to src/Note-master2/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-xlarge-v4.json
index 70c680a..4368ee2 100644
--- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-xlarge-v4.json
+++ b/src/Note-master2/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-xlarge-v4.json
@@ -1,7 +1,7 @@
{
"logs": [
{
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-xlarge-v4\\values-xlarge-v4.xml",
+ "outputFile": "D:\\Note-master2\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-xlarge-v4\\values-xlarge-v4.xml",
"map": [
{
"source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\4051cc509ba70441b9465808cc62a56d\\transformed\\appcompat-v7-28.0.0\\res\\values-xlarge-v4\\values-xlarge-v4.xml",
diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rCN.json b/src/Note-master2/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rCN.json
similarity index 95%
rename from src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rCN.json
rename to src/Note-master2/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rCN.json
index 0a6bb88..9c69a4f 100644
--- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rCN.json
+++ b/src/Note-master2/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rCN.json
@@ -1,8 +1,27 @@
{
"logs": [
{
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-zh-rCN\\values-zh-rCN.xml",
+ "outputFile": "D:\\Note-master2\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-zh-rCN\\values-zh-rCN.xml",
"map": [
+ {
+ "source": "D:\\Note-master2\\app\\src\\main\\res\\values-zh-rCN\\strings.xml",
+ "from": {
+ "startLines": "121,71,70,69,68,19,20,21,112,113,120,119,26,77,78,76,75,74,90,89,88,80,60,29,30,81,72,114,67,63,38,44,49,39,59,58,57,53,52,50,51,54,55,45,66,56,64,43,48,47,46,62,42,61,40,41,65,28,34,36,33,35,32,31,25,24,97,96,99,111,104,103,105,106,108,107,98,102,100,101,95,109,110,118,116,115,117,27,79,87,92,91,93,86,85,84,83,22,23",
+ "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
+ "startOffsets": "6532,3495,3429,3356,3306,827,867,915,6083,6128,6478,6428,1199,3861,3929,3802,3737,3674,4592,4532,4469,4061,2877,1369,1422,4115,3568,6185,3247,3034,1798,2079,2325,1851,2817,2764,2713,2518,2470,2376,2424,2564,2611,2122,3188,2661,3077,2036,2278,2222,2167,2979,1992,2937,1901,1942,3129,1318,1623,1719,1576,1672,1529,1484,1148,1095,4967,4908,5108,6009,5419,5350,5483,5561,5744,5671,5042,5295,5165,5230,4859,5848,5931,6390,6283,6235,6328,1261,4006,4410,4705,4647,4772,4362,4317,4269,4218,963,1029",
+ "endLines": "123,71,70,69,68,19,20,21,112,113,120,119,26,77,78,76,75,74,90,89,88,80,60,29,30,81,72,114,67,63,38,44,49,39,59,58,57,53,52,50,51,54,55,45,66,56,64,43,48,47,46,62,42,61,40,41,65,28,34,36,33,35,32,31,25,24,97,96,99,111,104,103,105,106,108,107,98,102,100,101,95,109,110,118,116,115,117,27,79,87,92,91,93,86,85,84,83,22,23",
+ "endColumns": "14,72,65,72,49,39,47,47,44,56,53,49,61,67,76,58,64,62,54,59,62,53,59,52,61,84,80,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65",
+ "endOffsets": "6704,3563,3490,3424,3351,862,910,958,6123,6180,6527,6473,1256,3924,4001,3856,3797,3732,4642,4587,4527,4110,2932,1417,1479,4195,3644,6230,3301,3072,1846,2117,2371,1896,2872,2812,2759,2559,2513,2419,2465,2606,2656,2162,3242,2708,3124,2074,2320,2273,2217,3029,2031,2974,1937,1987,3183,1364,1667,1763,1618,1714,1571,1524,1194,1143,5037,4962,5160,6078,5478,5414,5556,5666,5843,5739,5103,5345,5225,5290,4903,5926,6004,6423,6323,6278,6385,1313,4056,4464,4767,4700,4829,4405,4357,4312,4264,1024,1090"
+ },
+ "to": {
+ "startLines": "6,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,122,123,125,126,127,128,129,130,131,132,133,134,135",
+ "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,2945,3018,3084,3157,3207,3247,3295,3343,3388,3445,3499,3549,3611,3679,3756,3815,3880,3943,3998,4058,4121,4175,4235,4288,4350,4435,4516,4566,4625,4668,4721,4764,4815,4865,4925,4978,5029,5075,5123,5171,5217,5264,5314,5359,5418,5470,5522,5565,5612,5668,5723,5778,5822,5864,5905,5955,6014,6065,6114,6163,6210,6257,6304,6349,6400,6453,6528,6587,6644,6718,6782,6851,6929,7039,7143,7216,7282,7337,7402,7467,7516,7599,7677,7715,7760,7886,7948,8106,8161,8220,8287,8345,8407,8455,8500,8548,8599,8665",
+ "endLines": "8,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,122,123,125,126,127,128,129,130,131,132,133,134,135",
+ "endColumns": "14,72,65,72,49,39,47,47,44,56,53,49,61,67,76,58,64,62,54,59,62,53,59,52,61,84,80,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65",
+ "endOffsets": "379,3013,3079,3152,3202,3242,3290,3338,3383,3440,3494,3544,3606,3674,3751,3810,3875,3938,3993,4053,4116,4170,4230,4283,4345,4430,4511,4561,4620,4663,4716,4759,4810,4860,4920,4973,5024,5070,5118,5166,5212,5259,5309,5354,5413,5465,5517,5560,5607,5663,5718,5773,5817,5859,5900,5950,6009,6060,6109,6158,6205,6252,6299,6344,6395,6448,6523,6582,6639,6713,6777,6846,6924,7034,7138,7211,7277,7332,7397,7462,7511,7594,7672,7710,7755,7803,7943,8000,8156,8215,8282,8340,8402,8450,8495,8543,8594,8660,8726"
+ }
+ },
{
"source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\4051cc509ba70441b9465808cc62a56d\\transformed\\appcompat-v7-28.0.0\\res\\values-zh-rCN\\values-zh-rCN.xml",
"from": {
@@ -21,7 +40,7 @@
}
},
{
- "source": "D:\\Notes-master1\\app\\src\\main\\res\\values-zh-rCN\\arrays.xml",
+ "source": "D:\\Note-master2\\app\\src\\main\\res\\values-zh-rCN\\arrays.xml",
"from": {
"startLines": "18",
"startColumns": "4",
@@ -39,25 +58,6 @@
"endOffsets": "210"
}
},
- {
- "source": "D:\\Notes-master1\\app\\src\\main\\res\\values-zh-rCN\\strings.xml",
- "from": {
- "startLines": "121,71,70,69,68,19,20,21,112,113,120,119,26,77,78,76,75,74,90,89,88,80,60,29,30,81,72,114,67,63,38,44,49,39,59,58,57,53,52,50,51,54,55,45,66,56,64,43,48,47,46,62,42,61,40,41,65,28,34,36,33,35,32,31,25,24,97,96,99,111,104,103,105,106,108,107,98,102,100,101,95,109,110,118,116,115,117,27,79,87,92,91,93,86,85,84,83,22,23",
- "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
- "startOffsets": "6532,3495,3429,3356,3306,827,867,915,6083,6128,6478,6428,1199,3861,3929,3802,3737,3674,4592,4532,4469,4061,2877,1369,1422,4115,3568,6185,3247,3034,1798,2079,2325,1851,2817,2764,2713,2518,2470,2376,2424,2564,2611,2122,3188,2661,3077,2036,2278,2222,2167,2979,1992,2937,1901,1942,3129,1318,1623,1719,1576,1672,1529,1484,1148,1095,4967,4908,5108,6009,5419,5350,5483,5561,5744,5671,5042,5295,5165,5230,4859,5848,5931,6390,6283,6235,6328,1261,4006,4410,4705,4647,4772,4362,4317,4269,4218,963,1029",
- "endLines": "123,71,70,69,68,19,20,21,112,113,120,119,26,77,78,76,75,74,90,89,88,80,60,29,30,81,72,114,67,63,38,44,49,39,59,58,57,53,52,50,51,54,55,45,66,56,64,43,48,47,46,62,42,61,40,41,65,28,34,36,33,35,32,31,25,24,97,96,99,111,104,103,105,106,108,107,98,102,100,101,95,109,110,118,116,115,117,27,79,87,92,91,93,86,85,84,83,22,23",
- "endColumns": "14,72,65,72,49,39,47,47,44,56,53,49,61,67,76,58,64,62,54,59,62,53,59,52,61,84,80,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65",
- "endOffsets": "6704,3563,3490,3424,3351,862,910,958,6123,6180,6527,6473,1256,3924,4001,3856,3797,3732,4642,4587,4527,4110,2932,1417,1479,4195,3644,6230,3301,3072,1846,2117,2371,1896,2872,2812,2759,2559,2513,2419,2465,2606,2656,2162,3242,2708,3124,2074,2320,2273,2217,3029,2031,2974,1937,1987,3183,1364,1667,1763,1618,1714,1571,1524,1194,1143,5037,4962,5160,6078,5478,5414,5556,5666,5843,5739,5103,5345,5225,5290,4903,5926,6004,6423,6323,6278,6385,1313,4056,4464,4767,4700,4829,4405,4357,4312,4264,1024,1090"
- },
- "to": {
- "startLines": "6,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,122,123,125,126,127,128,129,130,131,132,133,134,135",
- "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,2945,3018,3084,3157,3207,3247,3295,3343,3388,3445,3499,3549,3611,3679,3756,3815,3880,3943,3998,4058,4121,4175,4235,4288,4350,4435,4516,4566,4625,4668,4721,4764,4815,4865,4925,4978,5029,5075,5123,5171,5217,5264,5314,5359,5418,5470,5522,5565,5612,5668,5723,5778,5822,5864,5905,5955,6014,6065,6114,6163,6210,6257,6304,6349,6400,6453,6528,6587,6644,6718,6782,6851,6929,7039,7143,7216,7282,7337,7402,7467,7516,7599,7677,7715,7760,7886,7948,8106,8161,8220,8287,8345,8407,8455,8500,8548,8599,8665",
- "endLines": "8,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,122,123,125,126,127,128,129,130,131,132,133,134,135",
- "endColumns": "14,72,65,72,49,39,47,47,44,56,53,49,61,67,76,58,64,62,54,59,62,53,59,52,61,84,80,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65",
- "endOffsets": "379,3013,3079,3152,3202,3242,3290,3338,3383,3440,3494,3544,3606,3674,3751,3810,3875,3938,3993,4053,4116,4170,4230,4283,4345,4430,4511,4561,4620,4663,4716,4759,4810,4860,4920,4973,5024,5070,5118,5166,5212,5259,5309,5354,5413,5465,5517,5560,5607,5663,5718,5773,5817,5859,5900,5950,6009,6060,6109,6158,6205,6252,6299,6344,6395,6448,6523,6582,6639,6713,6777,6846,6924,7034,7138,7211,7277,7332,7397,7462,7511,7594,7672,7710,7755,7803,7943,8000,8156,8215,8282,8340,8402,8450,8495,8543,8594,8660,8726"
- }
- },
{
"source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\c9913736ba0af3f26ba50dd9aa679a2b\\transformed\\support-compat-28.0.0\\res\\values-zh-rCN\\values-zh-rCN.xml",
"from": {
diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rHK.json b/src/Note-master2/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rHK.json
similarity index 92%
rename from src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rHK.json
rename to src/Note-master2/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rHK.json
index 4705d38..a9682d2 100644
--- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rHK.json
+++ b/src/Note-master2/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rHK.json
@@ -1,7 +1,7 @@
{
"logs": [
{
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-zh-rHK\\values-zh-rHK.xml",
+ "outputFile": "D:\\Note-master2\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-zh-rHK\\values-zh-rHK.xml",
"map": [
{
"source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\c9913736ba0af3f26ba50dd9aa679a2b\\transformed\\support-compat-28.0.0\\res\\values-zh-rHK\\values-zh-rHK.xml",
diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rTW.json b/src/Note-master2/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rTW.json
similarity index 95%
rename from src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rTW.json
rename to src/Note-master2/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rTW.json
index 2d239b7..f13ec71 100644
--- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rTW.json
+++ b/src/Note-master2/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rTW.json
@@ -1,7 +1,7 @@
{
"logs": [
{
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-zh-rTW\\values-zh-rTW.xml",
+ "outputFile": "D:\\Note-master2\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-zh-rTW\\values-zh-rTW.xml",
"map": [
{
"source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\4051cc509ba70441b9465808cc62a56d\\transformed\\appcompat-v7-28.0.0\\res\\values-zh-rTW\\values-zh-rTW.xml",
@@ -21,26 +21,7 @@
}
},
{
- "source": "D:\\Notes-master1\\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,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,122,123,125,126,127,128,129,130,131,132,133,134,135",
- "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,2954,3026,3092,3165,3215,3255,3303,3351,3396,3453,3507,3557,3619,3687,3764,3823,3889,3952,4007,4067,4130,4184,4244,4297,4359,4443,4523,4573,4632,4675,4728,4771,4822,4872,4932,4985,5036,5082,5130,5178,5224,5271,5321,5366,5425,5477,5529,5572,5619,5675,5730,5785,5829,5871,5912,5962,6021,6072,6121,6170,6217,6264,6311,6356,6407,6460,6535,6594,6651,6725,6789,6858,6936,7046,7150,7223,7289,7344,7409,7474,7523,7606,7684,7722,7767,7893,7955,8113,8168,8227,8294,8352,8414,8462,8507,8555,8606,8672",
- "endLines": "8,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,122,123,125,126,127,128,129,130,131,132,133,134,135",
- "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,3021,3087,3160,3210,3250,3298,3346,3391,3448,3502,3552,3614,3682,3759,3818,3884,3947,4002,4062,4125,4179,4239,4292,4354,4438,4518,4568,4627,4670,4723,4766,4817,4867,4927,4980,5031,5077,5125,5173,5219,5266,5316,5361,5420,5472,5524,5567,5614,5670,5725,5780,5824,5866,5907,5957,6016,6067,6116,6165,6212,6259,6306,6351,6402,6455,6530,6589,6646,6720,6784,6853,6931,7041,7145,7218,7284,7339,7404,7469,7518,7601,7679,7717,7762,7810,7950,8007,8163,8222,8289,8347,8409,8457,8502,8550,8601,8667,8733"
- }
- },
- {
- "source": "D:\\Notes-master1\\app\\src\\main\\res\\values-zh-rTW\\arrays.xml",
+ "source": "D:\\Note-master2\\app\\src\\main\\res\\values-zh-rTW\\arrays.xml",
"from": {
"startLines": "18",
"startColumns": "4",
@@ -58,6 +39,25 @@
"endOffsets": "210"
}
},
+ {
+ "source": "D:\\Note-master2\\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,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,122,123,125,126,127,128,129,130,131,132,133,134,135",
+ "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,2954,3026,3092,3165,3215,3255,3303,3351,3396,3453,3507,3557,3619,3687,3764,3823,3889,3952,4007,4067,4130,4184,4244,4297,4359,4443,4523,4573,4632,4675,4728,4771,4822,4872,4932,4985,5036,5082,5130,5178,5224,5271,5321,5366,5425,5477,5529,5572,5619,5675,5730,5785,5829,5871,5912,5962,6021,6072,6121,6170,6217,6264,6311,6356,6407,6460,6535,6594,6651,6725,6789,6858,6936,7046,7150,7223,7289,7344,7409,7474,7523,7606,7684,7722,7767,7893,7955,8113,8168,8227,8294,8352,8414,8462,8507,8555,8606,8672",
+ "endLines": "8,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,122,123,125,126,127,128,129,130,131,132,133,134,135",
+ "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,3021,3087,3160,3210,3250,3298,3346,3391,3448,3502,3552,3614,3682,3759,3818,3884,3947,4002,4062,4125,4179,4239,4292,4354,4438,4518,4568,4627,4670,4723,4766,4817,4867,4927,4980,5031,5077,5125,5173,5219,5266,5316,5361,5420,5472,5524,5567,5614,5670,5725,5780,5824,5866,5907,5957,6016,6067,6116,6165,6212,6259,6306,6351,6402,6455,6530,6589,6646,6720,6784,6853,6931,7041,7145,7218,7284,7339,7404,7469,7518,7601,7679,7717,7762,7810,7950,8007,8163,8222,8289,8347,8409,8457,8502,8550,8601,8667,8733"
+ }
+ },
{
"source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\c9913736ba0af3f26ba50dd9aa679a2b\\transformed\\support-compat-28.0.0\\res\\values-zh-rTW\\values-zh-rTW.xml",
"from": {
diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zu.json b/src/Note-master2/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zu.json
similarity index 92%
rename from src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zu.json
rename to src/Note-master2/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zu.json
index 70b646c..3cd9384 100644
--- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zu.json
+++ b/src/Note-master2/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zu.json
@@ -1,7 +1,7 @@
{
"logs": [
{
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-zu\\values-zu.xml",
+ "outputFile": "D:\\Note-master2\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-zu\\values-zu.xml",
"map": [
{
"source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\c9913736ba0af3f26ba50dd9aa679a2b\\transformed\\support-compat-28.0.0\\res\\values-zu\\values-zu.xml",
diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values.json b/src/Note-master2/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values.json
similarity index 98%
rename from src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values.json
rename to src/Note-master2/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values.json
index 25d407b..d79a3d8 100644
--- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values.json
+++ b/src/Note-master2/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values.json
@@ -1,25 +1,8 @@
{
"logs": [
{
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values\\values.xml",
+ "outputFile": "D:\\Note-master2\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values\\values.xml",
"map": [
- {
- "source": "D:\\Notes-master1\\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": "189,190,191,192,193",
- "startColumns": "4,4,4,4,4",
- "startOffsets": "12682,12734,12787,12840,12892",
- "endColumns": "51,52,52,51,51",
- "endOffsets": "12729,12782,12835,12887,12939"
- }
- },
{
"source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\a90015b78bf619886c4dbbae347a2742\\transformed\\coordinatorlayout-28.0.0\\res\\values\\values.xml",
"from": {
@@ -40,26 +23,26 @@
}
},
{
- "source": "D:\\Notes-master1\\app\\src\\main\\res\\values\\styles.xml",
+ "source": "D:\\Note-master2\\app\\src\\main\\res\\values\\strings.xml",
"from": {
- "startLines": "50,55,64,60,22,26,30,35,40,18,45",
- "startColumns": "4,4,4,4,4,4,4,4,4,4,4",
- "startOffsets": "2062,2267,2640,2479,895,1078,1263,1449,1653,712,1860",
- "endLines": "53,58,67,62,25,29,33,38,43,21,48",
- "endColumns": "12,12,12,12,12,12,12,12,12,12,12",
- "endOffsets": "2261,2473,2843,2634,1073,1258,1443,1647,1854,890,2056"
+ "startLines": "128,72,75,74,73,19,20,21,118,119,127,126,26,81,82,80,79,78,94,93,92,84,39,38,64,29,30,85,41,76,120,71,67,42,48,53,43,63,62,61,57,56,54,55,58,59,49,70,60,68,47,52,51,50,66,46,65,44,45,69,28,34,36,33,35,32,31,25,24,101,100,104,116,109,108,110,111,113,112,102,103,107,105,106,99,114,115,125,123,122,124,27,83,91,96,95,97,90,89,88,87,22,23",
+ "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
+ "startOffsets": "8008,3898,4159,4063,3994,827,870,922,7506,7555,7950,7899,1282,4613,4707,4542,4458,4375,5574,5491,5389,4883,2004,1953,3397,1486,1539,4944,2097,4242,7618,3827,3582,2156,2471,2772,2214,3326,3265,3208,2986,2934,2831,2884,3036,3086,2518,3761,3146,3631,2424,2717,2629,2571,3520,2374,3475,2271,2314,3694,1431,1750,1858,1703,1805,1647,1599,1227,1174,6030,5963,6271,7409,6635,6554,6709,6798,7040,6961,6114,6189,6495,6335,6415,5908,7184,7306,7858,7731,7674,7784,1366,4815,5303,5709,5640,5789,5244,5189,5127,5067,974,1084",
+ "endLines": "132,72,75,74,73,19,20,21,118,119,127,126,26,81,82,80,79,78,94,93,92,84,39,38,64,29,30,85,41,76,120,71,67,42,48,53,43,63,62,61,57,56,54,55,58,59,49,70,60,68,47,52,51,50,66,46,65,44,45,69,28,34,36,33,35,32,31,25,24,101,100,104,116,109,108,110,111,113,112,102,103,107,105,106,99,114,115,125,123,122,124,27,83,91,96,95,97,90,89,88,87,22,23",
+ "endColumns": "14,95,82,95,68,42,51,51,48,62,57,50,83,93,107,70,83,82,65,82,101,60,61,50,77,52,59,104,58,101,54,70,48,57,46,58,56,70,60,56,49,51,52,49,49,59,52,65,61,62,46,54,87,57,61,49,44,42,59,66,54,54,52,46,52,55,47,54,52,83,66,63,95,73,80,88,162,143,78,74,81,58,79,79,54,121,102,40,52,56,73,64,67,85,79,68,93,58,54,61,59,109,89",
+ "endOffsets": "8412,3989,4237,4154,4058,865,917,969,7550,7613,8003,7945,1361,4702,4810,4608,4537,4453,5635,5569,5486,4939,2061,1999,3470,1534,1594,5044,2151,4339,7668,3893,3626,2209,2513,2826,2266,3392,3321,3260,3031,2981,2879,2929,3081,3141,2566,3822,3203,3689,2466,2767,2712,2624,3577,2419,3515,2309,2369,3756,1481,1800,1906,1745,1853,1698,1642,1277,1222,6109,6025,6330,7500,6704,6630,6793,6956,7179,7035,6184,6266,6549,6410,6490,5958,7301,7404,7894,7779,7726,7853,1426,4878,5384,5784,5704,5878,5298,5239,5184,5122,1079,1169"
},
"to": {
- "startLines": "1439,1443,1447,1451,1720,1724,1728,1732,1736,1740,1744",
- "startColumns": "4,4,4,4,4,4,4,4,4,4,4",
- "startOffsets": "93289,93493,93704,93911,114454,114637,114822,115007,115210,115416,115599",
- "endLines": "1442,1446,1450,1453,1723,1727,1731,1735,1739,1743,1747",
- "endColumns": "12,12,12,12,12,12,12,12,12,12,12",
- "endOffsets": "93488,93699,93906,94066,114632,114817,115002,115205,115411,115594,115795"
+ "startLines": "226,270,271,272,273,274,275,276,277,278,279,280,281,282,283,284,285,286,287,288,289,290,291,292,293,294,295,296,297,298,299,300,301,302,303,304,305,306,307,308,309,310,311,312,313,314,315,316,317,318,319,320,321,322,323,324,325,326,327,328,329,330,331,332,333,334,335,336,337,338,339,340,341,342,343,344,345,346,347,348,349,350,351,352,353,354,355,356,357,358,360,361,363,364,365,366,367,368,369,370,371,372,373",
+ "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
+ "startOffsets": "14613,17764,17860,17943,18039,18108,18151,18203,18255,18304,18367,18425,18476,18560,18654,18762,18833,18917,19000,19066,19149,19251,19312,19374,19425,19503,19556,19616,19721,19780,19882,19937,20008,20057,20115,20162,20221,20278,20349,20410,20467,20517,20569,20622,20672,20722,20782,20835,20901,20963,21026,21073,21128,21216,21274,21336,21386,21431,21474,21534,21601,21656,21711,21764,21811,21864,21920,21968,22023,22076,22160,22227,22291,22387,22461,22542,22631,22794,22938,23017,23092,23174,23233,23313,23393,23448,23570,23673,23714,23767,23877,23951,24087,24155,24241,24321,24390,24484,24543,24598,24660,24720,24830",
+ "endLines": "230,270,271,272,273,274,275,276,277,278,279,280,281,282,283,284,285,286,287,288,289,290,291,292,293,294,295,296,297,298,299,300,301,302,303,304,305,306,307,308,309,310,311,312,313,314,315,316,317,318,319,320,321,322,323,324,325,326,327,328,329,330,331,332,333,334,335,336,337,338,339,340,341,342,343,344,345,346,347,348,349,350,351,352,353,354,355,356,357,358,360,361,363,364,365,366,367,368,369,370,371,372,373",
+ "endColumns": "14,95,82,95,68,42,51,51,48,62,57,50,83,93,107,70,83,82,65,82,101,60,61,50,77,52,59,104,58,101,54,70,48,57,46,58,56,70,60,56,49,51,52,49,49,59,52,65,61,62,46,54,87,57,61,49,44,42,59,66,54,54,52,46,52,55,47,54,52,83,66,63,95,73,80,88,162,143,78,74,81,58,79,79,54,121,102,40,52,56,73,64,67,85,79,68,93,58,54,61,59,109,89",
+ "endOffsets": "15001,17855,17938,18034,18103,18146,18198,18250,18299,18362,18420,18471,18555,18649,18757,18828,18912,18995,19061,19144,19246,19307,19369,19420,19498,19551,19611,19716,19775,19877,19932,20003,20052,20110,20157,20216,20273,20344,20405,20462,20512,20564,20617,20667,20717,20777,20830,20896,20958,21021,21068,21123,21211,21269,21331,21381,21426,21469,21529,21596,21651,21706,21759,21806,21859,21915,21963,22018,22071,22155,22222,22286,22382,22456,22537,22626,22789,22933,23012,23087,23169,23228,23308,23388,23443,23565,23668,23709,23762,23819,23946,24011,24150,24236,24316,24385,24479,24538,24593,24655,24715,24825,24915"
}
},
{
- "source": "D:\\Notes-master1\\app\\src\\main\\res\\values\\colors.xml",
+ "source": "D:\\Note-master2\\app\\src\\main\\res\\values\\colors.xml",
"from": {
"startLines": "18",
"startColumns": "4",
@@ -76,26 +59,7 @@
}
},
{
- "source": "D:\\Notes-master1\\app\\src\\main\\res\\values\\strings.xml",
- "from": {
- "startLines": "128,72,75,74,73,19,20,21,118,119,127,126,26,81,82,80,79,78,94,93,92,84,39,38,64,29,30,85,41,76,120,71,67,42,48,53,43,63,62,61,57,56,54,55,58,59,49,70,60,68,47,52,51,50,66,46,65,44,45,69,28,34,36,33,35,32,31,25,24,101,100,104,116,109,108,110,111,113,112,102,103,107,105,106,99,114,115,125,123,122,124,27,83,91,96,95,97,90,89,88,87,22,23",
- "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
- "startOffsets": "8008,3898,4159,4063,3994,827,870,922,7506,7555,7950,7899,1282,4613,4707,4542,4458,4375,5574,5491,5389,4883,2004,1953,3397,1486,1539,4944,2097,4242,7618,3827,3582,2156,2471,2772,2214,3326,3265,3208,2986,2934,2831,2884,3036,3086,2518,3761,3146,3631,2424,2717,2629,2571,3520,2374,3475,2271,2314,3694,1431,1750,1858,1703,1805,1647,1599,1227,1174,6030,5963,6271,7409,6635,6554,6709,6798,7040,6961,6114,6189,6495,6335,6415,5908,7184,7306,7858,7731,7674,7784,1366,4815,5303,5709,5640,5789,5244,5189,5127,5067,974,1084",
- "endLines": "132,72,75,74,73,19,20,21,118,119,127,126,26,81,82,80,79,78,94,93,92,84,39,38,64,29,30,85,41,76,120,71,67,42,48,53,43,63,62,61,57,56,54,55,58,59,49,70,60,68,47,52,51,50,66,46,65,44,45,69,28,34,36,33,35,32,31,25,24,101,100,104,116,109,108,110,111,113,112,102,103,107,105,106,99,114,115,125,123,122,124,27,83,91,96,95,97,90,89,88,87,22,23",
- "endColumns": "14,95,82,95,68,42,51,51,48,62,57,50,83,93,107,70,83,82,65,82,101,60,61,50,77,52,59,104,58,101,54,70,48,57,46,58,56,70,60,56,49,51,52,49,49,59,52,65,61,62,46,54,87,57,61,49,44,42,59,66,54,54,52,46,52,55,47,54,52,83,66,63,95,73,80,88,162,143,78,74,81,58,79,79,54,121,102,40,52,56,73,64,67,85,79,68,93,58,54,61,59,109,89",
- "endOffsets": "8412,3989,4237,4154,4058,865,917,969,7550,7613,8003,7945,1361,4702,4810,4608,4537,4453,5635,5569,5486,4939,2061,1999,3470,1534,1594,5044,2151,4339,7668,3893,3626,2209,2513,2826,2266,3392,3321,3260,3031,2981,2879,2929,3081,3141,2566,3822,3203,3689,2466,2767,2712,2624,3577,2419,3515,2309,2369,3756,1481,1800,1906,1745,1853,1698,1642,1277,1222,6109,6025,6330,7500,6704,6630,6793,6956,7179,7035,6184,6266,6549,6410,6490,5958,7301,7404,7894,7779,7726,7853,1426,4878,5384,5784,5704,5878,5298,5239,5184,5122,1079,1169"
- },
- "to": {
- "startLines": "226,270,271,272,273,274,275,276,277,278,279,280,281,282,283,284,285,286,287,288,289,290,291,292,293,294,295,296,297,298,299,300,301,302,303,304,305,306,307,308,309,310,311,312,313,314,315,316,317,318,319,320,321,322,323,324,325,326,327,328,329,330,331,332,333,334,335,336,337,338,339,340,341,342,343,344,345,346,347,348,349,350,351,352,353,354,355,356,357,358,360,361,363,364,365,366,367,368,369,370,371,372,373",
- "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
- "startOffsets": "14613,17764,17860,17943,18039,18108,18151,18203,18255,18304,18367,18425,18476,18560,18654,18762,18833,18917,19000,19066,19149,19251,19312,19374,19425,19503,19556,19616,19721,19780,19882,19937,20008,20057,20115,20162,20221,20278,20349,20410,20467,20517,20569,20622,20672,20722,20782,20835,20901,20963,21026,21073,21128,21216,21274,21336,21386,21431,21474,21534,21601,21656,21711,21764,21811,21864,21920,21968,22023,22076,22160,22227,22291,22387,22461,22542,22631,22794,22938,23017,23092,23174,23233,23313,23393,23448,23570,23673,23714,23767,23877,23951,24087,24155,24241,24321,24390,24484,24543,24598,24660,24720,24830",
- "endLines": "230,270,271,272,273,274,275,276,277,278,279,280,281,282,283,284,285,286,287,288,289,290,291,292,293,294,295,296,297,298,299,300,301,302,303,304,305,306,307,308,309,310,311,312,313,314,315,316,317,318,319,320,321,322,323,324,325,326,327,328,329,330,331,332,333,334,335,336,337,338,339,340,341,342,343,344,345,346,347,348,349,350,351,352,353,354,355,356,357,358,360,361,363,364,365,366,367,368,369,370,371,372,373",
- "endColumns": "14,95,82,95,68,42,51,51,48,62,57,50,83,93,107,70,83,82,65,82,101,60,61,50,77,52,59,104,58,101,54,70,48,57,46,58,56,70,60,56,49,51,52,49,49,59,52,65,61,62,46,54,87,57,61,49,44,42,59,66,54,54,52,46,52,55,47,54,52,83,66,63,95,73,80,88,162,143,78,74,81,58,79,79,54,121,102,40,52,56,73,64,67,85,79,68,93,58,54,61,59,109,89",
- "endOffsets": "15001,17855,17938,18034,18103,18146,18198,18250,18299,18362,18420,18471,18555,18649,18757,18828,18912,18995,19061,19144,19246,19307,19369,19420,19498,19551,19611,19716,19775,19877,19932,20003,20052,20110,20157,20216,20273,20344,20405,20462,20512,20564,20617,20667,20717,20777,20830,20896,20958,21021,21068,21123,21211,21269,21331,21381,21426,21469,21529,21596,21651,21706,21759,21806,21859,21915,21963,22018,22071,22155,22222,22286,22382,22456,22537,22626,22789,22933,23012,23087,23169,23228,23308,23388,23443,23565,23668,23709,23762,23819,23946,24011,24150,24236,24316,24385,24479,24538,24593,24655,24715,24825,24915"
- }
- },
- {
- "source": "D:\\Notes-master1\\app\\src\\main\\res\\values\\arrays.xml",
+ "source": "D:\\Note-master2\\app\\src\\main\\res\\values\\arrays.xml",
"from": {
"startLines": "19,26",
"startColumns": "4,4",
@@ -132,6 +96,25 @@
"endOffsets": "3784,3847,10497,10565,10637,10707,10768,10842,10915,11760,11821,11883,11947,12009,12070,12138,12238,12298,12364,12437,12506,12563,12615,12677,13464,13540,13814,13849,14041,14102,14159,14193,14228,14263,14608,24082,113380,113581,113691,113892,114021,126265,126332,162442,173592,175657,177417,177794"
}
},
+ {
+ "source": "D:\\Note-master2\\app\\src\\main\\res\\values\\styles.xml",
+ "from": {
+ "startLines": "50,55,64,60,22,26,30,35,40,18,45",
+ "startColumns": "4,4,4,4,4,4,4,4,4,4,4",
+ "startOffsets": "2062,2267,2640,2479,895,1078,1263,1449,1653,712,1860",
+ "endLines": "53,58,67,62,25,29,33,38,43,21,48",
+ "endColumns": "12,12,12,12,12,12,12,12,12,12,12",
+ "endOffsets": "2261,2473,2843,2634,1073,1258,1443,1647,1854,890,2056"
+ },
+ "to": {
+ "startLines": "1439,1443,1447,1451,1720,1724,1728,1732,1736,1740,1744",
+ "startColumns": "4,4,4,4,4,4,4,4,4,4,4",
+ "startOffsets": "93289,93493,93704,93911,114454,114637,114822,115007,115210,115416,115599",
+ "endLines": "1442,1446,1450,1453,1723,1727,1731,1735,1739,1743,1747",
+ "endColumns": "12,12,12,12,12,12,12,12,12,12,12",
+ "endOffsets": "93488,93699,93906,94066,114632,114817,115002,115205,115411,115594,115795"
+ }
+ },
{
"source": "C:\\Users\\86155\\.gradle\\caches\\transforms-3\\4051cc509ba70441b9465808cc62a56d\\transformed\\appcompat-v7-28.0.0\\res\\values\\values.xml",
"from": {
@@ -150,6 +133,23 @@
"endColumns": "54,44,48,40,54,58,61,80,60,74,75,76,77,84,81,75,75,76,77,105,105,78,79,56,57,73,74,64,65,59,60,71,72,66,67,58,58,58,58,58,53,53,52,53,53,53,53,73,78,72,73,70,71,71,72,56,57,72,73,73,74,71,72,69,70,59,60,68,68,69,73,75,63,76,75,76,64,68,76,74,68,67,76,65,60,96,64,68,98,70,58,57,56,58,63,70,71,71,71,71,66,67,67,58,62,63,89,90,59,65,66,65,69,63,52,112,57,62,64,64,74,72,71,48,60,60,60,61,63,63,63,64,62,59,60,65,58,59,61,70,59,67,85,86,89,86,87,81,82,89,90,51,57,44,65,63,56,56,53,56,47,48,50,33,46,48,45,31,63,61,59,56,73,69,77,53,69,84,47,45,70,77,77,71,73,73,73,79,72,68,71,76,60,62,65,63,70,62,64,63,60,60,51,72,73,68,74,73,73,140,69,52,77,89,87,95,89,12,88,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,136,130,104,12,12,12,12,12,111,111,104,116,12,12,12,12,12,87,12,12,12,81,12,12,99,12,12,12,93,88,12,12,12,101,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,117,12,12,12,12,12,12,12,63,12,12,12,12,12,12,93,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,91,12,12,12,61,12,12,90,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,83,95,95,97,99,101,101,101,101,101,99,95,111,128,122,130,130,97,113,93,12,12,95,111,99,115,95,111,99,12,135,12,129,12,12,140,12,134,111,149,127,127,12,131,129,129,111,139,12,12,12,65,89,75,103,89,101,107,107,99,79,91,97,12,77,105,91,103,109,12,12,12,79,99,89,109,93,105,91,12,12,12,12,12,93,113,111,12,12,12,81,103,119,125,97,93,87,111,115,121,111,12,115,85,91,12,12,66,12,67,12,12,12,68,94,114,112,98,108,110,110,100,104,99,12,90,122,93,12,85,103,95,87,12,12,12,12,87,107,99,89,109,83,101,83,53,63,105,109,83,119,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24",
"endOffsets": "643,688,737,778,833,892,954,1035,1096,1171,1247,1324,1402,1487,1569,1645,1721,1798,1876,1982,2088,2167,2247,2304,2362,2436,2511,2576,2642,2702,2763,2835,2908,2975,3043,3102,3161,3220,3279,3338,3392,3446,3499,3553,3607,3661,3715,3921,4000,4073,4147,4218,4290,4362,4435,4492,4550,4623,4697,4771,4846,4918,4991,5061,5132,5192,5253,5379,5448,5518,5592,5668,5732,5809,5885,5962,6027,6096,6173,6248,6317,6385,6462,6528,6589,6686,6751,6820,6919,6990,7049,7107,7164,7223,7287,7358,7430,7502,7574,7646,7713,7781,7849,7908,7971,8035,8125,8216,8276,8342,8409,8475,8545,8609,8662,8775,8833,8896,8961,9026,9101,9174,9246,9295,9356,9417,9478,9540,9604,9668,9732,9797,9860,9920,9981,10047,10106,10166,10228,10299,10359,10427,11001,11088,11178,11265,11353,11435,11518,11608,11699,12991,13049,13094,13160,13224,13281,13338,13392,13597,13645,13694,13745,13779,13896,13945,13991,14295,14359,14421,14481,14538,15075,15145,15223,15277,15347,15432,15480,15526,15597,15675,15753,15825,15899,15973,16047,16127,16200,16269,16341,16418,16479,16542,16608,16672,16743,16806,16871,16935,16996,17057,17109,17182,17256,17325,17400,17474,17548,17689,17759,23872,24993,25083,25171,25267,25357,25939,26028,26275,26556,26808,27093,27486,27963,28185,28407,28683,28910,29140,29370,29600,29830,30057,30476,30702,31127,31357,31785,32004,32287,32495,32626,32853,33279,33504,33931,34152,34577,34697,34973,35274,35598,35889,36203,36340,36471,36576,36818,36985,37189,37397,37668,37780,37892,37997,38114,38328,38474,38614,38700,39048,39136,39382,39800,40049,40131,40229,40846,40946,41198,41622,41877,41971,42060,42297,44349,44591,44693,44946,47130,57851,59367,70187,71715,73472,74098,74518,75579,76844,77100,77336,77883,78377,78982,79180,79760,80324,80699,80817,81355,81512,81708,81981,82237,82407,82548,82612,82894,83180,83856,84120,84458,84811,84905,85091,85397,85659,85784,85911,86150,86361,86480,86673,86850,87305,87486,87608,87867,87980,88167,88269,88376,88505,88780,89288,89784,90661,90955,91525,91674,92406,92578,92914,93006,93284,98410,102897,102959,103589,104203,104294,104407,104636,104796,104948,105119,105285,105454,105621,105784,106027,106197,106370,106541,106815,107014,107219,107549,107633,107729,107825,107923,108023,108125,108227,108329,108431,108533,108633,108729,108841,108970,109093,109224,109355,109453,109567,109661,109801,109935,110031,110143,110243,110359,110455,110567,110667,110807,110943,111107,111237,111395,111545,111686,111830,111965,112077,112227,112355,112483,112619,112751,112881,113011,113123,113263,114167,114311,114449,115861,115951,116027,116131,116221,116323,116431,116539,116639,116719,116811,116909,117019,117097,117203,117295,117399,117509,117631,117794,117951,118031,118131,118221,118331,118425,118531,118623,118723,118835,118949,119065,119181,119275,119389,119501,119603,119723,119845,119927,120031,120151,120277,120375,120469,120557,120669,120785,120907,121019,121194,121310,121396,121488,121600,121724,121791,121917,121985,122113,122257,122385,122454,122549,122664,122777,122876,122985,123096,123207,123308,123413,123513,123643,123734,123857,123951,124063,124149,124253,124349,124437,124555,124659,124763,124889,124977,125085,125185,125275,125385,125469,125571,125655,125709,125773,125879,125989,126073,126193,131621,131739,131854,131986,132701,133393,133910,135557,135942,136539,138138,139671,140059,142366,161884,162144,163834,170686,179807,180069,180425,181255,188037,189171,189465,189688,190015,192065,192713,194346,194616,198467,199068,202877,204092,205501,205975"
}
+ },
+ {
+ "source": "D:\\Note-master2\\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": "189,190,191,192,193",
+ "startColumns": "4,4,4,4,4",
+ "startOffsets": "12682,12734,12787,12840,12892",
+ "endColumns": "51,52,52,51,51",
+ "endOffsets": "12729,12782,12835,12887,12939"
+ }
}
]
}
diff --git a/src/Note-master2/app/build/intermediates/merged_res_blame_folder/debug/out/single/debug.json b/src/Note-master2/app/build/intermediates/merged_res_blame_folder/debug/out/single/debug.json
new file mode 100644
index 0000000..30f4099
--- /dev/null
+++ b/src/Note-master2/app/build/intermediates/merged_res_blame_folder/debug/out/single/debug.json
@@ -0,0 +1,382 @@
+[
+ {
+ "merged": "D:\\Note-master2\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_small.png.flat",
+ "source": "D:\\Note-master2\\app\\src\\main\\res\\drawable-hdpi\\font_small.png"
+ },
+ {
+ "merged": "D:\\Note-master2\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_bg_btn_set_color.png.flat",
+ "source": "D:\\Note-master2\\app\\src\\main\\res\\drawable-hdpi\\bg_btn_set_color.png"
+ },
+ {
+ "merged": "D:\\Note-master2\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_single.9.png.flat",
+ "source": "D:\\Note-master2\\app\\src\\main\\res\\drawable-hdpi\\list_red_single.9.png"
+ },
+ {
+ "merged": "D:\\Note-master2\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_green.9.png.flat",
+ "source": "D:\\Note-master2\\app\\src\\main\\res\\drawable-hdpi\\edit_green.9.png"
+ },
+ {
+ "merged": "D:\\Note-master2\\app\\build\\intermediates\\merged_res\\debug\\xml_preferences.xml.flat",
+ "source": "D:\\Note-master2\\app\\src\\main\\res\\xml\\preferences.xml"
+ },
+ {
+ "merged": "D:\\Note-master2\\app\\build\\intermediates\\merged_res\\debug\\layout_dialog_edit_text.xml.flat",
+ "source": "D:\\Note-master2\\app\\src\\main\\res\\layout\\dialog_edit_text.xml"
+ },
+ {
+ "merged": "D:\\Note-master2\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_green.9.png.flat",
+ "source": "D:\\Note-master2\\app\\src\\main\\res\\drawable-hdpi\\edit_title_green.9.png"
+ },
+ {
+ "merged": "D:\\Note-master2\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_title_bar_bg.9.png.flat",
+ "source": "D:\\Note-master2\\app\\src\\main\\res\\drawable-hdpi\\title_bar_bg.9.png"
+ },
+ {
+ "merged": "D:\\Note-master2\\app\\build\\intermediates\\merged_res\\debug\\menu_note_edit.xml.flat",
+ "source": "D:\\Note-master2\\app\\src\\main\\res\\menu\\note_edit.xml"
+ },
+ {
+ "merged": "D:\\Note-master2\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_new_note_normal.png.flat",
+ "source": "D:\\Note-master2\\app\\src\\main\\res\\drawable-hdpi\\new_note_normal.png"
+ },
+ {
+ "merged": "D:\\Note-master2\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_folder.9.png.flat",
+ "source": "D:\\Note-master2\\app\\src\\main\\res\\drawable-hdpi\\list_folder.9.png"
+ },
+ {
+ "merged": "D:\\Note-master2\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_notification.png.flat",
+ "source": "D:\\Note-master2\\app\\src\\main\\res\\drawable-hdpi\\notification.png"
+ },
+ {
+ "merged": "D:\\Note-master2\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_bg_color_btn_mask.png.flat",
+ "source": "D:\\Note-master2\\app\\src\\main\\res\\drawable-hdpi\\bg_color_btn_mask.png"
+ },
+ {
+ "merged": "D:\\Note-master2\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_dropdown_icon.9.png.flat",
+ "source": "D:\\Note-master2\\app\\src\\main\\res\\drawable-hdpi\\dropdown_icon.9.png"
+ },
+ {
+ "merged": "D:\\Note-master2\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_blue.9.png.flat",
+ "source": "D:\\Note-master2\\app\\src\\main\\res\\drawable-hdpi\\edit_blue.9.png"
+ },
+ {
+ "merged": "D:\\Note-master2\\app\\build\\intermediates\\merged_res\\debug\\xml_widget_2x_info.xml.flat",
+ "source": "D:\\Note-master2\\app\\src\\main\\res\\xml\\widget_2x_info.xml"
+ },
+ {
+ "merged": "D:\\Note-master2\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_selected.png.flat",
+ "source": "D:\\Note-master2\\app\\src\\main\\res\\drawable-hdpi\\selected.png"
+ },
+ {
+ "merged": "D:\\Note-master2\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_white.png.flat",
+ "source": "D:\\Note-master2\\app\\src\\main\\res\\drawable-hdpi\\widget_4x_white.png"
+ },
+ {
+ "merged": "D:\\Note-master2\\app\\build\\intermediates\\merged_res\\debug\\layout_account_dialog_title.xml.flat",
+ "source": "D:\\Note-master2\\app\\src\\main\\res\\layout\\account_dialog_title.xml"
+ },
+ {
+ "merged": "D:\\Note-master2\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_green_single.9.png.flat",
+ "source": "D:\\Note-master2\\app\\src\\main\\res\\drawable-hdpi\\list_green_single.9.png"
+ },
+ {
+ "merged": "D:\\Note-master2\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_up.9.png.flat",
+ "source": "D:\\Note-master2\\app\\src\\main\\res\\drawable-hdpi\\list_white_up.9.png"
+ },
+ {
+ "merged": "D:\\Note-master2\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_yellow.9.png.flat",
+ "source": "D:\\Note-master2\\app\\src\\main\\res\\drawable-hdpi\\edit_title_yellow.9.png"
+ },
+ {
+ "merged": "D:\\Note-master2\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_blue_middle.9.png.flat",
+ "source": "D:\\Note-master2\\app\\src\\main\\res\\drawable-hdpi\\list_blue_middle.9.png"
+ },
+ {
+ "merged": "D:\\Note-master2\\app\\build\\intermediates\\merged_res\\debug\\raw-zh-rCN_introduction.flat",
+ "source": "D:\\Note-master2\\app\\src\\main\\res\\raw-zh-rCN\\introduction"
+ },
+ {
+ "merged": "D:\\Note-master2\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_down.9.png.flat",
+ "source": "D:\\Note-master2\\app\\src\\main\\res\\drawable-hdpi\\list_white_down.9.png"
+ },
+ {
+ "merged": "D:\\Note-master2\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_background.png.flat",
+ "source": "D:\\Note-master2\\app\\src\\main\\res\\drawable-hdpi\\list_background.png"
+ },
+ {
+ "merged": "D:\\Note-master2\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_green.png.flat",
+ "source": "D:\\Note-master2\\app\\src\\main\\res\\drawable-hdpi\\widget_4x_green.png"
+ },
+ {
+ "merged": "D:\\Note-master2\\app\\build\\intermediates\\merged_res\\debug\\layout_folder_list_item.xml.flat",
+ "source": "D:\\Note-master2\\app\\src\\main\\res\\layout\\folder_list_item.xml"
+ },
+ {
+ "merged": "D:\\Note-master2\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_blue_down.9.png.flat",
+ "source": "D:\\Note-master2\\app\\src\\main\\res\\drawable-hdpi\\list_blue_down.9.png"
+ },
+ {
+ "merged": "D:\\Note-master2\\app\\build\\intermediates\\merged_res\\debug\\menu_note_list_dropdown.xml.flat",
+ "source": "D:\\Note-master2\\app\\src\\main\\res\\menu\\note_list_dropdown.xml"
+ },
+ {
+ "merged": "D:\\Note-master2\\app\\build\\intermediates\\merged_res\\debug\\menu_sub_folder.xml.flat",
+ "source": "D:\\Note-master2\\app\\src\\main\\res\\menu\\sub_folder.xml"
+ },
+ {
+ "merged": "D:\\Note-master2\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_up.9.png.flat",
+ "source": "D:\\Note-master2\\app\\src\\main\\res\\drawable-hdpi\\list_red_up.9.png"
+ },
+ {
+ "merged": "D:\\Note-master2\\app\\build\\intermediates\\merged_res\\debug\\xml_widget_4x_info.xml.flat",
+ "source": "D:\\Note-master2\\app\\src\\main\\res\\xml\\widget_4x_info.xml"
+ },
+ {
+ "merged": "D:\\Note-master2\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_large.png.flat",
+ "source": "D:\\Note-master2\\app\\src\\main\\res\\drawable-hdpi\\font_large.png"
+ },
+ {
+ "merged": "D:\\Note-master2\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_title_alert.png.flat",
+ "source": "D:\\Note-master2\\app\\src\\main\\res\\drawable-hdpi\\title_alert.png"
+ },
+ {
+ "merged": "D:\\Note-master2\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_green_up.9.png.flat",
+ "source": "D:\\Note-master2\\app\\src\\main\\res\\drawable-hdpi\\list_green_up.9.png"
+ },
+ {
+ "merged": "D:\\Note-master2\\app\\build\\intermediates\\merged_res\\debug\\layout_note_item.xml.flat",
+ "source": "D:\\Note-master2\\app\\src\\main\\res\\layout\\note_item.xml"
+ },
+ {
+ "merged": "D:\\Note-master2\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_white.9.png.flat",
+ "source": "D:\\Note-master2\\app\\src\\main\\res\\drawable-hdpi\\edit_white.9.png"
+ },
+ {
+ "merged": "D:\\Note-master2\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_blue.png.flat",
+ "source": "D:\\Note-master2\\app\\src\\main\\res\\drawable-hdpi\\widget_2x_blue.png"
+ },
+ {
+ "merged": "D:\\Note-master2\\app\\build\\intermediates\\merged_res\\debug\\menu_note_list_options.xml.flat",
+ "source": "D:\\Note-master2\\app\\src\\main\\res\\menu\\note_list_options.xml"
+ },
+ {
+ "merged": "D:\\Note-master2\\app\\build\\intermediates\\merged_res\\debug\\xml_searchable.xml.flat",
+ "source": "D:\\Note-master2\\app\\src\\main\\res\\xml\\searchable.xml"
+ },
+ {
+ "merged": "D:\\Note-master2\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_red.png.flat",
+ "source": "D:\\Note-master2\\app\\src\\main\\res\\drawable-hdpi\\widget_4x_red.png"
+ },
+ {
+ "merged": "D:\\Note-master2\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_note_edit_color_selector_panel.png.flat",
+ "source": "D:\\Note-master2\\app\\src\\main\\res\\drawable-hdpi\\note_edit_color_selector_panel.png"
+ },
+ {
+ "merged": "D:\\Note-master2\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_middle.9.png.flat",
+ "source": "D:\\Note-master2\\app\\src\\main\\res\\drawable-hdpi\\list_yellow_middle.9.png"
+ },
+ {
+ "merged": "D:\\Note-master2\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_blue_single.9.png.flat",
+ "source": "D:\\Note-master2\\app\\src\\main\\res\\drawable-hdpi\\list_blue_single.9.png"
+ },
+ {
+ "merged": "D:\\Note-master2\\app\\build\\intermediates\\merged_res\\debug\\menu_note_list.xml.flat",
+ "source": "D:\\Note-master2\\app\\src\\main\\res\\menu\\note_list.xml"
+ },
+ {
+ "merged": "D:\\Note-master2\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_menu_delete.png.flat",
+ "source": "D:\\Note-master2\\app\\src\\main\\res\\drawable-hdpi\\menu_delete.png"
+ },
+ {
+ "merged": "D:\\Note-master2\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_normal.png.flat",
+ "source": "D:\\Note-master2\\app\\src\\main\\res\\drawable-hdpi\\font_normal.png"
+ },
+ {
+ "merged": "D:\\Note-master2\\app\\build\\intermediates\\merged_res\\debug\\layout_widget_4x.xml.flat",
+ "source": "D:\\Note-master2\\app\\src\\main\\res\\layout\\widget_4x.xml"
+ },
+ {
+ "merged": "D:\\Note-master2\\app\\build\\intermediates\\merged_res\\debug\\layout_note_list_footer.xml.flat",
+ "source": "D:\\Note-master2\\app\\src\\main\\res\\layout\\note_list_footer.xml"
+ },
+ {
+ "merged": "D:\\Note-master2\\app\\build\\intermediates\\merged_res\\debug\\color_secondary_text_dark.xml.flat",
+ "source": "D:\\Note-master2\\app\\src\\main\\res\\color\\secondary_text_dark.xml"
+ },
+ {
+ "merged": "D:\\Note-master2\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_green.png.flat",
+ "source": "D:\\Note-master2\\app\\src\\main\\res\\drawable-hdpi\\widget_2x_green.png"
+ },
+ {
+ "merged": "D:\\Note-master2\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_menu_move.png.flat",
+ "source": "D:\\Note-master2\\app\\src\\main\\res\\drawable-hdpi\\menu_move.png"
+ },
+ {
+ "merged": "D:\\Note-master2\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_icon_app.png.flat",
+ "source": "D:\\Note-master2\\app\\src\\main\\res\\drawable-hdpi\\icon_app.png"
+ },
+ {
+ "merged": "D:\\Note-master2\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_yellow.9.png.flat",
+ "source": "D:\\Note-master2\\app\\src\\main\\res\\drawable-hdpi\\edit_yellow.9.png"
+ },
+ {
+ "merged": "D:\\Note-master2\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_red.9.png.flat",
+ "source": "D:\\Note-master2\\app\\src\\main\\res\\drawable-hdpi\\edit_red.9.png"
+ },
+ {
+ "merged": "D:\\Note-master2\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_delete.png.flat",
+ "source": "D:\\Note-master2\\app\\src\\main\\res\\drawable-hdpi\\delete.png"
+ },
+ {
+ "merged": "D:\\Note-master2\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_down.9.png.flat",
+ "source": "D:\\Note-master2\\app\\src\\main\\res\\drawable-hdpi\\list_yellow_down.9.png"
+ },
+ {
+ "merged": "D:\\Note-master2\\app\\build\\intermediates\\merged_res\\debug\\menu_call_note_edit.xml.flat",
+ "source": "D:\\Note-master2\\app\\src\\main\\res\\menu\\call_note_edit.xml"
+ },
+ {
+ "merged": "D:\\Note-master2\\app\\build\\intermediates\\merged_res\\debug\\menu_call_record_folder.xml.flat",
+ "source": "D:\\Note-master2\\app\\src\\main\\res\\menu\\call_record_folder.xml"
+ },
+ {
+ "merged": "D:\\Note-master2\\app\\build\\intermediates\\merged_res\\debug\\raw_introduction.flat",
+ "source": "D:\\Note-master2\\app\\src\\main\\res\\raw\\introduction"
+ },
+ {
+ "merged": "D:\\Note-master2\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_yellow.png.flat",
+ "source": "D:\\Note-master2\\app\\src\\main\\res\\drawable-hdpi\\widget_2x_yellow.png"
+ },
+ {
+ "merged": "D:\\Note-master2\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_call_record.png.flat",
+ "source": "D:\\Note-master2\\app\\src\\main\\res\\drawable-hdpi\\call_record.png"
+ },
+ {
+ "merged": "D:\\Note-master2\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_down.9.png.flat",
+ "source": "D:\\Note-master2\\app\\src\\main\\res\\drawable-hdpi\\list_red_down.9.png"
+ },
+ {
+ "merged": "D:\\Note-master2\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_single.9.png.flat",
+ "source": "D:\\Note-master2\\app\\src\\main\\res\\drawable-hdpi\\list_yellow_single.9.png"
+ },
+ {
+ "merged": "D:\\Note-master2\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_up.9.png.flat",
+ "source": "D:\\Note-master2\\app\\src\\main\\res\\drawable-hdpi\\list_yellow_up.9.png"
+ },
+ {
+ "merged": "D:\\Note-master2\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_search_result.png.flat",
+ "source": "D:\\Note-master2\\app\\src\\main\\res\\drawable-hdpi\\search_result.png"
+ },
+ {
+ "merged": "D:\\Note-master2\\app\\build\\intermediates\\merged_res\\debug\\layout_widget_2x.xml.flat",
+ "source": "D:\\Note-master2\\app\\src\\main\\res\\layout\\widget_2x.xml"
+ },
+ {
+ "merged": "D:\\Note-master2\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_clock.png.flat",
+ "source": "D:\\Note-master2\\app\\src\\main\\res\\drawable-hdpi\\clock.png"
+ },
+ {
+ "merged": "D:\\Note-master2\\app\\build\\intermediates\\merged_res\\debug\\drawable_new_note.xml.flat",
+ "source": "D:\\Note-master2\\app\\src\\main\\res\\drawable\\new_note.xml"
+ },
+ {
+ "merged": "D:\\Note-master2\\app\\build\\intermediates\\merged_res\\debug\\layout_note_list_dropdown_menu.xml.flat",
+ "source": "D:\\Note-master2\\app\\src\\main\\res\\layout\\note_list_dropdown_menu.xml"
+ },
+ {
+ "merged": "D:\\Note-master2\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_middle.9.png.flat",
+ "source": "D:\\Note-master2\\app\\src\\main\\res\\drawable-hdpi\\list_white_middle.9.png"
+ },
+ {
+ "merged": "D:\\Note-master2\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_blue.9.png.flat",
+ "source": "D:\\Note-master2\\app\\src\\main\\res\\drawable-hdpi\\edit_title_blue.9.png"
+ },
+ {
+ "merged": "D:\\Note-master2\\app\\build\\intermediates\\merged_res\\debug\\layout_note_edit.xml.flat",
+ "source": "D:\\Note-master2\\app\\src\\main\\res\\layout\\note_edit.xml"
+ },
+ {
+ "merged": "D:\\Note-master2\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_blue.png.flat",
+ "source": "D:\\Note-master2\\app\\src\\main\\res\\drawable-hdpi\\widget_4x_blue.png"
+ },
+ {
+ "merged": "D:\\Note-master2\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_yellow.png.flat",
+ "source": "D:\\Note-master2\\app\\src\\main\\res\\drawable-hdpi\\widget_4x_yellow.png"
+ },
+ {
+ "merged": "D:\\Note-master2\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_red.9.png.flat",
+ "source": "D:\\Note-master2\\app\\src\\main\\res\\drawable-hdpi\\edit_title_red.9.png"
+ },
+ {
+ "merged": "D:\\Note-master2\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_red.png.flat",
+ "source": "D:\\Note-master2\\app\\src\\main\\res\\drawable-hdpi\\widget_2x_red.png"
+ },
+ {
+ "merged": "D:\\Note-master2\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_size_selector_bg.9.png.flat",
+ "source": "D:\\Note-master2\\app\\src\\main\\res\\drawable-hdpi\\font_size_selector_bg.9.png"
+ },
+ {
+ "merged": "D:\\Note-master2\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_super.png.flat",
+ "source": "D:\\Note-master2\\app\\src\\main\\res\\drawable-hdpi\\font_super.png"
+ },
+ {
+ "merged": "D:\\Note-master2\\app\\build\\intermediates\\merged_res\\debug\\layout_note_edit_list_item.xml.flat",
+ "source": "D:\\Note-master2\\app\\src\\main\\res\\layout\\note_edit_list_item.xml"
+ },
+ {
+ "merged": "D:\\Note-master2\\app\\build\\intermediates\\merged_res\\debug\\layout_datetime_picker.xml.flat",
+ "source": "D:\\Note-master2\\app\\src\\main\\res\\layout\\datetime_picker.xml"
+ },
+ {
+ "merged": "D:\\Note-master2\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_new_note_pressed.png.flat",
+ "source": "D:\\Note-master2\\app\\src\\main\\res\\drawable-hdpi\\new_note_pressed.png"
+ },
+ {
+ "merged": "D:\\Note-master2\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_white.png.flat",
+ "source": "D:\\Note-master2\\app\\src\\main\\res\\drawable-hdpi\\widget_2x_white.png"
+ },
+ {
+ "merged": "D:\\Note-master2\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_single.9.png.flat",
+ "source": "D:\\Note-master2\\app\\src\\main\\res\\drawable-hdpi\\list_white_single.9.png"
+ },
+ {
+ "merged": "D:\\Note-master2\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_green_down.9.png.flat",
+ "source": "D:\\Note-master2\\app\\src\\main\\res\\drawable-hdpi\\list_green_down.9.png"
+ },
+ {
+ "merged": "D:\\Note-master2\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_white.9.png.flat",
+ "source": "D:\\Note-master2\\app\\src\\main\\res\\drawable-hdpi\\edit_title_white.9.png"
+ },
+ {
+ "merged": "D:\\Note-master2\\app\\build\\intermediates\\merged_res\\debug\\layout_add_account_text.xml.flat",
+ "source": "D:\\Note-master2\\app\\src\\main\\res\\layout\\add_account_text.xml"
+ },
+ {
+ "merged": "D:\\Note-master2\\app\\build\\intermediates\\merged_res\\debug\\color_primary_text_dark.xml.flat",
+ "source": "D:\\Note-master2\\app\\src\\main\\res\\color\\primary_text_dark.xml"
+ },
+ {
+ "merged": "D:\\Note-master2\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_blue_up.9.png.flat",
+ "source": "D:\\Note-master2\\app\\src\\main\\res\\drawable-hdpi\\list_blue_up.9.png"
+ },
+ {
+ "merged": "D:\\Note-master2\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_middle.9.png.flat",
+ "source": "D:\\Note-master2\\app\\src\\main\\res\\drawable-hdpi\\list_red_middle.9.png"
+ },
+ {
+ "merged": "D:\\Note-master2\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_green_middle.9.png.flat",
+ "source": "D:\\Note-master2\\app\\src\\main\\res\\drawable-hdpi\\list_green_middle.9.png"
+ },
+ {
+ "merged": "D:\\Note-master2\\app\\build\\intermediates\\merged_res\\debug\\layout_settings_header.xml.flat",
+ "source": "D:\\Note-master2\\app\\src\\main\\res\\layout\\settings_header.xml"
+ },
+ {
+ "merged": "D:\\Note-master2\\app\\build\\intermediates\\merged_res\\debug\\layout_note_list.xml.flat",
+ "source": "D:\\Note-master2\\app\\src\\main\\res\\layout\\note_list.xml"
+ },
+ {
+ "merged": "D:\\Note-master2\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_footer_bg.9.png.flat",
+ "source": "D:\\Note-master2\\app\\src\\main\\res\\drawable-hdpi\\list_footer_bg.9.png"
+ }
+]
\ No newline at end of file
diff --git a/src/Notes-master1/app/build/intermediates/navigation_json/debug/navigation.json b/src/Note-master2/app/build/intermediates/navigation_json/debug/navigation.json
similarity index 100%
rename from src/Notes-master1/app/build/intermediates/navigation_json/debug/navigation.json
rename to src/Note-master2/app/build/intermediates/navigation_json/debug/navigation.json
diff --git a/src/Notes-master1/app/build/intermediates/packaged_manifests/debug/AndroidManifest.xml b/src/Note-master2/app/build/intermediates/packaged_manifests/debug/AndroidManifest.xml
similarity index 100%
rename from src/Notes-master1/app/build/intermediates/packaged_manifests/debug/AndroidManifest.xml
rename to src/Note-master2/app/build/intermediates/packaged_manifests/debug/AndroidManifest.xml
diff --git a/src/Notes-master1/app/build/intermediates/packaged_manifests/debug/output-metadata.json b/src/Note-master2/app/build/intermediates/packaged_manifests/debug/output-metadata.json
similarity index 100%
rename from src/Notes-master1/app/build/intermediates/packaged_manifests/debug/output-metadata.json
rename to src/Note-master2/app/build/intermediates/packaged_manifests/debug/output-metadata.json
diff --git a/src/Notes-master1/app/build/intermediates/processed_res/debug/out/output-metadata.json b/src/Note-master2/app/build/intermediates/processed_res/debug/out/output-metadata.json
similarity index 100%
rename from src/Notes-master1/app/build/intermediates/processed_res/debug/out/output-metadata.json
rename to src/Note-master2/app/build/intermediates/processed_res/debug/out/output-metadata.json
diff --git a/src/Notes-master1/app/build/intermediates/processed_res/debug/out/resources-debug.ap_ b/src/Note-master2/app/build/intermediates/processed_res/debug/out/resources-debug.ap_
similarity index 100%
rename from src/Notes-master1/app/build/intermediates/processed_res/debug/out/resources-debug.ap_
rename to src/Note-master2/app/build/intermediates/processed_res/debug/out/resources-debug.ap_
diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/1aa90e4559c05b3cd437ff28c7536880547b5ed06dfb2e8770f2b3efebadc279_0.jar b/src/Note-master2/app/build/intermediates/project_dex_archive/debug/out/1aa90e4559c05b3cd437ff28c7536880547b5ed06dfb2e8770f2b3efebadc279_0.jar
similarity index 100%
rename from src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/1aa90e4559c05b3cd437ff28c7536880547b5ed06dfb2e8770f2b3efebadc279_0.jar
rename to src/Note-master2/app/build/intermediates/project_dex_archive/debug/out/1aa90e4559c05b3cd437ff28c7536880547b5ed06dfb2e8770f2b3efebadc279_0.jar
diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/1aa90e4559c05b3cd437ff28c7536880547b5ed06dfb2e8770f2b3efebadc279_1.jar b/src/Note-master2/app/build/intermediates/project_dex_archive/debug/out/1aa90e4559c05b3cd437ff28c7536880547b5ed06dfb2e8770f2b3efebadc279_1.jar
similarity index 100%
rename from src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/1aa90e4559c05b3cd437ff28c7536880547b5ed06dfb2e8770f2b3efebadc279_1.jar
rename to src/Note-master2/app/build/intermediates/project_dex_archive/debug/out/1aa90e4559c05b3cd437ff28c7536880547b5ed06dfb2e8770f2b3efebadc279_1.jar
diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/1aa90e4559c05b3cd437ff28c7536880547b5ed06dfb2e8770f2b3efebadc279_2.jar b/src/Note-master2/app/build/intermediates/project_dex_archive/debug/out/1aa90e4559c05b3cd437ff28c7536880547b5ed06dfb2e8770f2b3efebadc279_2.jar
similarity index 100%
rename from src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/1aa90e4559c05b3cd437ff28c7536880547b5ed06dfb2e8770f2b3efebadc279_2.jar
rename to src/Note-master2/app/build/intermediates/project_dex_archive/debug/out/1aa90e4559c05b3cd437ff28c7536880547b5ed06dfb2e8770f2b3efebadc279_2.jar
diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/1aa90e4559c05b3cd437ff28c7536880547b5ed06dfb2e8770f2b3efebadc279_3.jar b/src/Note-master2/app/build/intermediates/project_dex_archive/debug/out/1aa90e4559c05b3cd437ff28c7536880547b5ed06dfb2e8770f2b3efebadc279_3.jar
similarity index 100%
rename from src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/1aa90e4559c05b3cd437ff28c7536880547b5ed06dfb2e8770f2b3efebadc279_3.jar
rename to src/Note-master2/app/build/intermediates/project_dex_archive/debug/out/1aa90e4559c05b3cd437ff28c7536880547b5ed06dfb2e8770f2b3efebadc279_3.jar
diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/1aa90e4559c05b3cd437ff28c7536880547b5ed06dfb2e8770f2b3efebadc279_4.jar b/src/Note-master2/app/build/intermediates/project_dex_archive/debug/out/1aa90e4559c05b3cd437ff28c7536880547b5ed06dfb2e8770f2b3efebadc279_4.jar
similarity index 100%
rename from src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/1aa90e4559c05b3cd437ff28c7536880547b5ed06dfb2e8770f2b3efebadc279_4.jar
rename to src/Note-master2/app/build/intermediates/project_dex_archive/debug/out/1aa90e4559c05b3cd437ff28c7536880547b5ed06dfb2e8770f2b3efebadc279_4.jar
diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/1aa90e4559c05b3cd437ff28c7536880547b5ed06dfb2e8770f2b3efebadc279_5.jar b/src/Note-master2/app/build/intermediates/project_dex_archive/debug/out/1aa90e4559c05b3cd437ff28c7536880547b5ed06dfb2e8770f2b3efebadc279_5.jar
similarity index 100%
rename from src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/1aa90e4559c05b3cd437ff28c7536880547b5ed06dfb2e8770f2b3efebadc279_5.jar
rename to src/Note-master2/app/build/intermediates/project_dex_archive/debug/out/1aa90e4559c05b3cd437ff28c7536880547b5ed06dfb2e8770f2b3efebadc279_5.jar
diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/BuildConfig.dex b/src/Note-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/BuildConfig.dex
similarity index 100%
rename from src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/BuildConfig.dex
rename to src/Note-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/BuildConfig.dex
diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Contact.dex b/src/Note-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Contact.dex
similarity index 100%
rename from src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Contact.dex
rename to src/Note-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Contact.dex
diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$CallNote.dex b/src/Note-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$CallNote.dex
similarity index 100%
rename from src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$CallNote.dex
rename to src/Note-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$CallNote.dex
diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$DataColumns.dex b/src/Note-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$DataColumns.dex
similarity index 100%
rename from src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$DataColumns.dex
rename to src/Note-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$DataColumns.dex
diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$DataConstants.dex b/src/Note-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$DataConstants.dex
similarity index 100%
rename from src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$DataConstants.dex
rename to src/Note-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$DataConstants.dex
diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$NoteColumns.dex b/src/Note-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$NoteColumns.dex
similarity index 100%
rename from src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$NoteColumns.dex
rename to src/Note-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$NoteColumns.dex
diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$TextNote.dex b/src/Note-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$TextNote.dex
similarity index 100%
rename from src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$TextNote.dex
rename to src/Note-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$TextNote.dex
diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes.dex b/src/Note-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes.dex
similarity index 100%
rename from src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes.dex
rename to src/Note-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes.dex
diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/NotesDatabaseHelper$TABLE.dex b/src/Note-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/NotesDatabaseHelper$TABLE.dex
similarity index 100%
rename from src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/NotesDatabaseHelper$TABLE.dex
rename to src/Note-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/NotesDatabaseHelper$TABLE.dex
diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/NotesDatabaseHelper.dex b/src/Note-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/NotesDatabaseHelper.dex
similarity index 100%
rename from src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/NotesDatabaseHelper.dex
rename to src/Note-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/NotesDatabaseHelper.dex
diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/NotesProvider.dex b/src/Note-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/NotesProvider.dex
similarity index 100%
rename from src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/NotesProvider.dex
rename to src/Note-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/NotesProvider.dex
diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/MetaData.dex b/src/Note-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/MetaData.dex
similarity index 100%
rename from src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/MetaData.dex
rename to src/Note-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/MetaData.dex
diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/Node.dex b/src/Note-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/Node.dex
similarity index 100%
rename from src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/Node.dex
rename to src/Note-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/Node.dex
diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/SqlData.dex b/src/Note-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/SqlData.dex
similarity index 100%
rename from src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/SqlData.dex
rename to src/Note-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/SqlData.dex
diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/SqlNote.dex b/src/Note-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/SqlNote.dex
similarity index 100%
rename from src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/SqlNote.dex
rename to src/Note-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/SqlNote.dex
diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/Task.dex b/src/Note-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/Task.dex
similarity index 100%
rename from src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/Task.dex
rename to src/Note-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/Task.dex
diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/TaskList.dex b/src/Note-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/TaskList.dex
similarity index 100%
rename from src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/TaskList.dex
rename to src/Note-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/TaskList.dex
diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/exception/ActionFailureException.dex b/src/Note-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/exception/ActionFailureException.dex
similarity index 100%
rename from src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/exception/ActionFailureException.dex
rename to src/Note-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/exception/ActionFailureException.dex
diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/exception/NetworkFailureException.dex b/src/Note-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/exception/NetworkFailureException.dex
similarity index 100%
rename from src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/exception/NetworkFailureException.dex
rename to src/Note-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/exception/NetworkFailureException.dex
diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskASyncTask$1.dex b/src/Note-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskASyncTask$1.dex
similarity index 100%
rename from src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskASyncTask$1.dex
rename to src/Note-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskASyncTask$1.dex
diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskASyncTask$OnCompleteListener.dex b/src/Note-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskASyncTask$OnCompleteListener.dex
similarity index 100%
rename from src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskASyncTask$OnCompleteListener.dex
rename to src/Note-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskASyncTask$OnCompleteListener.dex
diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskASyncTask.dex b/src/Note-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskASyncTask.dex
similarity index 100%
rename from src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskASyncTask.dex
rename to src/Note-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskASyncTask.dex
diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskClient.dex b/src/Note-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskClient.dex
similarity index 100%
rename from src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskClient.dex
rename to src/Note-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskClient.dex
diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskManager.dex b/src/Note-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskManager.dex
similarity index 100%
rename from src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskManager.dex
rename to src/Note-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskManager.dex
diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskSyncService$1.dex b/src/Note-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskSyncService$1.dex
similarity index 100%
rename from src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskSyncService$1.dex
rename to src/Note-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskSyncService$1.dex
diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskSyncService.dex b/src/Note-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskSyncService.dex
similarity index 100%
rename from src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskSyncService.dex
rename to src/Note-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskSyncService.dex
diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/Note$NoteData.dex b/src/Note-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/Note$NoteData.dex
similarity index 100%
rename from src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/Note$NoteData.dex
rename to src/Note-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/Note$NoteData.dex
diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/Note.dex b/src/Note-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/Note.dex
similarity index 100%
rename from src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/Note.dex
rename to src/Note-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/Note.dex
diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/WorkingNote$NoteSettingChangedListener.dex b/src/Note-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/WorkingNote$NoteSettingChangedListener.dex
similarity index 100%
rename from src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/WorkingNote$NoteSettingChangedListener.dex
rename to src/Note-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/WorkingNote$NoteSettingChangedListener.dex
diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/WorkingNote.dex b/src/Note-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/WorkingNote.dex
similarity index 100%
rename from src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/WorkingNote.dex
rename to src/Note-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/WorkingNote.dex
diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/BackupUtils$TextExport.dex b/src/Note-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/BackupUtils$TextExport.dex
similarity index 100%
rename from src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/BackupUtils$TextExport.dex
rename to src/Note-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/BackupUtils$TextExport.dex
diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/BackupUtils.dex b/src/Note-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/BackupUtils.dex
similarity index 100%
rename from src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/BackupUtils.dex
rename to src/Note-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/BackupUtils.dex
diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/DataUtils.dex b/src/Note-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/DataUtils.dex
similarity index 100%
rename from src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/DataUtils.dex
rename to src/Note-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/DataUtils.dex
diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/GTaskStringUtils.dex b/src/Note-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/GTaskStringUtils.dex
similarity index 100%
rename from src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/GTaskStringUtils.dex
rename to src/Note-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/GTaskStringUtils.dex
diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser$NoteBgResources.dex b/src/Note-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser$NoteBgResources.dex
similarity index 100%
rename from src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser$NoteBgResources.dex
rename to src/Note-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser$NoteBgResources.dex
diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser$NoteItemBgResources.dex b/src/Note-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser$NoteItemBgResources.dex
similarity index 100%
rename from src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser$NoteItemBgResources.dex
rename to src/Note-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser$NoteItemBgResources.dex
diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser$TextAppearanceResources.dex b/src/Note-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser$TextAppearanceResources.dex
similarity index 100%
rename from src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser$TextAppearanceResources.dex
rename to src/Note-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser$TextAppearanceResources.dex
diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser$WidgetBgResources.dex b/src/Note-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser$WidgetBgResources.dex
similarity index 100%
rename from src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser$WidgetBgResources.dex
rename to src/Note-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser$WidgetBgResources.dex
diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser.dex b/src/Note-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser.dex
similarity index 100%
rename from src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser.dex
rename to src/Note-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser.dex
diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/AlarmAlertActivity.dex b/src/Note-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/AlarmAlertActivity.dex
similarity index 100%
rename from src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/AlarmAlertActivity.dex
rename to src/Note-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/AlarmAlertActivity.dex
diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/AlarmInitReceiver.dex b/src/Note-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/AlarmInitReceiver.dex
similarity index 100%
rename from src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/AlarmInitReceiver.dex
rename to src/Note-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/AlarmInitReceiver.dex
diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/AlarmReceiver.dex b/src/Note-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/AlarmReceiver.dex
similarity index 100%
rename from src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/AlarmReceiver.dex
rename to src/Note-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/AlarmReceiver.dex
diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$1.dex b/src/Note-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$1.dex
similarity index 100%
rename from src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$1.dex
rename to src/Note-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$1.dex
diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$2.dex b/src/Note-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$2.dex
similarity index 100%
rename from src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$2.dex
rename to src/Note-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$2.dex
diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$3.dex b/src/Note-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$3.dex
similarity index 100%
rename from src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$3.dex
rename to src/Note-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$3.dex
diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$4.dex b/src/Note-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$4.dex
similarity index 100%
rename from src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$4.dex
rename to src/Note-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$4.dex
diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$OnDateTimeChangedListener.dex b/src/Note-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$OnDateTimeChangedListener.dex
similarity index 100%
rename from src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$OnDateTimeChangedListener.dex
rename to src/Note-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$OnDateTimeChangedListener.dex
diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker.dex b/src/Note-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker.dex
similarity index 100%
rename from src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker.dex
rename to src/Note-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker.dex
diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePickerDialog$1.dex b/src/Note-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePickerDialog$1.dex
similarity index 100%
rename from src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePickerDialog$1.dex
rename to src/Note-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePickerDialog$1.dex
diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePickerDialog$OnDateTimeSetListener.dex b/src/Note-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePickerDialog$OnDateTimeSetListener.dex
similarity index 100%
rename from src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePickerDialog$OnDateTimeSetListener.dex
rename to src/Note-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePickerDialog$OnDateTimeSetListener.dex
diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePickerDialog.dex b/src/Note-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePickerDialog.dex
similarity index 100%
rename from src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePickerDialog.dex
rename to src/Note-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePickerDialog.dex
diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DropdownMenu$1.dex b/src/Note-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DropdownMenu$1.dex
similarity index 100%
rename from src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DropdownMenu$1.dex
rename to src/Note-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DropdownMenu$1.dex
diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DropdownMenu.dex b/src/Note-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DropdownMenu.dex
similarity index 100%
rename from src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DropdownMenu.dex
rename to src/Note-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DropdownMenu.dex
diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/FoldersListAdapter$FolderListItem.dex b/src/Note-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/FoldersListAdapter$FolderListItem.dex
similarity index 100%
rename from src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/FoldersListAdapter$FolderListItem.dex
rename to src/Note-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/FoldersListAdapter$FolderListItem.dex
diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/FoldersListAdapter.dex b/src/Note-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/FoldersListAdapter.dex
similarity index 100%
rename from src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/FoldersListAdapter.dex
rename to src/Note-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/FoldersListAdapter.dex
diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$1.dex b/src/Note-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$1.dex
similarity index 100%
rename from src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$1.dex
rename to src/Note-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$1.dex
diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$2.dex b/src/Note-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$2.dex
similarity index 100%
rename from src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$2.dex
rename to src/Note-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$2.dex
diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$3.dex b/src/Note-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$3.dex
similarity index 100%
rename from src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$3.dex
rename to src/Note-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$3.dex
diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$HeadViewHolder.dex b/src/Note-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$HeadViewHolder.dex
similarity index 100%
rename from src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$HeadViewHolder.dex
rename to src/Note-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$HeadViewHolder.dex
diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity.dex b/src/Note-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity.dex
similarity index 100%
rename from src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity.dex
rename to src/Note-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity.dex
diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditText$1.dex b/src/Note-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditText$1.dex
similarity index 100%
rename from src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditText$1.dex
rename to src/Note-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditText$1.dex
diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditText$OnTextViewChangeListener.dex b/src/Note-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditText$OnTextViewChangeListener.dex
similarity index 100%
rename from src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditText$OnTextViewChangeListener.dex
rename to src/Note-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditText$OnTextViewChangeListener.dex
diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditText.dex b/src/Note-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditText.dex
similarity index 100%
rename from src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditText.dex
rename to src/Note-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditText.dex
diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteItemData.dex b/src/Note-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteItemData.dex
similarity index 100%
rename from src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteItemData.dex
rename to src/Note-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteItemData.dex
diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$1.dex b/src/Note-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$1.dex
similarity index 100%
rename from src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$1.dex
rename to src/Note-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$1.dex
diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$2.dex b/src/Note-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$2.dex
similarity index 100%
rename from src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$2.dex
rename to src/Note-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$2.dex
diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$3.dex b/src/Note-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$3.dex
similarity index 100%
rename from src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$3.dex
rename to src/Note-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$3.dex
diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$4.dex b/src/Note-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$4.dex
similarity index 100%
rename from src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$4.dex
rename to src/Note-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$4.dex
diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$5.dex b/src/Note-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$5.dex
similarity index 100%
rename from src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$5.dex
rename to src/Note-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$5.dex
diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$6.dex b/src/Note-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$6.dex
similarity index 100%
rename from src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$6.dex
rename to src/Note-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$6.dex
diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$7.dex b/src/Note-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$7.dex
similarity index 100%
rename from src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$7.dex
rename to src/Note-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$7.dex
diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$8.dex b/src/Note-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$8.dex
similarity index 100%
rename from src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$8.dex
rename to src/Note-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$8.dex
diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$9.dex b/src/Note-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$9.dex
similarity index 100%
rename from src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$9.dex
rename to src/Note-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$9.dex
diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$BackgroundQueryHandler.dex b/src/Note-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$BackgroundQueryHandler.dex
similarity index 100%
rename from src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$BackgroundQueryHandler.dex
rename to src/Note-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$BackgroundQueryHandler.dex
diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ListEditState.dex b/src/Note-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ListEditState.dex
similarity index 100%
rename from src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ListEditState.dex
rename to src/Note-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ListEditState.dex
diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback$1.dex b/src/Note-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback$1.dex
similarity index 100%
rename from src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback$1.dex
rename to src/Note-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback$1.dex
diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback$2.dex b/src/Note-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback$2.dex
similarity index 100%
rename from src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback$2.dex
rename to src/Note-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback$2.dex
diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback.dex b/src/Note-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback.dex
similarity index 100%
rename from src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback.dex
rename to src/Note-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback.dex
diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$NewNoteOnTouchListener.dex b/src/Note-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$NewNoteOnTouchListener.dex
similarity index 100%
rename from src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$NewNoteOnTouchListener.dex
rename to src/Note-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$NewNoteOnTouchListener.dex
diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.dex b/src/Note-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.dex
similarity index 100%
rename from src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.dex
rename to src/Note-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.dex
diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity.dex b/src/Note-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity.dex
similarity index 100%
rename from src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity.dex
rename to src/Note-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity.dex
diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListAdapter$AppWidgetAttribute.dex b/src/Note-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListAdapter$AppWidgetAttribute.dex
similarity index 100%
rename from src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListAdapter$AppWidgetAttribute.dex
rename to src/Note-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListAdapter$AppWidgetAttribute.dex
diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListAdapter.dex b/src/Note-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListAdapter.dex
similarity index 100%
rename from src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListAdapter.dex
rename to src/Note-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListAdapter.dex
diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListItem.dex b/src/Note-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListItem.dex
similarity index 100%
rename from src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListItem.dex
rename to src/Note-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListItem.dex
diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$1.dex b/src/Note-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$1.dex
similarity index 100%
rename from src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$1.dex
rename to src/Note-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$1.dex
diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$2.dex b/src/Note-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$2.dex
similarity index 100%
rename from src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$2.dex
rename to src/Note-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$2.dex
diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$3.dex b/src/Note-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$3.dex
similarity index 100%
rename from src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$3.dex
rename to src/Note-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$3.dex
diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$4.dex b/src/Note-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$4.dex
similarity index 100%
rename from src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$4.dex
rename to src/Note-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$4.dex
diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$5.dex b/src/Note-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$5.dex
similarity index 100%
rename from src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$5.dex
rename to src/Note-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$5.dex
diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$6.dex b/src/Note-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$6.dex
similarity index 100%
rename from src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$6.dex
rename to src/Note-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$6.dex
diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$7.dex b/src/Note-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$7.dex
similarity index 100%
rename from src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$7.dex
rename to src/Note-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$7.dex
diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$8.dex b/src/Note-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$8.dex
similarity index 100%
rename from src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$8.dex
rename to src/Note-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$8.dex
diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$GTaskReceiver.dex b/src/Note-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$GTaskReceiver.dex
similarity index 100%
rename from src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$GTaskReceiver.dex
rename to src/Note-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$GTaskReceiver.dex
diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity.dex b/src/Note-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity.dex
similarity index 100%
rename from src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity.dex
rename to src/Note-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity.dex
diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/widget/NoteWidgetProvider.dex b/src/Note-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/widget/NoteWidgetProvider.dex
similarity index 100%
rename from src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/widget/NoteWidgetProvider.dex
rename to src/Note-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/widget/NoteWidgetProvider.dex
diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/widget/NoteWidgetProvider_2x.dex b/src/Note-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/widget/NoteWidgetProvider_2x.dex
similarity index 100%
rename from src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/widget/NoteWidgetProvider_2x.dex
rename to src/Note-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/widget/NoteWidgetProvider_2x.dex
diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/widget/NoteWidgetProvider_4x.dex b/src/Note-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/widget/NoteWidgetProvider_4x.dex
similarity index 100%
rename from src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/widget/NoteWidgetProvider_4x.dex
rename to src/Note-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/widget/NoteWidgetProvider_4x.dex
diff --git a/src/Notes-master1/app/build/intermediates/runtime_symbol_list/debug/R.txt b/src/Note-master2/app/build/intermediates/runtime_symbol_list/debug/R.txt
similarity index 100%
rename from src/Notes-master1/app/build/intermediates/runtime_symbol_list/debug/R.txt
rename to src/Note-master2/app/build/intermediates/runtime_symbol_list/debug/R.txt
diff --git a/src/Notes-master1/app/build/intermediates/signing_config_versions/debug/signing-config-versions.json b/src/Note-master2/app/build/intermediates/signing_config_versions/debug/signing-config-versions.json
similarity index 100%
rename from src/Notes-master1/app/build/intermediates/signing_config_versions/debug/signing-config-versions.json
rename to src/Note-master2/app/build/intermediates/signing_config_versions/debug/signing-config-versions.json
diff --git a/src/Notes-master1/app/build/intermediates/stable_resource_ids_file/debug/stableIds.txt b/src/Note-master2/app/build/intermediates/stable_resource_ids_file/debug/stableIds.txt
similarity index 100%
rename from src/Notes-master1/app/build/intermediates/stable_resource_ids_file/debug/stableIds.txt
rename to src/Note-master2/app/build/intermediates/stable_resource_ids_file/debug/stableIds.txt
diff --git a/src/Notes-master1/app/build/intermediates/symbol_list_with_package_name/debug/package-aware-r.txt b/src/Note-master2/app/build/intermediates/symbol_list_with_package_name/debug/package-aware-r.txt
similarity index 100%
rename from src/Notes-master1/app/build/intermediates/symbol_list_with_package_name/debug/package-aware-r.txt
rename to src/Note-master2/app/build/intermediates/symbol_list_with_package_name/debug/package-aware-r.txt
diff --git a/src/Notes-master1/app/build/outputs/apk/debug/app-debug.apk b/src/Note-master2/app/build/outputs/apk/debug/app-debug.apk
similarity index 98%
rename from src/Notes-master1/app/build/outputs/apk/debug/app-debug.apk
rename to src/Note-master2/app/build/outputs/apk/debug/app-debug.apk
index 5c981e7..ea1c55a 100644
Binary files a/src/Notes-master1/app/build/outputs/apk/debug/app-debug.apk and b/src/Note-master2/app/build/outputs/apk/debug/app-debug.apk differ
diff --git a/src/Notes-master1/app/build/outputs/apk/debug/output-metadata.json b/src/Note-master2/app/build/outputs/apk/debug/output-metadata.json
similarity index 100%
rename from src/Notes-master1/app/build/outputs/apk/debug/output-metadata.json
rename to src/Note-master2/app/build/outputs/apk/debug/output-metadata.json
diff --git a/src/Notes-master1/app/build/outputs/logs/manifest-merger-debug-report.txt b/src/Note-master2/app/build/outputs/logs/manifest-merger-debug-report.txt
similarity index 68%
rename from src/Notes-master1/app/build/outputs/logs/manifest-merger-debug-report.txt
rename to src/Note-master2/app/build/outputs/logs/manifest-merger-debug-report.txt
index b62d54f..03f5a74 100644
--- a/src/Notes-master1/app/build/outputs/logs/manifest-merger-debug-report.txt
+++ b/src/Note-master2/app/build/outputs/logs/manifest-merger-debug-report.txt
@@ -1,9 +1,9 @@
-- Merging decision tree log ---
manifest
-ADDED from D:\Notes-master1\app\src\main\AndroidManifest.xml:18:1-150:12
-INJECTED from D:\Notes-master1\app\src\main\AndroidManifest.xml:18:1-150:12
-INJECTED from D:\Notes-master1\app\src\main\AndroidManifest.xml:18:1-150:12
-INJECTED from D:\Notes-master1\app\src\main\AndroidManifest.xml:18:1-150:12
+ADDED from D:\Note-master2\app\src\main\AndroidManifest.xml:18:1-150:12
+INJECTED from D:\Note-master2\app\src\main\AndroidManifest.xml:18:1-150:12
+INJECTED from D:\Note-master2\app\src\main\AndroidManifest.xml:18:1-150:12
+INJECTED from D:\Note-master2\app\src\main\AndroidManifest.xml:18:1-150:12
MERGED from [com.android.support:appcompat-v7:28.0.0] C:\Users\86155\.gradle\caches\transforms-3\4051cc509ba70441b9465808cc62a56d\transformed\appcompat-v7-28.0.0\AndroidManifest.xml:17:1-22:12
MERGED from [com.android.support:support-fragment:28.0.0] C:\Users\86155\.gradle\caches\transforms-3\0df3a8e08a9cacc34b65b716d2606122\transformed\support-fragment-28.0.0\AndroidManifest.xml:17:1-22:12
MERGED from [com.android.support:animated-vector-drawable:28.0.0] C:\Users\86155\.gradle\caches\transforms-3\e41dc6607fb252012e02a766dc165f4f\transformed\animated-vector-drawable-28.0.0\AndroidManifest.xml:17:1-22:12
@@ -30,27 +30,27 @@ MERGED from [android.arch.lifecycle:livedata:1.1.1] C:\Users\86155\.gradle\cache
MERGED from [android.arch.lifecycle:livedata-core:1.1.1] C:\Users\86155\.gradle\caches\transforms-3\2355ac8fc75e59c81a1adeb01cc2d637\transformed\livedata-core-1.1.1\AndroidManifest.xml:17:1-22:12
MERGED from [android.arch.core:runtime:1.1.1] C:\Users\86155\.gradle\caches\transforms-3\304314cebb879c508994d262f5fe8333\transformed\runtime-1.1.1\AndroidManifest.xml:17:1-22:12
MERGED from [com.android.support:interpolator:28.0.0] C:\Users\86155\.gradle\caches\transforms-3\c04cfeafc2f0d658b047d32a7b15a579\transformed\interpolator-28.0.0\AndroidManifest.xml:17:1-22:12
-INJECTED from D:\Notes-master1\app\src\main\AndroidManifest.xml:18:1-150:12
-INJECTED from D:\Notes-master1\app\src\main\AndroidManifest.xml:18:1-150:12
-INJECTED from D:\Notes-master1\app\src\main\AndroidManifest.xml:18:1-150:12
+INJECTED from D:\Note-master2\app\src\main\AndroidManifest.xml:18:1-150:12
+INJECTED from D:\Note-master2\app\src\main\AndroidManifest.xml:18:1-150:12
+INJECTED from D:\Note-master2\app\src\main\AndroidManifest.xml:18:1-150:12
package
- ADDED from D:\Notes-master1\app\src\main\AndroidManifest.xml:19:5-31
- INJECTED from D:\Notes-master1\app\src\main\AndroidManifest.xml
- INJECTED from D:\Notes-master1\app\src\main\AndroidManifest.xml
+ ADDED from D:\Note-master2\app\src\main\AndroidManifest.xml:19:5-31
+ INJECTED from D:\Note-master2\app\src\main\AndroidManifest.xml
+ INJECTED from D:\Note-master2\app\src\main\AndroidManifest.xml
android:versionName
- ADDED from D:\Notes-master1\app\src\main\AndroidManifest.xml:21:5-30
- INJECTED from D:\Notes-master1\app\src\main\AndroidManifest.xml
- INJECTED from D:\Notes-master1\app\src\main\AndroidManifest.xml
+ ADDED from D:\Note-master2\app\src\main\AndroidManifest.xml:21:5-30
+ INJECTED from D:\Note-master2\app\src\main\AndroidManifest.xml
+ INJECTED from D:\Note-master2\app\src\main\AndroidManifest.xml
xmlns:android
- ADDED from D:\Notes-master1\app\src\main\AndroidManifest.xml:18:11-69
+ ADDED from D:\Note-master2\app\src\main\AndroidManifest.xml:18:11-69
android:versionCode
- ADDED from D:\Notes-master1\app\src\main\AndroidManifest.xml:20:5-28
- INJECTED from D:\Notes-master1\app\src\main\AndroidManifest.xml
- INJECTED from D:\Notes-master1\app\src\main\AndroidManifest.xml
+ ADDED from D:\Note-master2\app\src\main\AndroidManifest.xml:20:5-28
+ INJECTED from D:\Note-master2\app\src\main\AndroidManifest.xml
+ INJECTED from D:\Note-master2\app\src\main\AndroidManifest.xml
uses-sdk
-ADDED from D:\Notes-master1\app\src\main\AndroidManifest.xml:23:5-44
-INJECTED from D:\Notes-master1\app\src\main\AndroidManifest.xml:23:5-44
-INJECTED from D:\Notes-master1\app\src\main\AndroidManifest.xml:23:5-44
+ADDED from D:\Note-master2\app\src\main\AndroidManifest.xml:23:5-44
+INJECTED from D:\Note-master2\app\src\main\AndroidManifest.xml:23:5-44
+INJECTED from D:\Note-master2\app\src\main\AndroidManifest.xml:23:5-44
MERGED from [com.android.support:appcompat-v7:28.0.0] C:\Users\86155\.gradle\caches\transforms-3\4051cc509ba70441b9465808cc62a56d\transformed\appcompat-v7-28.0.0\AndroidManifest.xml:20:5-44
MERGED from [com.android.support:appcompat-v7:28.0.0] C:\Users\86155\.gradle\caches\transforms-3\4051cc509ba70441b9465808cc62a56d\transformed\appcompat-v7-28.0.0\AndroidManifest.xml:20:5-44
MERGED from [com.android.support:support-fragment:28.0.0] C:\Users\86155\.gradle\caches\transforms-3\0df3a8e08a9cacc34b65b716d2606122\transformed\support-fragment-28.0.0\AndroidManifest.xml:20:5-44
@@ -103,54 +103,54 @@ MERGED from [android.arch.core:runtime:1.1.1] C:\Users\86155\.gradle\caches\tran
MERGED from [android.arch.core:runtime:1.1.1] C:\Users\86155\.gradle\caches\transforms-3\304314cebb879c508994d262f5fe8333\transformed\runtime-1.1.1\AndroidManifest.xml:20:5-44
MERGED from [com.android.support:interpolator:28.0.0] C:\Users\86155\.gradle\caches\transforms-3\c04cfeafc2f0d658b047d32a7b15a579\transformed\interpolator-28.0.0\AndroidManifest.xml:20:5-44
MERGED from [com.android.support:interpolator:28.0.0] C:\Users\86155\.gradle\caches\transforms-3\c04cfeafc2f0d658b047d32a7b15a579\transformed\interpolator-28.0.0\AndroidManifest.xml:20:5-44
-INJECTED from D:\Notes-master1\app\src\main\AndroidManifest.xml:23:5-44
-INJECTED from D:\Notes-master1\app\src\main\AndroidManifest.xml:23:5-44
+INJECTED from D:\Note-master2\app\src\main\AndroidManifest.xml:23:5-44
+INJECTED from D:\Note-master2\app\src\main\AndroidManifest.xml:23:5-44
android:targetSdkVersion
- INJECTED from D:\Notes-master1\app\src\main\AndroidManifest.xml
- ADDED from D:\Notes-master1\app\src\main\AndroidManifest.xml:23:5-44
- INJECTED from D:\Notes-master1\app\src\main\AndroidManifest.xml
+ INJECTED from D:\Note-master2\app\src\main\AndroidManifest.xml
+ ADDED from D:\Note-master2\app\src\main\AndroidManifest.xml:23:5-44
+ INJECTED from D:\Note-master2\app\src\main\AndroidManifest.xml
android:minSdkVersion
- ADDED from D:\Notes-master1\app\src\main\AndroidManifest.xml:23:15-41
- INJECTED from D:\Notes-master1\app\src\main\AndroidManifest.xml
- INJECTED from D:\Notes-master1\app\src\main\AndroidManifest.xml
+ ADDED from D:\Note-master2\app\src\main\AndroidManifest.xml:23:15-41
+ INJECTED from D:\Note-master2\app\src\main\AndroidManifest.xml
+ INJECTED from D:\Note-master2\app\src\main\AndroidManifest.xml
uses-permission#android.permission.WRITE_EXTERNAL_STORAGE
-ADDED from D:\Notes-master1\app\src\main\AndroidManifest.xml:25:5-81
+ADDED from D:\Note-master2\app\src\main\AndroidManifest.xml:25:5-81
android:name
- ADDED from D:\Notes-master1\app\src\main\AndroidManifest.xml:25:22-78
+ ADDED from D:\Note-master2\app\src\main\AndroidManifest.xml:25:22-78
uses-permission#com.android.launcher.permission.INSTALL_SHORTCUT
-ADDED from D:\Notes-master1\app\src\main\AndroidManifest.xml:26:5-88
+ADDED from D:\Note-master2\app\src\main\AndroidManifest.xml:26:5-88
android:name
- ADDED from D:\Notes-master1\app\src\main\AndroidManifest.xml:26:22-85
+ ADDED from D:\Note-master2\app\src\main\AndroidManifest.xml:26:22-85
uses-permission#android.permission.INTERNET
-ADDED from D:\Notes-master1\app\src\main\AndroidManifest.xml:27:5-67
+ADDED from D:\Note-master2\app\src\main\AndroidManifest.xml:27:5-67
android:name
- ADDED from D:\Notes-master1\app\src\main\AndroidManifest.xml:27:22-64
+ ADDED from D:\Note-master2\app\src\main\AndroidManifest.xml:27:22-64
uses-permission#android.permission.READ_CONTACTS
-ADDED from D:\Notes-master1\app\src\main\AndroidManifest.xml:28:5-72
+ADDED from D:\Note-master2\app\src\main\AndroidManifest.xml:28:5-72
android:name
- ADDED from D:\Notes-master1\app\src\main\AndroidManifest.xml:28:22-69
+ ADDED from D:\Note-master2\app\src\main\AndroidManifest.xml:28:22-69
uses-permission#android.permission.MANAGE_ACCOUNTS
-ADDED from D:\Notes-master1\app\src\main\AndroidManifest.xml:29:5-74
+ADDED from D:\Note-master2\app\src\main\AndroidManifest.xml:29:5-74
android:name
- ADDED from D:\Notes-master1\app\src\main\AndroidManifest.xml:29:22-71
+ ADDED from D:\Note-master2\app\src\main\AndroidManifest.xml:29:22-71
uses-permission#android.permission.AUTHENTICATE_ACCOUNTS
-ADDED from D:\Notes-master1\app\src\main\AndroidManifest.xml:30:5-80
+ADDED from D:\Note-master2\app\src\main\AndroidManifest.xml:30:5-80
android:name
- ADDED from D:\Notes-master1\app\src\main\AndroidManifest.xml:30:22-77
+ ADDED from D:\Note-master2\app\src\main\AndroidManifest.xml:30:22-77
uses-permission#android.permission.GET_ACCOUNTS
-ADDED from D:\Notes-master1\app\src\main\AndroidManifest.xml:31:5-71
+ADDED from D:\Note-master2\app\src\main\AndroidManifest.xml:31:5-71
android:name
- ADDED from D:\Notes-master1\app\src\main\AndroidManifest.xml:31:22-68
+ ADDED from D:\Note-master2\app\src\main\AndroidManifest.xml:31:22-68
uses-permission#android.permission.USE_CREDENTIALS
-ADDED from D:\Notes-master1\app\src\main\AndroidManifest.xml:32:5-74
+ADDED from D:\Note-master2\app\src\main\AndroidManifest.xml:32:5-74
android:name
- ADDED from D:\Notes-master1\app\src\main\AndroidManifest.xml:32:22-71
+ ADDED from D:\Note-master2\app\src\main\AndroidManifest.xml:32:22-71
uses-permission#android.permission.RECEIVE_BOOT_COMPLETED
-ADDED from D:\Notes-master1\app\src\main\AndroidManifest.xml:33:5-81
+ADDED from D:\Note-master2\app\src\main\AndroidManifest.xml:33:5-81
android:name
- ADDED from D:\Notes-master1\app\src\main\AndroidManifest.xml:33:22-78
+ ADDED from D:\Note-master2\app\src\main\AndroidManifest.xml:33:22-78
application
-ADDED from D:\Notes-master1\app\src\main\AndroidManifest.xml:35:5-149:19
+ADDED from D:\Note-master2\app\src\main\AndroidManifest.xml:35:5-149:19
MERGED from [com.android.support:support-compat:28.0.0] C:\Users\86155\.gradle\caches\transforms-3\c9913736ba0af3f26ba50dd9aa679a2b\transformed\support-compat-28.0.0\AndroidManifest.xml:22:5-94
MERGED from [com.android.support:support-compat:28.0.0] C:\Users\86155\.gradle\caches\transforms-3\c9913736ba0af3f26ba50dd9aa679a2b\transformed\support-compat-28.0.0\AndroidManifest.xml:22:5-94
MERGED from [com.android.support:versionedparcelable:28.0.0] C:\Users\86155\.gradle\caches\transforms-3\1d9d83c4df60b4fd44020c9b79cc55b2\transformed\versionedparcelable-28.0.0\AndroidManifest.xml:22:5-23:19
@@ -158,162 +158,162 @@ MERGED from [com.android.support:versionedparcelable:28.0.0] C:\Users\86155\.gra
android:appComponentFactory
ADDED from [com.android.support:support-compat:28.0.0] C:\Users\86155\.gradle\caches\transforms-3\c9913736ba0af3f26ba50dd9aa679a2b\transformed\support-compat-28.0.0\AndroidManifest.xml:22:18-91
android:label
- ADDED from D:\Notes-master1\app\src\main\AndroidManifest.xml:37:9-41
+ ADDED from D:\Note-master2\app\src\main\AndroidManifest.xml:37:9-41
android:icon
- ADDED from D:\Notes-master1\app\src\main\AndroidManifest.xml:36:9-42
+ ADDED from D:\Note-master2\app\src\main\AndroidManifest.xml:36:9-42
activity#net.micode.notes.ui.NotesListActivity
-ADDED from D:\Notes-master1\app\src\main\AndroidManifest.xml:38:9-51:20
+ADDED from D:\Note-master2\app\src\main\AndroidManifest.xml:38:9-51:20
android:label
- ADDED from D:\Notes-master1\app\src\main\AndroidManifest.xml:41:13-45
+ ADDED from D:\Note-master2\app\src\main\AndroidManifest.xml:41:13-45
android:launchMode
- ADDED from D:\Notes-master1\app\src\main\AndroidManifest.xml:42:13-43
+ ADDED from D:\Note-master2\app\src\main\AndroidManifest.xml:42:13-43
android:windowSoftInputMode
- ADDED from D:\Notes-master1\app\src\main\AndroidManifest.xml:45:13-52
+ ADDED from D:\Note-master2\app\src\main\AndroidManifest.xml:45:13-52
android:uiOptions
- ADDED from D:\Notes-master1\app\src\main\AndroidManifest.xml:44:13-57
+ ADDED from D:\Note-master2\app\src\main\AndroidManifest.xml:44:13-57
android:configChanges
- ADDED from D:\Notes-master1\app\src\main\AndroidManifest.xml:40:13-74
+ ADDED from D:\Note-master2\app\src\main\AndroidManifest.xml:40:13-74
android:theme
- ADDED from D:\Notes-master1\app\src\main\AndroidManifest.xml:43:13-45
+ ADDED from D:\Note-master2\app\src\main\AndroidManifest.xml:43:13-45
android:name
- ADDED from D:\Notes-master1\app\src\main\AndroidManifest.xml:39:13-49
+ ADDED from D:\Note-master2\app\src\main\AndroidManifest.xml:39:13-49
intent-filter#action:name:android.intent.action.MAIN+category:name:android.intent.category.LAUNCHER
-ADDED from D:\Notes-master1\app\src\main\AndroidManifest.xml:47:13-50:29
+ADDED from D:\Note-master2\app\src\main\AndroidManifest.xml:47:13-50:29
action#android.intent.action.MAIN
-ADDED from D:\Notes-master1\app\src\main\AndroidManifest.xml:48:17-69
+ADDED from D:\Note-master2\app\src\main\AndroidManifest.xml:48:17-69
android:name
- ADDED from D:\Notes-master1\app\src\main\AndroidManifest.xml:48:25-66
+ ADDED from D:\Note-master2\app\src\main\AndroidManifest.xml:48:25-66
category#android.intent.category.LAUNCHER
-ADDED from D:\Notes-master1\app\src\main\AndroidManifest.xml:49:17-77
+ADDED from D:\Note-master2\app\src\main\AndroidManifest.xml:49:17-77
android:name
- ADDED from D:\Notes-master1\app\src\main\AndroidManifest.xml:49:27-74
+ ADDED from D:\Note-master2\app\src\main\AndroidManifest.xml:49:27-74
activity#net.micode.notes.ui.NoteEditActivity
-ADDED from D:\Notes-master1\app\src\main\AndroidManifest.xml:53:9-81:20
+ADDED from D:\Note-master2\app\src\main\AndroidManifest.xml:53:9-81:20
android:launchMode
- ADDED from D:\Notes-master1\app\src\main\AndroidManifest.xml:56:13-43
+ ADDED from D:\Note-master2\app\src\main\AndroidManifest.xml:56:13-43
android:configChanges
- ADDED from D:\Notes-master1\app\src\main\AndroidManifest.xml:55:13-74
+ ADDED from D:\Note-master2\app\src\main\AndroidManifest.xml:55:13-74
android:theme
- ADDED from D:\Notes-master1\app\src\main\AndroidManifest.xml:57:13-45
+ ADDED from D:\Note-master2\app\src\main\AndroidManifest.xml:57:13-45
android:name
- ADDED from D:\Notes-master1\app\src\main\AndroidManifest.xml:54:13-48
+ ADDED from D:\Note-master2\app\src\main\AndroidManifest.xml:54:13-48
intent-filter#action:name:android.intent.action.VIEW+category:name:android.intent.category.DEFAULT+data:mimeType:vnd.android.cursor.item/call_note+data:mimeType:vnd.android.cursor.item/text_note
-ADDED from D:\Notes-master1\app\src\main\AndroidManifest.xml:59:13-64:29
+ADDED from D:\Note-master2\app\src\main\AndroidManifest.xml:59:13-64:29
action#android.intent.action.VIEW
-ADDED from D:\Notes-master1\app\src\main\AndroidManifest.xml:60:17-69
+ADDED from D:\Note-master2\app\src\main\AndroidManifest.xml:60:17-69
android:name
- ADDED from D:\Notes-master1\app\src\main\AndroidManifest.xml:60:25-66
+ ADDED from D:\Note-master2\app\src\main\AndroidManifest.xml:60:25-66
category#android.intent.category.DEFAULT
-ADDED from D:\Notes-master1\app\src\main\AndroidManifest.xml:61:17-76
+ADDED from D:\Note-master2\app\src\main\AndroidManifest.xml:61:17-76
android:name
- ADDED from D:\Notes-master1\app\src\main\AndroidManifest.xml:61:27-73
+ ADDED from D:\Note-master2\app\src\main\AndroidManifest.xml:61:27-73
data
-ADDED from D:\Notes-master1\app\src\main\AndroidManifest.xml:62:17-78
+ADDED from D:\Note-master2\app\src\main\AndroidManifest.xml:62:17-78
android:mimeType
- ADDED from D:\Notes-master1\app\src\main\AndroidManifest.xml:62:23-75
+ ADDED from D:\Note-master2\app\src\main\AndroidManifest.xml:62:23-75
intent-filter#action:name:android.intent.action.INSERT_OR_EDIT+category:name:android.intent.category.DEFAULT+data:mimeType:vnd.android.cursor.item/call_note+data:mimeType:vnd.android.cursor.item/text_note
-ADDED from D:\Notes-master1\app\src\main\AndroidManifest.xml:66:13-71:29
+ADDED from D:\Note-master2\app\src\main\AndroidManifest.xml:66:13-71:29
action#android.intent.action.INSERT_OR_EDIT
-ADDED from D:\Notes-master1\app\src\main\AndroidManifest.xml:67:17-79
+ADDED from D:\Note-master2\app\src\main\AndroidManifest.xml:67:17-79
android:name
- ADDED from D:\Notes-master1\app\src\main\AndroidManifest.xml:67:25-76
+ ADDED from D:\Note-master2\app\src\main\AndroidManifest.xml:67:25-76
intent-filter#action:name:android.intent.action.SEARCH+category:name:android.intent.category.DEFAULT
-ADDED from D:\Notes-master1\app\src\main\AndroidManifest.xml:73:13-76:29
+ADDED from D:\Note-master2\app\src\main\AndroidManifest.xml:73:13-76:29
action#android.intent.action.SEARCH
-ADDED from D:\Notes-master1\app\src\main\AndroidManifest.xml:74:17-71
+ADDED from D:\Note-master2\app\src\main\AndroidManifest.xml:74:17-71
android:name
- ADDED from D:\Notes-master1\app\src\main\AndroidManifest.xml:74:25-68
+ ADDED from D:\Note-master2\app\src\main\AndroidManifest.xml:74:25-68
meta-data#android.app.searchable
-ADDED from D:\Notes-master1\app\src\main\AndroidManifest.xml:78:13-80:54
+ADDED from D:\Note-master2\app\src\main\AndroidManifest.xml:78:13-80:54
android:resource
- ADDED from D:\Notes-master1\app\src\main\AndroidManifest.xml:80:17-51
+ ADDED from D:\Note-master2\app\src\main\AndroidManifest.xml:80:17-51
android:name
- ADDED from D:\Notes-master1\app\src\main\AndroidManifest.xml:79:17-54
+ ADDED from D:\Note-master2\app\src\main\AndroidManifest.xml:79:17-54
provider#net.micode.notes.data.NotesProvider
-ADDED from D:\Notes-master1\app\src\main\AndroidManifest.xml:83:9-86:43
+ADDED from D:\Note-master2\app\src\main\AndroidManifest.xml:83:9-86:43
android:authorities
- ADDED from D:\Notes-master1\app\src\main\AndroidManifest.xml:85:13-47
+ ADDED from D:\Note-master2\app\src\main\AndroidManifest.xml:85:13-47
android:multiprocess
- ADDED from D:\Notes-master1\app\src\main\AndroidManifest.xml:86:13-40
+ ADDED from D:\Note-master2\app\src\main\AndroidManifest.xml:86:13-40
android:name
- ADDED from D:\Notes-master1\app\src\main\AndroidManifest.xml:84:13-63
+ ADDED from D:\Note-master2\app\src\main\AndroidManifest.xml:84:13-63
receiver#net.micode.notes.widget.NoteWidgetProvider_2x
-ADDED from D:\Notes-master1\app\src\main\AndroidManifest.xml:88:9-100:20
+ADDED from D:\Note-master2\app\src\main\AndroidManifest.xml:88:9-100:20
android:label
- ADDED from D:\Notes-master1\app\src\main\AndroidManifest.xml:90:13-50
+ ADDED from D:\Note-master2\app\src\main\AndroidManifest.xml:90:13-50
android:name
- ADDED from D:\Notes-master1\app\src\main\AndroidManifest.xml:89:13-57
+ ADDED from D:\Note-master2\app\src\main\AndroidManifest.xml:89:13-57
intent-filter#action:name:android.appwidget.action.APPWIDGET_DELETED+action:name:android.appwidget.action.APPWIDGET_UPDATE+action:name:android.intent.action.PRIVACY_MODE_CHANGED
-ADDED from D:\Notes-master1\app\src\main\AndroidManifest.xml:91:13-95:29
+ADDED from D:\Note-master2\app\src\main\AndroidManifest.xml:91:13-95:29
action#android.appwidget.action.APPWIDGET_UPDATE
-ADDED from D:\Notes-master1\app\src\main\AndroidManifest.xml:92:17-84
+ADDED from D:\Note-master2\app\src\main\AndroidManifest.xml:92:17-84
android:name
- ADDED from D:\Notes-master1\app\src\main\AndroidManifest.xml:92:25-81
+ ADDED from D:\Note-master2\app\src\main\AndroidManifest.xml:92:25-81
action#android.appwidget.action.APPWIDGET_DELETED
-ADDED from D:\Notes-master1\app\src\main\AndroidManifest.xml:93:17-85
+ADDED from D:\Note-master2\app\src\main\AndroidManifest.xml:93:17-85
android:name
- ADDED from D:\Notes-master1\app\src\main\AndroidManifest.xml:93:25-82
+ ADDED from D:\Note-master2\app\src\main\AndroidManifest.xml:93:25-82
action#android.intent.action.PRIVACY_MODE_CHANGED
-ADDED from D:\Notes-master1\app\src\main\AndroidManifest.xml:94:17-85
+ADDED from D:\Note-master2\app\src\main\AndroidManifest.xml:94:17-85
android:name
- ADDED from D:\Notes-master1\app\src\main\AndroidManifest.xml:94:25-82
+ ADDED from D:\Note-master2\app\src\main\AndroidManifest.xml:94:25-82
meta-data#android.appwidget.provider
-ADDED from D:\Notes-master1\app\src\main\AndroidManifest.xml:97:13-99:58
+ADDED from D:\Note-master2\app\src\main\AndroidManifest.xml:97:13-99:58
android:resource
- ADDED from D:\Notes-master1\app\src\main\AndroidManifest.xml:99:17-55
+ ADDED from D:\Note-master2\app\src\main\AndroidManifest.xml:99:17-55
android:name
- ADDED from D:\Notes-master1\app\src\main\AndroidManifest.xml:98:17-58
+ ADDED from D:\Note-master2\app\src\main\AndroidManifest.xml:98:17-58
receiver#net.micode.notes.widget.NoteWidgetProvider_4x
-ADDED from D:\Notes-master1\app\src\main\AndroidManifest.xml:101:9-114:20
+ADDED from D:\Note-master2\app\src\main\AndroidManifest.xml:101:9-114:20
android:label
- ADDED from D:\Notes-master1\app\src\main\AndroidManifest.xml:103:13-50
+ ADDED from D:\Note-master2\app\src\main\AndroidManifest.xml:103:13-50
android:name
- ADDED from D:\Notes-master1\app\src\main\AndroidManifest.xml:102:13-57
+ ADDED from D:\Note-master2\app\src\main\AndroidManifest.xml:102:13-57
receiver#net.micode.notes.ui.AlarmInitReceiver
-ADDED from D:\Notes-master1\app\src\main\AndroidManifest.xml:116:9-120:20
+ADDED from D:\Note-master2\app\src\main\AndroidManifest.xml:116:9-120:20
android:name
- ADDED from D:\Notes-master1\app\src\main\AndroidManifest.xml:116:19-55
+ ADDED from D:\Note-master2\app\src\main\AndroidManifest.xml:116:19-55
intent-filter#action:name:android.intent.action.BOOT_COMPLETED
-ADDED from D:\Notes-master1\app\src\main\AndroidManifest.xml:117:13-119:29
+ADDED from D:\Note-master2\app\src\main\AndroidManifest.xml:117:13-119:29
action#android.intent.action.BOOT_COMPLETED
-ADDED from D:\Notes-master1\app\src\main\AndroidManifest.xml:118:17-79
+ADDED from D:\Note-master2\app\src\main\AndroidManifest.xml:118:17-79
android:name
- ADDED from D:\Notes-master1\app\src\main\AndroidManifest.xml:118:25-76
+ ADDED from D:\Note-master2\app\src\main\AndroidManifest.xml:118:25-76
receiver#net.micode.notes.ui.AlarmReceiver
-ADDED from D:\Notes-master1\app\src\main\AndroidManifest.xml:122:9-125:20
+ADDED from D:\Note-master2\app\src\main\AndroidManifest.xml:122:9-125:20
android:process
- ADDED from D:\Notes-master1\app\src\main\AndroidManifest.xml:124:13-38
+ ADDED from D:\Note-master2\app\src\main\AndroidManifest.xml:124:13-38
android:name
- ADDED from D:\Notes-master1\app\src\main\AndroidManifest.xml:123:13-61
+ ADDED from D:\Note-master2\app\src\main\AndroidManifest.xml:123:13-61
activity#net.micode.notes.ui.AlarmAlertActivity
-ADDED from D:\Notes-master1\app\src\main\AndroidManifest.xml:127:9-132:20
+ADDED from D:\Note-master2\app\src\main\AndroidManifest.xml:127:9-132:20
android:label
- ADDED from D:\Notes-master1\app\src\main\AndroidManifest.xml:129:13-45
+ ADDED from D:\Note-master2\app\src\main\AndroidManifest.xml:129:13-45
android:launchMode
- ADDED from D:\Notes-master1\app\src\main\AndroidManifest.xml:130:13-48
+ ADDED from D:\Note-master2\app\src\main\AndroidManifest.xml:130:13-48
android:theme
- ADDED from D:\Notes-master1\app\src\main\AndroidManifest.xml:131:13-75
+ ADDED from D:\Note-master2\app\src\main\AndroidManifest.xml:131:13-75
android:name
- ADDED from D:\Notes-master1\app\src\main\AndroidManifest.xml:128:13-50
+ ADDED from D:\Note-master2\app\src\main\AndroidManifest.xml:128:13-50
activity#net.micode.notes.ui.NotesPreferenceActivity
-ADDED from D:\Notes-master1\app\src\main\AndroidManifest.xml:134:9-139:20
+ADDED from D:\Note-master2\app\src\main\AndroidManifest.xml:134:9-139:20
android:label
- ADDED from D:\Notes-master1\app\src\main\AndroidManifest.xml:136:13-54
+ ADDED from D:\Note-master2\app\src\main\AndroidManifest.xml:136:13-54
android:launchMode
- ADDED from D:\Notes-master1\app\src\main\AndroidManifest.xml:137:13-43
+ ADDED from D:\Note-master2\app\src\main\AndroidManifest.xml:137:13-43
android:theme
- ADDED from D:\Notes-master1\app\src\main\AndroidManifest.xml:138:13-60
+ ADDED from D:\Note-master2\app\src\main\AndroidManifest.xml:138:13-60
android:name
- ADDED from D:\Notes-master1\app\src\main\AndroidManifest.xml:135:13-71
+ ADDED from D:\Note-master2\app\src\main\AndroidManifest.xml:135:13-71
service#net.micode.notes.gtask.remote.GTaskSyncService
-ADDED from D:\Notes-master1\app\src\main\AndroidManifest.xml:141:9-144:19
+ADDED from D:\Note-master2\app\src\main\AndroidManifest.xml:141:9-144:19
android:exported
- ADDED from D:\Notes-master1\app\src\main\AndroidManifest.xml:143:13-37
+ ADDED from D:\Note-master2\app\src\main\AndroidManifest.xml:143:13-37
android:name
- ADDED from D:\Notes-master1\app\src\main\AndroidManifest.xml:142:13-74
+ ADDED from D:\Note-master2\app\src\main\AndroidManifest.xml:142:13-74
meta-data#android.app.default_searchable
-ADDED from D:\Notes-master1\app\src\main\AndroidManifest.xml:146:9-148:52
+ADDED from D:\Note-master2\app\src\main\AndroidManifest.xml:146:9-148:52
android:value
- ADDED from D:\Notes-master1\app\src\main\AndroidManifest.xml:148:13-49
+ ADDED from D:\Note-master2\app\src\main\AndroidManifest.xml:148:13-49
android:name
- ADDED from D:\Notes-master1\app\src\main\AndroidManifest.xml:147:13-58
+ ADDED from D:\Note-master2\app\src\main\AndroidManifest.xml:147:13-58
diff --git a/src/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/source-classes-mapping.txt b/src/Note-master2/app/build/tmp/compileDebugJavaWithJavac/source-classes-mapping.txt
similarity index 100%
rename from src/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/source-classes-mapping.txt
rename to src/Note-master2/app/build/tmp/compileDebugJavaWithJavac/source-classes-mapping.txt
diff --git a/src/Notes-master1/app/src/main/AndroidManifest.xml b/src/Note-master2/app/src/main/AndroidManifest.xml
similarity index 100%
rename from src/Notes-master1/app/src/main/AndroidManifest.xml
rename to src/Note-master2/app/src/main/AndroidManifest.xml
diff --git a/src/Notes-master1/app/src/main/java/net/micode/notes/data/Contact.java b/src/Note-master2/app/src/main/java/net/micode/notes/data/Contact.java
similarity index 100%
rename from src/Notes-master1/app/src/main/java/net/micode/notes/data/Contact.java
rename to src/Note-master2/app/src/main/java/net/micode/notes/data/Contact.java
diff --git a/src/Notes-master1/app/src/main/java/net/micode/notes/data/Notes.java b/src/Note-master2/app/src/main/java/net/micode/notes/data/Notes.java
similarity index 100%
rename from src/Notes-master1/app/src/main/java/net/micode/notes/data/Notes.java
rename to src/Note-master2/app/src/main/java/net/micode/notes/data/Notes.java
diff --git a/src/Notes-master1/app/src/main/java/net/micode/notes/data/NotesDatabaseHelper.java b/src/Note-master2/app/src/main/java/net/micode/notes/data/NotesDatabaseHelper.java
similarity index 100%
rename from src/Notes-master1/app/src/main/java/net/micode/notes/data/NotesDatabaseHelper.java
rename to src/Note-master2/app/src/main/java/net/micode/notes/data/NotesDatabaseHelper.java
diff --git a/src/Notes-master1/app/src/main/java/net/micode/notes/data/NotesProvider.java b/src/Note-master2/app/src/main/java/net/micode/notes/data/NotesProvider.java
similarity index 100%
rename from src/Notes-master1/app/src/main/java/net/micode/notes/data/NotesProvider.java
rename to src/Note-master2/app/src/main/java/net/micode/notes/data/NotesProvider.java
diff --git a/src/Notes-master1/app/src/main/java/net/micode/notes/gtask/data/MetaData.java b/src/Note-master2/app/src/main/java/net/micode/notes/gtask/data/MetaData.java
similarity index 100%
rename from src/Notes-master1/app/src/main/java/net/micode/notes/gtask/data/MetaData.java
rename to src/Note-master2/app/src/main/java/net/micode/notes/gtask/data/MetaData.java
diff --git a/src/Notes-master1/app/src/main/java/net/micode/notes/gtask/data/Node.java b/src/Note-master2/app/src/main/java/net/micode/notes/gtask/data/Node.java
similarity index 100%
rename from src/Notes-master1/app/src/main/java/net/micode/notes/gtask/data/Node.java
rename to src/Note-master2/app/src/main/java/net/micode/notes/gtask/data/Node.java
diff --git a/src/Notes-master1/app/src/main/java/net/micode/notes/gtask/data/SqlData.java b/src/Note-master2/app/src/main/java/net/micode/notes/gtask/data/SqlData.java
similarity index 100%
rename from src/Notes-master1/app/src/main/java/net/micode/notes/gtask/data/SqlData.java
rename to src/Note-master2/app/src/main/java/net/micode/notes/gtask/data/SqlData.java
diff --git a/src/Notes-master1/app/src/main/java/net/micode/notes/gtask/data/SqlNote.java b/src/Note-master2/app/src/main/java/net/micode/notes/gtask/data/SqlNote.java
similarity index 100%
rename from src/Notes-master1/app/src/main/java/net/micode/notes/gtask/data/SqlNote.java
rename to src/Note-master2/app/src/main/java/net/micode/notes/gtask/data/SqlNote.java
diff --git a/src/Notes-master1/app/src/main/java/net/micode/notes/gtask/data/Task.java b/src/Note-master2/app/src/main/java/net/micode/notes/gtask/data/Task.java
similarity index 100%
rename from src/Notes-master1/app/src/main/java/net/micode/notes/gtask/data/Task.java
rename to src/Note-master2/app/src/main/java/net/micode/notes/gtask/data/Task.java
diff --git a/src/Notes-master1/app/src/main/java/net/micode/notes/gtask/data/TaskList.java b/src/Note-master2/app/src/main/java/net/micode/notes/gtask/data/TaskList.java
similarity index 100%
rename from src/Notes-master1/app/src/main/java/net/micode/notes/gtask/data/TaskList.java
rename to src/Note-master2/app/src/main/java/net/micode/notes/gtask/data/TaskList.java
diff --git a/src/Notes-master1/app/src/main/java/net/micode/notes/gtask/exception/ActionFailureException.java b/src/Note-master2/app/src/main/java/net/micode/notes/gtask/exception/ActionFailureException.java
similarity index 100%
rename from src/Notes-master1/app/src/main/java/net/micode/notes/gtask/exception/ActionFailureException.java
rename to src/Note-master2/app/src/main/java/net/micode/notes/gtask/exception/ActionFailureException.java
diff --git a/src/Notes-master1/app/src/main/java/net/micode/notes/gtask/exception/NetworkFailureException.java b/src/Note-master2/app/src/main/java/net/micode/notes/gtask/exception/NetworkFailureException.java
similarity index 100%
rename from src/Notes-master1/app/src/main/java/net/micode/notes/gtask/exception/NetworkFailureException.java
rename to src/Note-master2/app/src/main/java/net/micode/notes/gtask/exception/NetworkFailureException.java
diff --git a/src/Notes-master1/app/src/main/java/net/micode/notes/gtask/remote/GTaskASyncTask.java b/src/Note-master2/app/src/main/java/net/micode/notes/gtask/remote/GTaskASyncTask.java
similarity index 100%
rename from src/Notes-master1/app/src/main/java/net/micode/notes/gtask/remote/GTaskASyncTask.java
rename to src/Note-master2/app/src/main/java/net/micode/notes/gtask/remote/GTaskASyncTask.java
diff --git a/src/Notes-master1/app/src/main/java/net/micode/notes/gtask/remote/GTaskClient.java b/src/Note-master2/app/src/main/java/net/micode/notes/gtask/remote/GTaskClient.java
similarity index 100%
rename from src/Notes-master1/app/src/main/java/net/micode/notes/gtask/remote/GTaskClient.java
rename to src/Note-master2/app/src/main/java/net/micode/notes/gtask/remote/GTaskClient.java
diff --git a/src/Notes-master1/app/src/main/java/net/micode/notes/gtask/remote/GTaskManager.java b/src/Note-master2/app/src/main/java/net/micode/notes/gtask/remote/GTaskManager.java
similarity index 100%
rename from src/Notes-master1/app/src/main/java/net/micode/notes/gtask/remote/GTaskManager.java
rename to src/Note-master2/app/src/main/java/net/micode/notes/gtask/remote/GTaskManager.java
diff --git a/src/Notes-master1/app/src/main/java/net/micode/notes/gtask/remote/GTaskSyncService.java b/src/Note-master2/app/src/main/java/net/micode/notes/gtask/remote/GTaskSyncService.java
similarity index 100%
rename from src/Notes-master1/app/src/main/java/net/micode/notes/gtask/remote/GTaskSyncService.java
rename to src/Note-master2/app/src/main/java/net/micode/notes/gtask/remote/GTaskSyncService.java
diff --git a/src/Notes-master1/app/src/main/java/net/micode/notes/model/Note.java b/src/Note-master2/app/src/main/java/net/micode/notes/model/Note.java
similarity index 100%
rename from src/Notes-master1/app/src/main/java/net/micode/notes/model/Note.java
rename to src/Note-master2/app/src/main/java/net/micode/notes/model/Note.java
diff --git a/src/Notes-master1/app/src/main/java/net/micode/notes/model/WorkingNote.java b/src/Note-master2/app/src/main/java/net/micode/notes/model/WorkingNote.java
similarity index 100%
rename from src/Notes-master1/app/src/main/java/net/micode/notes/model/WorkingNote.java
rename to src/Note-master2/app/src/main/java/net/micode/notes/model/WorkingNote.java
diff --git a/src/Notes-master1/app/src/main/java/net/micode/notes/tool/BackupUtils.java b/src/Note-master2/app/src/main/java/net/micode/notes/tool/BackupUtils.java
similarity index 100%
rename from src/Notes-master1/app/src/main/java/net/micode/notes/tool/BackupUtils.java
rename to src/Note-master2/app/src/main/java/net/micode/notes/tool/BackupUtils.java
diff --git a/src/Notes-master1/app/src/main/java/net/micode/notes/tool/DataUtils.java b/src/Note-master2/app/src/main/java/net/micode/notes/tool/DataUtils.java
similarity index 100%
rename from src/Notes-master1/app/src/main/java/net/micode/notes/tool/DataUtils.java
rename to src/Note-master2/app/src/main/java/net/micode/notes/tool/DataUtils.java
diff --git a/src/Notes-master1/app/src/main/java/net/micode/notes/tool/GTaskStringUtils.java b/src/Note-master2/app/src/main/java/net/micode/notes/tool/GTaskStringUtils.java
similarity index 100%
rename from src/Notes-master1/app/src/main/java/net/micode/notes/tool/GTaskStringUtils.java
rename to src/Note-master2/app/src/main/java/net/micode/notes/tool/GTaskStringUtils.java
diff --git a/src/Notes-master1/app/src/main/java/net/micode/notes/tool/ResourceParser.java b/src/Note-master2/app/src/main/java/net/micode/notes/tool/ResourceParser.java
similarity index 100%
rename from src/Notes-master1/app/src/main/java/net/micode/notes/tool/ResourceParser.java
rename to src/Note-master2/app/src/main/java/net/micode/notes/tool/ResourceParser.java
diff --git a/src/Notes-master1/app/src/main/java/net/micode/notes/ui/AlarmAlertActivity.java b/src/Note-master2/app/src/main/java/net/micode/notes/ui/AlarmAlertActivity.java
similarity index 100%
rename from src/Notes-master1/app/src/main/java/net/micode/notes/ui/AlarmAlertActivity.java
rename to src/Note-master2/app/src/main/java/net/micode/notes/ui/AlarmAlertActivity.java
diff --git a/src/Notes-master1/app/src/main/java/net/micode/notes/ui/AlarmInitReceiver.java b/src/Note-master2/app/src/main/java/net/micode/notes/ui/AlarmInitReceiver.java
similarity index 100%
rename from src/Notes-master1/app/src/main/java/net/micode/notes/ui/AlarmInitReceiver.java
rename to src/Note-master2/app/src/main/java/net/micode/notes/ui/AlarmInitReceiver.java
diff --git a/src/Notes-master1/app/src/main/java/net/micode/notes/ui/AlarmReceiver.java b/src/Note-master2/app/src/main/java/net/micode/notes/ui/AlarmReceiver.java
similarity index 100%
rename from src/Notes-master1/app/src/main/java/net/micode/notes/ui/AlarmReceiver.java
rename to src/Note-master2/app/src/main/java/net/micode/notes/ui/AlarmReceiver.java
diff --git a/src/Notes-master1/app/src/main/java/net/micode/notes/ui/DateTimePicker.java b/src/Note-master2/app/src/main/java/net/micode/notes/ui/DateTimePicker.java
similarity index 100%
rename from src/Notes-master1/app/src/main/java/net/micode/notes/ui/DateTimePicker.java
rename to src/Note-master2/app/src/main/java/net/micode/notes/ui/DateTimePicker.java
diff --git a/src/Notes-master1/app/src/main/java/net/micode/notes/ui/DateTimePickerDialog.java b/src/Note-master2/app/src/main/java/net/micode/notes/ui/DateTimePickerDialog.java
similarity index 100%
rename from src/Notes-master1/app/src/main/java/net/micode/notes/ui/DateTimePickerDialog.java
rename to src/Note-master2/app/src/main/java/net/micode/notes/ui/DateTimePickerDialog.java
diff --git a/src/Notes-master1/app/src/main/java/net/micode/notes/ui/DropdownMenu.java b/src/Note-master2/app/src/main/java/net/micode/notes/ui/DropdownMenu.java
similarity index 100%
rename from src/Notes-master1/app/src/main/java/net/micode/notes/ui/DropdownMenu.java
rename to src/Note-master2/app/src/main/java/net/micode/notes/ui/DropdownMenu.java
diff --git a/src/Notes-master1/app/src/main/java/net/micode/notes/ui/FoldersListAdapter.java b/src/Note-master2/app/src/main/java/net/micode/notes/ui/FoldersListAdapter.java
similarity index 100%
rename from src/Notes-master1/app/src/main/java/net/micode/notes/ui/FoldersListAdapter.java
rename to src/Note-master2/app/src/main/java/net/micode/notes/ui/FoldersListAdapter.java
diff --git a/src/Notes-master1/app/src/main/java/net/micode/notes/ui/NoteEditActivity.java b/src/Note-master2/app/src/main/java/net/micode/notes/ui/NoteEditActivity.java
similarity index 100%
rename from src/Notes-master1/app/src/main/java/net/micode/notes/ui/NoteEditActivity.java
rename to src/Note-master2/app/src/main/java/net/micode/notes/ui/NoteEditActivity.java
diff --git a/src/Notes-master1/app/src/main/java/net/micode/notes/ui/NoteEditText.java b/src/Note-master2/app/src/main/java/net/micode/notes/ui/NoteEditText.java
similarity index 100%
rename from src/Notes-master1/app/src/main/java/net/micode/notes/ui/NoteEditText.java
rename to src/Note-master2/app/src/main/java/net/micode/notes/ui/NoteEditText.java
diff --git a/src/Notes-master1/app/src/main/java/net/micode/notes/ui/NoteItemData.java b/src/Note-master2/app/src/main/java/net/micode/notes/ui/NoteItemData.java
similarity index 100%
rename from src/Notes-master1/app/src/main/java/net/micode/notes/ui/NoteItemData.java
rename to src/Note-master2/app/src/main/java/net/micode/notes/ui/NoteItemData.java
diff --git a/src/Notes-master1/app/src/main/java/net/micode/notes/ui/NotesListActivity.java b/src/Note-master2/app/src/main/java/net/micode/notes/ui/NotesListActivity.java
similarity index 100%
rename from src/Notes-master1/app/src/main/java/net/micode/notes/ui/NotesListActivity.java
rename to src/Note-master2/app/src/main/java/net/micode/notes/ui/NotesListActivity.java
diff --git a/src/Notes-master1/app/src/main/java/net/micode/notes/ui/NotesListAdapter.java b/src/Note-master2/app/src/main/java/net/micode/notes/ui/NotesListAdapter.java
similarity index 100%
rename from src/Notes-master1/app/src/main/java/net/micode/notes/ui/NotesListAdapter.java
rename to src/Note-master2/app/src/main/java/net/micode/notes/ui/NotesListAdapter.java
diff --git a/src/Notes-master1/app/src/main/java/net/micode/notes/ui/NotesListItem.java b/src/Note-master2/app/src/main/java/net/micode/notes/ui/NotesListItem.java
similarity index 100%
rename from src/Notes-master1/app/src/main/java/net/micode/notes/ui/NotesListItem.java
rename to src/Note-master2/app/src/main/java/net/micode/notes/ui/NotesListItem.java
diff --git a/src/Notes-master1/app/src/main/java/net/micode/notes/ui/NotesPreferenceActivity.java b/src/Note-master2/app/src/main/java/net/micode/notes/ui/NotesPreferenceActivity.java
similarity index 100%
rename from src/Notes-master1/app/src/main/java/net/micode/notes/ui/NotesPreferenceActivity.java
rename to src/Note-master2/app/src/main/java/net/micode/notes/ui/NotesPreferenceActivity.java
diff --git a/src/Notes-master1/app/src/main/java/net/micode/notes/widget/NoteWidgetProvider.java b/src/Note-master2/app/src/main/java/net/micode/notes/widget/NoteWidgetProvider.java
similarity index 100%
rename from src/Notes-master1/app/src/main/java/net/micode/notes/widget/NoteWidgetProvider.java
rename to src/Note-master2/app/src/main/java/net/micode/notes/widget/NoteWidgetProvider.java
diff --git a/src/Notes-master1/app/src/main/java/net/micode/notes/widget/NoteWidgetProvider_2x.java b/src/Note-master2/app/src/main/java/net/micode/notes/widget/NoteWidgetProvider_2x.java
similarity index 100%
rename from src/Notes-master1/app/src/main/java/net/micode/notes/widget/NoteWidgetProvider_2x.java
rename to src/Note-master2/app/src/main/java/net/micode/notes/widget/NoteWidgetProvider_2x.java
diff --git a/src/Notes-master1/app/src/main/java/net/micode/notes/widget/NoteWidgetProvider_4x.java b/src/Note-master2/app/src/main/java/net/micode/notes/widget/NoteWidgetProvider_4x.java
similarity index 100%
rename from src/Notes-master1/app/src/main/java/net/micode/notes/widget/NoteWidgetProvider_4x.java
rename to src/Note-master2/app/src/main/java/net/micode/notes/widget/NoteWidgetProvider_4x.java
diff --git a/src/Notes-master1/app/src/main/res/color/primary_text_dark.xml b/src/Note-master2/app/src/main/res/color/primary_text_dark.xml
similarity index 100%
rename from src/Notes-master1/app/src/main/res/color/primary_text_dark.xml
rename to src/Note-master2/app/src/main/res/color/primary_text_dark.xml
diff --git a/src/Notes-master1/app/src/main/res/color/secondary_text_dark.xml b/src/Note-master2/app/src/main/res/color/secondary_text_dark.xml
similarity index 100%
rename from src/Notes-master1/app/src/main/res/color/secondary_text_dark.xml
rename to src/Note-master2/app/src/main/res/color/secondary_text_dark.xml
diff --git a/src/Notes-master1/app/src/main/res/drawable-hdpi/bg_btn_set_color.png b/src/Note-master2/app/src/main/res/drawable-hdpi/bg_btn_set_color.png
similarity index 100%
rename from src/Notes-master1/app/src/main/res/drawable-hdpi/bg_btn_set_color.png
rename to src/Note-master2/app/src/main/res/drawable-hdpi/bg_btn_set_color.png
diff --git a/src/Notes-master1/app/src/main/res/drawable-hdpi/bg_color_btn_mask.png b/src/Note-master2/app/src/main/res/drawable-hdpi/bg_color_btn_mask.png
similarity index 100%
rename from src/Notes-master1/app/src/main/res/drawable-hdpi/bg_color_btn_mask.png
rename to src/Note-master2/app/src/main/res/drawable-hdpi/bg_color_btn_mask.png
diff --git a/src/Notes-master1/app/src/main/res/drawable-hdpi/call_record.png b/src/Note-master2/app/src/main/res/drawable-hdpi/call_record.png
similarity index 100%
rename from src/Notes-master1/app/src/main/res/drawable-hdpi/call_record.png
rename to src/Note-master2/app/src/main/res/drawable-hdpi/call_record.png
diff --git a/src/Notes-master1/app/src/main/res/drawable-hdpi/clock.png b/src/Note-master2/app/src/main/res/drawable-hdpi/clock.png
similarity index 100%
rename from src/Notes-master1/app/src/main/res/drawable-hdpi/clock.png
rename to src/Note-master2/app/src/main/res/drawable-hdpi/clock.png
diff --git a/src/Notes-master1/app/src/main/res/drawable-hdpi/delete.png b/src/Note-master2/app/src/main/res/drawable-hdpi/delete.png
similarity index 100%
rename from src/Notes-master1/app/src/main/res/drawable-hdpi/delete.png
rename to src/Note-master2/app/src/main/res/drawable-hdpi/delete.png
diff --git a/src/Notes-master1/app/src/main/res/drawable-hdpi/dropdown_icon.9.png b/src/Note-master2/app/src/main/res/drawable-hdpi/dropdown_icon.9.png
similarity index 100%
rename from src/Notes-master1/app/src/main/res/drawable-hdpi/dropdown_icon.9.png
rename to src/Note-master2/app/src/main/res/drawable-hdpi/dropdown_icon.9.png
diff --git a/src/Notes-master1/app/src/main/res/drawable-hdpi/edit_blue.9.png b/src/Note-master2/app/src/main/res/drawable-hdpi/edit_blue.9.png
similarity index 100%
rename from src/Notes-master1/app/src/main/res/drawable-hdpi/edit_blue.9.png
rename to src/Note-master2/app/src/main/res/drawable-hdpi/edit_blue.9.png
diff --git a/src/Notes-master1/app/src/main/res/drawable-hdpi/edit_green.9.png b/src/Note-master2/app/src/main/res/drawable-hdpi/edit_green.9.png
similarity index 100%
rename from src/Notes-master1/app/src/main/res/drawable-hdpi/edit_green.9.png
rename to src/Note-master2/app/src/main/res/drawable-hdpi/edit_green.9.png
diff --git a/src/Notes-master1/app/src/main/res/drawable-hdpi/edit_red.9.png b/src/Note-master2/app/src/main/res/drawable-hdpi/edit_red.9.png
similarity index 100%
rename from src/Notes-master1/app/src/main/res/drawable-hdpi/edit_red.9.png
rename to src/Note-master2/app/src/main/res/drawable-hdpi/edit_red.9.png
diff --git a/src/Notes-master1/app/src/main/res/drawable-hdpi/edit_title_blue.9.png b/src/Note-master2/app/src/main/res/drawable-hdpi/edit_title_blue.9.png
similarity index 100%
rename from src/Notes-master1/app/src/main/res/drawable-hdpi/edit_title_blue.9.png
rename to src/Note-master2/app/src/main/res/drawable-hdpi/edit_title_blue.9.png
diff --git a/src/Notes-master1/app/src/main/res/drawable-hdpi/edit_title_green.9.png b/src/Note-master2/app/src/main/res/drawable-hdpi/edit_title_green.9.png
similarity index 100%
rename from src/Notes-master1/app/src/main/res/drawable-hdpi/edit_title_green.9.png
rename to src/Note-master2/app/src/main/res/drawable-hdpi/edit_title_green.9.png
diff --git a/src/Notes-master1/app/src/main/res/drawable-hdpi/edit_title_red.9.png b/src/Note-master2/app/src/main/res/drawable-hdpi/edit_title_red.9.png
similarity index 100%
rename from src/Notes-master1/app/src/main/res/drawable-hdpi/edit_title_red.9.png
rename to src/Note-master2/app/src/main/res/drawable-hdpi/edit_title_red.9.png
diff --git a/src/Notes-master1/app/src/main/res/drawable-hdpi/edit_title_white.9.png b/src/Note-master2/app/src/main/res/drawable-hdpi/edit_title_white.9.png
similarity index 100%
rename from src/Notes-master1/app/src/main/res/drawable-hdpi/edit_title_white.9.png
rename to src/Note-master2/app/src/main/res/drawable-hdpi/edit_title_white.9.png
diff --git a/src/Notes-master1/app/src/main/res/drawable-hdpi/edit_title_yellow.9.png b/src/Note-master2/app/src/main/res/drawable-hdpi/edit_title_yellow.9.png
similarity index 100%
rename from src/Notes-master1/app/src/main/res/drawable-hdpi/edit_title_yellow.9.png
rename to src/Note-master2/app/src/main/res/drawable-hdpi/edit_title_yellow.9.png
diff --git a/src/Notes-master1/app/src/main/res/drawable-hdpi/edit_white.9.png b/src/Note-master2/app/src/main/res/drawable-hdpi/edit_white.9.png
similarity index 100%
rename from src/Notes-master1/app/src/main/res/drawable-hdpi/edit_white.9.png
rename to src/Note-master2/app/src/main/res/drawable-hdpi/edit_white.9.png
diff --git a/src/Notes-master1/app/src/main/res/drawable-hdpi/edit_yellow.9.png b/src/Note-master2/app/src/main/res/drawable-hdpi/edit_yellow.9.png
similarity index 100%
rename from src/Notes-master1/app/src/main/res/drawable-hdpi/edit_yellow.9.png
rename to src/Note-master2/app/src/main/res/drawable-hdpi/edit_yellow.9.png
diff --git a/src/Notes-master1/app/src/main/res/drawable-hdpi/font_large.png b/src/Note-master2/app/src/main/res/drawable-hdpi/font_large.png
similarity index 100%
rename from src/Notes-master1/app/src/main/res/drawable-hdpi/font_large.png
rename to src/Note-master2/app/src/main/res/drawable-hdpi/font_large.png
diff --git a/src/Notes-master1/app/src/main/res/drawable-hdpi/font_normal.png b/src/Note-master2/app/src/main/res/drawable-hdpi/font_normal.png
similarity index 100%
rename from src/Notes-master1/app/src/main/res/drawable-hdpi/font_normal.png
rename to src/Note-master2/app/src/main/res/drawable-hdpi/font_normal.png
diff --git a/src/Notes-master1/app/src/main/res/drawable-hdpi/font_size_selector_bg.9.png b/src/Note-master2/app/src/main/res/drawable-hdpi/font_size_selector_bg.9.png
similarity index 100%
rename from src/Notes-master1/app/src/main/res/drawable-hdpi/font_size_selector_bg.9.png
rename to src/Note-master2/app/src/main/res/drawable-hdpi/font_size_selector_bg.9.png
diff --git a/src/Notes-master1/app/src/main/res/drawable-hdpi/font_small.png b/src/Note-master2/app/src/main/res/drawable-hdpi/font_small.png
similarity index 100%
rename from src/Notes-master1/app/src/main/res/drawable-hdpi/font_small.png
rename to src/Note-master2/app/src/main/res/drawable-hdpi/font_small.png
diff --git a/src/Notes-master1/app/src/main/res/drawable-hdpi/font_super.png b/src/Note-master2/app/src/main/res/drawable-hdpi/font_super.png
similarity index 100%
rename from src/Notes-master1/app/src/main/res/drawable-hdpi/font_super.png
rename to src/Note-master2/app/src/main/res/drawable-hdpi/font_super.png
diff --git a/src/Notes-master1/app/src/main/res/drawable-hdpi/icon_app.png b/src/Note-master2/app/src/main/res/drawable-hdpi/icon_app.png
similarity index 100%
rename from src/Notes-master1/app/src/main/res/drawable-hdpi/icon_app.png
rename to src/Note-master2/app/src/main/res/drawable-hdpi/icon_app.png
diff --git a/src/Notes-master1/app/src/main/res/drawable-hdpi/list_background.png b/src/Note-master2/app/src/main/res/drawable-hdpi/list_background.png
similarity index 100%
rename from src/Notes-master1/app/src/main/res/drawable-hdpi/list_background.png
rename to src/Note-master2/app/src/main/res/drawable-hdpi/list_background.png
diff --git a/src/Notes-master1/app/src/main/res/drawable-hdpi/list_blue_down.9.png b/src/Note-master2/app/src/main/res/drawable-hdpi/list_blue_down.9.png
similarity index 100%
rename from src/Notes-master1/app/src/main/res/drawable-hdpi/list_blue_down.9.png
rename to src/Note-master2/app/src/main/res/drawable-hdpi/list_blue_down.9.png
diff --git a/src/Notes-master1/app/src/main/res/drawable-hdpi/list_blue_middle.9.png b/src/Note-master2/app/src/main/res/drawable-hdpi/list_blue_middle.9.png
similarity index 100%
rename from src/Notes-master1/app/src/main/res/drawable-hdpi/list_blue_middle.9.png
rename to src/Note-master2/app/src/main/res/drawable-hdpi/list_blue_middle.9.png
diff --git a/src/Notes-master1/app/src/main/res/drawable-hdpi/list_blue_single.9.png b/src/Note-master2/app/src/main/res/drawable-hdpi/list_blue_single.9.png
similarity index 100%
rename from src/Notes-master1/app/src/main/res/drawable-hdpi/list_blue_single.9.png
rename to src/Note-master2/app/src/main/res/drawable-hdpi/list_blue_single.9.png
diff --git a/src/Notes-master1/app/src/main/res/drawable-hdpi/list_blue_up.9.png b/src/Note-master2/app/src/main/res/drawable-hdpi/list_blue_up.9.png
similarity index 100%
rename from src/Notes-master1/app/src/main/res/drawable-hdpi/list_blue_up.9.png
rename to src/Note-master2/app/src/main/res/drawable-hdpi/list_blue_up.9.png
diff --git a/src/Notes-master1/app/src/main/res/drawable-hdpi/list_folder.9.png b/src/Note-master2/app/src/main/res/drawable-hdpi/list_folder.9.png
similarity index 100%
rename from src/Notes-master1/app/src/main/res/drawable-hdpi/list_folder.9.png
rename to src/Note-master2/app/src/main/res/drawable-hdpi/list_folder.9.png
diff --git a/src/Notes-master1/app/src/main/res/drawable-hdpi/list_footer_bg.9.png b/src/Note-master2/app/src/main/res/drawable-hdpi/list_footer_bg.9.png
similarity index 100%
rename from src/Notes-master1/app/src/main/res/drawable-hdpi/list_footer_bg.9.png
rename to src/Note-master2/app/src/main/res/drawable-hdpi/list_footer_bg.9.png
diff --git a/src/Notes-master1/app/src/main/res/drawable-hdpi/list_green_down.9.png b/src/Note-master2/app/src/main/res/drawable-hdpi/list_green_down.9.png
similarity index 100%
rename from src/Notes-master1/app/src/main/res/drawable-hdpi/list_green_down.9.png
rename to src/Note-master2/app/src/main/res/drawable-hdpi/list_green_down.9.png
diff --git a/src/Notes-master1/app/src/main/res/drawable-hdpi/list_green_middle.9.png b/src/Note-master2/app/src/main/res/drawable-hdpi/list_green_middle.9.png
similarity index 100%
rename from src/Notes-master1/app/src/main/res/drawable-hdpi/list_green_middle.9.png
rename to src/Note-master2/app/src/main/res/drawable-hdpi/list_green_middle.9.png
diff --git a/src/Notes-master1/app/src/main/res/drawable-hdpi/list_green_single.9.png b/src/Note-master2/app/src/main/res/drawable-hdpi/list_green_single.9.png
similarity index 100%
rename from src/Notes-master1/app/src/main/res/drawable-hdpi/list_green_single.9.png
rename to src/Note-master2/app/src/main/res/drawable-hdpi/list_green_single.9.png
diff --git a/src/Notes-master1/app/src/main/res/drawable-hdpi/list_green_up.9.png b/src/Note-master2/app/src/main/res/drawable-hdpi/list_green_up.9.png
similarity index 100%
rename from src/Notes-master1/app/src/main/res/drawable-hdpi/list_green_up.9.png
rename to src/Note-master2/app/src/main/res/drawable-hdpi/list_green_up.9.png
diff --git a/src/Notes-master1/app/src/main/res/drawable-hdpi/list_red_down.9.png b/src/Note-master2/app/src/main/res/drawable-hdpi/list_red_down.9.png
similarity index 100%
rename from src/Notes-master1/app/src/main/res/drawable-hdpi/list_red_down.9.png
rename to src/Note-master2/app/src/main/res/drawable-hdpi/list_red_down.9.png
diff --git a/src/Notes-master1/app/src/main/res/drawable-hdpi/list_red_middle.9.png b/src/Note-master2/app/src/main/res/drawable-hdpi/list_red_middle.9.png
similarity index 100%
rename from src/Notes-master1/app/src/main/res/drawable-hdpi/list_red_middle.9.png
rename to src/Note-master2/app/src/main/res/drawable-hdpi/list_red_middle.9.png
diff --git a/src/Notes-master1/app/src/main/res/drawable-hdpi/list_red_single.9.png b/src/Note-master2/app/src/main/res/drawable-hdpi/list_red_single.9.png
similarity index 100%
rename from src/Notes-master1/app/src/main/res/drawable-hdpi/list_red_single.9.png
rename to src/Note-master2/app/src/main/res/drawable-hdpi/list_red_single.9.png
diff --git a/src/Notes-master1/app/src/main/res/drawable-hdpi/list_red_up.9.png b/src/Note-master2/app/src/main/res/drawable-hdpi/list_red_up.9.png
similarity index 100%
rename from src/Notes-master1/app/src/main/res/drawable-hdpi/list_red_up.9.png
rename to src/Note-master2/app/src/main/res/drawable-hdpi/list_red_up.9.png
diff --git a/src/Notes-master1/app/src/main/res/drawable-hdpi/list_white_down.9.png b/src/Note-master2/app/src/main/res/drawable-hdpi/list_white_down.9.png
similarity index 100%
rename from src/Notes-master1/app/src/main/res/drawable-hdpi/list_white_down.9.png
rename to src/Note-master2/app/src/main/res/drawable-hdpi/list_white_down.9.png
diff --git a/src/Notes-master1/app/src/main/res/drawable-hdpi/list_white_middle.9.png b/src/Note-master2/app/src/main/res/drawable-hdpi/list_white_middle.9.png
similarity index 100%
rename from src/Notes-master1/app/src/main/res/drawable-hdpi/list_white_middle.9.png
rename to src/Note-master2/app/src/main/res/drawable-hdpi/list_white_middle.9.png
diff --git a/src/Notes-master1/app/src/main/res/drawable-hdpi/list_white_single.9.png b/src/Note-master2/app/src/main/res/drawable-hdpi/list_white_single.9.png
similarity index 100%
rename from src/Notes-master1/app/src/main/res/drawable-hdpi/list_white_single.9.png
rename to src/Note-master2/app/src/main/res/drawable-hdpi/list_white_single.9.png
diff --git a/src/Notes-master1/app/src/main/res/drawable-hdpi/list_white_up.9.png b/src/Note-master2/app/src/main/res/drawable-hdpi/list_white_up.9.png
similarity index 100%
rename from src/Notes-master1/app/src/main/res/drawable-hdpi/list_white_up.9.png
rename to src/Note-master2/app/src/main/res/drawable-hdpi/list_white_up.9.png
diff --git a/src/Notes-master1/app/src/main/res/drawable-hdpi/list_yellow_down.9.png b/src/Note-master2/app/src/main/res/drawable-hdpi/list_yellow_down.9.png
similarity index 100%
rename from src/Notes-master1/app/src/main/res/drawable-hdpi/list_yellow_down.9.png
rename to src/Note-master2/app/src/main/res/drawable-hdpi/list_yellow_down.9.png
diff --git a/src/Notes-master1/app/src/main/res/drawable-hdpi/list_yellow_middle.9.png b/src/Note-master2/app/src/main/res/drawable-hdpi/list_yellow_middle.9.png
similarity index 100%
rename from src/Notes-master1/app/src/main/res/drawable-hdpi/list_yellow_middle.9.png
rename to src/Note-master2/app/src/main/res/drawable-hdpi/list_yellow_middle.9.png
diff --git a/src/Notes-master1/app/src/main/res/drawable-hdpi/list_yellow_single.9.png b/src/Note-master2/app/src/main/res/drawable-hdpi/list_yellow_single.9.png
similarity index 100%
rename from src/Notes-master1/app/src/main/res/drawable-hdpi/list_yellow_single.9.png
rename to src/Note-master2/app/src/main/res/drawable-hdpi/list_yellow_single.9.png
diff --git a/src/Notes-master1/app/src/main/res/drawable-hdpi/list_yellow_up.9.png b/src/Note-master2/app/src/main/res/drawable-hdpi/list_yellow_up.9.png
similarity index 100%
rename from src/Notes-master1/app/src/main/res/drawable-hdpi/list_yellow_up.9.png
rename to src/Note-master2/app/src/main/res/drawable-hdpi/list_yellow_up.9.png
diff --git a/src/Notes-master1/app/src/main/res/drawable-hdpi/menu_delete.png b/src/Note-master2/app/src/main/res/drawable-hdpi/menu_delete.png
similarity index 100%
rename from src/Notes-master1/app/src/main/res/drawable-hdpi/menu_delete.png
rename to src/Note-master2/app/src/main/res/drawable-hdpi/menu_delete.png
diff --git a/src/Notes-master1/app/src/main/res/drawable-hdpi/menu_move.png b/src/Note-master2/app/src/main/res/drawable-hdpi/menu_move.png
similarity index 100%
rename from src/Notes-master1/app/src/main/res/drawable-hdpi/menu_move.png
rename to src/Note-master2/app/src/main/res/drawable-hdpi/menu_move.png
diff --git a/src/Notes-master1/app/src/main/res/drawable-hdpi/new_note_normal.png b/src/Note-master2/app/src/main/res/drawable-hdpi/new_note_normal.png
similarity index 100%
rename from src/Notes-master1/app/src/main/res/drawable-hdpi/new_note_normal.png
rename to src/Note-master2/app/src/main/res/drawable-hdpi/new_note_normal.png
diff --git a/src/Notes-master1/app/src/main/res/drawable-hdpi/new_note_pressed.png b/src/Note-master2/app/src/main/res/drawable-hdpi/new_note_pressed.png
similarity index 100%
rename from src/Notes-master1/app/src/main/res/drawable-hdpi/new_note_pressed.png
rename to src/Note-master2/app/src/main/res/drawable-hdpi/new_note_pressed.png
diff --git a/src/Notes-master1/app/src/main/res/drawable-hdpi/note_edit_color_selector_panel.png b/src/Note-master2/app/src/main/res/drawable-hdpi/note_edit_color_selector_panel.png
similarity index 100%
rename from src/Notes-master1/app/src/main/res/drawable-hdpi/note_edit_color_selector_panel.png
rename to src/Note-master2/app/src/main/res/drawable-hdpi/note_edit_color_selector_panel.png
diff --git a/src/Notes-master1/app/src/main/res/drawable-hdpi/notification.png b/src/Note-master2/app/src/main/res/drawable-hdpi/notification.png
similarity index 100%
rename from src/Notes-master1/app/src/main/res/drawable-hdpi/notification.png
rename to src/Note-master2/app/src/main/res/drawable-hdpi/notification.png
diff --git a/src/Notes-master1/app/src/main/res/drawable-hdpi/search_result.png b/src/Note-master2/app/src/main/res/drawable-hdpi/search_result.png
similarity index 100%
rename from src/Notes-master1/app/src/main/res/drawable-hdpi/search_result.png
rename to src/Note-master2/app/src/main/res/drawable-hdpi/search_result.png
diff --git a/src/Notes-master1/app/src/main/res/drawable-hdpi/selected.png b/src/Note-master2/app/src/main/res/drawable-hdpi/selected.png
similarity index 100%
rename from src/Notes-master1/app/src/main/res/drawable-hdpi/selected.png
rename to src/Note-master2/app/src/main/res/drawable-hdpi/selected.png
diff --git a/src/Notes-master1/app/src/main/res/drawable-hdpi/title_alert.png b/src/Note-master2/app/src/main/res/drawable-hdpi/title_alert.png
similarity index 100%
rename from src/Notes-master1/app/src/main/res/drawable-hdpi/title_alert.png
rename to src/Note-master2/app/src/main/res/drawable-hdpi/title_alert.png
diff --git a/src/Notes-master1/app/src/main/res/drawable-hdpi/title_bar_bg.9.png b/src/Note-master2/app/src/main/res/drawable-hdpi/title_bar_bg.9.png
similarity index 100%
rename from src/Notes-master1/app/src/main/res/drawable-hdpi/title_bar_bg.9.png
rename to src/Note-master2/app/src/main/res/drawable-hdpi/title_bar_bg.9.png
diff --git a/src/Notes-master1/app/src/main/res/drawable-hdpi/widget_2x_blue.png b/src/Note-master2/app/src/main/res/drawable-hdpi/widget_2x_blue.png
similarity index 100%
rename from src/Notes-master1/app/src/main/res/drawable-hdpi/widget_2x_blue.png
rename to src/Note-master2/app/src/main/res/drawable-hdpi/widget_2x_blue.png
diff --git a/src/Notes-master1/app/src/main/res/drawable-hdpi/widget_2x_green.png b/src/Note-master2/app/src/main/res/drawable-hdpi/widget_2x_green.png
similarity index 100%
rename from src/Notes-master1/app/src/main/res/drawable-hdpi/widget_2x_green.png
rename to src/Note-master2/app/src/main/res/drawable-hdpi/widget_2x_green.png
diff --git a/src/Notes-master1/app/src/main/res/drawable-hdpi/widget_2x_red.png b/src/Note-master2/app/src/main/res/drawable-hdpi/widget_2x_red.png
similarity index 100%
rename from src/Notes-master1/app/src/main/res/drawable-hdpi/widget_2x_red.png
rename to src/Note-master2/app/src/main/res/drawable-hdpi/widget_2x_red.png
diff --git a/src/Notes-master1/app/src/main/res/drawable-hdpi/widget_2x_white.png b/src/Note-master2/app/src/main/res/drawable-hdpi/widget_2x_white.png
similarity index 100%
rename from src/Notes-master1/app/src/main/res/drawable-hdpi/widget_2x_white.png
rename to src/Note-master2/app/src/main/res/drawable-hdpi/widget_2x_white.png
diff --git a/src/Notes-master1/app/src/main/res/drawable-hdpi/widget_2x_yellow.png b/src/Note-master2/app/src/main/res/drawable-hdpi/widget_2x_yellow.png
similarity index 100%
rename from src/Notes-master1/app/src/main/res/drawable-hdpi/widget_2x_yellow.png
rename to src/Note-master2/app/src/main/res/drawable-hdpi/widget_2x_yellow.png
diff --git a/src/Notes-master1/app/src/main/res/drawable-hdpi/widget_4x_blue.png b/src/Note-master2/app/src/main/res/drawable-hdpi/widget_4x_blue.png
similarity index 100%
rename from src/Notes-master1/app/src/main/res/drawable-hdpi/widget_4x_blue.png
rename to src/Note-master2/app/src/main/res/drawable-hdpi/widget_4x_blue.png
diff --git a/src/Notes-master1/app/src/main/res/drawable-hdpi/widget_4x_green.png b/src/Note-master2/app/src/main/res/drawable-hdpi/widget_4x_green.png
similarity index 100%
rename from src/Notes-master1/app/src/main/res/drawable-hdpi/widget_4x_green.png
rename to src/Note-master2/app/src/main/res/drawable-hdpi/widget_4x_green.png
diff --git a/src/Notes-master1/app/src/main/res/drawable-hdpi/widget_4x_red.png b/src/Note-master2/app/src/main/res/drawable-hdpi/widget_4x_red.png
similarity index 100%
rename from src/Notes-master1/app/src/main/res/drawable-hdpi/widget_4x_red.png
rename to src/Note-master2/app/src/main/res/drawable-hdpi/widget_4x_red.png
diff --git a/src/Notes-master1/app/src/main/res/drawable-hdpi/widget_4x_white.png b/src/Note-master2/app/src/main/res/drawable-hdpi/widget_4x_white.png
similarity index 100%
rename from src/Notes-master1/app/src/main/res/drawable-hdpi/widget_4x_white.png
rename to src/Note-master2/app/src/main/res/drawable-hdpi/widget_4x_white.png
diff --git a/src/Notes-master1/app/src/main/res/drawable-hdpi/widget_4x_yellow.png b/src/Note-master2/app/src/main/res/drawable-hdpi/widget_4x_yellow.png
similarity index 100%
rename from src/Notes-master1/app/src/main/res/drawable-hdpi/widget_4x_yellow.png
rename to src/Note-master2/app/src/main/res/drawable-hdpi/widget_4x_yellow.png
diff --git a/src/Notes-master1/app/src/main/res/drawable/new_note.xml b/src/Note-master2/app/src/main/res/drawable/new_note.xml
similarity index 100%
rename from src/Notes-master1/app/src/main/res/drawable/new_note.xml
rename to src/Note-master2/app/src/main/res/drawable/new_note.xml
diff --git a/src/Notes-master1/app/src/main/res/layout/account_dialog_title.xml b/src/Note-master2/app/src/main/res/layout/account_dialog_title.xml
similarity index 100%
rename from src/Notes-master1/app/src/main/res/layout/account_dialog_title.xml
rename to src/Note-master2/app/src/main/res/layout/account_dialog_title.xml
diff --git a/src/Notes-master1/app/src/main/res/layout/add_account_text.xml b/src/Note-master2/app/src/main/res/layout/add_account_text.xml
similarity index 100%
rename from src/Notes-master1/app/src/main/res/layout/add_account_text.xml
rename to src/Note-master2/app/src/main/res/layout/add_account_text.xml
diff --git a/src/Notes-master1/app/src/main/res/layout/datetime_picker.xml b/src/Note-master2/app/src/main/res/layout/datetime_picker.xml
similarity index 100%
rename from src/Notes-master1/app/src/main/res/layout/datetime_picker.xml
rename to src/Note-master2/app/src/main/res/layout/datetime_picker.xml
diff --git a/src/Notes-master1/app/src/main/res/layout/dialog_edit_text.xml b/src/Note-master2/app/src/main/res/layout/dialog_edit_text.xml
similarity index 100%
rename from src/Notes-master1/app/src/main/res/layout/dialog_edit_text.xml
rename to src/Note-master2/app/src/main/res/layout/dialog_edit_text.xml
diff --git a/src/Notes-master1/app/src/main/res/layout/folder_list_item.xml b/src/Note-master2/app/src/main/res/layout/folder_list_item.xml
similarity index 100%
rename from src/Notes-master1/app/src/main/res/layout/folder_list_item.xml
rename to src/Note-master2/app/src/main/res/layout/folder_list_item.xml
diff --git a/src/Notes-master1/app/src/main/res/layout/note_edit.xml b/src/Note-master2/app/src/main/res/layout/note_edit.xml
similarity index 100%
rename from src/Notes-master1/app/src/main/res/layout/note_edit.xml
rename to src/Note-master2/app/src/main/res/layout/note_edit.xml
diff --git a/src/Notes-master1/app/src/main/res/layout/note_edit_list_item.xml b/src/Note-master2/app/src/main/res/layout/note_edit_list_item.xml
similarity index 100%
rename from src/Notes-master1/app/src/main/res/layout/note_edit_list_item.xml
rename to src/Note-master2/app/src/main/res/layout/note_edit_list_item.xml
diff --git a/src/Notes-master1/app/src/main/res/layout/note_item.xml b/src/Note-master2/app/src/main/res/layout/note_item.xml
similarity index 100%
rename from src/Notes-master1/app/src/main/res/layout/note_item.xml
rename to src/Note-master2/app/src/main/res/layout/note_item.xml
diff --git a/src/Notes-master1/app/src/main/res/layout/note_list.xml b/src/Note-master2/app/src/main/res/layout/note_list.xml
similarity index 100%
rename from src/Notes-master1/app/src/main/res/layout/note_list.xml
rename to src/Note-master2/app/src/main/res/layout/note_list.xml
diff --git a/src/Notes-master1/app/src/main/res/layout/note_list_dropdown_menu.xml b/src/Note-master2/app/src/main/res/layout/note_list_dropdown_menu.xml
similarity index 100%
rename from src/Notes-master1/app/src/main/res/layout/note_list_dropdown_menu.xml
rename to src/Note-master2/app/src/main/res/layout/note_list_dropdown_menu.xml
diff --git a/src/Notes-master1/app/src/main/res/layout/note_list_footer.xml b/src/Note-master2/app/src/main/res/layout/note_list_footer.xml
similarity index 100%
rename from src/Notes-master1/app/src/main/res/layout/note_list_footer.xml
rename to src/Note-master2/app/src/main/res/layout/note_list_footer.xml
diff --git a/src/Notes-master1/app/src/main/res/layout/settings_header.xml b/src/Note-master2/app/src/main/res/layout/settings_header.xml
similarity index 100%
rename from src/Notes-master1/app/src/main/res/layout/settings_header.xml
rename to src/Note-master2/app/src/main/res/layout/settings_header.xml
diff --git a/src/Notes-master1/app/src/main/res/layout/widget_2x.xml b/src/Note-master2/app/src/main/res/layout/widget_2x.xml
similarity index 100%
rename from src/Notes-master1/app/src/main/res/layout/widget_2x.xml
rename to src/Note-master2/app/src/main/res/layout/widget_2x.xml
diff --git a/src/Notes-master1/app/src/main/res/layout/widget_4x.xml b/src/Note-master2/app/src/main/res/layout/widget_4x.xml
similarity index 100%
rename from src/Notes-master1/app/src/main/res/layout/widget_4x.xml
rename to src/Note-master2/app/src/main/res/layout/widget_4x.xml
diff --git a/src/Notes-master1/app/src/main/res/menu/call_note_edit.xml b/src/Note-master2/app/src/main/res/menu/call_note_edit.xml
similarity index 100%
rename from src/Notes-master1/app/src/main/res/menu/call_note_edit.xml
rename to src/Note-master2/app/src/main/res/menu/call_note_edit.xml
diff --git a/src/Notes-master1/app/src/main/res/menu/call_record_folder.xml b/src/Note-master2/app/src/main/res/menu/call_record_folder.xml
similarity index 100%
rename from src/Notes-master1/app/src/main/res/menu/call_record_folder.xml
rename to src/Note-master2/app/src/main/res/menu/call_record_folder.xml
diff --git a/src/Notes-master1/app/src/main/res/menu/note_edit.xml b/src/Note-master2/app/src/main/res/menu/note_edit.xml
similarity index 100%
rename from src/Notes-master1/app/src/main/res/menu/note_edit.xml
rename to src/Note-master2/app/src/main/res/menu/note_edit.xml
diff --git a/src/Notes-master1/app/src/main/res/menu/note_list.xml b/src/Note-master2/app/src/main/res/menu/note_list.xml
similarity index 100%
rename from src/Notes-master1/app/src/main/res/menu/note_list.xml
rename to src/Note-master2/app/src/main/res/menu/note_list.xml
diff --git a/src/Notes-master1/app/src/main/res/menu/note_list_dropdown.xml b/src/Note-master2/app/src/main/res/menu/note_list_dropdown.xml
similarity index 100%
rename from src/Notes-master1/app/src/main/res/menu/note_list_dropdown.xml
rename to src/Note-master2/app/src/main/res/menu/note_list_dropdown.xml
diff --git a/src/Notes-master1/app/src/main/res/menu/note_list_options.xml b/src/Note-master2/app/src/main/res/menu/note_list_options.xml
similarity index 100%
rename from src/Notes-master1/app/src/main/res/menu/note_list_options.xml
rename to src/Note-master2/app/src/main/res/menu/note_list_options.xml
diff --git a/src/Notes-master1/app/src/main/res/menu/sub_folder.xml b/src/Note-master2/app/src/main/res/menu/sub_folder.xml
similarity index 100%
rename from src/Notes-master1/app/src/main/res/menu/sub_folder.xml
rename to src/Note-master2/app/src/main/res/menu/sub_folder.xml
diff --git a/src/Notes-master1/app/src/main/res/raw-zh-rCN/introduction b/src/Note-master2/app/src/main/res/raw-zh-rCN/introduction
similarity index 100%
rename from src/Notes-master1/app/src/main/res/raw-zh-rCN/introduction
rename to src/Note-master2/app/src/main/res/raw-zh-rCN/introduction
diff --git a/src/Notes-master1/app/src/main/res/raw/introduction b/src/Note-master2/app/src/main/res/raw/introduction
similarity index 100%
rename from src/Notes-master1/app/src/main/res/raw/introduction
rename to src/Note-master2/app/src/main/res/raw/introduction
diff --git a/src/Notes-master1/app/src/main/res/values-zh-rCN/arrays.xml b/src/Note-master2/app/src/main/res/values-zh-rCN/arrays.xml
similarity index 100%
rename from src/Notes-master1/app/src/main/res/values-zh-rCN/arrays.xml
rename to src/Note-master2/app/src/main/res/values-zh-rCN/arrays.xml
diff --git a/src/Notes-master1/app/src/main/res/values-zh-rCN/strings.xml b/src/Note-master2/app/src/main/res/values-zh-rCN/strings.xml
similarity index 100%
rename from src/Notes-master1/app/src/main/res/values-zh-rCN/strings.xml
rename to src/Note-master2/app/src/main/res/values-zh-rCN/strings.xml
diff --git a/src/Notes-master1/app/src/main/res/values-zh-rTW/arrays.xml b/src/Note-master2/app/src/main/res/values-zh-rTW/arrays.xml
similarity index 100%
rename from src/Notes-master1/app/src/main/res/values-zh-rTW/arrays.xml
rename to src/Note-master2/app/src/main/res/values-zh-rTW/arrays.xml
diff --git a/src/Notes-master1/app/src/main/res/values-zh-rTW/strings.xml b/src/Note-master2/app/src/main/res/values-zh-rTW/strings.xml
similarity index 100%
rename from src/Notes-master1/app/src/main/res/values-zh-rTW/strings.xml
rename to src/Note-master2/app/src/main/res/values-zh-rTW/strings.xml
diff --git a/src/Notes-master1/app/src/main/res/values/arrays.xml b/src/Note-master2/app/src/main/res/values/arrays.xml
similarity index 100%
rename from src/Notes-master1/app/src/main/res/values/arrays.xml
rename to src/Note-master2/app/src/main/res/values/arrays.xml
diff --git a/src/Notes-master1/app/src/main/res/values/colors.xml b/src/Note-master2/app/src/main/res/values/colors.xml
similarity index 100%
rename from src/Notes-master1/app/src/main/res/values/colors.xml
rename to src/Note-master2/app/src/main/res/values/colors.xml
diff --git a/src/Notes-master1/app/src/main/res/values/dimens.xml b/src/Note-master2/app/src/main/res/values/dimens.xml
similarity index 100%
rename from src/Notes-master1/app/src/main/res/values/dimens.xml
rename to src/Note-master2/app/src/main/res/values/dimens.xml
diff --git a/src/Notes-master1/app/src/main/res/values/strings.xml b/src/Note-master2/app/src/main/res/values/strings.xml
similarity index 100%
rename from src/Notes-master1/app/src/main/res/values/strings.xml
rename to src/Note-master2/app/src/main/res/values/strings.xml
diff --git a/src/Notes-master1/app/src/main/res/values/styles.xml b/src/Note-master2/app/src/main/res/values/styles.xml
similarity index 100%
rename from src/Notes-master1/app/src/main/res/values/styles.xml
rename to src/Note-master2/app/src/main/res/values/styles.xml
diff --git a/src/Notes-master1/app/src/main/res/xml/preferences.xml b/src/Note-master2/app/src/main/res/xml/preferences.xml
similarity index 100%
rename from src/Notes-master1/app/src/main/res/xml/preferences.xml
rename to src/Note-master2/app/src/main/res/xml/preferences.xml
diff --git a/src/Notes-master1/app/src/main/res/xml/searchable.xml b/src/Note-master2/app/src/main/res/xml/searchable.xml
similarity index 100%
rename from src/Notes-master1/app/src/main/res/xml/searchable.xml
rename to src/Note-master2/app/src/main/res/xml/searchable.xml
diff --git a/src/Notes-master1/app/src/main/res/xml/widget_2x_info.xml b/src/Note-master2/app/src/main/res/xml/widget_2x_info.xml
similarity index 100%
rename from src/Notes-master1/app/src/main/res/xml/widget_2x_info.xml
rename to src/Note-master2/app/src/main/res/xml/widget_2x_info.xml
diff --git a/src/Notes-master1/app/src/main/res/xml/widget_4x_info.xml b/src/Note-master2/app/src/main/res/xml/widget_4x_info.xml
similarity index 100%
rename from src/Notes-master1/app/src/main/res/xml/widget_4x_info.xml
rename to src/Note-master2/app/src/main/res/xml/widget_4x_info.xml
diff --git a/src/Notes-master1/build.gradle b/src/Note-master2/build.gradle
similarity index 100%
rename from src/Notes-master1/build.gradle
rename to src/Note-master2/build.gradle
diff --git a/src/Notes-master1/gradle.properties b/src/Note-master2/gradle.properties
similarity index 100%
rename from src/Notes-master1/gradle.properties
rename to src/Note-master2/gradle.properties
diff --git a/src/Notes-master1/gradle/wrapper/gradle-wrapper.jar b/src/Note-master2/gradle/wrapper/gradle-wrapper.jar
similarity index 100%
rename from src/Notes-master1/gradle/wrapper/gradle-wrapper.jar
rename to src/Note-master2/gradle/wrapper/gradle-wrapper.jar
diff --git a/src/Notes-master1/gradle/wrapper/gradle-wrapper.properties b/src/Note-master2/gradle/wrapper/gradle-wrapper.properties
similarity index 100%
rename from src/Notes-master1/gradle/wrapper/gradle-wrapper.properties
rename to src/Note-master2/gradle/wrapper/gradle-wrapper.properties
diff --git a/src/Notes-master1/gradlew b/src/Note-master2/gradlew
similarity index 100%
rename from src/Notes-master1/gradlew
rename to src/Note-master2/gradlew
diff --git a/src/Notes-master1/gradlew.bat b/src/Note-master2/gradlew.bat
similarity index 100%
rename from src/Notes-master1/gradlew.bat
rename to src/Note-master2/gradlew.bat
diff --git a/src/Notes-master1/import-summary.txt b/src/Note-master2/import-summary.txt
similarity index 100%
rename from src/Notes-master1/import-summary.txt
rename to src/Note-master2/import-summary.txt
diff --git a/src/Notes-master1/local.properties b/src/Note-master2/local.properties
similarity index 100%
rename from src/Notes-master1/local.properties
rename to src/Note-master2/local.properties
diff --git a/src/Notes-master1/settings.gradle b/src/Note-master2/settings.gradle
similarity index 100%
rename from src/Notes-master1/settings.gradle
rename to src/Note-master2/settings.gradle
diff --git a/src/Notes-master1/.gradle/7.0.2/executionHistory/executionHistory.lock b/src/Notes-master1/.gradle/7.0.2/executionHistory/executionHistory.lock
deleted file mode 100644
index 6f4d1d6..0000000
Binary files a/src/Notes-master1/.gradle/7.0.2/executionHistory/executionHistory.lock and /dev/null differ
diff --git a/src/Notes-master1/.gradle/7.0.2/fileHashes/fileHashes.lock b/src/Notes-master1/.gradle/7.0.2/fileHashes/fileHashes.lock
deleted file mode 100644
index fc6c198..0000000
Binary files a/src/Notes-master1/.gradle/7.0.2/fileHashes/fileHashes.lock and /dev/null differ
diff --git a/src/Notes-master1/.gradle/7.0.2/javaCompile/javaCompile.lock b/src/Notes-master1/.gradle/7.0.2/javaCompile/javaCompile.lock
deleted file mode 100644
index bbd390c..0000000
Binary files a/src/Notes-master1/.gradle/7.0.2/javaCompile/javaCompile.lock and /dev/null differ
diff --git a/src/Notes-master1/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/src/Notes-master1/.gradle/buildOutputCleanup/buildOutputCleanup.lock
deleted file mode 100644
index d783147..0000000
Binary files a/src/Notes-master1/.gradle/buildOutputCleanup/buildOutputCleanup.lock and /dev/null differ
diff --git a/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_0/graph.bin b/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_0/graph.bin
deleted file mode 100644
index bb2e5a4..0000000
Binary files a/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_0/graph.bin and /dev/null differ
diff --git a/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_3/graph.bin b/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_3/graph.bin
deleted file mode 100644
index 388aeb5..0000000
Binary files a/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_3/graph.bin and /dev/null differ
diff --git a/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_5/graph.bin b/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_5/graph.bin
deleted file mode 100644
index e0a206c..0000000
Binary files a/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_5/graph.bin and /dev/null differ
diff --git a/src/Notes-master1/app/build/intermediates/dex_archive_input_jar_hashes/debug/out b/src/Notes-master1/app/build/intermediates/dex_archive_input_jar_hashes/debug/out
deleted file mode 100644
index f9e19bc..0000000
Binary files a/src/Notes-master1/app/build/intermediates/dex_archive_input_jar_hashes/debug/out and /dev/null differ
diff --git a/src/Notes-master1/app/build/intermediates/incremental/mergeDebugAssets/merger.xml b/src/Notes-master1/app/build/intermediates/incremental/mergeDebugAssets/merger.xml
deleted file mode 100644
index f79d0b5..0000000
--- a/src/Notes-master1/app/build/intermediates/incremental/mergeDebugAssets/merger.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-
-
\ No newline at end of file
diff --git a/src/Notes-master1/app/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml b/src/Notes-master1/app/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml
deleted file mode 100644
index c6ae0a3..0000000
--- a/src/Notes-master1/app/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-
-
\ No newline at end of file
diff --git a/src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/compile-file-map.properties b/src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/compile-file-map.properties
deleted file mode 100644
index 827cf87..0000000
--- a/src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/compile-file-map.properties
+++ /dev/null
@@ -1,96 +0,0 @@
-#Thu Sep 16 01:55:54 GMT+08:00 2021
-D\:\\Notes-master1\\app\\src\\main\\res\\layout\\widget_4x.xml=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_widget_4x.xml.flat
-D\:\\Notes-master1\\app\\src\\main\\res\\xml\\searchable.xml=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\xml_searchable.xml.flat
-D\:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\widget_4x_blue.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_blue.png.flat
-D\:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\dropdown_icon.9.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_dropdown_icon.9.png.flat
-D\:\\Notes-master1\\app\\src\\main\\res\\xml\\widget_2x_info.xml=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\xml_widget_2x_info.xml.flat
-D\:\\Notes-master1\\app\\src\\main\\res\\menu\\note_list_dropdown.xml=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\menu_note_list_dropdown.xml.flat
-D\:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\search_result.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_search_result.png.flat
-D\:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\selected.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_selected.png.flat
-D\:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\edit_green.9.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_green.9.png.flat
-D\:\\Notes-master1\\app\\src\\main\\res\\layout\\note_list_dropdown_menu.xml=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_note_list_dropdown_menu.xml.flat
-D\:\\Notes-master1\\app\\src\\main\\res\\color\\primary_text_dark.xml=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\color_primary_text_dark.xml.flat
-D\:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\widget_2x_white.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_white.png.flat
-D\:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\edit_white.9.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_white.9.png.flat
-D\:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_red_down.9.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_down.9.png.flat
-D\:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\edit_title_yellow.9.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_yellow.9.png.flat
-D\:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\edit_title_red.9.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_red.9.png.flat
-D\:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_white_up.9.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_up.9.png.flat
-D\:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_green_single.9.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_green_single.9.png.flat
-D\:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\bg_btn_set_color.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_bg_btn_set_color.png.flat
-D\:\\Notes-master1\\app\\src\\main\\res\\raw\\introduction=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\raw_introduction.flat
-D\:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\edit_title_green.9.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_green.9.png.flat
-D\:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\widget_4x_yellow.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_yellow.png.flat
-D\:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\font_large.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_large.png.flat
-D\:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\widget_2x_yellow.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_yellow.png.flat
-D\:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\new_note_normal.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_new_note_normal.png.flat
-D\:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\widget_4x_red.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_red.png.flat
-D\:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\note_edit_color_selector_panel.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_note_edit_color_selector_panel.png.flat
-D\:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\delete.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_delete.png.flat
-D\:\\Notes-master1\\app\\src\\main\\res\\layout\\note_edit.xml=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_note_edit.xml.flat
-D\:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\edit_yellow.9.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_yellow.9.png.flat
-D\:\\Notes-master1\\app\\src\\main\\res\\layout\\datetime_picker.xml=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_datetime_picker.xml.flat
-D\:\\Notes-master1\\app\\src\\main\\res\\menu\\note_list.xml=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\menu_note_list.xml.flat
-D\:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\icon_app.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_icon_app.png.flat
-D\:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_yellow_middle.9.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_middle.9.png.flat
-D\:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\new_note_pressed.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_new_note_pressed.png.flat
-D\:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_red_single.9.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_single.9.png.flat
-D\:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\title_alert.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_title_alert.png.flat
-D\:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\font_normal.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_normal.png.flat
-D\:\\Notes-master1\\app\\src\\main\\res\\menu\\call_note_edit.xml=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\menu_call_note_edit.xml.flat
-D\:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_footer_bg.9.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_footer_bg.9.png.flat
-D\:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_background.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_background.png.flat
-D\:\\Notes-master1\\app\\src\\main\\res\\xml\\widget_4x_info.xml=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\xml_widget_4x_info.xml.flat
-D\:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\font_size_selector_bg.9.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_size_selector_bg.9.png.flat
-D\:\\Notes-master1\\app\\src\\main\\res\\xml\\preferences.xml=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\xml_preferences.xml.flat
-D\:\\Notes-master1\\app\\src\\main\\res\\layout\\note_list.xml=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_note_list.xml.flat
-D\:\\Notes-master1\\app\\src\\main\\res\\menu\\note_list_options.xml=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\menu_note_list_options.xml.flat
-D\:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\menu_delete.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_menu_delete.png.flat
-D\:\\Notes-master1\\app\\src\\main\\res\\layout\\note_item.xml=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_note_item.xml.flat
-D\:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\widget_2x_red.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_red.png.flat
-D\:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_blue_middle.9.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_blue_middle.9.png.flat
-D\:\\Notes-master1\\app\\src\\main\\res\\menu\\note_edit.xml=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\menu_note_edit.xml.flat
-D\:\\Notes-master1\\app\\src\\main\\res\\layout\\add_account_text.xml=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_add_account_text.xml.flat
-D\:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\widget_2x_blue.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_blue.png.flat
-D\:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_white_single.9.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_single.9.png.flat
-D\:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\widget_4x_white.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_white.png.flat
-D\:\\Notes-master1\\app\\src\\main\\res\\layout\\dialog_edit_text.xml=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_dialog_edit_text.xml.flat
-D\:\\Notes-master1\\app\\src\\main\\res\\layout\\note_list_footer.xml=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_note_list_footer.xml.flat
-D\:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_green_up.9.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_green_up.9.png.flat
-D\:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\clock.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_clock.png.flat
-D\:\\Notes-master1\\app\\src\\main\\res\\layout\\note_edit_list_item.xml=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_note_edit_list_item.xml.flat
-D\:\\Notes-master1\\app\\src\\main\\res\\menu\\sub_folder.xml=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\menu_sub_folder.xml.flat
-D\:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_green_middle.9.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_green_middle.9.png.flat
-D\:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\edit_blue.9.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_blue.9.png.flat
-D\:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_yellow_up.9.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_up.9.png.flat
-D\:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_green_down.9.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_green_down.9.png.flat
-D\:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_blue_single.9.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_blue_single.9.png.flat
-D\:\\Notes-master1\\app\\src\\main\\res\\layout\\folder_list_item.xml=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_folder_list_item.xml.flat
-D\:\\Notes-master1\\app\\src\\main\\res\\drawable\\new_note.xml=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable_new_note.xml.flat
-D\:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_blue_up.9.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_blue_up.9.png.flat
-D\:\\Notes-master1\\app\\src\\main\\res\\layout\\widget_2x.xml=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_widget_2x.xml.flat
-D\:\\Notes-master1\\app\\src\\main\\res\\menu\\call_record_folder.xml=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\menu_call_record_folder.xml.flat
-D\:\\Notes-master1\\app\\src\\main\\res\\color\\secondary_text_dark.xml=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\color_secondary_text_dark.xml.flat
-D\:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\call_record.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_call_record.png.flat
-D\:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\widget_4x_green.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_green.png.flat
-D\:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_white_down.9.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_down.9.png.flat
-D\:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\font_small.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_small.png.flat
-D\:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_yellow_down.9.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_down.9.png.flat
-D\:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\title_bar_bg.9.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_title_bar_bg.9.png.flat
-D\:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\font_super.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_super.png.flat
-D\:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_blue_down.9.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_blue_down.9.png.flat
-D\:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_folder.9.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_folder.9.png.flat
-D\:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_red_middle.9.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_middle.9.png.flat
-D\:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\bg_color_btn_mask.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_bg_color_btn_mask.png.flat
-D\:\\Notes-master1\\app\\src\\main\\res\\raw-zh-rCN\\introduction=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\raw-zh-rCN_introduction.flat
-D\:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_red_up.9.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_up.9.png.flat
-D\:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\edit_red.9.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_red.9.png.flat
-D\:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\edit_title_white.9.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_white.9.png.flat
-D\:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\notification.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_notification.png.flat
-D\:\\Notes-master1\\app\\src\\main\\res\\layout\\settings_header.xml=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_settings_header.xml.flat
-D\:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_yellow_single.9.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_single.9.png.flat
-D\:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\edit_title_blue.9.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_blue.9.png.flat
-D\:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\widget_2x_green.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_green.png.flat
-D\:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_white_middle.9.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_middle.9.png.flat
-D\:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\menu_move.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_menu_move.png.flat
-D\:\\Notes-master1\\app\\src\\main\\res\\layout\\account_dialog_title.xml=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_account_dialog_title.xml.flat
diff --git a/src/Notes-master1/app/build/intermediates/incremental/mergeDebugShaders/merger.xml b/src/Notes-master1/app/build/intermediates/incremental/mergeDebugShaders/merger.xml
deleted file mode 100644
index 8b924a7..0000000
--- a/src/Notes-master1/app/build/intermediates/incremental/mergeDebugShaders/merger.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-
-
\ No newline at end of file
diff --git a/src/Notes-master1/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt b/src/Notes-master1/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt
deleted file mode 100644
index 477b94b..0000000
--- a/src/Notes-master1/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-#Thu Sep 16 07:57:14 GMT+08:00 2021
-base.0=D\:\\Notes-master1\\app\\build\\intermediates\\dex\\debug\\mergeDexDebug\\classes.dex
-renamed.0=classes.dex
-path.0=classes.dex
diff --git a/src/Notes-master1/app/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt b/src/Notes-master1/app/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt
deleted file mode 100644
index 9e795cb..0000000
--- a/src/Notes-master1/app/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt
+++ /dev/null
@@ -1,275 +0,0 @@
-1
-2
-17
-21
-22 D:\Notes-master1\app\src\main\AndroidManifest.xml:23:5-44
-23 android:minSdkVersion="14"
-23-->D:\Notes-master1\app\src\main\AndroidManifest.xml:23:15-41
-24 android:targetSdkVersion="14" />
-24-->D:\Notes-master1\app\src\main\AndroidManifest.xml:23:5-44
-25
-26
-26-->D:\Notes-master1\app\src\main\AndroidManifest.xml:25:5-81
-26-->D:\Notes-master1\app\src\main\AndroidManifest.xml:25:22-78
-27
-27-->D:\Notes-master1\app\src\main\AndroidManifest.xml:26:5-88
-27-->D:\Notes-master1\app\src\main\AndroidManifest.xml:26:22-85
-28
-28-->D:\Notes-master1\app\src\main\AndroidManifest.xml:27:5-67
-28-->D:\Notes-master1\app\src\main\AndroidManifest.xml:27:22-64
-29
-29-->D:\Notes-master1\app\src\main\AndroidManifest.xml:28:5-72
-29-->D:\Notes-master1\app\src\main\AndroidManifest.xml:28:22-69
-30
-30-->D:\Notes-master1\app\src\main\AndroidManifest.xml:29:5-74
-30-->D:\Notes-master1\app\src\main\AndroidManifest.xml:29:22-71
-31
-31-->D:\Notes-master1\app\src\main\AndroidManifest.xml:30:5-80
-31-->D:\Notes-master1\app\src\main\AndroidManifest.xml:30:22-77
-32
-32-->D:\Notes-master1\app\src\main\AndroidManifest.xml:31:5-71
-32-->D:\Notes-master1\app\src\main\AndroidManifest.xml:31:22-68
-33
-33-->D:\Notes-master1\app\src\main\AndroidManifest.xml:32:5-74
-33-->D:\Notes-master1\app\src\main\AndroidManifest.xml:32:22-71
-34
-34-->D:\Notes-master1\app\src\main\AndroidManifest.xml:33:5-81
-34-->D:\Notes-master1\app\src\main\AndroidManifest.xml:33:22-78
-35
-36 D:\Notes-master1\app\src\main\AndroidManifest.xml:35:5-149:19
-37 android:appComponentFactory="android.support.v4.app.CoreComponentFactory"
-37-->[com.android.support:support-compat:28.0.0] C:\Users\86155\.gradle\caches\transforms-3\c9913736ba0af3f26ba50dd9aa679a2b\transformed\support-compat-28.0.0\AndroidManifest.xml:22:18-91
-38 android:debuggable="true"
-39 android:icon="@drawable/icon_app"
-39-->D:\Notes-master1\app\src\main\AndroidManifest.xml:36:9-42
-40 android:label="@string/app_name"
-40-->D:\Notes-master1\app\src\main\AndroidManifest.xml:37:9-41
-41 android:testOnly="true" >
-42 D:\Notes-master1\app\src\main\AndroidManifest.xml:38:9-51:20
-43 android:name="net.micode.notes.ui.NotesListActivity"
-43-->D:\Notes-master1\app\src\main\AndroidManifest.xml:39:13-49
-44 android:configChanges="keyboardHidden|orientation|screenSize"
-44-->D:\Notes-master1\app\src\main\AndroidManifest.xml:40:13-74
-45 android:label="@string/app_name"
-45-->D:\Notes-master1\app\src\main\AndroidManifest.xml:41:13-45
-46 android:launchMode="singleTop"
-46-->D:\Notes-master1\app\src\main\AndroidManifest.xml:42:13-43
-47 android:theme="@style/NoteTheme"
-47-->D:\Notes-master1\app\src\main\AndroidManifest.xml:43:13-45
-48 android:uiOptions="splitActionBarWhenNarrow"
-48-->D:\Notes-master1\app\src\main\AndroidManifest.xml:44:13-57
-49 android:windowSoftInputMode="adjustPan" >
-49-->D:\Notes-master1\app\src\main\AndroidManifest.xml:45:13-52
-50
-50-->D:\Notes-master1\app\src\main\AndroidManifest.xml:47:13-50:29
-51
-51-->D:\Notes-master1\app\src\main\AndroidManifest.xml:48:17-69
-51-->D:\Notes-master1\app\src\main\AndroidManifest.xml:48:25-66
-52
-53
-53-->D:\Notes-master1\app\src\main\AndroidManifest.xml:49:17-77
-53-->D:\Notes-master1\app\src\main\AndroidManifest.xml:49:27-74
-54
-55
-56 D:\Notes-master1\app\src\main\AndroidManifest.xml:53:9-81:20
-57 android:name="net.micode.notes.ui.NoteEditActivity"
-57-->D:\Notes-master1\app\src\main\AndroidManifest.xml:54:13-48
-58 android:configChanges="keyboardHidden|orientation|screenSize"
-58-->D:\Notes-master1\app\src\main\AndroidManifest.xml:55:13-74
-59 android:launchMode="singleTop"
-59-->D:\Notes-master1\app\src\main\AndroidManifest.xml:56:13-43
-60 android:theme="@style/NoteTheme" >
-60-->D:\Notes-master1\app\src\main\AndroidManifest.xml:57:13-45
-61
-61-->D:\Notes-master1\app\src\main\AndroidManifest.xml:59:13-64:29
-62
-62-->D:\Notes-master1\app\src\main\AndroidManifest.xml:60:17-69
-62-->D:\Notes-master1\app\src\main\AndroidManifest.xml:60:25-66
-63
-64
-64-->D:\Notes-master1\app\src\main\AndroidManifest.xml:61:17-76
-64-->D:\Notes-master1\app\src\main\AndroidManifest.xml:61:27-73
-65
-66
-66-->D:\Notes-master1\app\src\main\AndroidManifest.xml:62:17-78
-66-->D:\Notes-master1\app\src\main\AndroidManifest.xml:62:23-75
-67
-67-->D:\Notes-master1\app\src\main\AndroidManifest.xml:62:17-78
-67-->D:\Notes-master1\app\src\main\AndroidManifest.xml:62:23-75
-68
-69
-69-->D:\Notes-master1\app\src\main\AndroidManifest.xml:66:13-71:29
-70
-70-->D:\Notes-master1\app\src\main\AndroidManifest.xml:67:17-79
-70-->D:\Notes-master1\app\src\main\AndroidManifest.xml:67:25-76
-71
-72
-72-->D:\Notes-master1\app\src\main\AndroidManifest.xml:61:17-76
-72-->D:\Notes-master1\app\src\main\AndroidManifest.xml:61:27-73
-73
-74
-74-->D:\Notes-master1\app\src\main\AndroidManifest.xml:62:17-78
-74-->D:\Notes-master1\app\src\main\AndroidManifest.xml:62:23-75
-75
-75-->D:\Notes-master1\app\src\main\AndroidManifest.xml:62:17-78
-75-->D:\Notes-master1\app\src\main\AndroidManifest.xml:62:23-75
-76
-77
-77-->D:\Notes-master1\app\src\main\AndroidManifest.xml:73:13-76:29
-78
-78-->D:\Notes-master1\app\src\main\AndroidManifest.xml:74:17-71
-78-->D:\Notes-master1\app\src\main\AndroidManifest.xml:74:25-68
-79
-80
-80-->D:\Notes-master1\app\src\main\AndroidManifest.xml:61:17-76
-80-->D:\Notes-master1\app\src\main\AndroidManifest.xml:61:27-73
-81
-82
-83 D:\Notes-master1\app\src\main\AndroidManifest.xml:78:13-80:54
-84 android:name="android.app.searchable"
-84-->D:\Notes-master1\app\src\main\AndroidManifest.xml:79:17-54
-85 android:resource="@xml/searchable" />
-85-->D:\Notes-master1\app\src\main\AndroidManifest.xml:80:17-51
-86
-87
-88 D:\Notes-master1\app\src\main\AndroidManifest.xml:83:9-86:43
-89 android:name="net.micode.notes.data.NotesProvider"
-89-->D:\Notes-master1\app\src\main\AndroidManifest.xml:84:13-63
-90 android:authorities="micode_notes"
-90-->D:\Notes-master1\app\src\main\AndroidManifest.xml:85:13-47
-91 android:multiprocess="true" />
-91-->D:\Notes-master1\app\src\main\AndroidManifest.xml:86:13-40
-92
-93 D:\Notes-master1\app\src\main\AndroidManifest.xml:88:9-100:20
-94 android:name="net.micode.notes.widget.NoteWidgetProvider_2x"
-94-->D:\Notes-master1\app\src\main\AndroidManifest.xml:89:13-57
-95 android:label="@string/app_widget2x2" >
-95-->D:\Notes-master1\app\src\main\AndroidManifest.xml:90:13-50
-96
-96-->D:\Notes-master1\app\src\main\AndroidManifest.xml:91:13-95:29
-97
-97-->D:\Notes-master1\app\src\main\AndroidManifest.xml:92:17-84
-97-->D:\Notes-master1\app\src\main\AndroidManifest.xml:92:25-81
-98
-98-->D:\Notes-master1\app\src\main\AndroidManifest.xml:93:17-85
-98-->D:\Notes-master1\app\src\main\AndroidManifest.xml:93:25-82
-99
-99-->D:\Notes-master1\app\src\main\AndroidManifest.xml:94:17-85
-99-->D:\Notes-master1\app\src\main\AndroidManifest.xml:94:25-82
-100
-101
-102 D:\Notes-master1\app\src\main\AndroidManifest.xml:97:13-99:58
-103 android:name="android.appwidget.provider"
-103-->D:\Notes-master1\app\src\main\AndroidManifest.xml:98:17-58
-104 android:resource="@xml/widget_2x_info" />
-104-->D:\Notes-master1\app\src\main\AndroidManifest.xml:99:17-55
-105
-106 D:\Notes-master1\app\src\main\AndroidManifest.xml:101:9-114:20
-107 android:name="net.micode.notes.widget.NoteWidgetProvider_4x"
-107-->D:\Notes-master1\app\src\main\AndroidManifest.xml:102:13-57
-108 android:label="@string/app_widget4x4" >
-108-->D:\Notes-master1\app\src\main\AndroidManifest.xml:103:13-50
-109
-109-->D:\Notes-master1\app\src\main\AndroidManifest.xml:91:13-95:29
-110
-110-->D:\Notes-master1\app\src\main\AndroidManifest.xml:92:17-84
-110-->D:\Notes-master1\app\src\main\AndroidManifest.xml:92:25-81
-111
-111-->D:\Notes-master1\app\src\main\AndroidManifest.xml:93:17-85
-111-->D:\Notes-master1\app\src\main\AndroidManifest.xml:93:25-82
-112
-112-->D:\Notes-master1\app\src\main\AndroidManifest.xml:94:17-85
-112-->D:\Notes-master1\app\src\main\AndroidManifest.xml:94:25-82
-113
-114
-115 D:\Notes-master1\app\src\main\AndroidManifest.xml:97:13-99:58
-116 android:name="android.appwidget.provider"
-116-->D:\Notes-master1\app\src\main\AndroidManifest.xml:98:17-58
-117 android:resource="@xml/widget_4x_info" />
-117-->D:\Notes-master1\app\src\main\AndroidManifest.xml:99:17-55
-118
-119
-119-->D:\Notes-master1\app\src\main\AndroidManifest.xml:116:9-120:20
-119-->D:\Notes-master1\app\src\main\AndroidManifest.xml:116:19-55
-120
-120-->D:\Notes-master1\app\src\main\AndroidManifest.xml:117:13-119:29
-121
-121-->D:\Notes-master1\app\src\main\AndroidManifest.xml:118:17-79
-121-->D:\Notes-master1\app\src\main\AndroidManifest.xml:118:25-76
-122
-123
-124 D:\Notes-master1\app\src\main\AndroidManifest.xml:122:9-125:20
-125 android:name="net.micode.notes.ui.AlarmReceiver"
-125-->D:\Notes-master1\app\src\main\AndroidManifest.xml:123:13-61
-126 android:process=":remote" >
-126-->D:\Notes-master1\app\src\main\AndroidManifest.xml:124:13-38
-127
-128
-129 D:\Notes-master1\app\src\main\AndroidManifest.xml:127:9-132:20
-130 android:name="net.micode.notes.ui.AlarmAlertActivity"
-130-->D:\Notes-master1\app\src\main\AndroidManifest.xml:128:13-50
-131 android:label="@string/app_name"
-131-->D:\Notes-master1\app\src\main\AndroidManifest.xml:129:13-45
-132 android:launchMode="singleInstance"
-132-->D:\Notes-master1\app\src\main\AndroidManifest.xml:130:13-48
-133 android:theme="@android:style/Theme.Holo.Wallpaper.NoTitleBar" >
-133-->D:\Notes-master1\app\src\main\AndroidManifest.xml:131:13-75
-134
-135 D:\Notes-master1\app\src\main\AndroidManifest.xml:134:9-139:20
-136 android:name="net.micode.notes.ui.NotesPreferenceActivity"
-136-->D:\Notes-master1\app\src\main\AndroidManifest.xml:135:13-71
-137 android:label="@string/preferences_title"
-137-->D:\Notes-master1\app\src\main\AndroidManifest.xml:136:13-54
-138 android:launchMode="singleTop"
-138-->D:\Notes-master1\app\src\main\AndroidManifest.xml:137:13-43
-139 android:theme="@android:style/Theme.Holo.Light" >
-139-->D:\Notes-master1\app\src\main\AndroidManifest.xml:138:13-60
-140
-141
-142 D:\Notes-master1\app\src\main\AndroidManifest.xml:141:9-144:19
-143 android:name="net.micode.notes.gtask.remote.GTaskSyncService"
-143-->D:\Notes-master1\app\src\main\AndroidManifest.xml:142:13-74
-144 android:exported="false" >
-144-->D:\Notes-master1\app\src\main\AndroidManifest.xml:143:13-37
-145
-146
-147 D:\Notes-master1\app\src\main\AndroidManifest.xml:146:9-148:52
-148 android:name="android.app.default_searchable"
-148-->D:\Notes-master1\app\src\main\AndroidManifest.xml:147:13-58
-149 android:value=".ui.NoteEditActivity" />
-149-->D:\Notes-master1\app\src\main\AndroidManifest.xml:148:13-49
-150
-151
-152
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_bg_color_btn_mask.png.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_bg_color_btn_mask.png.flat
deleted file mode 100644
index 71afe7b..0000000
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_bg_color_btn_mask.png.flat and /dev/null differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_footer_bg.9.png.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_footer_bg.9.png.flat
deleted file mode 100644
index fe09113..0000000
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_footer_bg.9.png.flat and /dev/null differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/raw_introduction.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/raw_introduction.flat
deleted file mode 100644
index 61c08fe..0000000
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/raw_introduction.flat and /dev/null differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-h720dp-v13_values-h720dp-v13.arsc.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-h720dp-v13_values-h720dp-v13.arsc.flat
deleted file mode 100644
index 739c181..0000000
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-h720dp-v13_values-h720dp-v13.arsc.flat and /dev/null differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-land_values-land.arsc.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-land_values-land.arsc.flat
deleted file mode 100644
index f84ec3f..0000000
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-land_values-land.arsc.flat and /dev/null differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-ldltr-v21_values-ldltr-v21.arsc.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-ldltr-v21_values-ldltr-v21.arsc.flat
deleted file mode 100644
index f6fbe7c..0000000
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-ldltr-v21_values-ldltr-v21.arsc.flat and /dev/null differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-port_values-port.arsc.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-port_values-port.arsc.flat
deleted file mode 100644
index 9e0d536..0000000
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-port_values-port.arsc.flat and /dev/null differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-v18_values-v18.arsc.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-v18_values-v18.arsc.flat
deleted file mode 100644
index f97bb79..0000000
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-v18_values-v18.arsc.flat and /dev/null differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/single/debug.json b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/single/debug.json
deleted file mode 100644
index 3f80a95..0000000
--- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/single/debug.json
+++ /dev/null
@@ -1,382 +0,0 @@
-[
- {
- "merged": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_single.9.png.flat",
- "source": "D:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_red_single.9.png"
- },
- {
- "merged": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_blue.9.png.flat",
- "source": "D:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\edit_blue.9.png"
- },
- {
- "merged": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_datetime_picker.xml.flat",
- "source": "D:\\Notes-master1\\app\\src\\main\\res\\layout\\datetime_picker.xml"
- },
- {
- "merged": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_middle.9.png.flat",
- "source": "D:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_red_middle.9.png"
- },
- {
- "merged": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_bg_btn_set_color.png.flat",
- "source": "D:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\bg_btn_set_color.png"
- },
- {
- "merged": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_add_account_text.xml.flat",
- "source": "D:\\Notes-master1\\app\\src\\main\\res\\layout\\add_account_text.xml"
- },
- {
- "merged": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_red.9.png.flat",
- "source": "D:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\edit_red.9.png"
- },
- {
- "merged": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_red.png.flat",
- "source": "D:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\widget_2x_red.png"
- },
- {
- "merged": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_new_note_normal.png.flat",
- "source": "D:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\new_note_normal.png"
- },
- {
- "merged": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_large.png.flat",
- "source": "D:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\font_large.png"
- },
- {
- "merged": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_down.9.png.flat",
- "source": "D:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_white_down.9.png"
- },
- {
- "merged": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_size_selector_bg.9.png.flat",
- "source": "D:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\font_size_selector_bg.9.png"
- },
- {
- "merged": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\xml_preferences.xml.flat",
- "source": "D:\\Notes-master1\\app\\src\\main\\res\\xml\\preferences.xml"
- },
- {
- "merged": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_up.9.png.flat",
- "source": "D:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_white_up.9.png"
- },
- {
- "merged": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_down.9.png.flat",
- "source": "D:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_yellow_down.9.png"
- },
- {
- "merged": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_red.9.png.flat",
- "source": "D:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\edit_title_red.9.png"
- },
- {
- "merged": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_yellow.9.png.flat",
- "source": "D:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\edit_yellow.9.png"
- },
- {
- "merged": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_white.png.flat",
- "source": "D:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\widget_4x_white.png"
- },
- {
- "merged": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_normal.png.flat",
- "source": "D:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\font_normal.png"
- },
- {
- "merged": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_note_edit_list_item.xml.flat",
- "source": "D:\\Notes-master1\\app\\src\\main\\res\\layout\\note_edit_list_item.xml"
- },
- {
- "merged": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_selected.png.flat",
- "source": "D:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\selected.png"
- },
- {
- "merged": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\menu_note_list.xml.flat",
- "source": "D:\\Notes-master1\\app\\src\\main\\res\\menu\\note_list.xml"
- },
- {
- "merged": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\xml_searchable.xml.flat",
- "source": "D:\\Notes-master1\\app\\src\\main\\res\\xml\\searchable.xml"
- },
- {
- "merged": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\menu_note_edit.xml.flat",
- "source": "D:\\Notes-master1\\app\\src\\main\\res\\menu\\note_edit.xml"
- },
- {
- "merged": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_search_result.png.flat",
- "source": "D:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\search_result.png"
- },
- {
- "merged": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_background.png.flat",
- "source": "D:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_background.png"
- },
- {
- "merged": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_blue_down.9.png.flat",
- "source": "D:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_blue_down.9.png"
- },
- {
- "merged": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_bg_color_btn_mask.png.flat",
- "source": "D:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\bg_color_btn_mask.png"
- },
- {
- "merged": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_super.png.flat",
- "source": "D:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\font_super.png"
- },
- {
- "merged": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_dropdown_icon.9.png.flat",
- "source": "D:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\dropdown_icon.9.png"
- },
- {
- "merged": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_green_up.9.png.flat",
- "source": "D:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_green_up.9.png"
- },
- {
- "merged": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_folder.9.png.flat",
- "source": "D:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_folder.9.png"
- },
- {
- "merged": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_single.9.png.flat",
- "source": "D:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_white_single.9.png"
- },
- {
- "merged": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_note_edit_color_selector_panel.png.flat",
- "source": "D:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\note_edit_color_selector_panel.png"
- },
- {
- "merged": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_note_item.xml.flat",
- "source": "D:\\Notes-master1\\app\\src\\main\\res\\layout\\note_item.xml"
- },
- {
- "merged": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\color_primary_text_dark.xml.flat",
- "source": "D:\\Notes-master1\\app\\src\\main\\res\\color\\primary_text_dark.xml"
- },
- {
- "merged": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_delete.png.flat",
- "source": "D:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\delete.png"
- },
- {
- "merged": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\raw-zh-rCN_introduction.flat",
- "source": "D:\\Notes-master1\\app\\src\\main\\res\\raw-zh-rCN\\introduction"
- },
- {
- "merged": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_note_list_footer.xml.flat",
- "source": "D:\\Notes-master1\\app\\src\\main\\res\\layout\\note_list_footer.xml"
- },
- {
- "merged": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\menu_sub_folder.xml.flat",
- "source": "D:\\Notes-master1\\app\\src\\main\\res\\menu\\sub_folder.xml"
- },
- {
- "merged": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_middle.9.png.flat",
- "source": "D:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_yellow_middle.9.png"
- },
- {
- "merged": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_title_bar_bg.9.png.flat",
- "source": "D:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\title_bar_bg.9.png"
- },
- {
- "merged": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_clock.png.flat",
- "source": "D:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\clock.png"
- },
- {
- "merged": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_menu_move.png.flat",
- "source": "D:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\menu_move.png"
- },
- {
- "merged": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_green.png.flat",
- "source": "D:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\widget_4x_green.png"
- },
- {
- "merged": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_blue.png.flat",
- "source": "D:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\widget_2x_blue.png"
- },
- {
- "merged": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_green.9.png.flat",
- "source": "D:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\edit_title_green.9.png"
- },
- {
- "merged": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_widget_4x.xml.flat",
- "source": "D:\\Notes-master1\\app\\src\\main\\res\\layout\\widget_4x.xml"
- },
- {
- "merged": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_call_record.png.flat",
- "source": "D:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\call_record.png"
- },
- {
- "merged": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\menu_note_list_options.xml.flat",
- "source": "D:\\Notes-master1\\app\\src\\main\\res\\menu\\note_list_options.xml"
- },
- {
- "merged": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_note_list_dropdown_menu.xml.flat",
- "source": "D:\\Notes-master1\\app\\src\\main\\res\\layout\\note_list_dropdown_menu.xml"
- },
- {
- "merged": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_green.9.png.flat",
- "source": "D:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\edit_green.9.png"
- },
- {
- "merged": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_blue.9.png.flat",
- "source": "D:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\edit_title_blue.9.png"
- },
- {
- "merged": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_menu_delete.png.flat",
- "source": "D:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\menu_delete.png"
- },
- {
- "merged": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_account_dialog_title.xml.flat",
- "source": "D:\\Notes-master1\\app\\src\\main\\res\\layout\\account_dialog_title.xml"
- },
- {
- "merged": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_green_middle.9.png.flat",
- "source": "D:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_green_middle.9.png"
- },
- {
- "merged": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_blue_middle.9.png.flat",
- "source": "D:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_blue_middle.9.png"
- },
- {
- "merged": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_blue_single.9.png.flat",
- "source": "D:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_blue_single.9.png"
- },
- {
- "merged": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_blue_up.9.png.flat",
- "source": "D:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_blue_up.9.png"
- },
- {
- "merged": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_yellow.png.flat",
- "source": "D:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\widget_2x_yellow.png"
- },
- {
- "merged": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_green_single.9.png.flat",
- "source": "D:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_green_single.9.png"
- },
- {
- "merged": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\color_secondary_text_dark.xml.flat",
- "source": "D:\\Notes-master1\\app\\src\\main\\res\\color\\secondary_text_dark.xml"
- },
- {
- "merged": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable_new_note.xml.flat",
- "source": "D:\\Notes-master1\\app\\src\\main\\res\\drawable\\new_note.xml"
- },
- {
- "merged": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_new_note_pressed.png.flat",
- "source": "D:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\new_note_pressed.png"
- },
- {
- "merged": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_up.9.png.flat",
- "source": "D:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_yellow_up.9.png"
- },
- {
- "merged": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_small.png.flat",
- "source": "D:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\font_small.png"
- },
- {
- "merged": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_icon_app.png.flat",
- "source": "D:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\icon_app.png"
- },
- {
- "merged": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_down.9.png.flat",
- "source": "D:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_red_down.9.png"
- },
- {
- "merged": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\menu_call_note_edit.xml.flat",
- "source": "D:\\Notes-master1\\app\\src\\main\\res\\menu\\call_note_edit.xml"
- },
- {
- "merged": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_single.9.png.flat",
- "source": "D:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_yellow_single.9.png"
- },
- {
- "merged": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_title_alert.png.flat",
- "source": "D:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\title_alert.png"
- },
- {
- "merged": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\xml_widget_2x_info.xml.flat",
- "source": "D:\\Notes-master1\\app\\src\\main\\res\\xml\\widget_2x_info.xml"
- },
- {
- "merged": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_widget_2x.xml.flat",
- "source": "D:\\Notes-master1\\app\\src\\main\\res\\layout\\widget_2x.xml"
- },
- {
- "merged": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_white.9.png.flat",
- "source": "D:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\edit_title_white.9.png"
- },
- {
- "merged": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_notification.png.flat",
- "source": "D:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\notification.png"
- },
- {
- "merged": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_green.png.flat",
- "source": "D:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\widget_2x_green.png"
- },
- {
- "merged": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_note_edit.xml.flat",
- "source": "D:\\Notes-master1\\app\\src\\main\\res\\layout\\note_edit.xml"
- },
- {
- "merged": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_yellow.9.png.flat",
- "source": "D:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\edit_title_yellow.9.png"
- },
- {
- "merged": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_yellow.png.flat",
- "source": "D:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\widget_4x_yellow.png"
- },
- {
- "merged": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_folder_list_item.xml.flat",
- "source": "D:\\Notes-master1\\app\\src\\main\\res\\layout\\folder_list_item.xml"
- },
- {
- "merged": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_blue.png.flat",
- "source": "D:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\widget_4x_blue.png"
- },
- {
- "merged": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_footer_bg.9.png.flat",
- "source": "D:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_footer_bg.9.png"
- },
- {
- "merged": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_settings_header.xml.flat",
- "source": "D:\\Notes-master1\\app\\src\\main\\res\\layout\\settings_header.xml"
- },
- {
- "merged": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\menu_note_list_dropdown.xml.flat",
- "source": "D:\\Notes-master1\\app\\src\\main\\res\\menu\\note_list_dropdown.xml"
- },
- {
- "merged": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_red.png.flat",
- "source": "D:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\widget_4x_red.png"
- },
- {
- "merged": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_middle.9.png.flat",
- "source": "D:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_white_middle.9.png"
- },
- {
- "merged": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_white.png.flat",
- "source": "D:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\widget_2x_white.png"
- },
- {
- "merged": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_white.9.png.flat",
- "source": "D:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\edit_white.9.png"
- },
- {
- "merged": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_green_down.9.png.flat",
- "source": "D:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_green_down.9.png"
- },
- {
- "merged": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\menu_call_record_folder.xml.flat",
- "source": "D:\\Notes-master1\\app\\src\\main\\res\\menu\\call_record_folder.xml"
- },
- {
- "merged": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\xml_widget_4x_info.xml.flat",
- "source": "D:\\Notes-master1\\app\\src\\main\\res\\xml\\widget_4x_info.xml"
- },
- {
- "merged": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_dialog_edit_text.xml.flat",
- "source": "D:\\Notes-master1\\app\\src\\main\\res\\layout\\dialog_edit_text.xml"
- },
- {
- "merged": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_note_list.xml.flat",
- "source": "D:\\Notes-master1\\app\\src\\main\\res\\layout\\note_list.xml"
- },
- {
- "merged": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\raw_introduction.flat",
- "source": "D:\\Notes-master1\\app\\src\\main\\res\\raw\\introduction"
- },
- {
- "merged": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_up.9.png.flat",
- "source": "D:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_red_up.9.png"
- }
-]
\ No newline at end of file