diff --git a/src/Notes-master1/.gradle/7.0.2/executionHistory/executionHistory.bin b/src/Notes-master1/.gradle/7.0.2/executionHistory/executionHistory.bin index a5b557af..5c554fdd 100644 Binary files a/src/Notes-master1/.gradle/7.0.2/executionHistory/executionHistory.bin and b/src/Notes-master1/.gradle/7.0.2/executionHistory/executionHistory.bin differ diff --git a/src/Notes-master1/.gradle/7.0.2/executionHistory/executionHistory.lock b/src/Notes-master1/.gradle/7.0.2/executionHistory/executionHistory.lock index f40dd9e0..55867a4f 100644 Binary files a/src/Notes-master1/.gradle/7.0.2/executionHistory/executionHistory.lock and b/src/Notes-master1/.gradle/7.0.2/executionHistory/executionHistory.lock differ diff --git a/src/Notes-master1/.gradle/7.0.2/fileHashes/fileHashes.bin b/src/Notes-master1/.gradle/7.0.2/fileHashes/fileHashes.bin index 1edfa130..c7d8c654 100644 Binary files a/src/Notes-master1/.gradle/7.0.2/fileHashes/fileHashes.bin and b/src/Notes-master1/.gradle/7.0.2/fileHashes/fileHashes.bin 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 index 7c4573f4..50480468 100644 Binary files a/src/Notes-master1/.gradle/7.0.2/fileHashes/fileHashes.lock and b/src/Notes-master1/.gradle/7.0.2/fileHashes/fileHashes.lock differ diff --git a/src/Notes-master1/.gradle/7.0.2/fileHashes/resourceHashesCache.bin b/src/Notes-master1/.gradle/7.0.2/fileHashes/resourceHashesCache.bin index 27a489c1..e25e07e7 100644 Binary files a/src/Notes-master1/.gradle/7.0.2/fileHashes/resourceHashesCache.bin and b/src/Notes-master1/.gradle/7.0.2/fileHashes/resourceHashesCache.bin differ diff --git a/src/Notes-master1/.gradle/7.0.2/javaCompile/classAnalysis.bin b/src/Notes-master1/.gradle/7.0.2/javaCompile/classAnalysis.bin index 6be86f43..a96ccc77 100644 Binary files a/src/Notes-master1/.gradle/7.0.2/javaCompile/classAnalysis.bin and b/src/Notes-master1/.gradle/7.0.2/javaCompile/classAnalysis.bin differ diff --git a/src/Notes-master1/.gradle/7.0.2/javaCompile/jarAnalysis.bin b/src/Notes-master1/.gradle/7.0.2/javaCompile/jarAnalysis.bin index 02282ec0..e803d1a2 100644 Binary files a/src/Notes-master1/.gradle/7.0.2/javaCompile/jarAnalysis.bin and b/src/Notes-master1/.gradle/7.0.2/javaCompile/jarAnalysis.bin 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 index a70ba9ce..77f72398 100644 Binary files a/src/Notes-master1/.gradle/7.0.2/javaCompile/javaCompile.lock and b/src/Notes-master1/.gradle/7.0.2/javaCompile/javaCompile.lock differ diff --git a/src/Notes-master1/.gradle/7.0.2/javaCompile/taskHistory.bin b/src/Notes-master1/.gradle/7.0.2/javaCompile/taskHistory.bin index 153fcb4c..32f14fac 100644 Binary files a/src/Notes-master1/.gradle/7.0.2/javaCompile/taskHistory.bin and b/src/Notes-master1/.gradle/7.0.2/javaCompile/taskHistory.bin differ diff --git a/src/Notes-master1/.gradle/7.2/dependencies-accessors/dependencies-accessors.lock b/src/Notes-master1/.gradle/7.2/dependencies-accessors/dependencies-accessors.lock new file mode 100644 index 00000000..ae076a23 Binary files /dev/null and b/src/Notes-master1/.gradle/7.2/dependencies-accessors/dependencies-accessors.lock differ diff --git a/src/Notes-master1/.gradle/7.2/dependencies-accessors/gc.properties b/src/Notes-master1/.gradle/7.2/dependencies-accessors/gc.properties new file mode 100644 index 00000000..e69de29b diff --git a/src/Notes-master1/.gradle/7.2/executionHistory/executionHistory.bin b/src/Notes-master1/.gradle/7.2/executionHistory/executionHistory.bin new file mode 100644 index 00000000..b981a4d2 Binary files /dev/null and b/src/Notes-master1/.gradle/7.2/executionHistory/executionHistory.bin differ diff --git a/src/Notes-master1/.gradle/7.2/executionHistory/executionHistory.lock b/src/Notes-master1/.gradle/7.2/executionHistory/executionHistory.lock new file mode 100644 index 00000000..95938630 Binary files /dev/null and b/src/Notes-master1/.gradle/7.2/executionHistory/executionHistory.lock differ diff --git a/src/Notes-master1/.gradle/7.2/fileChanges/last-build.bin b/src/Notes-master1/.gradle/7.2/fileChanges/last-build.bin new file mode 100644 index 00000000..f76dd238 Binary files /dev/null and b/src/Notes-master1/.gradle/7.2/fileChanges/last-build.bin differ diff --git a/src/Notes-master1/.gradle/7.2/fileHashes/fileHashes.bin b/src/Notes-master1/.gradle/7.2/fileHashes/fileHashes.bin new file mode 100644 index 00000000..a1813d2c Binary files /dev/null and b/src/Notes-master1/.gradle/7.2/fileHashes/fileHashes.bin differ diff --git a/src/Notes-master1/.gradle/7.2/fileHashes/fileHashes.lock b/src/Notes-master1/.gradle/7.2/fileHashes/fileHashes.lock new file mode 100644 index 00000000..fa4f60b3 Binary files /dev/null and b/src/Notes-master1/.gradle/7.2/fileHashes/fileHashes.lock differ diff --git a/src/Notes-master1/.gradle/7.2/fileHashes/resourceHashesCache.bin b/src/Notes-master1/.gradle/7.2/fileHashes/resourceHashesCache.bin new file mode 100644 index 00000000..28c8d0a9 Binary files /dev/null and b/src/Notes-master1/.gradle/7.2/fileHashes/resourceHashesCache.bin differ diff --git a/src/Notes-master1/.gradle/7.2/gc.properties b/src/Notes-master1/.gradle/7.2/gc.properties new file mode 100644 index 00000000..e69de29b diff --git a/src/Notes-master1/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/src/Notes-master1/.gradle/buildOutputCleanup/buildOutputCleanup.lock index ce3d7bff..45b46c8b 100644 Binary files a/src/Notes-master1/.gradle/buildOutputCleanup/buildOutputCleanup.lock and b/src/Notes-master1/.gradle/buildOutputCleanup/buildOutputCleanup.lock differ diff --git a/src/Notes-master1/.gradle/buildOutputCleanup/cache.properties b/src/Notes-master1/.gradle/buildOutputCleanup/cache.properties index 2c3d20b7..e527cfb4 100644 --- a/src/Notes-master1/.gradle/buildOutputCleanup/cache.properties +++ b/src/Notes-master1/.gradle/buildOutputCleanup/cache.properties @@ -1,2 +1,2 @@ -#Fri Sep 03 10:41:34 CST 2021 -gradle.version=7.0.2 +#Wed Nov 03 08:19:11 CST 2021 +gradle.version=7.2 diff --git a/src/Notes-master1/.gradle/buildOutputCleanup/outputFiles.bin b/src/Notes-master1/.gradle/buildOutputCleanup/outputFiles.bin index b21b196f..2bef2b11 100644 Binary files a/src/Notes-master1/.gradle/buildOutputCleanup/outputFiles.bin and b/src/Notes-master1/.gradle/buildOutputCleanup/outputFiles.bin differ diff --git a/src/Notes-master1/.idea/dbnavigator.xml b/src/Notes-master1/.idea/dbnavigator.xml new file mode 100644 index 00000000..fc9454b4 --- /dev/null +++ b/src/Notes-master1/.idea/dbnavigator.xml @@ -0,0 +1,660 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + + + + + + + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + + + + + + + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + +
\ No newline at end of file diff --git a/src/Notes-master1/.idea/deploymentTargetDropDown.xml b/src/Notes-master1/.idea/deploymentTargetDropDown.xml index 5744a697..7983c65d 100644 --- a/src/Notes-master1/.idea/deploymentTargetDropDown.xml +++ b/src/Notes-master1/.idea/deploymentTargetDropDown.xml @@ -7,11 +7,11 @@ - + - + \ No newline at end of file diff --git a/src/Notes-master1/.idea/misc.xml b/src/Notes-master1/.idea/misc.xml index dcb656f5..6fbf7480 100644 --- a/src/Notes-master1/.idea/misc.xml +++ b/src/Notes-master1/.idea/misc.xml @@ -3,10 +3,17 @@ - - + @@ -56,9 +56,13 @@ + + @@ -68,6 +72,9 @@ + + + + + + file://$PROJECT_DIR$/app/src/main/java/net/micode/notes/ui/NotesListActivity.java - 139 - + 147 + file://$PROJECT_DIR$/app/src/main/java/net/micode/notes/ui/NotesListActivity.java - 272 - + 280 + file://$PROJECT_DIR$/app/src/main/java/net/micode/notes/ui/NotesListActivity.java - 921 + 963 file://$PROJECT_DIR$/app/src/main/java/net/micode/notes/ui/NotesListActivity.java - 783 + 825 file://$PROJECT_DIR$/app/src/main/java/net/micode/notes/ui/NotesListActivity.java - 278 + 286 file://$PROJECT_DIR$/app/src/main/java/net/micode/notes/ui/NotesListActivity.java - 354 + 362 file://$PROJECT_DIR$/app/src/main/java/net/micode/notes/ui/NotesListActivity.java - 478 - - - file://$PROJECT_DIR$/app/src/main/java/net/micode/notes/ui/NotesListActivity.java - 486 - - - file://$PROJECT_DIR$/app/src/main/java/net/micode/notes/ui/NotesListActivity.java - 547 + 567 file://$PROJECT_DIR$/app/src/main/java/net/micode/notes/ui/NotesListActivity.java - 550 + 570 file://$PROJECT_DIR$/app/src/main/java/net/micode/notes/ui/NotesListActivity.java - 613 + 633 diff --git a/src/Notes-master1/app/build/intermediates/compile_and_runtime_not_namespaced_r_class_jar/debug/R.jar b/src/Notes-master1/app/build/intermediates/compile_and_runtime_not_namespaced_r_class_jar/debug/R.jar index 598bbd6f..14ce031c 100644 Binary files a/src/Notes-master1/app/build/intermediates/compile_and_runtime_not_namespaced_r_class_jar/debug/R.jar and b/src/Notes-master1/app/build/intermediates/compile_and_runtime_not_namespaced_r_class_jar/debug/R.jar 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 index 6d37fb17..7a59e8bd 100644 Binary files a/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_0/graph.bin and b/src/Notes-master1/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/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_1/graph.bin index 04fa0495..fe02d4d8 100644 Binary files a/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_1/graph.bin and b/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_1/graph.bin differ diff --git a/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_2/graph.bin b/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_2/graph.bin index 601f245f..d68755fa 100644 Binary files a/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_2/graph.bin and b/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_2/graph.bin 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 index 4ec1d1af..df7125b2 100644 Binary files a/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_3/graph.bin and b/src/Notes-master1/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/jar_54143eeb0ea1a5cb11cabce248cb9602bc9bff6f0457d8f480658f8e704f3947_bucket_0/graph.bin b/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_54143eeb0ea1a5cb11cabce248cb9602bc9bff6f0457d8f480658f8e704f3947_bucket_0/graph.bin new file mode 100644 index 00000000..601f245f Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_54143eeb0ea1a5cb11cabce248cb9602bc9bff6f0457d8f480658f8e704f3947_bucket_0/graph.bin differ diff --git a/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_54143eeb0ea1a5cb11cabce248cb9602bc9bff6f0457d8f480658f8e704f3947_bucket_1/graph.bin b/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_54143eeb0ea1a5cb11cabce248cb9602bc9bff6f0457d8f480658f8e704f3947_bucket_1/graph.bin new file mode 100644 index 00000000..601f245f Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_54143eeb0ea1a5cb11cabce248cb9602bc9bff6f0457d8f480658f8e704f3947_bucket_1/graph.bin differ diff --git a/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_54143eeb0ea1a5cb11cabce248cb9602bc9bff6f0457d8f480658f8e704f3947_bucket_2/graph.bin b/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_54143eeb0ea1a5cb11cabce248cb9602bc9bff6f0457d8f480658f8e704f3947_bucket_2/graph.bin new file mode 100644 index 00000000..601f245f Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_54143eeb0ea1a5cb11cabce248cb9602bc9bff6f0457d8f480658f8e704f3947_bucket_2/graph.bin differ diff --git a/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_54143eeb0ea1a5cb11cabce248cb9602bc9bff6f0457d8f480658f8e704f3947_bucket_3/graph.bin b/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_54143eeb0ea1a5cb11cabce248cb9602bc9bff6f0457d8f480658f8e704f3947_bucket_3/graph.bin new file mode 100644 index 00000000..601f245f Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_54143eeb0ea1a5cb11cabce248cb9602bc9bff6f0457d8f480658f8e704f3947_bucket_3/graph.bin differ diff --git a/src/Notes-master1/app/build/intermediates/dex/debug/mergeDexDebug/classes.dex b/src/Notes-master1/app/build/intermediates/dex/debug/mergeDexDebug/classes.dex index 8677f8fe..9d5d339f 100644 Binary files a/src/Notes-master1/app/build/intermediates/dex/debug/mergeDexDebug/classes.dex and b/src/Notes-master1/app/build/intermediates/dex/debug/mergeDexDebug/classes.dex 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 index d9b20d97..6b905fb0 100644 Binary files a/src/Notes-master1/app/build/intermediates/dex_archive_input_jar_hashes/debug/out and b/src/Notes-master1/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/Notes-master1/app/build/intermediates/dex_number_of_buckets_file/debug/out index 62f94575..bf0d87ab 100644 --- a/src/Notes-master1/app/build/intermediates/dex_number_of_buckets_file/debug/out +++ b/src/Notes-master1/app/build/intermediates/dex_number_of_buckets_file/debug/out @@ -1 +1 @@ -6 \ No newline at end of file +4 \ No newline at end of file diff --git a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/merge-state b/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/merge-state index 5fc4ff5f..ca2f4a1e 100644 Binary files a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/merge-state and b/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/merge-state differ diff --git a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/1_W15q7LeuWkNGTYPuth9dRTgeI= b/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/1_W15q7LeuWkNGTYPuth9dRTgeI= new file mode 100644 index 00000000..2b56acdb Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/1_W15q7LeuWkNGTYPuth9dRTgeI= differ diff --git a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/3yuxLDmxFdVtaXROb6R1dLvsoDw= b/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/3yuxLDmxFdVtaXROb6R1dLvsoDw= new file mode 100644 index 00000000..a19a2a51 Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/3yuxLDmxFdVtaXROb6R1dLvsoDw= differ diff --git a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/6TIfGNH1KPBsEbPbyP81l3mpNXI= b/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/6TIfGNH1KPBsEbPbyP81l3mpNXI= new file mode 100644 index 00000000..e7159a9a Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/6TIfGNH1KPBsEbPbyP81l3mpNXI= differ diff --git a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/9ccf831OBotyj0pIkpV9zFty1ec= b/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/9ccf831OBotyj0pIkpV9zFty1ec= new file mode 100644 index 00000000..e27d24ae Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/9ccf831OBotyj0pIkpV9zFty1ec= differ diff --git a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/CE1WuYdw3lB4rIwtnna6iDpswi4= b/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/CE1WuYdw3lB4rIwtnna6iDpswi4= new file mode 100644 index 00000000..e9e76081 Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/CE1WuYdw3lB4rIwtnna6iDpswi4= differ diff --git a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/DSC95mXyQ37bUs3AOctxRjluLT4= b/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/DSC95mXyQ37bUs3AOctxRjluLT4= new file mode 100644 index 00000000..6bb2c493 Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/DSC95mXyQ37bUs3AOctxRjluLT4= differ diff --git a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/GT1hsmEANwrCq7sQ5nuy9WMgAfM= b/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/GT1hsmEANwrCq7sQ5nuy9WMgAfM= new file mode 100644 index 00000000..06e914d8 Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/GT1hsmEANwrCq7sQ5nuy9WMgAfM= differ diff --git a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/L1Z8LD2CXmyMLVBGQWHjUxeWvBI= b/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/L1Z8LD2CXmyMLVBGQWHjUxeWvBI= new file mode 100644 index 00000000..865488d1 Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/L1Z8LD2CXmyMLVBGQWHjUxeWvBI= differ diff --git a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/S00XUbzW_7z7mNTePBtrdvGIDW8= b/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/S00XUbzW_7z7mNTePBtrdvGIDW8= new file mode 100644 index 00000000..2dae2f9b Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/S00XUbzW_7z7mNTePBtrdvGIDW8= differ diff --git a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/SwXj+1+2q3G4OpwTBKUcqrzEzas= b/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/SwXj+1+2q3G4OpwTBKUcqrzEzas= new file mode 100644 index 00000000..f61d7629 Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/SwXj+1+2q3G4OpwTBKUcqrzEzas= differ diff --git a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/UuRc09vK1JiV+lfTSi45YsFicFs= b/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/UuRc09vK1JiV+lfTSi45YsFicFs= new file mode 100644 index 00000000..371b4414 Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/UuRc09vK1JiV+lfTSi45YsFicFs= differ diff --git a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/WJ3Xci8v7MzZNPrnHsvJ9Nap+PY= b/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/WJ3Xci8v7MzZNPrnHsvJ9Nap+PY= new file mode 100644 index 00000000..25547cc9 Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/WJ3Xci8v7MzZNPrnHsvJ9Nap+PY= differ diff --git a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/XMpIGV0NlmQ5P+zejRbXKRU9oOI= b/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/XMpIGV0NlmQ5P+zejRbXKRU9oOI= new file mode 100644 index 00000000..feebff2e Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/XMpIGV0NlmQ5P+zejRbXKRU9oOI= differ diff --git a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/XjMXkratVhre7m6qO6JaLEo_dxA= b/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/XjMXkratVhre7m6qO6JaLEo_dxA= new file mode 100644 index 00000000..1423435f Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/XjMXkratVhre7m6qO6JaLEo_dxA= differ diff --git a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/_deTPkWANkUHb8vgXxkq56Kiyas= b/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/_deTPkWANkUHb8vgXxkq56Kiyas= new file mode 100644 index 00000000..27924dd4 Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/_deTPkWANkUHb8vgXxkq56Kiyas= differ diff --git a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/dI+OlassKbBCJ+UNLcU5wPRDCis= b/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/dI+OlassKbBCJ+UNLcU5wPRDCis= new file mode 100644 index 00000000..87586a52 Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/dI+OlassKbBCJ+UNLcU5wPRDCis= differ diff --git a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/f3tGX7tl2UXTrGDyrXmR_LBrRlw= b/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/f3tGX7tl2UXTrGDyrXmR_LBrRlw= new file mode 100644 index 00000000..e49acf79 Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/f3tGX7tl2UXTrGDyrXmR_LBrRlw= differ diff --git a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/fQgF1OYkCoSe9JLQ_4gnykSwaak= b/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/fQgF1OYkCoSe9JLQ_4gnykSwaak= new file mode 100644 index 00000000..2365cb90 Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/fQgF1OYkCoSe9JLQ_4gnykSwaak= differ diff --git a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/faGw4VI3Xaerit9mSWcMyw8wmlg= b/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/faGw4VI3Xaerit9mSWcMyw8wmlg= new file mode 100644 index 00000000..d0dcd9ca Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/faGw4VI3Xaerit9mSWcMyw8wmlg= differ diff --git a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/fsoIgGdxI41ux4ST6G5stapr5Po= b/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/fsoIgGdxI41ux4ST6G5stapr5Po= new file mode 100644 index 00000000..32d47c06 Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/fsoIgGdxI41ux4ST6G5stapr5Po= differ diff --git a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/gtC1u8wslap_73arZOPY7fT_gAo= b/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/gtC1u8wslap_73arZOPY7fT_gAo= new file mode 100644 index 00000000..3c086f36 Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/gtC1u8wslap_73arZOPY7fT_gAo= differ diff --git a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/iepOrlkSd9uYzTz3DqQhDT26HG4= b/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/iepOrlkSd9uYzTz3DqQhDT26HG4= new file mode 100644 index 00000000..a69b1ec0 Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/iepOrlkSd9uYzTz3DqQhDT26HG4= differ diff --git a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/ktSEYahBM8WSsQHNOa49EYXB4t4= b/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/ktSEYahBM8WSsQHNOa49EYXB4t4= new file mode 100644 index 00000000..b12b2871 Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/ktSEYahBM8WSsQHNOa49EYXB4t4= differ diff --git a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/maXRyFfuaSiVWhgV9Gt12AIBwEQ= b/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/maXRyFfuaSiVWhgV9Gt12AIBwEQ= new file mode 100644 index 00000000..483b42ca Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/maXRyFfuaSiVWhgV9Gt12AIBwEQ= differ diff --git a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/ncbvxLOLgvkQ998BwH8zL4SHySo= b/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/ncbvxLOLgvkQ998BwH8zL4SHySo= new file mode 100644 index 00000000..8d3e7638 Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/ncbvxLOLgvkQ998BwH8zL4SHySo= differ diff --git a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/pqfTNCxc4EuqkeHe6s14d_T_tBY= b/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/pqfTNCxc4EuqkeHe6s14d_T_tBY= new file mode 100644 index 00000000..083d96b0 Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/pqfTNCxc4EuqkeHe6s14d_T_tBY= differ diff --git a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/q7qSLdWOjEsEzvrdwsNcFG8IJX0= b/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/q7qSLdWOjEsEzvrdwsNcFG8IJX0= new file mode 100644 index 00000000..1c79806c Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/q7qSLdWOjEsEzvrdwsNcFG8IJX0= differ diff --git a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/tJTnU9hSkZzShOpGq5ac_yD85IQ= b/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/tJTnU9hSkZzShOpGq5ac_yD85IQ= new file mode 100644 index 00000000..b6ac9fe4 Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/tJTnU9hSkZzShOpGq5ac_yD85IQ= differ diff --git a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/tlOQ4AWBT9N_OakX+0GHFLOrbJU= b/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/tlOQ4AWBT9N_OakX+0GHFLOrbJU= new file mode 100644 index 00000000..0fb7130e Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/tlOQ4AWBT9N_OakX+0GHFLOrbJU= differ diff --git a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/zo5qwgKQ64nEwlD+Ps2ZZmTFduY= b/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/zo5qwgKQ64nEwlD+Ps2ZZmTFduY= new file mode 100644 index 00000000..c063f2b9 Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/zo5qwgKQ64nEwlD+Ps2ZZmTFduY= 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 index 20dc4f0f..f79d0b52 100644 --- a/src/Notes-master1/app/build/intermediates/incremental/mergeDebugAssets/merger.xml +++ b/src/Notes-master1/app/build/intermediates/incremental/mergeDebugAssets/merger.xml @@ -1,2 +1,2 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/src/Notes-master1/app/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml b/src/Notes-master1/app/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml index e2978779..c6ae0a39 100644 --- a/src/Notes-master1/app/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml +++ b/src/Notes-master1/app/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml @@ -1,2 +1,2 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/compile-file-map.properties b/src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/compile-file-map.properties index 986468cf..545484b0 100644 --- 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 @@ -1,96 +1,97 @@ -#Sun Sep 26 21:15:02 CST 2021 -E\:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\edit_blue.9.png=E\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_blue.9.png.flat -E\:\\Notes-master1\\app\\src\\main\\res\\layout\\note_list_dropdown_menu.xml=E\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_note_list_dropdown_menu.xml.flat -E\:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\font_small.png=E\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_small.png.flat -E\:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_green_single.9.png=E\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_green_single.9.png.flat -E\:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\widget_2x_red.png=E\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_red.png.flat -E\:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\dropdown_icon.9.png=E\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_dropdown_icon.9.png.flat -E\:\\Notes-master1\\app\\src\\main\\res\\xml\\searchable.xml=E\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\xml_searchable.xml.flat -E\:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_white_down.9.png=E\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_down.9.png.flat -E\:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\edit_green.9.png=E\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_green.9.png.flat -E\:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_blue_middle.9.png=E\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_blue_middle.9.png.flat -E\:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\title_alert.png=E\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_title_alert.png.flat -E\:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\edit_white.9.png=E\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_white.9.png.flat -E\:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\widget_2x_white.png=E\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_white.png.flat -E\:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\menu_delete.png=E\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_menu_delete.png.flat -E\:\\Notes-master1\\app\\src\\main\\res\\menu\\note_list_dropdown.xml=E\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\menu_note_list_dropdown.xml.flat -E\:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_blue_single.9.png=E\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_blue_single.9.png.flat -E\:\\Notes-master1\\app\\src\\main\\res\\menu\\sub_folder.xml=E\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\menu_sub_folder.xml.flat -E\:\\Notes-master1\\app\\src\\main\\res\\layout\\settings_header.xml=E\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_settings_header.xml.flat -E\:\\Notes-master1\\app\\src\\main\\res\\xml\\preferences.xml=E\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\xml_preferences.xml.flat -E\:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_blue_down.9.png=E\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_blue_down.9.png.flat -E\:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_white_up.9.png=E\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_up.9.png.flat -E\:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_red_down.9.png=E\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_down.9.png.flat -E\:\\Notes-master1\\app\\src\\main\\res\\layout\\datetime_picker.xml=E\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_datetime_picker.xml.flat -E\:\\Notes-master1\\app\\src\\main\\res\\raw\\introduction=E\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\raw_introduction.flat -E\:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\edit_title_yellow.9.png=E\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_yellow.9.png.flat -E\:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\new_note_normal.png=E\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_new_note_normal.png.flat -E\:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\edit_title_green.9.png=E\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_green.9.png.flat -E\:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_green_down.9.png=E\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_green_down.9.png.flat -E\:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\delete.png=E\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_delete.png.flat -E\:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_blue_up.9.png=E\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_blue_up.9.png.flat -E\:\\Notes-master1\\app\\src\\main\\res\\menu\\note_list_options.xml=E\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\menu_note_list_options.xml.flat -E\:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\edit_title_blue.9.png=E\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_blue.9.png.flat -E\:\\Notes-master1\\app\\src\\main\\res\\layout\\folder_list_item.xml=E\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_folder_list_item.xml.flat -E\:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_red_up.9.png=E\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_up.9.png.flat -E\:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_folder.9.png=E\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_folder.9.png.flat -E\:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\widget_4x_blue.png=E\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_blue.png.flat -E\:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\notification.png=E\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_notification.png.flat -E\:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\font_super.png=E\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_super.png.flat -E\:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_white_single.9.png=E\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_single.9.png.flat -E\:\\Notes-master1\\app\\src\\main\\res\\color\\primary_text_dark.xml=E\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\color_primary_text_dark.xml.flat -E\:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\title_bar_bg.9.png=E\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_title_bar_bg.9.png.flat -E\:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_red_middle.9.png=E\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_middle.9.png.flat -E\:\\Notes-master1\\app\\src\\main\\res\\layout\\widget_4x.xml=E\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_widget_4x.xml.flat -E\:\\Notes-master1\\app\\src\\main\\res\\layout\\account_dialog_title.xml=E\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_account_dialog_title.xml.flat -E\:\\Notes-master1\\app\\src\\main\\res\\layout\\note_item.xml=E\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_note_item.xml.flat -E\:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\edit_red.9.png=E\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_red.9.png.flat -E\:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_background.png=E\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_background.png.flat -E\:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_green_up.9.png=E\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_green_up.9.png.flat -E\:\\Notes-master1\\app\\src\\main\\res\\layout\\note_list.xml=E\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_note_list.xml.flat -E\:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\icon_app.png=E\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_icon_app.png.flat -E\:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\search_result.png=E\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_search_result.png.flat -E\:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\font_normal.png=E\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_normal.png.flat -E\:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\font_large.png=E\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_large.png.flat -E\:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_yellow_single.9.png=E\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_single.9.png.flat -E\:\\Notes-master1\\app\\src\\main\\res\\layout\\dialog_edit_text.xml=E\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_dialog_edit_text.xml.flat -E\:\\Notes-master1\\app\\src\\main\\res\\layout\\widget_2x.xml=E\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_widget_2x.xml.flat -E\:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\font_size_selector_bg.9.png=E\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_size_selector_bg.9.png.flat -E\:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\widget_4x_green.png=E\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_green.png.flat -E\:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_yellow_middle.9.png=E\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_middle.9.png.flat -E\:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\widget_4x_yellow.png=E\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_yellow.png.flat -E\:\\Notes-master1\\app\\src\\main\\res\\menu\\call_note_edit.xml=E\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\menu_call_note_edit.xml.flat -E\:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\edit_title_red.9.png=E\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_red.9.png.flat -E\:\\Notes-master1\\app\\src\\main\\res\\layout\\note_list_footer.xml=E\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_note_list_footer.xml.flat -E\:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\bg_color_btn_mask.png=E\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_bg_color_btn_mask.png.flat -E\:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\clock.png=E\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_clock.png.flat -E\:\\Notes-master1\\app\\src\\main\\res\\menu\\note_edit.xml=E\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\menu_note_edit.xml.flat -E\:\\Notes-master1\\app\\src\\main\\res\\xml\\widget_2x_info.xml=E\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\xml_widget_2x_info.xml.flat -E\:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_yellow_up.9.png=E\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_up.9.png.flat -E\:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_yellow_down.9.png=E\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_down.9.png.flat -E\:\\Notes-master1\\app\\src\\main\\res\\xml\\widget_4x_info.xml=E\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\xml_widget_4x_info.xml.flat -E\:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\new_note_pressed.png=E\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_new_note_pressed.png.flat -E\:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\widget_4x_red.png=E\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_red.png.flat -E\:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_footer_bg.9.png=E\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_footer_bg.9.png.flat -E\:\\Notes-master1\\app\\src\\main\\res\\menu\\call_record_folder.xml=E\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\menu_call_record_folder.xml.flat -E\:\\Notes-master1\\app\\src\\main\\res\\layout\\note_edit.xml=E\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_note_edit.xml.flat -E\:\\Notes-master1\\app\\src\\main\\res\\menu\\note_list.xml=E\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\menu_note_list.xml.flat -E\:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_red_single.9.png=E\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_single.9.png.flat -E\:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\call_record.png=E\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_call_record.png.flat -E\:\\Notes-master1\\app\\src\\main\\res\\color\\secondary_text_dark.xml=E\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\color_secondary_text_dark.xml.flat -E\:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\selected.png=E\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_selected.png.flat -E\:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_white_middle.9.png=E\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_middle.9.png.flat -E\:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\widget_2x_yellow.png=E\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_yellow.png.flat -E\:\\Notes-master1\\app\\src\\main\\res\\layout\\note_edit_list_item.xml=E\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_note_edit_list_item.xml.flat -E\:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\edit_yellow.9.png=E\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_yellow.9.png.flat -E\:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\widget_2x_blue.png=E\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_blue.png.flat -E\:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\widget_4x_white.png=E\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_white.png.flat -E\:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\note_edit_color_selector_panel.png=E\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_note_edit_color_selector_panel.png.flat -E\:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\widget_2x_green.png=E\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_green.png.flat -E\:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\menu_move.png=E\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_menu_move.png.flat -E\:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_green_middle.9.png=E\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_green_middle.9.png.flat -E\:\\Notes-master1\\app\\src\\main\\res\\raw-zh-rCN\\introduction=E\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\raw-zh-rCN_introduction.flat -E\:\\Notes-master1\\app\\src\\main\\res\\layout\\add_account_text.xml=E\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_add_account_text.xml.flat -E\:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\edit_title_white.9.png=E\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_white.9.png.flat -E\:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\bg_btn_set_color.png=E\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_bg_btn_set_color.png.flat -E\:\\Notes-master1\\app\\src\\main\\res\\drawable\\new_note.xml=E\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable_new_note.xml.flat +#Wed Nov 03 23:45:19 CST 2021 +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\\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\\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\\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\\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\\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\\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\\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\\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\\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\\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\\xml\\preferences.xml=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\xml_preferences.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\\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\\menu\\trash_folder.xml=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\menu_trash_folder.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\\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\\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\\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\\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\\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\\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\\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\\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\\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\\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\\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\\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\\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\\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\\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\\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\\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\\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\\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\\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\\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\\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\\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\\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\\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\\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\\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-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\\widget_2x.xml=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_widget_2x.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\\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\\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_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\\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\\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\\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\\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/mergeDebugResources/merger.xml b/src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merger.xml index 6d5c9b72..09b853da 100644 --- a/src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merger.xml +++ b/src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merger.xml @@ -1,5 +1,5 @@ -#ffffffff#ff9e9e9e#1f000000#8a000000 +#ffffffff#ff9e9e9e#1f000000#8a000000 @@ -89,13 +89,13 @@ "999+""999+""999+""999+""999+" + "999+""999+""999+""999+""999+" @@ -179,7 +179,7 @@ truefalsetrue@android:color/black#7fa87f@android:color/black@android:color/black@color/material_deep_teal_200@color/material_deep_teal_500@color/material_grey_800@android:color/white@color/material_grey_850@color/material_grey_50#80ffffff#80000000@color/bright_foreground_material_light@color/bright_foreground_material_dark@android:color/white@android:color/black#ff5a595b#ffd6d7d7#80bebebe#80323232#ffbebebe#ff323232#ff7043#ff5722@android:color/white@android:color/black#6680cbc4#66009688#ff37474f#ff263238#ff21272b#ff80cbc4#ff009688#fff5f5f5#ffe0e0e0#fffafafa#ff757575#ff424242#ff303030#ff212121@android:color/black@color/material_grey_600@color/material_grey_900@color/material_grey_100#ffffffff#de000000#4Dffffff#39000000#33ffffff#1f000000#b3ffffff#8a000000#36ffffff#24000000#ff616161#ffbdbdbd#ffbdbdbd#fff1f1f1#e6616161#e6FFFFFF + truefalsetrue@android:color/black#7fa87f@android:color/black@android:color/black@color/material_deep_teal_200@color/material_deep_teal_500@color/material_grey_800@android:color/white@color/material_grey_850@color/material_grey_50#80ffffff#80000000@color/bright_foreground_material_light@color/bright_foreground_material_dark@android:color/white@android:color/black#ff5a595b#ffd6d7d7#80bebebe#80323232#ffbebebe#ff323232#ff7043#ff5722@android:color/white@android:color/black#6680cbc4#66009688#ff37474f#ff263238#ff21272b#ff80cbc4#ff009688#fff5f5f5#ffe0e0e0#fffafafa#ff757575#ff424242#ff303030#ff212121@android:color/black@color/material_grey_600@color/material_grey_900@color/material_grey_100#ffffffff#de000000#4Dffffff#39000000#33ffffff#1f000000#b3ffffff#8a000000#36ffffff#24000000#ff616161#ffbdbdbd#ffbdbdbd#fff1f1f1#e6616161#e6FFFFFF @@ -2319,14 +2319,14 @@ "होम पेज पर जाएं""ऊपर जाएं""ज़्यादा विकल्प""हो गया""सभी देखें""कोई एप्‍लिकेशन चुनें""बंद""चालू""Alt+""Ctrl+""delete""enter""Function+""Meta+""Shift+""space""Sym+""Menu+""खोजा जा रहा है…""क्‍वेरी साफ़ करें""सर्च क्वेरी""सर्च करें""क्वेरी सबमिट करें""आवाज़ सर्च""इसके साथ शेयर करें""%s के साथ शेयर करें""छोटा करें""सर्च""Idi na početnu""Idi gore""Dodatne opcije""Gotovo""Prikaži sve""Odabir aplikacije""ISKLJUČENO""UKLJUČENO""Alt+""Ctrl+""delete""enter""Function+""Meta+""Shift+""razmaknica""Sym+""Menu+""Pretražite…""Izbriši upit""Upit za pretraživanje""Pretraživanje""Pošalji upit""Glasovno pretraživanje""Dijeljenje sa""Dijeli putem aplikacije %s""Sažmi""Pretraživanje""Ugrás a főoldalra""Felfelé mozgatás""További lehetőségek""Kész""Összes megtekintése""Válasszon ki egy alkalmazást""KI""BE""Alt+""Ctrl+""Delete""Enter""Function+""Meta+""Shift+""Szóköz""Sym+""Menu+""Keresés…""Lekérdezés törlése""Keresési lekérdezés""Keresés""Lekérdezés küldése""Hangalapú keresés""Megosztás a következővel:""Megosztás a következő alkalmazással: %s""Összecsukás""Keresés""Ուղղվել տուն""Ուղղվել վերև""Այլ ընտրանքներ""Պատրաստ է""Տեսնել բոլորը""Ընտրել ծրագիր""ԱՆՋԱՏՎԱԾ""ՄԻԱՑՎԱԾ""Alt+""Ctrl+""Delete""Enter""Function+""Meta+""Shift+""բացատ""Sym+""Menu+""Որոնում...""Մաքրել հարցումը""Որոնման հարցում""Որոնել""Ուղարկել հարցումը""Ձայնային որոնում""Կիսվել""Ուղարկել %s-ին""Թաքցնել""Որոնել""Navigasi ke beranda""Navigasi naik""Opsi lain""Selesai""Lihat semua""Pilih aplikasi""NONAKTIF""AKTIF""Alt+""Ctrl+""delete""enter""Function+""Meta+""Shift+""spasi""Sym+""Menu+""Telusuri...""Hapus kueri""Kueri penelusuran""Telusuri""Kirim kueri""Penelusuran suara""Bagikan dengan""Bagikan ke %s""Ciutkan""Telusuri""Fara heim""Fara upp""Fleiri valkostir""Lokið""Sjá allt""Veldu forrit""SLÖKKT""KVEIKT""Alt+""Ctrl+""delete""enter""Aðgerðarlykill+""Meta+""Shift+""bilslá""Sym+""Valmynd+""Leita…""Hreinsa fyrirspurn""Leitarfyrirspurn""Leita""Senda fyrirspurn""Raddleit""Deila með""Deila með %s""Minnka""Leita""Vai alla home page""Vai in alto""Altre opzioni""Fine""Visualizza tutte""Scegli un\'applicazione""OFF""ON""ALT +""CTRL +""CANC""INVIO""FUNZIONE +""META +""MAIUSC +""barra spaziatrice""SYM +""MENU +""Cerca…""Cancella query""Query di ricerca""Cerca""Invia query""Ricerca vocale""Condividi con""Condividi tramite %s""Comprimi""Ricerca""נווט לדף הבית""נווט למעלה""עוד אפשרויות""בוצע""ראה הכל""בחר אפליקציה""כבוי""פועל""Alt+""Ctrl+‎""delete""Enter""Function+""Meta+""Shift+""מקש רווח""Sym+""תפריט+""חיפוש…""מחק שאילתה""שאילתת חיפוש""חיפוש""שלח שאילתה""חיפוש קולי""שתף עם""שתף עם %s""כווץ""חיפוש""ホームへ移動""上へ移動""その他のオプション""完了""すべて表示""アプリの選択""OFF""ON""Alt+""Ctrl+""Delete""Enter""Function+""Meta+""Shift+""Space""Sym+""Menu+""検索…""検索キーワードを削除""検索キーワード""検索""検索キーワードを送信""音声検索""共有""%sと共有""折りたたむ""検索""მთავარზე ნავიგაცია""ზემოთ ნავიგაცია""მეტი ვარიანტები""დასრულდა""ყველას ნახვა""აპის არჩევა""გამორთულია""ჩართულია""Alt+""Ctrl+""წაშლა""შეყვანა""Function+""Meta+""Shift+""space""Sym+""Menu+""ძიება...""მოთხოვნის გასუფთავება""ძიების მოთხოვნა""ძიება""მოთხოვნის გადაგზავნა""ხმოვანი ძიება""გაზიარება:""გაუზიარეთ %s-ს""აკეცვა""ძიება""Негізгі бетте қозғалу""Жоғары қозғалу""Басқа опциялар""Дайын""Барлығын көру""Қолданбаны таңдау""ӨШІРУЛІ""ҚОСУЛЫ""Alt+""Ctrl+""delete""enter""Function+""Meta+""Shift+""бос орын""Sym+""Mәзір+""Іздеу…""Сұрақты жою""Сұрақты іздеу""Іздеу""Сұрақты жіберу""Дауыс арқылы іздеу""Бөлісу""%s қолданбасымен бөлісу""Тасалау""Іздеу""រកមើល​ទៅ​ដើម""រកមើល​ឡើងលើ""ជម្រើស​ច្រើន​ទៀត""រួចរាល់""មើល​ទាំងអស់""ជ្រើស​កម្មវិធី​​""បិទ""បើក""Alt+""Ctrl+""delete""enter""Function+""Meta+""Shift+""space""Sym+""Menu+""ស្វែងរក…""សម្អាត​សំណួរ""ស្វែងរក​សំណួរ""ស្វែងរក""ដាក់​​​ស្នើ​សំណួរ""ការស្វែងរក​សំឡេង""ចែករំលែក​ជាមួយ""ចែក​រំលែក​ជា​មួយ %s""បង្រួម""ស្វែងរក""ಮುಖಪುಟವನ್ನು ನ್ಯಾವಿಗೇಟ್ ಮಾಡಿ""ಮೇಲಕ್ಕೆ ನ್ಯಾವಿಗೇಟ್ ಮಾಡಿ""ಇನ್ನಷ್ಟು ಆಯ್ಕೆಗಳು""ಮುಗಿದಿದೆ""ಎಲ್ಲವನ್ನೂ ನೋಡಿ""ಒಂದು ಅಪ್ಲಿಕೇಶನ್ ಆಯ್ಕೆಮಾಡಿ""ಆಫ್""ಆನ್""Alt+""Ctrl+""delete""enter""Function+""Meta+""Shift+""space""Sym+""Menu+""ಹುಡುಕಿ…""ಪ್ರಶ್ನೆಯನ್ನು ತೆರವುಗೊಳಿಸು""ಪ್ರಶ್ನೆಯನ್ನು ಹುಡುಕಿ""ಹುಡುಕಿ""ಪ್ರಶ್ನೆಯನ್ನು ಸಲ್ಲಿಸು""ಧ್ವನಿ ಹುಡುಕಾಟ""ಇವರೊಂದಿಗೆ ಹಂಚಿಕೊಳ್ಳಿ""%s ನೊಂದಿಗೆ ಹಂಚಿಕೊಳ್ಳಿ""ಸಂಕುಚಿಸು""ಹುಡುಕಿ""홈 탐색""위로 탐색""옵션 더보기""완료""전체 보기""앱 선택""사용 안함""사용""Alt+""Ctrl+""삭제""입력""Function+""Meta+""Shift+""스페이스바""Sym+""Menu+""검색...""검색어 삭제""검색어""검색""검색어 보내기""음성 검색""공유 대상""%s와(과) 공유""접기""검색""Үйгө багыттоо""Жогору""Көбүрөөк мүмкүнчүлүктөр""Даяр""Бардыгын көрүү""Колдонмо тандоо""ӨЧҮК""КҮЙҮК""Alt+""Ctrl+""Delete""Enter""Function+""Meta+""Shift+""боштук""Sym+""Menu+""Издөө…""Талаптарды тазалоо""Издөө талаптары""Издөө""Талап жөнөтүү""Үн аркылуу издөө""Бөлүшүү""%s аркылуу бөлүшүү""Жыйнап коюу""Издөө"48dp12dp14dp440dp60%90%60%90%55%80%"होम पेज पर जाएं""ऊपर जाएं""ज़्यादा विकल्प""हो गया""सभी देखें""कोई एप्‍लिकेशन चुनें""बंद""चालू""Alt+""Ctrl+""delete""enter""Function+""Meta+""Shift+""space""Sym+""Menu+""खोजा जा रहा है…""क्‍वेरी साफ़ करें""सर्च क्वेरी""सर्च करें""क्वेरी सबमिट करें""आवाज़ सर्च""इसके साथ शेयर करें""%s के साथ शेयर करें""छोटा करें""सर्च""Idi na početnu""Idi gore""Dodatne opcije""Gotovo""Prikaži sve""Odabir aplikacije""ISKLJUČENO""UKLJUČENO""Alt+""Ctrl+""delete""enter""Function+""Meta+""Shift+""razmaknica""Sym+""Menu+""Pretražite…""Izbriši upit""Upit za pretraživanje""Pretraživanje""Pošalji upit""Glasovno pretraživanje""Dijeljenje sa""Dijeli putem aplikacije %s""Sažmi""Pretraživanje""Ugrás a főoldalra""Felfelé mozgatás""További lehetőségek""Kész""Összes megtekintése""Válasszon ki egy alkalmazást""KI""BE""Alt+""Ctrl+""Delete""Enter""Function+""Meta+""Shift+""Szóköz""Sym+""Menu+""Keresés…""Lekérdezés törlése""Keresési lekérdezés""Keresés""Lekérdezés küldése""Hangalapú keresés""Megosztás a következővel:""Megosztás a következő alkalmazással: %s""Összecsukás""Keresés""Ուղղվել տուն""Ուղղվել վերև""Այլ ընտրանքներ""Պատրաստ է""Տեսնել բոլորը""Ընտրել ծրագիր""ԱՆՋԱՏՎԱԾ""ՄԻԱՑՎԱԾ""Alt+""Ctrl+""Delete""Enter""Function+""Meta+""Shift+""բացատ""Sym+""Menu+""Որոնում...""Մաքրել հարցումը""Որոնման հարցում""Որոնել""Ուղարկել հարցումը""Ձայնային որոնում""Կիսվել""Ուղարկել %s-ին""Թաքցնել""Որոնել""Navigasi ke beranda""Navigasi naik""Opsi lain""Selesai""Lihat semua""Pilih aplikasi""NONAKTIF""AKTIF""Alt+""Ctrl+""delete""enter""Function+""Meta+""Shift+""spasi""Sym+""Menu+""Telusuri...""Hapus kueri""Kueri penelusuran""Telusuri""Kirim kueri""Penelusuran suara""Bagikan dengan""Bagikan ke %s""Ciutkan""Telusuri""Fara heim""Fara upp""Fleiri valkostir""Lokið""Sjá allt""Veldu forrit""SLÖKKT""KVEIKT""Alt+""Ctrl+""delete""enter""Aðgerðarlykill+""Meta+""Shift+""bilslá""Sym+""Valmynd+""Leita…""Hreinsa fyrirspurn""Leitarfyrirspurn""Leita""Senda fyrirspurn""Raddleit""Deila með""Deila með %s""Minnka""Leita""Vai alla home page""Vai in alto""Altre opzioni""Fine""Visualizza tutte""Scegli un\'applicazione""OFF""ON""ALT +""CTRL +""CANC""INVIO""FUNZIONE +""META +""MAIUSC +""barra spaziatrice""SYM +""MENU +""Cerca…""Cancella query""Query di ricerca""Cerca""Invia query""Ricerca vocale""Condividi con""Condividi tramite %s""Comprimi""Ricerca""נווט לדף הבית""נווט למעלה""עוד אפשרויות""בוצע""ראה הכל""בחר אפליקציה""כבוי""פועל""Alt+""Ctrl+‎""delete""Enter""Function+""Meta+""Shift+""מקש רווח""Sym+""תפריט+""חיפוש…""מחק שאילתה""שאילתת חיפוש""חיפוש""שלח שאילתה""חיפוש קולי""שתף עם""שתף עם %s""כווץ""חיפוש""ホームへ移動""上へ移動""その他のオプション""完了""すべて表示""アプリの選択""OFF""ON""Alt+""Ctrl+""Delete""Enter""Function+""Meta+""Shift+""Space""Sym+""Menu+""検索…""検索キーワードを削除""検索キーワード""検索""検索キーワードを送信""音声検索""共有""%sと共有""折りたたむ""検索""მთავარზე ნავიგაცია""ზემოთ ნავიგაცია""მეტი ვარიანტები""დასრულდა""ყველას ნახვა""აპის არჩევა""გამორთულია""ჩართულია""Alt+""Ctrl+""წაშლა""შეყვანა""Function+""Meta+""Shift+""space""Sym+""Menu+""ძიება...""მოთხოვნის გასუფთავება""ძიების მოთხოვნა""ძიება""მოთხოვნის გადაგზავნა""ხმოვანი ძიება""გაზიარება:""გაუზიარეთ %s-ს""აკეცვა""ძიება""Негізгі бетте қозғалу""Жоғары қозғалу""Басқа опциялар""Дайын""Барлығын көру""Қолданбаны таңдау""ӨШІРУЛІ""ҚОСУЛЫ""Alt+""Ctrl+""delete""enter""Function+""Meta+""Shift+""бос орын""Sym+""Mәзір+""Іздеу…""Сұрақты жою""Сұрақты іздеу""Іздеу""Сұрақты жіберу""Дауыс арқылы іздеу""Бөлісу""%s қолданбасымен бөлісу""Тасалау""Іздеу""រកមើល​ទៅ​ដើម""រកមើល​ឡើងលើ""ជម្រើស​ច្រើន​ទៀត""រួចរាល់""មើល​ទាំងអស់""ជ្រើស​កម្មវិធី​​""បិទ""បើក""Alt+""Ctrl+""delete""enter""Function+""Meta+""Shift+""space""Sym+""Menu+""ស្វែងរក…""សម្អាត​សំណួរ""ស្វែងរក​សំណួរ""ស្វែងរក""ដាក់​​​ស្នើ​សំណួរ""ការស្វែងរក​សំឡេង""ចែករំលែក​ជាមួយ""ចែក​រំលែក​ជា​មួយ %s""បង្រួម""ស្វែងរក""ಮುಖಪುಟವನ್ನು ನ್ಯಾವಿಗೇಟ್ ಮಾಡಿ""ಮೇಲಕ್ಕೆ ನ್ಯಾವಿಗೇಟ್ ಮಾಡಿ""ಇನ್ನಷ್ಟು ಆಯ್ಕೆಗಳು""ಮುಗಿದಿದೆ""ಎಲ್ಲವನ್ನೂ ನೋಡಿ""ಒಂದು ಅಪ್ಲಿಕೇಶನ್ ಆಯ್ಕೆಮಾಡಿ""ಆಫ್""ಆನ್""Alt+""Ctrl+""delete""enter""Function+""Meta+""Shift+""space""Sym+""Menu+""ಹುಡುಕಿ…""ಪ್ರಶ್ನೆಯನ್ನು ತೆರವುಗೊಳಿಸು""ಪ್ರಶ್ನೆಯನ್ನು ಹುಡುಕಿ""ಹುಡುಕಿ""ಪ್ರಶ್ನೆಯನ್ನು ಸಲ್ಲಿಸು""ಧ್ವನಿ ಹುಡುಕಾಟ""ಇವರೊಂದಿಗೆ ಹಂಚಿಕೊಳ್ಳಿ""%s ನೊಂದಿಗೆ ಹಂಚಿಕೊಳ್ಳಿ""ಸಂಕುಚಿಸು""ಹುಡುಕಿ""홈 탐색""위로 탐색""옵션 더보기""완료""전체 보기""앱 선택""사용 안함""사용""Alt+""Ctrl+""삭제""입력""Function+""Meta+""Shift+""스페이스바""Sym+""Menu+""검색...""검색어 삭제""검색어""검색""검색어 보내기""음성 검색""공유 대상""%s와(과) 공유""접기""검색""Үйгө багыттоо""Жогору""Көбүрөөк мүмкүнчүлүктөр""Даяр""Бардыгын көрүү""Колдонмо тандоо""ӨЧҮК""КҮЙҮК""Alt+""Ctrl+""Delete""Enter""Function+""Meta+""Shift+""боштук""Sym+""Menu+""Издөө…""Талаптарды тазалоо""Издөө талаптары""Издөө""Талап жөнөтүү""Үн аркылуу издөө""Бөлүшүү""%s аркылуу бөлүшүү""Жыйнап коюу""Издөө"48dp12dp14dp440dp60%90%60%90%55%80%0px0px"Điều hướng về trang chủ""Điều hướng lên trên""Tùy chọn khác""Xong""Xem tất cả""Chọn một ứng dụng""TẮT""BẬT""Alt+""Ctrl+""delete""enter""Function+""Meta+""Shift+""phím cách""Sym+""Menu+""Tìm kiếm…""Xóa truy vấn""Tìm kiếm truy vấn""Tìm kiếm""Gửi truy vấn""Tìm kiếm bằng giọng nói""Chia sẻ với""Chia sẻ với %s""Thu gọn""Tìm kiếm""Điều hướng về trang chủ""Điều hướng lên trên""Tùy chọn khác""Xong""Xem tất cả""Chọn một ứng dụng""TẮT""BẬT""Alt+""Ctrl+""delete""enter""Function+""Meta+""Shift+""phím cách""Sym+""Menu+""Tìm kiếm…""Xóa truy vấn""Tìm kiếm truy vấn""Tìm kiếm""Gửi truy vấn""Tìm kiếm bằng giọng nói""Chia sẻ với""Chia sẻ với %s""Thu gọn""Tìm kiếm"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" + 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" + 短信 + 邮件 + 便签便签2x2便签4x4没有关联内容,点击新建便签。访客模式下,便签内容不可见...新建便签成功删除提醒创建提醒已过期yyyyMMddMM月dd日 kk:mm知道了查看呼叫电话发送邮件浏览网页打开地图新建文件夹导出文本同步取消同步设置搜索删除移动到文件夹选中了 %d 项没有选中项,操作无效全选取消全选文字大小正常超大进入清单模式退出清单模式查看文件夹刪除文件夹修改文件夹名称文件夹 %1$s 已存在,请重新命名分享发送到桌面提醒我删除提醒选择文件夹上一级文件夹已添加到桌面删除确认要删除所选的 %d 条便签吗?确认要删除该条便签吗?确认删除文件夹及所包含的便签吗?已将所选 %1$d 条便签移到 %2$s 文件夹SD卡被占用,不能操作导出文本时发生错误,请检查SD卡要查看的便签不存在不能为空便签设置闹钟提醒不能将空便签发送到桌面导出成功导出失败已将文本文件(%1$s)输出至SD卡(%2$s)目录同步便签...同步成功同步失败同步已取消与%1$s同步成功同步失败,请检查网络和帐号设置同步失败,发生内部错误同步已取消登录%1$s...正在获取服务器便签列表...正在同步本地便签...设置同步账号与google task同步便签记录上次同步于 %1$s添加账号更换账号删除账号取消立即同步取消同步当前帐号 %1$s如更换同步帐号,过去的帐号同步信息将被清空,再次切换的同时可能会造成数据重复同步便签请选择google帐号,便签将与该帐号的google task内容同步。正在同步中,不能修改同步帐号同步帐号已设置为%1$s新建便签背景颜色随机删除通话便签请输入名称正在搜索便签搜索便签便签中的文字便签设置取消 + %1$s 条符合“%2$s”的搜索结果 + 字数 + 短信 + 郵件 + 便簽便簽2x2便簽4x4沒有關聯內容,點擊新建便簽。訪客模式下,便籤內容不可見...新建便簽成功刪除提醒創建提醒已過期yyyyMMddMM月dd日 kk:mm知道了查看呼叫電話發送郵件浏覽網頁打開地圖已將所選 %1$d 便籤移到 %2$s 文件夾新建文件夾導出文本同步取消同步設置搜尋刪除移動到文件夾選中了 %d 項沒有選中項,操作無效全選取消全選文字大小正常超大進入清單模式退出清單模式查看文件夾刪除文件夾修改文件夾名稱文件夾 %1$s 已存在,請重新命名分享發送到桌面提醒我刪除提醒選擇文件夾上一級文件夾已添加到桌面刪除确认要刪除所選的 %d 條便籤嗎?确认要删除該條便籤嗎?確認刪除檔夾及所包含的便簽嗎?SD卡被佔用,不能操作導出TXT時發生錯誤,請檢查SD卡要查看的便籤不存在不能爲空便籤設置鬧鐘提醒不能將空便籤發送到桌面導出成功導出失敗已將文本文件(%1$s)導出至SD(%2$s)目錄同步便簽...同步成功同步失敗同步已取消與%1$s同步成功同步失敗,請檢查網絡和帳號設置同步失敗,發生內部錯誤同步已取消登陸%1$s...正在獲取服務器便籤列表...正在同步本地便籤...設置同步賬號与google task同步便簽記錄上次同步于 %1$s添加賬號更換賬號刪除賬號取消立即同步取消同步當前帳號 %1$s如更換同步帳號,過去的帳號同步信息將被清空,再次切換的同時可能會造成數據重復同步便簽請選擇google帳號,便簽將與該帳號的google task內容同步。正在同步中,不能修改同步帳號同步帳號已設置為%1$s新建便籤背景顏色隨機刪除通話便籤請輸入名稱正在搜索便籤搜索便籤便籤中的文字便籤設置取消 + %1$s 條符合”%2$s“的搜尋結果 + 字數 -%s --%s --%s @@ -2608,11 +2618,11 @@ Messaging Email - #335b5b5b33sp26sp20sp17sp14spNotesNotes 2x2Notes 4x4No associated note found, click to create associated note.Privacy mode,can not see note content...Add noteDelete reminder successfullySet reminderExpiredyyyyMMddMMMd kk:mmGot itTake a lookCallSend emailBrowse webOpen map/MIUI/notes/notes_%s.txt(%d)New FolderExport textSyncCancel syncingSettingsSearchDeleteMove to folder%d selectedNothing selected, the operation is invalidSelect allDeselect allFont sizeSmallMediumLargeSuperEnter check listLeave check listView folderDelete folderChange folder nameThe folder %1$s exist, please renameShareSend to homeRemind meDelete reminderSelect folderParent folderNote added to homeConfirm to delete folder and its notes?Delete selected notesConfirm to delete the selected %d notes?Confirm to delete this note?Have moved selected %1$d notes to %2$s folderSD card busy, not available nowExport failed, please check SD cardThe note is not existSorry, can not set clock on empty noteSorry, can not send and empty note to homeExport successfulExport failExport text file (%1$s) to SD (%2$s) directorySyncing notes...Sync is successfulSync is failedSync is canceledSync is successful with account %1$sSync failed, please check network and account settingsSync failed, internal error occursSync is canceledLogging into %1$s...Getting remote note list...Synchronize local notes with Google Task...SettingsSync accountSync notes with google taskLast sync time %1$syyyy-MM-dd hh:mm:ssAdd accountChange sync accountRemove sync accountCancelSync immediatelyCancel syncingCurrent account %1$sAll sync related information will be deleted, which may result in duplicated items sometimeSync notesPlease select a google account. Local notes will be synced with google task.Cannot change the account because sync is in progress%1$s has been set as the sync accountNew note background color randomDeleteCall notesInput nameSearching NotesSearch notesText in your notesNotessetcancel + #335b5b5b33sp26sp20sp17sp14spNotesNotes 2x2Notes 4x4No associated note found, click to create associated note.Privacy mode,can not see note content...Add noteDelete reminder successfullySet reminderExpiredyyyyMMddMMMd kk:mmGot itTake a lookCallSend emailBrowse webOpen map/MIUI/notes/notes_%s.txt(%d)New FolderExport textSyncCancel syncingSettingsSearchRestoreChange viewDeleteMove to folder%d selectedNothing selected, the operation is invalidSelect allDeselect allFont sizeSmallMediumLargeSuperEnter check listLeave check listView folderDelete folderChange folder nameThe folder %1$s exist, please renameShareSend to homeRemind meDelete reminderSelect folderParent folderNote added to homeConfirm to delete folder and its notes?Delete selected notesConfirm to delete the selected %d notes?Confirm to delete this note?Have moved selected %1$d notes to %2$s folderSD card busy, not available nowExport failed, please check SD cardThe note is not existSorry, can not set clock on empty noteSorry, can not send and empty note to homeExport successfulExport failExport text file (%1$s) to SD (%2$s) directorySyncing notes...Sync is successfulSync is failedSync is canceledSync is successful with account %1$sSync failed, please check network and account settingsSync failed, internal error occursSync is canceledLogging into %1$s...Getting remote note list...Synchronize local notes with Google Task...SettingsSync accountSync notes with google taskLast sync time %1$syyyy-MM-dd hh:mm:ssAdd accountChange sync accountRemove sync accountCancelSync immediatelyCancel syncingCurrent account %1$sAll sync related information will be deleted, which may result in duplicated items sometimeSync notesPlease select a google account. Local notes will be synced with google task.Cannot change the account because sync is in progress%1$s has been set as the sync accountNew note background color randomDeleteCall notesInput nameSearching NotesSearch notesText in your notesNotessetcancel %1$s result for \"%2$s\" %1$s results for \"%2$s\" - - 短信 - 邮件 - 便签便签2x2便签4x4没有关联内容,点击新建便签。访客模式下,便签内容不可见...新建便签成功删除提醒创建提醒已过期yyyyMMddMM月dd日 kk:mm知道了查看呼叫电话发送邮件浏览网页打开地图新建文件夹导出文本同步取消同步设置搜索删除移动到文件夹选中了 %d 项没有选中项,操作无效全选取消全选文字大小正常超大进入清单模式退出清单模式查看文件夹刪除文件夹修改文件夹名称文件夹 %1$s 已存在,请重新命名分享发送到桌面提醒我删除提醒选择文件夹上一级文件夹已添加到桌面删除确认要删除所选的 %d 条便签吗?确认要删除该条便签吗?确认删除文件夹及所包含的便签吗?已将所选 %1$d 条便签移到 %2$s 文件夹SD卡被占用,不能操作导出文本时发生错误,请检查SD卡要查看的便签不存在不能为空便签设置闹钟提醒不能将空便签发送到桌面导出成功导出失败已将文本文件(%1$s)输出至SD卡(%2$s)目录同步便签...同步成功同步失败同步已取消与%1$s同步成功同步失败,请检查网络和帐号设置同步失败,发生内部错误同步已取消登录%1$s...正在获取服务器便签列表...正在同步本地便签...设置同步账号与google task同步便签记录上次同步于 %1$s添加账号更换账号删除账号取消立即同步取消同步当前帐号 %1$s如更换同步帐号,过去的帐号同步信息将被清空,再次切换的同时可能会造成数据重复同步便签请选择google帐号,便签将与该帐号的google task内容同步。正在同步中,不能修改同步帐号同步帐号已设置为%1$s新建便签背景颜色随机删除通话便签请输入名称正在搜索便签搜索便签便签中的文字便签设置取消 - %1$s 条符合“%2$s”的搜索结果 - - 短信 - 郵件 - 便簽便簽2x2便簽4x4沒有關聯內容,點擊新建便簽。訪客模式下,便籤內容不可見...新建便簽成功刪除提醒創建提醒已過期yyyyMMddMM月dd日 kk:mm知道了查看呼叫電話發送郵件浏覽網頁打開地圖已將所選 %1$d 便籤移到 %2$s 文件夾新建文件夾導出文本同步取消同步設置搜尋刪除移動到文件夾選中了 %d 項沒有選中項,操作無效全選取消全選文字大小正常超大進入清單模式退出清單模式查看文件夾刪除文件夾修改文件夾名稱文件夾 %1$s 已存在,請重新命名分享發送到桌面提醒我刪除提醒選擇文件夾上一級文件夾已添加到桌面刪除确认要刪除所選的 %d 條便籤嗎?确认要删除該條便籤嗎?確認刪除檔夾及所包含的便簽嗎?SD卡被佔用,不能操作導出TXT時發生錯誤,請檢查SD卡要查看的便籤不存在不能爲空便籤設置鬧鐘提醒不能將空便籤發送到桌面導出成功導出失敗已將文本文件(%1$s)導出至SD(%2$s)目錄同步便簽...同步成功同步失敗同步已取消與%1$s同步成功同步失敗,請檢查網絡和帳號設置同步失敗,發生內部錯誤同步已取消登陸%1$s...正在獲取服務器便籤列表...正在同步本地便籤...設置同步賬號与google task同步便簽記錄上次同步于 %1$s添加賬號更換賬號刪除賬號取消立即同步取消同步當前帳號 %1$s如更換同步帳號,過去的帳號同步信息將被清空,再次切換的同時可能會造成數據重復同步便簽請選擇google帳號,便簽將與該帳號的google task內容同步。正在同步中,不能修改同步帳號同步帳號已設置為%1$s新建便籤背景顏色隨機刪除通話便籤請輸入名稱正在搜索便籤搜索便籤便籤中的文字便籤設置取消 - %1$s 條符合”%2$s“的搜尋結果 - + diff --git a/src/Notes-master1/app/build/intermediates/incremental/mergeDebugShaders/merger.xml b/src/Notes-master1/app/build/intermediates/incremental/mergeDebugShaders/merger.xml index 56a1ec16..8b924a7a 100644 --- a/src/Notes-master1/app/build/intermediates/incremental/mergeDebugShaders/merger.xml +++ b/src/Notes-master1/app/build/intermediates/incremental/mergeDebugShaders/merger.xml @@ -1,2 +1,2 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/src/Notes-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 index 24816610..6efc2bbf 100644 --- 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 @@ -1,4 +1,4 @@ -#Thu Sep 16 02:01:56 CST 2021 -base.0=E\:\\Notes-master1\\app\\build\\intermediates\\dex\\debug\\mergeDexDebug\\classes.dex +#Wed Nov 03 23:45:23 CST 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/incremental/packageDebug/tmp/debug/zip-cache/androidResources b/src/Notes-master1/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/androidResources index a86cb834..02a39b55 100644 Binary files a/src/Notes-master1/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/androidResources and b/src/Notes-master1/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/androidResources differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$CallNote.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$CallNote.class index 534af6e1..89d31944 100644 Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$CallNote.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$CallNote.class differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$NoteColumns.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$NoteColumns.class index 37c051dc..db96b8b1 100644 Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$NoteColumns.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$NoteColumns.class differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$TextNote.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$TextNote.class index a78b61a1..7640e9fe 100644 Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$TextNote.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$TextNote.class differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/data/NotesDatabaseHelper.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/data/NotesDatabaseHelper.class index 1f3ea0b6..eeaf53c1 100644 Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/data/NotesDatabaseHelper.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/data/NotesDatabaseHelper.class differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskASyncTask.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskASyncTask.class index 70dd8fff..33286f0b 100644 Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskASyncTask.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskASyncTask.class differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskManager.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskManager.class index dccdbd35..c8d2922d 100644 Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskManager.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskManager.class differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/model/Note$NoteData.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/model/Note$NoteData.class index 30318fc9..54b4705d 100644 Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/model/Note$NoteData.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/model/Note$NoteData.class differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/model/Note.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/model/Note.class index bbbea2e5..e93ace14 100644 Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/model/Note.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/model/Note.class differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/DataUtils.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/DataUtils.class index fc1d9a26..6f163023 100644 Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/DataUtils.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/DataUtils.class differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/AlarmAlertActivity.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/AlarmAlertActivity.class index 47327956..c9b4d093 100644 Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/AlarmAlertActivity.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/AlarmAlertActivity.class differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker.class index 5019af99..ac7300fc 100644 Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker.class differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/FoldersListAdapter$FolderListItem.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/FoldersListAdapter$FolderListItem.class index 4134fb1d..ab9ce99a 100644 Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/FoldersListAdapter$FolderListItem.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/FoldersListAdapter$FolderListItem.class differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/FoldersListAdapter.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/FoldersListAdapter.class index 0c6ef372..58d68753 100644 Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/FoldersListAdapter.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/FoldersListAdapter.class differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$1.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$1.class index 4196c53f..20066d76 100644 Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$1.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$1.class differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$2.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$2.class index 06b45e38..470d0ec1 100644 Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$2.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$2.class differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$3.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$3.class index 911747cb..1aec7442 100644 Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$3.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$3.class differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$4.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$4.class new file mode 100644 index 00000000..73edd9cf Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$4.class differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$HeadViewHolder.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$HeadViewHolder.class index 1d9192ab..407cd912 100644 Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$HeadViewHolder.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$HeadViewHolder.class differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity.class index d72e25df..14c09428 100644 Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity.class differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditText.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditText.class index a172ca5d..8081c102 100644 Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditText.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditText.class differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$1.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$1.class index 4f7e6075..d202bf63 100644 Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$1.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$1.class differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$2.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$2.class index 817fae79..59c539e3 100644 Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$2.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$2.class differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$3.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$3.class index 0cbb8a53..14caec84 100644 Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$3.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$3.class differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$4.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$4.class index dfa4f705..624498e2 100644 Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$4.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$4.class differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$5.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$5.class index 43c92d1b..033bda0a 100644 Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$5.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$5.class differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$6.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$6.class index 1cfc848b..f4ee9b53 100644 Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$6.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$6.class differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$7.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$7.class index 8e8f18b9..b909b8e3 100644 Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$7.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$7.class differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$8.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$8.class index 5d6651d9..8dc203e4 100644 Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$8.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$8.class differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$9.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$9.class index c3c084a2..e8c1fe3c 100644 Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$9.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$9.class differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$BackgroundQueryHandler.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$BackgroundQueryHandler.class index ad360396..db11d2b1 100644 Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$BackgroundQueryHandler.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$BackgroundQueryHandler.class differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ListEditState.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ListEditState.class index 6cd91945..b40ced99 100644 Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ListEditState.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ListEditState.class differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback$1.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback$1.class index 4af37e90..aa9e373f 100644 Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback$1.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback$1.class differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback$2.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback$2.class index 2cce5c16..12863784 100644 Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback$2.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback$2.class differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback.class index 6def3954..161cbc68 100644 Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback.class differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$NewNoteOnTouchListener.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$NewNoteOnTouchListener.class index 52efe7b0..6a0ede77 100644 Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$NewNoteOnTouchListener.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$NewNoteOnTouchListener.class differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.class index 56251f05..9e3a285b 100644 Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.class differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity.class index 6860127e..202ded9c 100644 Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity.class differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListItem.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListItem.class index 80863f03..9ced5c6e 100644 Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListItem.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListItem.class differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$1.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$1.class index 9ba716fa..3991932d 100644 Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$1.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$1.class differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$GTaskReceiver.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$GTaskReceiver.class index e56e7e8f..b2372c1a 100644 Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$GTaskReceiver.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$GTaskReceiver.class differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity.class index 1cba5c3f..d3abcd7b 100644 Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity.class differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider.class index 49c8406b..ae103155 100644 Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider.class differ 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 index 03a1c5b0..cbb26511 100644 --- 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 @@ -21,253 +21,253 @@ 21 22 E:\Notes-master1\app\src\main\AndroidManifest.xml +23-->D:\Notes-master1\app\src\main\AndroidManifest.xml 24 android:targetSdkVersion="14" /> -24-->E:\Notes-master1\app\src\main\AndroidManifest.xml +24-->D:\Notes-master1\app\src\main\AndroidManifest.xml 25 26 -26-->E:\Notes-master1\app\src\main\AndroidManifest.xml:25:5-81 -26-->E:\Notes-master1\app\src\main\AndroidManifest.xml:25:22-78 +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-->E:\Notes-master1\app\src\main\AndroidManifest.xml:26:5-88 -27-->E:\Notes-master1\app\src\main\AndroidManifest.xml:26:22-85 +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-->E:\Notes-master1\app\src\main\AndroidManifest.xml:27:5-67 -28-->E:\Notes-master1\app\src\main\AndroidManifest.xml:27:22-64 +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-->E:\Notes-master1\app\src\main\AndroidManifest.xml:28:5-72 -29-->E:\Notes-master1\app\src\main\AndroidManifest.xml:28:22-69 +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-->E:\Notes-master1\app\src\main\AndroidManifest.xml:29:5-74 -30-->E:\Notes-master1\app\src\main\AndroidManifest.xml:29:22-71 +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-->E:\Notes-master1\app\src\main\AndroidManifest.xml:30:5-80 -31-->E:\Notes-master1\app\src\main\AndroidManifest.xml:30:22-77 +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-->E:\Notes-master1\app\src\main\AndroidManifest.xml:31:5-71 -32-->E:\Notes-master1\app\src\main\AndroidManifest.xml:31:22-68 +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-->E:\Notes-master1\app\src\main\AndroidManifest.xml:32:5-74 -33-->E:\Notes-master1\app\src\main\AndroidManifest.xml:32:22-71 +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-->E:\Notes-master1\app\src\main\AndroidManifest.xml:33:5-81 -34-->E:\Notes-master1\app\src\main\AndroidManifest.xml:33:22-78 +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 E:\Notes-master1\app\src\main\AndroidManifest.xml:35:5-149:19 +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\小超人\.gradle\caches\transforms-3\21795bd83e308c947c8dfe0c1fc89322\transformed\support-compat-28.0.0\AndroidManifest.xml:22:18-91 +37-->[com.android.support:support-compat:28.0.0] C:\Users\fanyi\.gradle\caches\transforms-3\2b9474e47639de47b19dc72cadc6eaea\transformed\support-compat-28.0.0\AndroidManifest.xml:22:18-91 38 android:debuggable="true" 39 android:icon="@drawable/icon_app" -39-->E:\Notes-master1\app\src\main\AndroidManifest.xml:36:9-42 +39-->D:\Notes-master1\app\src\main\AndroidManifest.xml:36:9-42 40 android:label="@string/app_name" > -40-->E:\Notes-master1\app\src\main\AndroidManifest.xml:37:9-41 +40-->D:\Notes-master1\app\src\main\AndroidManifest.xml:37:9-41 41 E:\Notes-master1\app\src\main\AndroidManifest.xml:38:9-51:20 +41-->D:\Notes-master1\app\src\main\AndroidManifest.xml:38:9-51:20 42 android:name="net.micode.notes.ui.NotesListActivity" -42-->E:\Notes-master1\app\src\main\AndroidManifest.xml:39:13-49 +42-->D:\Notes-master1\app\src\main\AndroidManifest.xml:39:13-49 43 android:configChanges="keyboardHidden|orientation|screenSize" -43-->E:\Notes-master1\app\src\main\AndroidManifest.xml:40:13-74 +43-->D:\Notes-master1\app\src\main\AndroidManifest.xml:40:13-74 44 android:label="@string/app_name" -44-->E:\Notes-master1\app\src\main\AndroidManifest.xml:41:13-45 +44-->D:\Notes-master1\app\src\main\AndroidManifest.xml:41:13-45 45 android:launchMode="singleTop" -45-->E:\Notes-master1\app\src\main\AndroidManifest.xml:42:13-43 +45-->D:\Notes-master1\app\src\main\AndroidManifest.xml:42:13-43 46 android:theme="@style/Theme.AppCompat.Light.DarkActionBar" -46-->E:\Notes-master1\app\src\main\AndroidManifest.xml:43:13-71 +46-->D:\Notes-master1\app\src\main\AndroidManifest.xml:43:13-71 47 android:uiOptions="splitActionBarWhenNarrow" -47-->E:\Notes-master1\app\src\main\AndroidManifest.xml:44:13-57 +47-->D:\Notes-master1\app\src\main\AndroidManifest.xml:44:13-57 48 android:windowSoftInputMode="adjustPan" > -48-->E:\Notes-master1\app\src\main\AndroidManifest.xml:45:13-52 +48-->D:\Notes-master1\app\src\main\AndroidManifest.xml:45:13-52 49 -49-->E:\Notes-master1\app\src\main\AndroidManifest.xml:47:13-50:29 +49-->D:\Notes-master1\app\src\main\AndroidManifest.xml:47:13-50:29 50 -50-->E:\Notes-master1\app\src\main\AndroidManifest.xml:48:17-69 -50-->E:\Notes-master1\app\src\main\AndroidManifest.xml:48:25-66 +50-->D:\Notes-master1\app\src\main\AndroidManifest.xml:48:17-69 +50-->D:\Notes-master1\app\src\main\AndroidManifest.xml:48:25-66 51 52 -52-->E:\Notes-master1\app\src\main\AndroidManifest.xml:49:17-77 -52-->E:\Notes-master1\app\src\main\AndroidManifest.xml:49:27-74 +52-->D:\Notes-master1\app\src\main\AndroidManifest.xml:49:17-77 +52-->D:\Notes-master1\app\src\main\AndroidManifest.xml:49:27-74 53 54 55 E:\Notes-master1\app\src\main\AndroidManifest.xml:53:9-81:20 +55-->D:\Notes-master1\app\src\main\AndroidManifest.xml:53:9-81:20 56 android:name="net.micode.notes.ui.NoteEditActivity" -56-->E:\Notes-master1\app\src\main\AndroidManifest.xml:54:13-48 +56-->D:\Notes-master1\app\src\main\AndroidManifest.xml:54:13-48 57 android:configChanges="keyboardHidden|orientation|screenSize" -57-->E:\Notes-master1\app\src\main\AndroidManifest.xml:55:13-74 +57-->D:\Notes-master1\app\src\main\AndroidManifest.xml:55:13-74 58 android:launchMode="singleTop" -58-->E:\Notes-master1\app\src\main\AndroidManifest.xml:56:13-43 +58-->D:\Notes-master1\app\src\main\AndroidManifest.xml:56:13-43 59 android:theme="@style/Theme.AppCompat.Light.DarkActionBar" > -59-->E:\Notes-master1\app\src\main\AndroidManifest.xml:57:13-71 +59-->D:\Notes-master1\app\src\main\AndroidManifest.xml:57:13-71 60 -60-->E:\Notes-master1\app\src\main\AndroidManifest.xml:59:13-64:29 +60-->D:\Notes-master1\app\src\main\AndroidManifest.xml:59:13-64:29 61 -61-->E:\Notes-master1\app\src\main\AndroidManifest.xml:60:17-69 -61-->E:\Notes-master1\app\src\main\AndroidManifest.xml:60:25-66 +61-->D:\Notes-master1\app\src\main\AndroidManifest.xml:60:17-69 +61-->D:\Notes-master1\app\src\main\AndroidManifest.xml:60:25-66 62 63 -63-->E:\Notes-master1\app\src\main\AndroidManifest.xml:61:17-76 -63-->E:\Notes-master1\app\src\main\AndroidManifest.xml:61:27-73 +63-->D:\Notes-master1\app\src\main\AndroidManifest.xml:61:17-76 +63-->D:\Notes-master1\app\src\main\AndroidManifest.xml:61:27-73 64 65 -65-->E:\Notes-master1\app\src\main\AndroidManifest.xml:62:17-78 -65-->E:\Notes-master1\app\src\main\AndroidManifest.xml:62:23-75 +65-->D:\Notes-master1\app\src\main\AndroidManifest.xml:62:17-78 +65-->D:\Notes-master1\app\src\main\AndroidManifest.xml:62:23-75 66 -66-->E:\Notes-master1\app\src\main\AndroidManifest.xml:62:17-78 -66-->E:\Notes-master1\app\src\main\AndroidManifest.xml:62:23-75 +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 68 -68-->E:\Notes-master1\app\src\main\AndroidManifest.xml:66:13-71:29 +68-->D:\Notes-master1\app\src\main\AndroidManifest.xml:66:13-71:29 69 -69-->E:\Notes-master1\app\src\main\AndroidManifest.xml:67:17-79 -69-->E:\Notes-master1\app\src\main\AndroidManifest.xml:67:25-76 +69-->D:\Notes-master1\app\src\main\AndroidManifest.xml:67:17-79 +69-->D:\Notes-master1\app\src\main\AndroidManifest.xml:67:25-76 70 71 -71-->E:\Notes-master1\app\src\main\AndroidManifest.xml:61:17-76 -71-->E:\Notes-master1\app\src\main\AndroidManifest.xml:61:27-73 +71-->D:\Notes-master1\app\src\main\AndroidManifest.xml:61:17-76 +71-->D:\Notes-master1\app\src\main\AndroidManifest.xml:61:27-73 72 73 -73-->E:\Notes-master1\app\src\main\AndroidManifest.xml:62:17-78 -73-->E:\Notes-master1\app\src\main\AndroidManifest.xml:62:23-75 +73-->D:\Notes-master1\app\src\main\AndroidManifest.xml:62:17-78 +73-->D:\Notes-master1\app\src\main\AndroidManifest.xml:62:23-75 74 -74-->E:\Notes-master1\app\src\main\AndroidManifest.xml:62:17-78 -74-->E:\Notes-master1\app\src\main\AndroidManifest.xml:62:23-75 +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 76 -76-->E:\Notes-master1\app\src\main\AndroidManifest.xml:73:13-76:29 +76-->D:\Notes-master1\app\src\main\AndroidManifest.xml:73:13-76:29 77 -77-->E:\Notes-master1\app\src\main\AndroidManifest.xml:74:17-71 -77-->E:\Notes-master1\app\src\main\AndroidManifest.xml:74:25-68 +77-->D:\Notes-master1\app\src\main\AndroidManifest.xml:74:17-71 +77-->D:\Notes-master1\app\src\main\AndroidManifest.xml:74:25-68 78 79 -79-->E:\Notes-master1\app\src\main\AndroidManifest.xml:61:17-76 -79-->E:\Notes-master1\app\src\main\AndroidManifest.xml:61:27-73 +79-->D:\Notes-master1\app\src\main\AndroidManifest.xml:61:17-76 +79-->D:\Notes-master1\app\src\main\AndroidManifest.xml:61:27-73 80 81 82 E:\Notes-master1\app\src\main\AndroidManifest.xml:78:13-80:54 +82-->D:\Notes-master1\app\src\main\AndroidManifest.xml:78:13-80:54 83 android:name="android.app.searchable" -83-->E:\Notes-master1\app\src\main\AndroidManifest.xml:79:17-54 +83-->D:\Notes-master1\app\src\main\AndroidManifest.xml:79:17-54 84 android:resource="@xml/searchable" /> -84-->E:\Notes-master1\app\src\main\AndroidManifest.xml:80:17-51 +84-->D:\Notes-master1\app\src\main\AndroidManifest.xml:80:17-51 85 86 87 E:\Notes-master1\app\src\main\AndroidManifest.xml:83:9-86:43 +87-->D:\Notes-master1\app\src\main\AndroidManifest.xml:83:9-86:43 88 android:name="net.micode.notes.data.NotesProvider" -88-->E:\Notes-master1\app\src\main\AndroidManifest.xml:84:13-63 +88-->D:\Notes-master1\app\src\main\AndroidManifest.xml:84:13-63 89 android:authorities="micode_notes" -89-->E:\Notes-master1\app\src\main\AndroidManifest.xml:85:13-47 +89-->D:\Notes-master1\app\src\main\AndroidManifest.xml:85:13-47 90 android:multiprocess="true" /> -90-->E:\Notes-master1\app\src\main\AndroidManifest.xml:86:13-40 +90-->D:\Notes-master1\app\src\main\AndroidManifest.xml:86:13-40 91 92 E:\Notes-master1\app\src\main\AndroidManifest.xml:88:9-100:20 +92-->D:\Notes-master1\app\src\main\AndroidManifest.xml:88:9-100:20 93 android:name="net.micode.notes.widget.NoteWidgetProvider_2x" -93-->E:\Notes-master1\app\src\main\AndroidManifest.xml:89:13-57 +93-->D:\Notes-master1\app\src\main\AndroidManifest.xml:89:13-57 94 android:label="@string/app_widget2x2" > -94-->E:\Notes-master1\app\src\main\AndroidManifest.xml:90:13-50 +94-->D:\Notes-master1\app\src\main\AndroidManifest.xml:90:13-50 95 -95-->E:\Notes-master1\app\src\main\AndroidManifest.xml:91:13-95:29 +95-->D:\Notes-master1\app\src\main\AndroidManifest.xml:91:13-95:29 96 -96-->E:\Notes-master1\app\src\main\AndroidManifest.xml:92:17-84 -96-->E:\Notes-master1\app\src\main\AndroidManifest.xml:92:25-81 +96-->D:\Notes-master1\app\src\main\AndroidManifest.xml:92:17-84 +96-->D:\Notes-master1\app\src\main\AndroidManifest.xml:92:25-81 97 -97-->E:\Notes-master1\app\src\main\AndroidManifest.xml:93:17-85 -97-->E:\Notes-master1\app\src\main\AndroidManifest.xml:93:25-82 +97-->D:\Notes-master1\app\src\main\AndroidManifest.xml:93:17-85 +97-->D:\Notes-master1\app\src\main\AndroidManifest.xml:93:25-82 98 -98-->E:\Notes-master1\app\src\main\AndroidManifest.xml:94:17-85 -98-->E:\Notes-master1\app\src\main\AndroidManifest.xml:94:25-82 +98-->D:\Notes-master1\app\src\main\AndroidManifest.xml:94:17-85 +98-->D:\Notes-master1\app\src\main\AndroidManifest.xml:94:25-82 99 100 101 E:\Notes-master1\app\src\main\AndroidManifest.xml:97:13-99:58 +101-->D:\Notes-master1\app\src\main\AndroidManifest.xml:97:13-99:58 102 android:name="android.appwidget.provider" -102-->E:\Notes-master1\app\src\main\AndroidManifest.xml:98:17-58 +102-->D:\Notes-master1\app\src\main\AndroidManifest.xml:98:17-58 103 android:resource="@xml/widget_2x_info" /> -103-->E:\Notes-master1\app\src\main\AndroidManifest.xml:99:17-55 +103-->D:\Notes-master1\app\src\main\AndroidManifest.xml:99:17-55 104 105 E:\Notes-master1\app\src\main\AndroidManifest.xml:101:9-114:20 +105-->D:\Notes-master1\app\src\main\AndroidManifest.xml:101:9-114:20 106 android:name="net.micode.notes.widget.NoteWidgetProvider_4x" -106-->E:\Notes-master1\app\src\main\AndroidManifest.xml:102:13-57 +106-->D:\Notes-master1\app\src\main\AndroidManifest.xml:102:13-57 107 android:label="@string/app_widget4x4" > -107-->E:\Notes-master1\app\src\main\AndroidManifest.xml:103:13-50 +107-->D:\Notes-master1\app\src\main\AndroidManifest.xml:103:13-50 108 -108-->E:\Notes-master1\app\src\main\AndroidManifest.xml:91:13-95:29 +108-->D:\Notes-master1\app\src\main\AndroidManifest.xml:91:13-95:29 109 -109-->E:\Notes-master1\app\src\main\AndroidManifest.xml:92:17-84 -109-->E:\Notes-master1\app\src\main\AndroidManifest.xml:92:25-81 +109-->D:\Notes-master1\app\src\main\AndroidManifest.xml:92:17-84 +109-->D:\Notes-master1\app\src\main\AndroidManifest.xml:92:25-81 110 -110-->E:\Notes-master1\app\src\main\AndroidManifest.xml:93:17-85 -110-->E:\Notes-master1\app\src\main\AndroidManifest.xml:93:25-82 +110-->D:\Notes-master1\app\src\main\AndroidManifest.xml:93:17-85 +110-->D:\Notes-master1\app\src\main\AndroidManifest.xml:93:25-82 111 -111-->E:\Notes-master1\app\src\main\AndroidManifest.xml:94:17-85 -111-->E:\Notes-master1\app\src\main\AndroidManifest.xml:94:25-82 +111-->D:\Notes-master1\app\src\main\AndroidManifest.xml:94:17-85 +111-->D:\Notes-master1\app\src\main\AndroidManifest.xml:94:25-82 112 113 114 E:\Notes-master1\app\src\main\AndroidManifest.xml:97:13-99:58 +114-->D:\Notes-master1\app\src\main\AndroidManifest.xml:97:13-99:58 115 android:name="android.appwidget.provider" -115-->E:\Notes-master1\app\src\main\AndroidManifest.xml:98:17-58 +115-->D:\Notes-master1\app\src\main\AndroidManifest.xml:98:17-58 116 android:resource="@xml/widget_4x_info" /> -116-->E:\Notes-master1\app\src\main\AndroidManifest.xml:99:17-55 +116-->D:\Notes-master1\app\src\main\AndroidManifest.xml:99:17-55 117 118 -118-->E:\Notes-master1\app\src\main\AndroidManifest.xml:116:9-120:20 -118-->E:\Notes-master1\app\src\main\AndroidManifest.xml:116:19-55 +118-->D:\Notes-master1\app\src\main\AndroidManifest.xml:116:9-120:20 +118-->D:\Notes-master1\app\src\main\AndroidManifest.xml:116:19-55 119 -119-->E:\Notes-master1\app\src\main\AndroidManifest.xml:117:13-119:29 +119-->D:\Notes-master1\app\src\main\AndroidManifest.xml:117:13-119:29 120 -120-->E:\Notes-master1\app\src\main\AndroidManifest.xml:118:17-79 -120-->E:\Notes-master1\app\src\main\AndroidManifest.xml:118:25-76 +120-->D:\Notes-master1\app\src\main\AndroidManifest.xml:118:17-79 +120-->D:\Notes-master1\app\src\main\AndroidManifest.xml:118:25-76 121 122 123 E:\Notes-master1\app\src\main\AndroidManifest.xml:122:9-125:20 +123-->D:\Notes-master1\app\src\main\AndroidManifest.xml:122:9-125:20 124 android:name="net.micode.notes.ui.AlarmReceiver" -124-->E:\Notes-master1\app\src\main\AndroidManifest.xml:123:13-61 +124-->D:\Notes-master1\app\src\main\AndroidManifest.xml:123:13-61 125 android:process=":remote" > -125-->E:\Notes-master1\app\src\main\AndroidManifest.xml:124:13-38 +125-->D:\Notes-master1\app\src\main\AndroidManifest.xml:124:13-38 126 127 128 E:\Notes-master1\app\src\main\AndroidManifest.xml:127:9-132:20 +128-->D:\Notes-master1\app\src\main\AndroidManifest.xml:127:9-132:20 129 android:name="net.micode.notes.ui.AlarmAlertActivity" -129-->E:\Notes-master1\app\src\main\AndroidManifest.xml:128:13-50 +129-->D:\Notes-master1\app\src\main\AndroidManifest.xml:128:13-50 130 android:label="@string/app_name" -130-->E:\Notes-master1\app\src\main\AndroidManifest.xml:129:13-45 +130-->D:\Notes-master1\app\src\main\AndroidManifest.xml:129:13-45 131 android:launchMode="singleInstance" -131-->E:\Notes-master1\app\src\main\AndroidManifest.xml:130:13-48 +131-->D:\Notes-master1\app\src\main\AndroidManifest.xml:130:13-48 132 android:theme="@android:style/Theme.Holo.Wallpaper.NoTitleBar" > -132-->E:\Notes-master1\app\src\main\AndroidManifest.xml:131:13-75 +132-->D:\Notes-master1\app\src\main\AndroidManifest.xml:131:13-75 133 134 E:\Notes-master1\app\src\main\AndroidManifest.xml:134:9-139:20 +134-->D:\Notes-master1\app\src\main\AndroidManifest.xml:134:9-139:20 135 android:name="net.micode.notes.ui.NotesPreferenceActivity" -135-->E:\Notes-master1\app\src\main\AndroidManifest.xml:135:13-71 +135-->D:\Notes-master1\app\src\main\AndroidManifest.xml:135:13-71 136 android:label="@string/preferences_title" -136-->E:\Notes-master1\app\src\main\AndroidManifest.xml:136:13-54 +136-->D:\Notes-master1\app\src\main\AndroidManifest.xml:136:13-54 137 android:launchMode="singleTop" -137-->E:\Notes-master1\app\src\main\AndroidManifest.xml:137:13-43 +137-->D:\Notes-master1\app\src\main\AndroidManifest.xml:137:13-43 138 android:theme="@android:style/Theme.Holo.Light" > -138-->E:\Notes-master1\app\src\main\AndroidManifest.xml:138:13-60 +138-->D:\Notes-master1\app\src\main\AndroidManifest.xml:138:13-60 139 140 141 E:\Notes-master1\app\src\main\AndroidManifest.xml:141:9-144:19 +141-->D:\Notes-master1\app\src\main\AndroidManifest.xml:141:9-144:19 142 android:name="net.micode.notes.gtask.remote.GTaskSyncService" -142-->E:\Notes-master1\app\src\main\AndroidManifest.xml:142:13-74 +142-->D:\Notes-master1\app\src\main\AndroidManifest.xml:142:13-74 143 android:exported="false" > -143-->E:\Notes-master1\app\src\main\AndroidManifest.xml:143:13-37 +143-->D:\Notes-master1\app\src\main\AndroidManifest.xml:143:13-37 144 145 146 E:\Notes-master1\app\src\main\AndroidManifest.xml:146:9-148:52 +146-->D:\Notes-master1\app\src\main\AndroidManifest.xml:146:9-148:52 147 android:name="android.app.default_searchable" -147-->E:\Notes-master1\app\src\main\AndroidManifest.xml:147:13-58 +147-->D:\Notes-master1\app\src\main\AndroidManifest.xml:147:13-58 148 android:value=".ui.NoteEditActivity" /> -148-->E:\Notes-master1\app\src\main\AndroidManifest.xml:148:13-49 +148-->D:\Notes-master1\app\src\main\AndroidManifest.xml:148:13-49 149 150 151 diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/color_primary_text_dark.xml.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/color_primary_text_dark.xml.flat index 4e417c6c..9a0e912e 100644 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/color_primary_text_dark.xml.flat and b/src/Notes-master1/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/Notes-master1/app/build/intermediates/merged_res/debug/color_secondary_text_dark.xml.flat index 9420821e..3fcc8624 100644 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/color_secondary_text_dark.xml.flat and b/src/Notes-master1/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/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_bg_btn_set_color.png.flat index 4c4cd18a..636f43c5 100644 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_bg_btn_set_color.png.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_bg_btn_set_color.png.flat differ 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 index 0479c858..71afe7ba 100644 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_bg_color_btn_mask.png.flat and b/src/Notes-master1/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/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_call_record.png.flat index d26c8538..7fb6dfb0 100644 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_call_record.png.flat and b/src/Notes-master1/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/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_clock.png.flat index 11dc9042..654ac6b6 100644 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_clock.png.flat and b/src/Notes-master1/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/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_delete.png.flat index dd9e8238..3aae5e2f 100644 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_delete.png.flat and b/src/Notes-master1/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/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_dropdown_icon.9.png.flat index 2eefc35e..302aeff4 100644 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_dropdown_icon.9.png.flat and b/src/Notes-master1/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/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_blue.9.png.flat index 27eab4be..e5eb8b41 100644 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_blue.9.png.flat and b/src/Notes-master1/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/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_green.9.png.flat index 6e8ef01f..6cc95df3 100644 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_green.9.png.flat and b/src/Notes-master1/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/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_red.9.png.flat index d323571f..ccc843af 100644 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_red.9.png.flat and b/src/Notes-master1/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/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_title_blue.9.png.flat index f7414186..47429675 100644 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_title_blue.9.png.flat and b/src/Notes-master1/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/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_title_green.9.png.flat index 3dfe3508..1398c535 100644 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_title_green.9.png.flat and b/src/Notes-master1/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/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_title_red.9.png.flat index 0fdcfad8..726619c2 100644 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_title_red.9.png.flat and b/src/Notes-master1/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/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_title_white.9.png.flat index 765b763e..9c5a0148 100644 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_title_white.9.png.flat and b/src/Notes-master1/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/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_title_yellow.9.png.flat index 435dc53c..6ea7bf6d 100644 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_title_yellow.9.png.flat and b/src/Notes-master1/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/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_white.9.png.flat index 518be773..8d60ea50 100644 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_white.9.png.flat and b/src/Notes-master1/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/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_yellow.9.png.flat index 1954a82e..f9c6ab97 100644 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_yellow.9.png.flat and b/src/Notes-master1/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/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_font_large.png.flat index 56cc5aa0..1838cb68 100644 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_font_large.png.flat and b/src/Notes-master1/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/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_font_normal.png.flat index 402a4f07..a6dbcb93 100644 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_font_normal.png.flat and b/src/Notes-master1/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/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_font_size_selector_bg.9.png.flat index 8a96d27b..2880df8c 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/Notes-master1/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/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_font_small.png.flat index a1271a7a..83c1c63b 100644 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_font_small.png.flat and b/src/Notes-master1/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/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_font_super.png.flat index 96434dc7..20017fcb 100644 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_font_super.png.flat and b/src/Notes-master1/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/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_icon_app.png.flat index c84a0c1a..d9d8f019 100644 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_icon_app.png.flat and b/src/Notes-master1/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/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_background.png.flat index 8fd2d28b..6c080dff 100644 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_background.png.flat and b/src/Notes-master1/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/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_blue_down.9.png.flat index 6c9b3ad1..2047ac34 100644 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_blue_down.9.png.flat and b/src/Notes-master1/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/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_blue_middle.9.png.flat index 0b617a05..35d03f20 100644 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_blue_middle.9.png.flat and b/src/Notes-master1/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/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_blue_single.9.png.flat index 3d76ee05..2a2e4482 100644 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_blue_single.9.png.flat and b/src/Notes-master1/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/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_blue_up.9.png.flat index e7c91aa6..16696a84 100644 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_blue_up.9.png.flat and b/src/Notes-master1/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/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_folder.9.png.flat index 5724559a..ca018404 100644 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_folder.9.png.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_folder.9.png.flat 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 index b2e51024..fe091133 100644 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_footer_bg.9.png.flat and b/src/Notes-master1/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/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_green_down.9.png.flat index 1d4176b1..8250cfcb 100644 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_green_down.9.png.flat and b/src/Notes-master1/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/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_green_middle.9.png.flat index 44acfa38..7d807faa 100644 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_green_middle.9.png.flat and b/src/Notes-master1/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/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_green_single.9.png.flat index caebcfc9..18056d59 100644 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_green_single.9.png.flat and b/src/Notes-master1/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/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_green_up.9.png.flat index 422960ab..ccb6e410 100644 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_green_up.9.png.flat and b/src/Notes-master1/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/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_red_down.9.png.flat index cf08936a..a5e25e0c 100644 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_red_down.9.png.flat and b/src/Notes-master1/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/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_red_middle.9.png.flat index ebf1af53..e2d684b7 100644 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_red_middle.9.png.flat and b/src/Notes-master1/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/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_red_single.9.png.flat index 348b3443..4865e3fa 100644 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_red_single.9.png.flat and b/src/Notes-master1/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/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_red_up.9.png.flat index ac236167..127dbc1b 100644 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_red_up.9.png.flat and b/src/Notes-master1/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/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_white_down.9.png.flat index 0880c5e1..6fbb9b5e 100644 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_white_down.9.png.flat and b/src/Notes-master1/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/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_white_middle.9.png.flat index 709dffe0..3efa49cf 100644 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_white_middle.9.png.flat and b/src/Notes-master1/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/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_white_single.9.png.flat index 1ec6455d..8f653ea1 100644 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_white_single.9.png.flat and b/src/Notes-master1/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/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_white_up.9.png.flat index e5e4867a..e13fad77 100644 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_white_up.9.png.flat and b/src/Notes-master1/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/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_yellow_down.9.png.flat index 2095e767..e3579c58 100644 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_yellow_down.9.png.flat and b/src/Notes-master1/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/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_yellow_middle.9.png.flat index 6ecb5a88..0b4a3252 100644 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_yellow_middle.9.png.flat and b/src/Notes-master1/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/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_yellow_single.9.png.flat index 031195b1..992026dc 100644 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_yellow_single.9.png.flat and b/src/Notes-master1/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/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_yellow_up.9.png.flat index 4d73728c..4502b78b 100644 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_yellow_up.9.png.flat and b/src/Notes-master1/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/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_menu_delete.png.flat index 15f99657..cba8af00 100644 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_menu_delete.png.flat and b/src/Notes-master1/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/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_menu_move.png.flat index a668600c..f9d67b9c 100644 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_menu_move.png.flat and b/src/Notes-master1/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/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_new_note_normal.png.flat index 10d4f6b3..ca85394d 100644 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_new_note_normal.png.flat and b/src/Notes-master1/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/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_new_note_pressed.png.flat index 2828cc01..76630b44 100644 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_new_note_pressed.png.flat and b/src/Notes-master1/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/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_note_edit_color_selector_panel.png.flat index bdfbf26b..d16fb3a8 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/Notes-master1/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/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_notification.png.flat index c9d0a2df..86df61c8 100644 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_notification.png.flat and b/src/Notes-master1/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/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_search_result.png.flat index 871766da..04c9b563 100644 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_search_result.png.flat and b/src/Notes-master1/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/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_selected.png.flat index c8d9cd32..4b0436ab 100644 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_selected.png.flat and b/src/Notes-master1/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/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_title_alert.png.flat index a9b228cc..10f5b226 100644 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_title_alert.png.flat and b/src/Notes-master1/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/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_title_bar_bg.9.png.flat index 7f8fb76e..e51619ce 100644 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_title_bar_bg.9.png.flat and b/src/Notes-master1/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/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_2x_blue.png.flat index e8b94802..4c621a1a 100644 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_2x_blue.png.flat and b/src/Notes-master1/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/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_2x_green.png.flat index 2f940d28..0ec60341 100644 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_2x_green.png.flat and b/src/Notes-master1/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/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_2x_red.png.flat index 4ab1715f..e2e3daf1 100644 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_2x_red.png.flat and b/src/Notes-master1/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/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_2x_white.png.flat index 78d551fb..49ec2627 100644 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_2x_white.png.flat and b/src/Notes-master1/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/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_2x_yellow.png.flat index 18259ad1..e5ce872a 100644 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_2x_yellow.png.flat and b/src/Notes-master1/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/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_4x_blue.png.flat index 1956e782..7bf3769f 100644 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_4x_blue.png.flat and b/src/Notes-master1/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/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_4x_green.png.flat index 6520e7a3..c99097e5 100644 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_4x_green.png.flat and b/src/Notes-master1/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/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_4x_red.png.flat index 14f78b60..1a1164cc 100644 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_4x_red.png.flat and b/src/Notes-master1/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/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_4x_white.png.flat index a6cfa924..bfb1ac74 100644 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_4x_white.png.flat and b/src/Notes-master1/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/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_4x_yellow.png.flat index ce50db93..9b25610d 100644 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_4x_yellow.png.flat and b/src/Notes-master1/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/Notes-master1/app/build/intermediates/merged_res/debug/drawable_new_note.xml.flat index 560af3c8..eccd6a69 100644 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable_new_note.xml.flat and b/src/Notes-master1/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/Notes-master1/app/build/intermediates/merged_res/debug/layout_account_dialog_title.xml.flat index 1622cf78..4f74c372 100644 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/layout_account_dialog_title.xml.flat and b/src/Notes-master1/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/Notes-master1/app/build/intermediates/merged_res/debug/layout_add_account_text.xml.flat index aa41e3ef..ecc9675a 100644 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/layout_add_account_text.xml.flat and b/src/Notes-master1/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/Notes-master1/app/build/intermediates/merged_res/debug/layout_datetime_picker.xml.flat index 17851bce..58888e45 100644 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/layout_datetime_picker.xml.flat and b/src/Notes-master1/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/Notes-master1/app/build/intermediates/merged_res/debug/layout_dialog_edit_text.xml.flat index 64d28959..87bf8693 100644 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/layout_dialog_edit_text.xml.flat and b/src/Notes-master1/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/Notes-master1/app/build/intermediates/merged_res/debug/layout_folder_list_item.xml.flat index 49402fa7..144c574c 100644 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/layout_folder_list_item.xml.flat and b/src/Notes-master1/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/Notes-master1/app/build/intermediates/merged_res/debug/layout_note_edit.xml.flat index dfc42a3b..372b3c34 100644 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/layout_note_edit.xml.flat and b/src/Notes-master1/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/Notes-master1/app/build/intermediates/merged_res/debug/layout_note_edit_list_item.xml.flat index f9e13b94..56121363 100644 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/layout_note_edit_list_item.xml.flat and b/src/Notes-master1/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/Notes-master1/app/build/intermediates/merged_res/debug/layout_note_item.xml.flat index cddea7b9..91c908a1 100644 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/layout_note_item.xml.flat and b/src/Notes-master1/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/Notes-master1/app/build/intermediates/merged_res/debug/layout_note_list.xml.flat index 95e178b2..a121973d 100644 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/layout_note_list.xml.flat and b/src/Notes-master1/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/Notes-master1/app/build/intermediates/merged_res/debug/layout_note_list_dropdown_menu.xml.flat index 6dc84201..d72c9eec 100644 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/layout_note_list_dropdown_menu.xml.flat and b/src/Notes-master1/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/Notes-master1/app/build/intermediates/merged_res/debug/layout_note_list_footer.xml.flat index dd78e2c1..981a9e56 100644 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/layout_note_list_footer.xml.flat and b/src/Notes-master1/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/Notes-master1/app/build/intermediates/merged_res/debug/layout_settings_header.xml.flat index bd671635..d059c5ac 100644 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/layout_settings_header.xml.flat and b/src/Notes-master1/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/Notes-master1/app/build/intermediates/merged_res/debug/layout_widget_2x.xml.flat index 5304d9b1..8648a1dd 100644 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/layout_widget_2x.xml.flat and b/src/Notes-master1/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/Notes-master1/app/build/intermediates/merged_res/debug/layout_widget_4x.xml.flat index a84ec96d..d421dd71 100644 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/layout_widget_4x.xml.flat and b/src/Notes-master1/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/Notes-master1/app/build/intermediates/merged_res/debug/menu_call_note_edit.xml.flat index 4f8de888..6936bfa6 100644 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/menu_call_note_edit.xml.flat and b/src/Notes-master1/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/Notes-master1/app/build/intermediates/merged_res/debug/menu_call_record_folder.xml.flat index 0b7f1b36..3f221294 100644 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/menu_call_record_folder.xml.flat and b/src/Notes-master1/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/Notes-master1/app/build/intermediates/merged_res/debug/menu_note_edit.xml.flat index 5a95f6ee..c75bf067 100644 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/menu_note_edit.xml.flat and b/src/Notes-master1/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/Notes-master1/app/build/intermediates/merged_res/debug/menu_note_list.xml.flat index 37dc9eb5..01a450eb 100644 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/menu_note_list.xml.flat and b/src/Notes-master1/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/Notes-master1/app/build/intermediates/merged_res/debug/menu_note_list_dropdown.xml.flat index d2fa6347..82984ff3 100644 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/menu_note_list_dropdown.xml.flat and b/src/Notes-master1/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/Notes-master1/app/build/intermediates/merged_res/debug/menu_note_list_options.xml.flat index b9e9da2e..902d00c6 100644 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/menu_note_list_options.xml.flat and b/src/Notes-master1/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/Notes-master1/app/build/intermediates/merged_res/debug/menu_sub_folder.xml.flat index 92ec179e..5464d1a2 100644 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/menu_sub_folder.xml.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/menu_sub_folder.xml.flat differ diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/menu_trash_folder.xml.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/menu_trash_folder.xml.flat new file mode 100644 index 00000000..16cc21c3 Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/merged_res/debug/menu_trash_folder.xml.flat differ diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/raw-zh-rCN_introduction.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/raw-zh-rCN_introduction.flat index 874ab51a..b428c896 100644 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/raw-zh-rCN_introduction.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/raw-zh-rCN_introduction.flat 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 index b970d463..61c08fe7 100644 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/raw_introduction.flat and b/src/Notes-master1/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/Notes-master1/app/build/intermediates/merged_res/debug/values-af_values-af.arsc.flat index bff29c7a..0d168ab4 100644 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-af_values-af.arsc.flat and b/src/Notes-master1/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/Notes-master1/app/build/intermediates/merged_res/debug/values-am_values-am.arsc.flat index 55b30cf8..5d38499c 100644 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-am_values-am.arsc.flat and b/src/Notes-master1/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/Notes-master1/app/build/intermediates/merged_res/debug/values-ar_values-ar.arsc.flat index 029dd417..7ff20992 100644 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-ar_values-ar.arsc.flat and b/src/Notes-master1/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/Notes-master1/app/build/intermediates/merged_res/debug/values-as_values-as.arsc.flat index 4243df4c..173d0ff8 100644 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-as_values-as.arsc.flat and b/src/Notes-master1/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/Notes-master1/app/build/intermediates/merged_res/debug/values-az_values-az.arsc.flat index 6240c1f1..fed9f152 100644 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-az_values-az.arsc.flat and b/src/Notes-master1/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/Notes-master1/app/build/intermediates/merged_res/debug/values-b+sr+Latn_values-b+sr+Latn.arsc.flat index 813e26e1..32631651 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/Notes-master1/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/Notes-master1/app/build/intermediates/merged_res/debug/values-be_values-be.arsc.flat index cca00e5f..f29506ce 100644 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-be_values-be.arsc.flat and b/src/Notes-master1/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/Notes-master1/app/build/intermediates/merged_res/debug/values-bg_values-bg.arsc.flat index d60f72ac..cf819b91 100644 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-bg_values-bg.arsc.flat and b/src/Notes-master1/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/Notes-master1/app/build/intermediates/merged_res/debug/values-bn_values-bn.arsc.flat index de8f95f2..d7197521 100644 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-bn_values-bn.arsc.flat and b/src/Notes-master1/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/Notes-master1/app/build/intermediates/merged_res/debug/values-bs_values-bs.arsc.flat index 62f46b33..c3e65532 100644 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-bs_values-bs.arsc.flat and b/src/Notes-master1/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/Notes-master1/app/build/intermediates/merged_res/debug/values-ca_values-ca.arsc.flat index 0fbb6fb5..6bc6c179 100644 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-ca_values-ca.arsc.flat and b/src/Notes-master1/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/Notes-master1/app/build/intermediates/merged_res/debug/values-cs_values-cs.arsc.flat index 54d8938d..01e8d1d8 100644 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-cs_values-cs.arsc.flat and b/src/Notes-master1/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/Notes-master1/app/build/intermediates/merged_res/debug/values-da_values-da.arsc.flat index 7ea73a9d..fb18fa9c 100644 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-da_values-da.arsc.flat and b/src/Notes-master1/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/Notes-master1/app/build/intermediates/merged_res/debug/values-de_values-de.arsc.flat index 50f84291..90581e2f 100644 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-de_values-de.arsc.flat and b/src/Notes-master1/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/Notes-master1/app/build/intermediates/merged_res/debug/values-el_values-el.arsc.flat index d6c778c8..70cd0f79 100644 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-el_values-el.arsc.flat and b/src/Notes-master1/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/Notes-master1/app/build/intermediates/merged_res/debug/values-en-rAU_values-en-rAU.arsc.flat index fbee79f0..5ff4c73d 100644 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-en-rAU_values-en-rAU.arsc.flat and b/src/Notes-master1/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/Notes-master1/app/build/intermediates/merged_res/debug/values-en-rCA_values-en-rCA.arsc.flat index 37dd7e40..750715fd 100644 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-en-rCA_values-en-rCA.arsc.flat and b/src/Notes-master1/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/Notes-master1/app/build/intermediates/merged_res/debug/values-en-rGB_values-en-rGB.arsc.flat index 76df248d..1fd29950 100644 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-en-rGB_values-en-rGB.arsc.flat and b/src/Notes-master1/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/Notes-master1/app/build/intermediates/merged_res/debug/values-en-rIN_values-en-rIN.arsc.flat index e627736d..bbf57640 100644 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-en-rIN_values-en-rIN.arsc.flat and b/src/Notes-master1/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/Notes-master1/app/build/intermediates/merged_res/debug/values-en-rXC_values-en-rXC.arsc.flat index 0f619d11..77034022 100644 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-en-rXC_values-en-rXC.arsc.flat and b/src/Notes-master1/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/Notes-master1/app/build/intermediates/merged_res/debug/values-es-rUS_values-es-rUS.arsc.flat index 4f2ac14b..de10682a 100644 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-es-rUS_values-es-rUS.arsc.flat and b/src/Notes-master1/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/Notes-master1/app/build/intermediates/merged_res/debug/values-es_values-es.arsc.flat index 801b8b26..578dcdb3 100644 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-es_values-es.arsc.flat and b/src/Notes-master1/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/Notes-master1/app/build/intermediates/merged_res/debug/values-et_values-et.arsc.flat index c5215433..2d35f856 100644 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-et_values-et.arsc.flat and b/src/Notes-master1/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/Notes-master1/app/build/intermediates/merged_res/debug/values-eu_values-eu.arsc.flat index feac2845..b4f44e5d 100644 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-eu_values-eu.arsc.flat and b/src/Notes-master1/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/Notes-master1/app/build/intermediates/merged_res/debug/values-fa_values-fa.arsc.flat index c791f2da..ff61455b 100644 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-fa_values-fa.arsc.flat and b/src/Notes-master1/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/Notes-master1/app/build/intermediates/merged_res/debug/values-fi_values-fi.arsc.flat index 85aa3cfc..aea59ede 100644 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-fi_values-fi.arsc.flat and b/src/Notes-master1/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/Notes-master1/app/build/intermediates/merged_res/debug/values-fr-rCA_values-fr-rCA.arsc.flat index 70f48bd0..f6472111 100644 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-fr-rCA_values-fr-rCA.arsc.flat and b/src/Notes-master1/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/Notes-master1/app/build/intermediates/merged_res/debug/values-fr_values-fr.arsc.flat index 0c720a15..9bc000fb 100644 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-fr_values-fr.arsc.flat and b/src/Notes-master1/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/Notes-master1/app/build/intermediates/merged_res/debug/values-gl_values-gl.arsc.flat index e258d687..4ad8d386 100644 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-gl_values-gl.arsc.flat and b/src/Notes-master1/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/Notes-master1/app/build/intermediates/merged_res/debug/values-gu_values-gu.arsc.flat index 827ad0bc..875d9293 100644 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-gu_values-gu.arsc.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-gu_values-gu.arsc.flat 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 index 7e00e0b6..739c181d 100644 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-h720dp-v13_values-h720dp-v13.arsc.flat and b/src/Notes-master1/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/Notes-master1/app/build/intermediates/merged_res/debug/values-hdpi-v4_values-hdpi-v4.arsc.flat index 7d718033..845ef43e 100644 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-hdpi-v4_values-hdpi-v4.arsc.flat and b/src/Notes-master1/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/Notes-master1/app/build/intermediates/merged_res/debug/values-hi_values-hi.arsc.flat index b4764f9d..dd7278c0 100644 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-hi_values-hi.arsc.flat and b/src/Notes-master1/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/Notes-master1/app/build/intermediates/merged_res/debug/values-hr_values-hr.arsc.flat index c0cbf366..721050c5 100644 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-hr_values-hr.arsc.flat and b/src/Notes-master1/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/Notes-master1/app/build/intermediates/merged_res/debug/values-hu_values-hu.arsc.flat index cd2bf604..b6b10d6d 100644 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-hu_values-hu.arsc.flat and b/src/Notes-master1/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/Notes-master1/app/build/intermediates/merged_res/debug/values-hy_values-hy.arsc.flat index db6c9984..35a8a3c9 100644 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-hy_values-hy.arsc.flat and b/src/Notes-master1/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/Notes-master1/app/build/intermediates/merged_res/debug/values-in_values-in.arsc.flat index 2775d329..adcfbeef 100644 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-in_values-in.arsc.flat and b/src/Notes-master1/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/Notes-master1/app/build/intermediates/merged_res/debug/values-is_values-is.arsc.flat index c852cf66..71245c09 100644 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-is_values-is.arsc.flat and b/src/Notes-master1/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/Notes-master1/app/build/intermediates/merged_res/debug/values-it_values-it.arsc.flat index 9612e6ca..621e9aba 100644 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-it_values-it.arsc.flat and b/src/Notes-master1/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/Notes-master1/app/build/intermediates/merged_res/debug/values-iw_values-iw.arsc.flat index e93153c4..f2fb3e05 100644 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-iw_values-iw.arsc.flat and b/src/Notes-master1/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/Notes-master1/app/build/intermediates/merged_res/debug/values-ja_values-ja.arsc.flat index 2b6bd463..7fc7ac59 100644 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-ja_values-ja.arsc.flat and b/src/Notes-master1/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/Notes-master1/app/build/intermediates/merged_res/debug/values-ka_values-ka.arsc.flat index 3fb41889..13e71696 100644 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-ka_values-ka.arsc.flat and b/src/Notes-master1/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/Notes-master1/app/build/intermediates/merged_res/debug/values-kk_values-kk.arsc.flat index 8974c7a3..b0b93c6c 100644 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-kk_values-kk.arsc.flat and b/src/Notes-master1/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/Notes-master1/app/build/intermediates/merged_res/debug/values-km_values-km.arsc.flat index 027effae..63a044f0 100644 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-km_values-km.arsc.flat and b/src/Notes-master1/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/Notes-master1/app/build/intermediates/merged_res/debug/values-kn_values-kn.arsc.flat index df4d8359..7ea5cdab 100644 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-kn_values-kn.arsc.flat and b/src/Notes-master1/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/Notes-master1/app/build/intermediates/merged_res/debug/values-ko_values-ko.arsc.flat index e55e4b04..7d0c9b1f 100644 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-ko_values-ko.arsc.flat and b/src/Notes-master1/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/Notes-master1/app/build/intermediates/merged_res/debug/values-ky_values-ky.arsc.flat index 8ad56081..7a3b6538 100644 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-ky_values-ky.arsc.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-ky_values-ky.arsc.flat 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 index eab049a2..f84ec3fa 100644 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-land_values-land.arsc.flat and b/src/Notes-master1/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/Notes-master1/app/build/intermediates/merged_res/debug/values-large-v4_values-large-v4.arsc.flat index da18757c..76cbaad0 100644 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-large-v4_values-large-v4.arsc.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-large-v4_values-large-v4.arsc.flat 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 index 4428d5aa..f6fbe7cc 100644 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-ldltr-v21_values-ldltr-v21.arsc.flat and b/src/Notes-master1/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/Notes-master1/app/build/intermediates/merged_res/debug/values-lo_values-lo.arsc.flat index 269b5b7e..068f9454 100644 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-lo_values-lo.arsc.flat and b/src/Notes-master1/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/Notes-master1/app/build/intermediates/merged_res/debug/values-lt_values-lt.arsc.flat index eb5b22ea..db9aa27a 100644 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-lt_values-lt.arsc.flat and b/src/Notes-master1/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/Notes-master1/app/build/intermediates/merged_res/debug/values-lv_values-lv.arsc.flat index 1ad5a1a7..0f1e81d2 100644 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-lv_values-lv.arsc.flat and b/src/Notes-master1/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/Notes-master1/app/build/intermediates/merged_res/debug/values-mk_values-mk.arsc.flat index 1a3adc2f..a2a826d9 100644 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-mk_values-mk.arsc.flat and b/src/Notes-master1/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/Notes-master1/app/build/intermediates/merged_res/debug/values-ml_values-ml.arsc.flat index 937ca486..74571b63 100644 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-ml_values-ml.arsc.flat and b/src/Notes-master1/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/Notes-master1/app/build/intermediates/merged_res/debug/values-mn_values-mn.arsc.flat index 4666bdf1..0325e765 100644 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-mn_values-mn.arsc.flat and b/src/Notes-master1/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/Notes-master1/app/build/intermediates/merged_res/debug/values-mr_values-mr.arsc.flat index cbd9451a..36bb94ad 100644 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-mr_values-mr.arsc.flat and b/src/Notes-master1/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/Notes-master1/app/build/intermediates/merged_res/debug/values-ms_values-ms.arsc.flat index a1bf2553..0e2e2c51 100644 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-ms_values-ms.arsc.flat and b/src/Notes-master1/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/Notes-master1/app/build/intermediates/merged_res/debug/values-my_values-my.arsc.flat index 40124fc3..854d9948 100644 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-my_values-my.arsc.flat and b/src/Notes-master1/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/Notes-master1/app/build/intermediates/merged_res/debug/values-nb_values-nb.arsc.flat index a5c7a17f..19a7a6c3 100644 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-nb_values-nb.arsc.flat and b/src/Notes-master1/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/Notes-master1/app/build/intermediates/merged_res/debug/values-ne_values-ne.arsc.flat index 3bd72056..cc888c10 100644 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-ne_values-ne.arsc.flat and b/src/Notes-master1/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/Notes-master1/app/build/intermediates/merged_res/debug/values-night-v8_values-night-v8.arsc.flat index adc72b77..e32a4d8e 100644 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-night-v8_values-night-v8.arsc.flat and b/src/Notes-master1/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/Notes-master1/app/build/intermediates/merged_res/debug/values-nl_values-nl.arsc.flat index 483fcd74..733c6180 100644 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-nl_values-nl.arsc.flat and b/src/Notes-master1/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/Notes-master1/app/build/intermediates/merged_res/debug/values-or_values-or.arsc.flat index c8c1dc79..47a75abf 100644 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-or_values-or.arsc.flat and b/src/Notes-master1/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/Notes-master1/app/build/intermediates/merged_res/debug/values-pa_values-pa.arsc.flat index 9c0d8487..1e7d2702 100644 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-pa_values-pa.arsc.flat and b/src/Notes-master1/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/Notes-master1/app/build/intermediates/merged_res/debug/values-pl_values-pl.arsc.flat index f708f599..40a39ca9 100644 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-pl_values-pl.arsc.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-pl_values-pl.arsc.flat 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 index e1cd1897..9e0d5366 100644 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-port_values-port.arsc.flat and b/src/Notes-master1/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/Notes-master1/app/build/intermediates/merged_res/debug/values-pt-rBR_values-pt-rBR.arsc.flat index 429a190a..5809497b 100644 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-pt-rBR_values-pt-rBR.arsc.flat and b/src/Notes-master1/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/Notes-master1/app/build/intermediates/merged_res/debug/values-pt-rPT_values-pt-rPT.arsc.flat index 3721769b..ac4eb5d8 100644 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-pt-rPT_values-pt-rPT.arsc.flat and b/src/Notes-master1/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/Notes-master1/app/build/intermediates/merged_res/debug/values-pt_values-pt.arsc.flat index 99eb733b..7e1d0994 100644 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-pt_values-pt.arsc.flat and b/src/Notes-master1/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/Notes-master1/app/build/intermediates/merged_res/debug/values-ro_values-ro.arsc.flat index f6c6d444..6dbda85b 100644 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-ro_values-ro.arsc.flat and b/src/Notes-master1/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/Notes-master1/app/build/intermediates/merged_res/debug/values-ru_values-ru.arsc.flat index 38506229..2a7714bb 100644 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-ru_values-ru.arsc.flat and b/src/Notes-master1/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/Notes-master1/app/build/intermediates/merged_res/debug/values-si_values-si.arsc.flat index 050a66ce..b30af218 100644 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-si_values-si.arsc.flat and b/src/Notes-master1/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/Notes-master1/app/build/intermediates/merged_res/debug/values-sk_values-sk.arsc.flat index 84ac0a29..12fa271a 100644 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-sk_values-sk.arsc.flat and b/src/Notes-master1/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/Notes-master1/app/build/intermediates/merged_res/debug/values-sl_values-sl.arsc.flat index 34fe39a2..6ef4efca 100644 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-sl_values-sl.arsc.flat and b/src/Notes-master1/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/Notes-master1/app/build/intermediates/merged_res/debug/values-sq_values-sq.arsc.flat index b6641dc1..c15075ce 100644 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-sq_values-sq.arsc.flat and b/src/Notes-master1/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/Notes-master1/app/build/intermediates/merged_res/debug/values-sr_values-sr.arsc.flat index 36939c6c..e5e0e783 100644 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-sr_values-sr.arsc.flat and b/src/Notes-master1/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/Notes-master1/app/build/intermediates/merged_res/debug/values-sv_values-sv.arsc.flat index caf9ddd9..68457866 100644 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-sv_values-sv.arsc.flat and b/src/Notes-master1/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/Notes-master1/app/build/intermediates/merged_res/debug/values-sw600dp-v13_values-sw600dp-v13.arsc.flat index 4812477b..ed0f45cf 100644 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-sw600dp-v13_values-sw600dp-v13.arsc.flat and b/src/Notes-master1/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/Notes-master1/app/build/intermediates/merged_res/debug/values-sw_values-sw.arsc.flat index 1a95b345..41e0d021 100644 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-sw_values-sw.arsc.flat and b/src/Notes-master1/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/Notes-master1/app/build/intermediates/merged_res/debug/values-ta_values-ta.arsc.flat index 541dbb9d..509c614d 100644 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-ta_values-ta.arsc.flat and b/src/Notes-master1/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/Notes-master1/app/build/intermediates/merged_res/debug/values-te_values-te.arsc.flat index 0aa26801..6ae93777 100644 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-te_values-te.arsc.flat and b/src/Notes-master1/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/Notes-master1/app/build/intermediates/merged_res/debug/values-th_values-th.arsc.flat index 04f931f9..f6ad263c 100644 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-th_values-th.arsc.flat and b/src/Notes-master1/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/Notes-master1/app/build/intermediates/merged_res/debug/values-tl_values-tl.arsc.flat index aeb18f4a..14d49efc 100644 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-tl_values-tl.arsc.flat and b/src/Notes-master1/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/Notes-master1/app/build/intermediates/merged_res/debug/values-tr_values-tr.arsc.flat index 4abdcbb9..4892129a 100644 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-tr_values-tr.arsc.flat and b/src/Notes-master1/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/Notes-master1/app/build/intermediates/merged_res/debug/values-uk_values-uk.arsc.flat index 91948b74..e93e6fb5 100644 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-uk_values-uk.arsc.flat and b/src/Notes-master1/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/Notes-master1/app/build/intermediates/merged_res/debug/values-ur_values-ur.arsc.flat index ffbfcbb8..cb6ff62e 100644 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-ur_values-ur.arsc.flat and b/src/Notes-master1/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/Notes-master1/app/build/intermediates/merged_res/debug/values-uz_values-uz.arsc.flat index ee0dcfb2..c0640f07 100644 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-uz_values-uz.arsc.flat and b/src/Notes-master1/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/Notes-master1/app/build/intermediates/merged_res/debug/values-v16_values-v16.arsc.flat index 055ede03..6fdf6095 100644 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-v16_values-v16.arsc.flat and b/src/Notes-master1/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/Notes-master1/app/build/intermediates/merged_res/debug/values-v17_values-v17.arsc.flat index 12492edb..4eeb8baf 100644 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-v17_values-v17.arsc.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-v17_values-v17.arsc.flat 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 index 6b98e395..f97bb79b 100644 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-v18_values-v18.arsc.flat and b/src/Notes-master1/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/Notes-master1/app/build/intermediates/merged_res/debug/values-v21_values-v21.arsc.flat index d6cccd4d..508facfe 100644 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-v21_values-v21.arsc.flat and b/src/Notes-master1/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/Notes-master1/app/build/intermediates/merged_res/debug/values-v22_values-v22.arsc.flat index befe745f..a57abf88 100644 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-v22_values-v22.arsc.flat and b/src/Notes-master1/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/Notes-master1/app/build/intermediates/merged_res/debug/values-v23_values-v23.arsc.flat index bfd69073..f24ca8e0 100644 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-v23_values-v23.arsc.flat and b/src/Notes-master1/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/Notes-master1/app/build/intermediates/merged_res/debug/values-v24_values-v24.arsc.flat index 69d125dd..2b8f9f97 100644 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-v24_values-v24.arsc.flat and b/src/Notes-master1/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/Notes-master1/app/build/intermediates/merged_res/debug/values-v25_values-v25.arsc.flat index 3a155f42..960fd4a1 100644 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-v25_values-v25.arsc.flat and b/src/Notes-master1/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/Notes-master1/app/build/intermediates/merged_res/debug/values-v26_values-v26.arsc.flat index 6970628e..75401613 100644 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-v26_values-v26.arsc.flat and b/src/Notes-master1/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/Notes-master1/app/build/intermediates/merged_res/debug/values-v28_values-v28.arsc.flat index e8b6cee6..ef855dbd 100644 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-v28_values-v28.arsc.flat and b/src/Notes-master1/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/Notes-master1/app/build/intermediates/merged_res/debug/values-vi_values-vi.arsc.flat index 203284b6..26e0c0f8 100644 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-vi_values-vi.arsc.flat and b/src/Notes-master1/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/Notes-master1/app/build/intermediates/merged_res/debug/values-watch-v20_values-watch-v20.arsc.flat index 6d0943ee..a92cfd29 100644 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-watch-v20_values-watch-v20.arsc.flat and b/src/Notes-master1/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/Notes-master1/app/build/intermediates/merged_res/debug/values-watch-v21_values-watch-v21.arsc.flat index 8f589901..568dc861 100644 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-watch-v21_values-watch-v21.arsc.flat and b/src/Notes-master1/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/Notes-master1/app/build/intermediates/merged_res/debug/values-xlarge-v4_values-xlarge-v4.arsc.flat index 432801e3..a1495667 100644 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-xlarge-v4_values-xlarge-v4.arsc.flat and b/src/Notes-master1/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/Notes-master1/app/build/intermediates/merged_res/debug/values-zh-rCN_values-zh-rCN.arsc.flat index bf2d6e0a..6150f707 100644 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-zh-rCN_values-zh-rCN.arsc.flat and b/src/Notes-master1/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/Notes-master1/app/build/intermediates/merged_res/debug/values-zh-rHK_values-zh-rHK.arsc.flat index 4faaa323..9bc9a5cc 100644 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-zh-rHK_values-zh-rHK.arsc.flat and b/src/Notes-master1/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/Notes-master1/app/build/intermediates/merged_res/debug/values-zh-rTW_values-zh-rTW.arsc.flat index 4b40596c..f5cf286e 100644 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-zh-rTW_values-zh-rTW.arsc.flat and b/src/Notes-master1/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/Notes-master1/app/build/intermediates/merged_res/debug/values-zu_values-zu.arsc.flat index 921fee88..ec0ab54d 100644 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-zu_values-zu.arsc.flat and b/src/Notes-master1/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/Notes-master1/app/build/intermediates/merged_res/debug/values_values.arsc.flat index a1497edd..31f83181 100644 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values_values.arsc.flat and b/src/Notes-master1/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/Notes-master1/app/build/intermediates/merged_res/debug/xml_preferences.xml.flat index 2d866550..a444fe8e 100644 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/xml_preferences.xml.flat and b/src/Notes-master1/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/Notes-master1/app/build/intermediates/merged_res/debug/xml_searchable.xml.flat index 7b9abaf8..6bcba7af 100644 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/xml_searchable.xml.flat and b/src/Notes-master1/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/Notes-master1/app/build/intermediates/merged_res/debug/xml_widget_2x_info.xml.flat index eb2f9a49..02fe8009 100644 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/xml_widget_2x_info.xml.flat and b/src/Notes-master1/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/Notes-master1/app/build/intermediates/merged_res/debug/xml_widget_4x_info.xml.flat index ef58c8e8..d85d6465 100644 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/xml_widget_4x_info.xml.flat and b/src/Notes-master1/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/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/debug.json index e3de8c76..6a0504f0 100644 --- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/debug.json +++ b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/debug.json @@ -1,20 +1,10 @@ { "logs": [ { - "outputFile": "E:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-en-rGB_values-en-rGB.arsc.flat", + "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-ar_values-ar.arsc.flat", "map": [ { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\86ef1ec83f39cd41be9f0f4ea4f4caae\\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\\小超人\\.gradle\\caches\\transforms-3\\21795bd83e308c947c8dfe0c1fc89322\\transformed\\support-compat-28.0.0\\res\\values-en-rGB\\values-en-rGB.xml", + "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\2b9474e47639de47b19dc72cadc6eaea\\transformed\\support-compat-28.0.0\\res\\values-ar\\values-ar.xml", "from": { "startLines": "2", "startColumns": "4", @@ -25,28 +15,38 @@ "to": { "startLines": "30", "startColumns": "4", - "startOffsets": "2846", + "startOffsets": "2860", "endColumns": "100", - "endOffsets": "2942" + "endOffsets": "2956" + } + }, + { + "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\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,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": "E:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-sk_values-sk.arsc.flat", + "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-tr_values-tr.arsc.flat", "map": [ { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\86ef1ec83f39cd41be9f0f4ea4f4caae\\transformed\\appcompat-v7-28.0.0\\res\\values-sk\\values-sk.xml", + "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\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,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,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" } }, { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\21795bd83e308c947c8dfe0c1fc89322\\transformed\\support-compat-28.0.0\\res\\values-sk\\values-sk.xml", + "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\2b9474e47639de47b19dc72cadc6eaea\\transformed\\support-compat-28.0.0\\res\\values-tr\\values-tr.xml", "from": { "startLines": "2", "startColumns": "4", @@ -57,18 +57,28 @@ "to": { "startLines": "30", "startColumns": "4", - "startOffsets": "2918", + "startOffsets": "2865", "endColumns": "100", - "endOffsets": "3014" + "endOffsets": "2961" } } ] }, { - "outputFile": "E:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-pt-rPT_values-pt-rPT.arsc.flat", + "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-es-rUS_values-es-rUS.arsc.flat", "map": [ { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\21795bd83e308c947c8dfe0c1fc89322\\transformed\\support-compat-28.0.0\\res\\values-pt-rPT\\values-pt-rPT.xml", + "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\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,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\\fanyi\\.gradle\\caches\\transforms-3\\2b9474e47639de47b19dc72cadc6eaea\\transformed\\support-compat-28.0.0\\res\\values-es-rUS\\values-es-rUS.xml", "from": { "startLines": "2", "startColumns": "4", @@ -79,44 +89,28 @@ "to": { "startLines": "30", "startColumns": "4", - "startOffsets": "2949", + "startOffsets": "2920", "endColumns": "100", - "endOffsets": "3045" - } - }, - { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\86ef1ec83f39cd41be9f0f4ea4f4caae\\transformed\\appcompat-v7-28.0.0\\res\\values-pt-rPT\\values-pt-rPT.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" + "endOffsets": "3016" } } ] }, { - "outputFile": "E:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-watch-v21_values-watch-v21.arsc.flat", + "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-da_values-da.arsc.flat", "map": [ { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\86ef1ec83f39cd41be9f0f4ea4f4caae\\transformed\\appcompat-v7-28.0.0\\res\\values-watch-v21\\values-watch-v21.xml", + "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\transformed\\appcompat-v7-28.0.0\\res\\values-da\\values-da.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,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" } - } - ] - }, - { - "outputFile": "E:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-mn_values-mn.arsc.flat", - "map": [ + }, { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\21795bd83e308c947c8dfe0c1fc89322\\transformed\\support-compat-28.0.0\\res\\values-mn\\values-mn.xml", + "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\2b9474e47639de47b19dc72cadc6eaea\\transformed\\support-compat-28.0.0\\res\\values-da\\values-da.xml", "from": { "startLines": "2", "startColumns": "4", @@ -127,38 +121,44 @@ "to": { "startLines": "30", "startColumns": "4", - "startOffsets": "2876", + "startOffsets": "2844", "endColumns": "100", - "endOffsets": "2972" + "endOffsets": "2940" } - }, + } + ] + }, + { + "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-v28_values-v28.arsc.flat", + "map": [ { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\86ef1ec83f39cd41be9f0f4ea4f4caae\\transformed\\appcompat-v7-28.0.0\\res\\values-mn\\values-mn.xml", + "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\transformed\\appcompat-v7-28.0.0\\res\\values-v28\\values-v28.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,218,318,431,518,624,736,818,900,991,1084,1180,1276,1374,1467,1562,1654,1745,1835,1917,2026,2130,2227,2335,2436,2539,2698,2795", - "endColumns": "112,99,112,86,105,111,81,81,90,92,95,95,97,92,94,91,90,89,81,108,103,96,107,100,102,158,96,80", - "endOffsets": "213,313,426,513,619,731,813,895,986,1079,1175,1271,1369,1462,1557,1649,1740,1830,1912,2021,2125,2222,2330,2431,2534,2693,2790,2871" + "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": "E:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-eu_values-eu.arsc.flat", + "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-si_values-si.arsc.flat", "map": [ { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\86ef1ec83f39cd41be9f0f4ea4f4caae\\transformed\\appcompat-v7-28.0.0\\res\\values-eu\\values-eu.xml", + "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\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,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,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" } }, { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\21795bd83e308c947c8dfe0c1fc89322\\transformed\\support-compat-28.0.0\\res\\values-eu\\values-eu.xml", + "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\2b9474e47639de47b19dc72cadc6eaea\\transformed\\support-compat-28.0.0\\res\\values-si\\values-si.xml", "from": { "startLines": "2", "startColumns": "4", @@ -169,34 +169,18 @@ "to": { "startLines": "30", "startColumns": "4", - "startOffsets": "2938", + "startOffsets": "2903", "endColumns": "100", - "endOffsets": "3034" - } - } - ] - }, - { - "outputFile": "E:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-v25_values-v25.arsc.flat", - "map": [ - { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\86ef1ec83f39cd41be9f0f4ea4f4caae\\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" + "endOffsets": "2999" } } ] }, { - "outputFile": "E:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-bg_values-bg.arsc.flat", + "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-ml_values-ml.arsc.flat", "map": [ { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\21795bd83e308c947c8dfe0c1fc89322\\transformed\\support-compat-28.0.0\\res\\values-bg\\values-bg.xml", + "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\2b9474e47639de47b19dc72cadc6eaea\\transformed\\support-compat-28.0.0\\res\\values-ml\\values-ml.xml", "from": { "startLines": "2", "startColumns": "4", @@ -207,81 +191,70 @@ "to": { "startLines": "30", "startColumns": "4", - "startOffsets": "2930", + "startOffsets": "2955", "endColumns": "100", - "endOffsets": "3026" + "endOffsets": "3051" } }, { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\86ef1ec83f39cd41be9f0f4ea4f4caae\\transformed\\appcompat-v7-28.0.0\\res\\values-bg\\values-bg.xml", + "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\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,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,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" } } ] }, { - "outputFile": "E:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-v21_values-v21.arsc.flat", + "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-es_values-es.arsc.flat", "map": [ { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\21795bd83e308c947c8dfe0c1fc89322\\transformed\\support-compat-28.0.0\\res\\values-v21\\values-v21.xml", + "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\transformed\\appcompat-v7-28.0.0\\res\\values-es\\values-es.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" + "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" } }, { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\86ef1ec83f39cd41be9f0f4ea4f4caae\\transformed\\appcompat-v7-28.0.0\\res\\values-v21\\values-v21.xml", + "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\2b9474e47639de47b19dc72cadc6eaea\\transformed\\support-compat-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,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" + "startLines": "2", + "startColumns": "4", + "startOffsets": "55", + "endColumns": "100", + "endOffsets": "151" }, "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" + "startLines": "30", + "startColumns": "4", + "startOffsets": "2924", + "endColumns": "100", + "endOffsets": "3020" } } ] }, { - "outputFile": "E:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-pa_values-pa.arsc.flat", + "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-de_values-de.arsc.flat", "map": [ { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\86ef1ec83f39cd41be9f0f4ea4f4caae\\transformed\\appcompat-v7-28.0.0\\res\\values-pa\\values-pa.xml", + "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\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,208,305,410,496,596,709,786,862,953,1046,1142,1236,1337,1430,1525,1619,1710,1801,1880,1981,2085,2182,2291,2390,2500,2659,2759", - "endColumns": "102,96,104,85,99,112,76,75,90,92,95,93,100,92,94,93,90,90,78,100,103,96,108,98,109,158,99,79", - "endOffsets": "203,300,405,491,591,704,781,857,948,1041,1137,1231,1332,1425,1520,1614,1705,1796,1875,1976,2080,2177,2286,2385,2495,2654,2754,2834" + "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" } }, { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\21795bd83e308c947c8dfe0c1fc89322\\transformed\\support-compat-28.0.0\\res\\values-pa\\values-pa.xml", + "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\2b9474e47639de47b19dc72cadc6eaea\\transformed\\support-compat-28.0.0\\res\\values-de\\values-de.xml", "from": { "startLines": "2", "startColumns": "4", @@ -292,62 +265,60 @@ "to": { "startLines": "30", "startColumns": "4", - "startOffsets": "2839", + "startOffsets": "2925", "endColumns": "100", - "endOffsets": "2935" + "endOffsets": "3021" } } ] }, { - "outputFile": "E:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-v16_values-v16.arsc.flat", + "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-sr_values-sr.arsc.flat", "map": [ { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\86ef1ec83f39cd41be9f0f4ea4f4caae\\transformed\\appcompat-v7-28.0.0\\res\\values-v16\\values-v16.xml", + "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\2b9474e47639de47b19dc72cadc6eaea\\transformed\\support-compat-28.0.0\\res\\values-sr\\values-sr.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": "2905", + "endColumns": "100", + "endOffsets": "3001" } }, { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\21795bd83e308c947c8dfe0c1fc89322\\transformed\\support-compat-28.0.0\\res\\values-v16\\values-v16.xml", + "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\transformed\\appcompat-v7-28.0.0\\res\\values-sr\\values-sr.xml", "from": { - "startLines": "2", - "startColumns": "4", - "startOffsets": "55", - "endColumns": "65", - "endOffsets": "116" + "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" } } ] }, { - "outputFile": "E:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-uk_values-uk.arsc.flat", + "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-ky_values-ky.arsc.flat", "map": [ { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\86ef1ec83f39cd41be9f0f4ea4f4caae\\transformed\\appcompat-v7-28.0.0\\res\\values-uk\\values-uk.xml", + "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\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,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,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\\小超人\\.gradle\\caches\\transforms-3\\21795bd83e308c947c8dfe0c1fc89322\\transformed\\support-compat-28.0.0\\res\\values-uk\\values-uk.xml", + "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\2b9474e47639de47b19dc72cadc6eaea\\transformed\\support-compat-28.0.0\\res\\values-ky\\values-ky.xml", "from": { "startLines": "2", "startColumns": "4", @@ -358,28 +329,28 @@ "to": { "startLines": "30", "startColumns": "4", - "startOffsets": "2900", + "startOffsets": "2883", "endColumns": "100", - "endOffsets": "2996" + "endOffsets": "2979" } } ] }, { - "outputFile": "E:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-hr_values-hr.arsc.flat", + "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-sv_values-sv.arsc.flat", "map": [ { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\86ef1ec83f39cd41be9f0f4ea4f4caae\\transformed\\appcompat-v7-28.0.0\\res\\values-hr\\values-hr.xml", + "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\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,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,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\\小超人\\.gradle\\caches\\transforms-3\\21795bd83e308c947c8dfe0c1fc89322\\transformed\\support-compat-28.0.0\\res\\values-hr\\values-hr.xml", + "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\2b9474e47639de47b19dc72cadc6eaea\\transformed\\support-compat-28.0.0\\res\\values-sv\\values-sv.xml", "from": { "startLines": "2", "startColumns": "4", @@ -390,18 +361,18 @@ "to": { "startLines": "30", "startColumns": "4", - "startOffsets": "2926", + "startOffsets": "2863", "endColumns": "100", - "endOffsets": "3022" + "endOffsets": "2959" } } ] }, { - "outputFile": "E:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-ne_values-ne.arsc.flat", + "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-en-rAU_values-en-rAU.arsc.flat", "map": [ { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\21795bd83e308c947c8dfe0c1fc89322\\transformed\\support-compat-28.0.0\\res\\values-ne\\values-ne.xml", + "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\2b9474e47639de47b19dc72cadc6eaea\\transformed\\support-compat-28.0.0\\res\\values-en-rAU\\values-en-rAU.xml", "from": { "startLines": "2", "startColumns": "4", @@ -412,53 +383,38 @@ "to": { "startLines": "30", "startColumns": "4", - "startOffsets": "2988", + "startOffsets": "2846", "endColumns": "100", - "endOffsets": "3084" + "endOffsets": "2942" } }, { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\86ef1ec83f39cd41be9f0f4ea4f4caae\\transformed\\appcompat-v7-28.0.0\\res\\values-ne\\values-ne.xml", + "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\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,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" - } - } - ] - }, - { - "outputFile": "E:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-night-v8_values-night-v8.arsc.flat", - "map": [ - { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\86ef1ec83f39cd41be9f0f4ea4f4caae\\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" + "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": "E:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-hi_values-hi.arsc.flat", + "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-en-rCA_values-en-rCA.arsc.flat", "map": [ { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\86ef1ec83f39cd41be9f0f4ea4f4caae\\transformed\\appcompat-v7-28.0.0\\res\\values-hi\\values-hi.xml", + "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\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,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,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\\小超人\\.gradle\\caches\\transforms-3\\21795bd83e308c947c8dfe0c1fc89322\\transformed\\support-compat-28.0.0\\res\\values-hi\\values-hi.xml", + "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\2b9474e47639de47b19dc72cadc6eaea\\transformed\\support-compat-28.0.0\\res\\values-en-rCA\\values-en-rCA.xml", "from": { "startLines": "2", "startColumns": "4", @@ -469,28 +425,28 @@ "to": { "startLines": "30", "startColumns": "4", - "startOffsets": "2892", + "startOffsets": "2846", "endColumns": "100", - "endOffsets": "2988" + "endOffsets": "2942" } } ] }, { - "outputFile": "E:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-pt_values-pt.arsc.flat", + "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-it_values-it.arsc.flat", "map": [ { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\86ef1ec83f39cd41be9f0f4ea4f4caae\\transformed\\appcompat-v7-28.0.0\\res\\values-pt\\values-pt.xml", + "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\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,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,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\\小超人\\.gradle\\caches\\transforms-3\\21795bd83e308c947c8dfe0c1fc89322\\transformed\\support-compat-28.0.0\\res\\values-pt\\values-pt.xml", + "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\2b9474e47639de47b19dc72cadc6eaea\\transformed\\support-compat-28.0.0\\res\\values-it\\values-it.xml", "from": { "startLines": "2", "startColumns": "4", @@ -501,28 +457,102 @@ "to": { "startLines": "30", "startColumns": "4", - "startOffsets": "2929", + "startOffsets": "2906", "endColumns": "100", - "endOffsets": "3025" + "endOffsets": "3002" } } ] }, { - "outputFile": "E:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-zu_values-zu.arsc.flat", + "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-v24_values-v24.arsc.flat", "map": [ { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\86ef1ec83f39cd41be9f0f4ea4f4caae\\transformed\\appcompat-v7-28.0.0\\res\\values-zu\\values-zu.xml", + "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\transformed\\appcompat-v7-28.0.0\\res\\values-v24\\values-v24.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", + "startLines": "2,3", + "startColumns": "4,4", + "startOffsets": "55,212", + "endColumns": "156,134", + "endOffsets": "207,342" + } + } + ] + }, + { + "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-zh-rTW_values-zh-rTW.arsc.flat", + "map": [ + { + "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\transformed\\appcompat-v7-28.0.0\\res\\values-zh-rTW\\values-zh-rTW.xml", + "from": { + "startLines": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1", + "startColumns": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1", + "startOffsets": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1" + }, + "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,122", "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" + "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,7858", + "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,7931" + } + }, + { + "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\2b9474e47639de47b19dc72cadc6eaea\\transformed\\support-compat-28.0.0\\res\\values-zh-rTW\\values-zh-rTW.xml", + "from": { + "startLines": "-1", + "startColumns": "-1", + "startOffsets": "-1" + }, + "to": { + "startLines": "125", + "startColumns": "4", + "startOffsets": "8055", + "endColumns": "100", + "endOffsets": "8151" + } + }, + { + "source": "D:\\Notes-master1\\app\\src\\main\\res\\values-zh-rTW\\strings.xml", + "from": { + "startLines": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,19,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1", + "startColumns": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,4,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1", + "startOffsets": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,846,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1", + "endColumns": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,42,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1", + "endOffsets": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,884,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1" + }, + "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,121,123,124,126,127,128,129,130,131,132,133,134,135,136", + "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", + "startOffsets": "215,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,6115,6164,6213,6260,6307,6354,6399,6450,6503,6578,6637,6694,6768,6832,6901,6979,7089,7193,7266,7332,7387,7452,7517,7566,7649,7727,7765,7810,7936,7998,8156,8211,8270,8337,8395,8457,8505,8550,8598,8649,8715", + "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,121,123,124,126,127,128,129,130,131,132,133,134,135,136", + "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,42,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,6110,6159,6208,6255,6302,6349,6394,6445,6498,6573,6632,6689,6763,6827,6896,6974,7084,7188,7261,7327,7382,7447,7512,7561,7644,7722,7760,7805,7853,7993,8050,8206,8265,8332,8390,8452,8500,8545,8593,8644,8710,8776" } }, { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\21795bd83e308c947c8dfe0c1fc89322\\transformed\\support-compat-28.0.0\\res\\values-zu\\values-zu.xml", + "source": "D:\\Notes-master1\\app\\src\\main\\res\\values-zh-rTW\\arrays.xml", + "from": { + "startLines": "-1", + "startColumns": "-1", + "startOffsets": "-1" + }, + "to": { + "startLines": "2", + "startColumns": "4", + "startOffsets": "105", + "endLines": "5", + "endColumns": "19", + "endOffsets": "210" + } + } + ] + }, + { + "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-bn_values-bn.arsc.flat", + "map": [ + { + "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\2b9474e47639de47b19dc72cadc6eaea\\transformed\\support-compat-28.0.0\\res\\values-bn\\values-bn.xml", "from": { "startLines": "2", "startColumns": "4", @@ -533,44 +563,70 @@ "to": { "startLines": "30", "startColumns": "4", - "startOffsets": "2898", + "startOffsets": "2939", "endColumns": "100", - "endOffsets": "2994" + "endOffsets": "3035" + } + }, + { + "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\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": "E:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-watch-v20_values-watch-v20.arsc.flat", + "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-ca_values-ca.arsc.flat", "map": [ { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\86ef1ec83f39cd41be9f0f4ea4f4caae\\transformed\\appcompat-v7-28.0.0\\res\\values-watch-v20\\values-watch-v20.xml", + "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\transformed\\appcompat-v7-28.0.0\\res\\values-ca\\values-ca.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,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" + } + }, + { + "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\2b9474e47639de47b19dc72cadc6eaea\\transformed\\support-compat-28.0.0\\res\\values-ca\\values-ca.xml", + "from": { + "startLines": "2", + "startColumns": "4", + "startOffsets": "55", + "endColumns": "100", + "endOffsets": "151" + }, + "to": { + "startLines": "30", + "startColumns": "4", + "startOffsets": "2915", + "endColumns": "100", + "endOffsets": "3011" } } ] }, { - "outputFile": "E:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-pt-rBR_values-pt-rBR.arsc.flat", + "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-cs_values-cs.arsc.flat", "map": [ { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\86ef1ec83f39cd41be9f0f4ea4f4caae\\transformed\\appcompat-v7-28.0.0\\res\\values-pt-rBR\\values-pt-rBR.xml", + "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\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\\小超人\\.gradle\\caches\\transforms-3\\21795bd83e308c947c8dfe0c1fc89322\\transformed\\support-compat-28.0.0\\res\\values-pt-rBR\\values-pt-rBR.xml", + "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\2b9474e47639de47b19dc72cadc6eaea\\transformed\\support-compat-28.0.0\\res\\values-cs\\values-cs.xml", "from": { "startLines": "2", "startColumns": "4", @@ -581,28 +637,28 @@ "to": { "startLines": "30", "startColumns": "4", - "startOffsets": "2929", + "startOffsets": "2891", "endColumns": "100", - "endOffsets": "3025" + "endOffsets": "2987" } } ] }, { - "outputFile": "E:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-iw_values-iw.arsc.flat", + "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-am_values-am.arsc.flat", "map": [ { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\86ef1ec83f39cd41be9f0f4ea4f4caae\\transformed\\appcompat-v7-28.0.0\\res\\values-iw\\values-iw.xml", + "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\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,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" + "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" } }, { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\21795bd83e308c947c8dfe0c1fc89322\\transformed\\support-compat-28.0.0\\res\\values-iw\\values-iw.xml", + "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\2b9474e47639de47b19dc72cadc6eaea\\transformed\\support-compat-28.0.0\\res\\values-am\\values-am.xml", "from": { "startLines": "2", "startColumns": "4", @@ -613,50 +669,60 @@ "to": { "startLines": "30", "startColumns": "4", - "startOffsets": "2832", + "startOffsets": "2817", "endColumns": "100", - "endOffsets": "2928" + "endOffsets": "2913" } } ] }, { - "outputFile": "E:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-kn_values-kn.arsc.flat", + "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-en-rXC_values-en-rXC.arsc.flat", "map": [ { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\21795bd83e308c947c8dfe0c1fc89322\\transformed\\support-compat-28.0.0\\res\\values-kn\\values-kn.xml", + "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\2b9474e47639de47b19dc72cadc6eaea\\transformed\\support-compat-28.0.0\\res\\values-en-rXC\\values-en-rXC.xml", "from": { "startLines": "2", "startColumns": "4", "startOffsets": "55", - "endColumns": "100", - "endOffsets": "151" + "endColumns": "202", + "endOffsets": "253" }, "to": { "startLines": "30", "startColumns": "4", - "startOffsets": "2948", - "endColumns": "100", - "endOffsets": "3044" + "startOffsets": "5682", + "endColumns": "202", + "endOffsets": "5880" } }, { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\86ef1ec83f39cd41be9f0f4ea4f4caae\\transformed\\appcompat-v7-28.0.0\\res\\values-kn\\values-kn.xml", + "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\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,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,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": "E:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-ro_values-ro.arsc.flat", + "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-en-rIN_values-en-rIN.arsc.flat", "map": [ { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\21795bd83e308c947c8dfe0c1fc89322\\transformed\\support-compat-28.0.0\\res\\values-ro\\values-ro.xml", + "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\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" + } + }, + { + "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\2b9474e47639de47b19dc72cadc6eaea\\transformed\\support-compat-28.0.0\\res\\values-en-rIN\\values-en-rIN.xml", "from": { "startLines": "2", "startColumns": "4", @@ -667,84 +733,91 @@ "to": { "startLines": "30", "startColumns": "4", - "startOffsets": "2953", + "startOffsets": "2846", "endColumns": "100", - "endOffsets": "3049" - } - }, - { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\86ef1ec83f39cd41be9f0f4ea4f4caae\\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,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" + "endOffsets": "2942" } } ] }, { - "outputFile": "E:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-v28_values-v28.arsc.flat", + "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-watch-v20_values-watch-v20.arsc.flat", "map": [ { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\86ef1ec83f39cd41be9f0f4ea4f4caae\\transformed\\appcompat-v7-28.0.0\\res\\values-v28\\values-v28.xml", + "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\transformed\\appcompat-v7-28.0.0\\res\\values-watch-v20\\values-watch-v20.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,5,8", + "startColumns": "4,4,4", + "startOffsets": "55,214,385", + "endLines": "4,7,10", + "endColumns": "12,12,12", + "endOffsets": "209,380,553" } } ] }, { - "outputFile": "E:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-land_values-land.arsc.flat", + "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-te_values-te.arsc.flat", "map": [ { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\86ef1ec83f39cd41be9f0f4ea4f4caae\\transformed\\appcompat-v7-28.0.0\\res\\values-land\\values-land.xml", + "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\transformed\\appcompat-v7-28.0.0\\res\\values-te\\values-te.xml", "from": { - "startLines": "2,3,4", - "startColumns": "4,4,4", - "startOffsets": "55,125,196", - "endColumns": "69,70,67", - "endOffsets": "120,191,259" + "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\\fanyi\\.gradle\\caches\\transforms-3\\2b9474e47639de47b19dc72cadc6eaea\\transformed\\support-compat-28.0.0\\res\\values-te\\values-te.xml", + "from": { + "startLines": "2", + "startColumns": "4", + "startOffsets": "55", + "endColumns": "100", + "endOffsets": "151" + }, + "to": { + "startLines": "30", + "startColumns": "4", + "startOffsets": "2946", + "endColumns": "100", + "endOffsets": "3042" } } ] }, { - "outputFile": "E:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-large-v4_values-large-v4.arsc.flat", + "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-port_values-port.arsc.flat", "map": [ { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\86ef1ec83f39cd41be9f0f4ea4f4caae\\transformed\\appcompat-v7-28.0.0\\res\\values-large-v4\\values-large-v4.xml", + "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\transformed\\appcompat-v7-28.0.0\\res\\values-port\\values-port.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", + "startColumns": "4", + "startOffsets": "55", + "endColumns": "55", + "endOffsets": "106" } } ] }, { - "outputFile": "E:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-ms_values-ms.arsc.flat", + "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-my_values-my.arsc.flat", "map": [ { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\86ef1ec83f39cd41be9f0f4ea4f4caae\\transformed\\appcompat-v7-28.0.0\\res\\values-ms\\values-ms.xml", + "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\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,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" + "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\\小超人\\.gradle\\caches\\transforms-3\\21795bd83e308c947c8dfe0c1fc89322\\transformed\\support-compat-28.0.0\\res\\values-ms\\values-ms.xml", + "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\2b9474e47639de47b19dc72cadc6eaea\\transformed\\support-compat-28.0.0\\res\\values-my\\values-my.xml", "from": { "startLines": "2", "startColumns": "4", @@ -755,28 +828,43 @@ "to": { "startLines": "30", "startColumns": "4", - "startOffsets": "2881", + "startOffsets": "2979", "endColumns": "100", - "endOffsets": "2977" + "endOffsets": "3075" + } + } + ] + }, + { + "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-v18_values-v18.arsc.flat", + "map": [ + { + "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\transformed\\appcompat-v7-28.0.0\\res\\values-v18\\values-v18.xml", + "from": { + "startLines": "2", + "startColumns": "4", + "startOffsets": "55", + "endColumns": "48", + "endOffsets": "99" } } ] }, { - "outputFile": "E:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-th_values-th.arsc.flat", + "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-ru_values-ru.arsc.flat", "map": [ { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\86ef1ec83f39cd41be9f0f4ea4f4caae\\transformed\\appcompat-v7-28.0.0\\res\\values-th\\values-th.xml", + "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\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,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,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" } }, { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\21795bd83e308c947c8dfe0c1fc89322\\transformed\\support-compat-28.0.0\\res\\values-th\\values-th.xml", + "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\2b9474e47639de47b19dc72cadc6eaea\\transformed\\support-compat-28.0.0\\res\\values-ru\\values-ru.xml", "from": { "startLines": "2", "startColumns": "4", @@ -787,28 +875,28 @@ "to": { "startLines": "30", "startColumns": "4", - "startOffsets": "2845", + "startOffsets": "2913", "endColumns": "100", - "endOffsets": "2941" + "endOffsets": "3009" } } ] }, { - "outputFile": "E:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-or_values-or.arsc.flat", + "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-ko_values-ko.arsc.flat", "map": [ { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\86ef1ec83f39cd41be9f0f4ea4f4caae\\transformed\\appcompat-v7-28.0.0\\res\\values-or\\values-or.xml", + "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\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,224,334,441,527,631,751,828,905,996,1089,1186,1281,1382,1475,1570,1666,1757,1847,1929,2039,2144,2250,2361,2464,2582,2745,2847", - "endColumns": "118,109,106,85,103,119,76,76,90,92,96,94,100,92,94,95,90,89,81,109,104,105,110,102,117,162,101,88", - "endOffsets": "219,329,436,522,626,746,823,900,991,1084,1181,1276,1377,1470,1565,1661,1752,1842,1924,2034,2139,2245,2356,2459,2577,2740,2842,2931" + "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" } }, { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\21795bd83e308c947c8dfe0c1fc89322\\transformed\\support-compat-28.0.0\\res\\values-or\\values-or.xml", + "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\2b9474e47639de47b19dc72cadc6eaea\\transformed\\support-compat-28.0.0\\res\\values-ko\\values-ko.xml", "from": { "startLines": "2", "startColumns": "4", @@ -819,18 +907,18 @@ "to": { "startLines": "30", "startColumns": "4", - "startOffsets": "2936", + "startOffsets": "2756", "endColumns": "100", - "endOffsets": "3032" + "endOffsets": "2852" } } ] }, { - "outputFile": "E:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-ru_values-ru.arsc.flat", + "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-lt_values-lt.arsc.flat", "map": [ { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\21795bd83e308c947c8dfe0c1fc89322\\transformed\\support-compat-28.0.0\\res\\values-ru\\values-ru.xml", + "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\2b9474e47639de47b19dc72cadc6eaea\\transformed\\support-compat-28.0.0\\res\\values-lt\\values-lt.xml", "from": { "startLines": "2", "startColumns": "4", @@ -841,38 +929,28 @@ "to": { "startLines": "30", "startColumns": "4", - "startOffsets": "2913", + "startOffsets": "2978", "endColumns": "100", - "endOffsets": "3009" + "endOffsets": "3074" } }, { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\86ef1ec83f39cd41be9f0f4ea4f4caae\\transformed\\appcompat-v7-28.0.0\\res\\values-ru\\values-ru.xml", + "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\transformed\\appcompat-v7-28.0.0\\res\\values-lt\\values-lt.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,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": "E:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-fr_values-fr.arsc.flat", + "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-uz_values-uz.arsc.flat", "map": [ { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\86ef1ec83f39cd41be9f0f4ea4f4caae\\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,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\\小超人\\.gradle\\caches\\transforms-3\\21795bd83e308c947c8dfe0c1fc89322\\transformed\\support-compat-28.0.0\\res\\values-fr\\values-fr.xml", + "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\2b9474e47639de47b19dc72cadc6eaea\\transformed\\support-compat-28.0.0\\res\\values-uz\\values-uz.xml", "from": { "startLines": "2", "startColumns": "4", @@ -883,28 +961,38 @@ "to": { "startLines": "30", "startColumns": "4", - "startOffsets": "2945", + "startOffsets": "2889", "endColumns": "100", - "endOffsets": "3041" + "endOffsets": "2985" + } + }, + { + "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\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,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": "E:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-lo_values-lo.arsc.flat", + "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-th_values-th.arsc.flat", "map": [ { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\86ef1ec83f39cd41be9f0f4ea4f4caae\\transformed\\appcompat-v7-28.0.0\\res\\values-lo\\values-lo.xml", + "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\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,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,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" } }, { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\21795bd83e308c947c8dfe0c1fc89322\\transformed\\support-compat-28.0.0\\res\\values-lo\\values-lo.xml", + "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\2b9474e47639de47b19dc72cadc6eaea\\transformed\\support-compat-28.0.0\\res\\values-th\\values-th.xml", "from": { "startLines": "2", "startColumns": "4", @@ -915,18 +1003,34 @@ "to": { "startLines": "30", "startColumns": "4", - "startOffsets": "2836", + "startOffsets": "2845", "endColumns": "100", - "endOffsets": "2932" + "endOffsets": "2941" + } + } + ] + }, + { + "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-watch-v21_values-watch-v21.arsc.flat", + "map": [ + { + "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\transformed\\appcompat-v7-28.0.0\\res\\values-watch-v21\\values-watch-v21.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" } } ] }, { - "outputFile": "E:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-hy_values-hy.arsc.flat", + "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-hy_values-hy.arsc.flat", "map": [ { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\21795bd83e308c947c8dfe0c1fc89322\\transformed\\support-compat-28.0.0\\res\\values-hy\\values-hy.xml", + "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\2b9474e47639de47b19dc72cadc6eaea\\transformed\\support-compat-28.0.0\\res\\values-hy\\values-hy.xml", "from": { "startLines": "2", "startColumns": "4", @@ -943,7 +1047,7 @@ } }, { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\86ef1ec83f39cd41be9f0f4ea4f4caae\\transformed\\appcompat-v7-28.0.0\\res\\values-hy\\values-hy.xml", + "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\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", @@ -955,20 +1059,57 @@ ] }, { - "outputFile": "E:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-ja_values-ja.arsc.flat", + "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-nb_values-nb.arsc.flat", "map": [ { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\86ef1ec83f39cd41be9f0f4ea4f4caae\\transformed\\appcompat-v7-28.0.0\\res\\values-ja\\values-ja.xml", + "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\2b9474e47639de47b19dc72cadc6eaea\\transformed\\support-compat-28.0.0\\res\\values-nb\\values-nb.xml", + "from": { + "startLines": "2", + "startColumns": "4", + "startOffsets": "55", + "endColumns": "100", + "endOffsets": "151" + }, + "to": { + "startLines": "30", + "startColumns": "4", + "startOffsets": "2826", + "endColumns": "100", + "endOffsets": "2922" + } + }, + { + "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\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,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,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\\fanyi\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\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:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-hu_values-hu.arsc.flat", + "map": [ { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\21795bd83e308c947c8dfe0c1fc89322\\transformed\\support-compat-28.0.0\\res\\values-ja\\values-ja.xml", + "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\2b9474e47639de47b19dc72cadc6eaea\\transformed\\support-compat-28.0.0\\res\\values-hu\\values-hu.xml", "from": { "startLines": "2", "startColumns": "4", @@ -979,28 +1120,38 @@ "to": { "startLines": "30", "startColumns": "4", - "startOffsets": "2771", + "startOffsets": "2961", "endColumns": "100", - "endOffsets": "2867" + "endOffsets": "3057" + } + }, + { + "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\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" } } ] }, { - "outputFile": "E:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-sw_values-sw.arsc.flat", + "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-lv_values-lv.arsc.flat", "map": [ { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\86ef1ec83f39cd41be9f0f4ea4f4caae\\transformed\\appcompat-v7-28.0.0\\res\\values-sw\\values-sw.xml", + "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\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,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,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\\小超人\\.gradle\\caches\\transforms-3\\21795bd83e308c947c8dfe0c1fc89322\\transformed\\support-compat-28.0.0\\res\\values-sw\\values-sw.xml", + "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\2b9474e47639de47b19dc72cadc6eaea\\transformed\\support-compat-28.0.0\\res\\values-lv\\values-lv.xml", "from": { "startLines": "2", "startColumns": "4", @@ -1011,18 +1162,18 @@ "to": { "startLines": "30", "startColumns": "4", - "startOffsets": "2883", + "startOffsets": "3076", "endColumns": "100", - "endOffsets": "2979" + "endOffsets": "3172" } } ] }, { - "outputFile": "E:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-fi_values-fi.arsc.flat", + "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-in_values-in.arsc.flat", "map": [ { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\21795bd83e308c947c8dfe0c1fc89322\\transformed\\support-compat-28.0.0\\res\\values-fi\\values-fi.xml", + "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\2b9474e47639de47b19dc72cadc6eaea\\transformed\\support-compat-28.0.0\\res\\values-in\\values-in.xml", "from": { "startLines": "2", "startColumns": "4", @@ -1033,28 +1184,28 @@ "to": { "startLines": "30", "startColumns": "4", - "startOffsets": "2872", + "startOffsets": "2887", "endColumns": "100", - "endOffsets": "2968" + "endOffsets": "2983" } }, { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\86ef1ec83f39cd41be9f0f4ea4f4caae\\transformed\\appcompat-v7-28.0.0\\res\\values-fi\\values-fi.xml", + "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\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,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" + "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": "E:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-bs_values-bs.arsc.flat", + "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-bs_values-bs.arsc.flat", "map": [ { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\86ef1ec83f39cd41be9f0f4ea4f4caae\\transformed\\appcompat-v7-28.0.0\\res\\values-bs\\values-bs.xml", + "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\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", @@ -1064,7 +1215,7 @@ } }, { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\21795bd83e308c947c8dfe0c1fc89322\\transformed\\support-compat-28.0.0\\res\\values-bs\\values-bs.xml", + "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\2b9474e47639de47b19dc72cadc6eaea\\transformed\\support-compat-28.0.0\\res\\values-bs\\values-bs.xml", "from": { "startLines": "2", "startColumns": "4", @@ -1083,52 +1234,104 @@ ] }, { - "outputFile": "E:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-nb_values-nb.arsc.flat", + "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-zh-rCN_values-zh-rCN.arsc.flat", "map": [ { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\86ef1ec83f39cd41be9f0f4ea4f4caae\\transformed\\appcompat-v7-28.0.0\\res\\values-nb\\values-nb.xml", + "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\2b9474e47639de47b19dc72cadc6eaea\\transformed\\support-compat-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,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" + "startLines": "-1", + "startColumns": "-1", + "startOffsets": "-1" + }, + "to": { + "startLines": "125", + "startColumns": "4", + "startOffsets": "8048", + "endColumns": "100", + "endOffsets": "8144" } }, { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\21795bd83e308c947c8dfe0c1fc89322\\transformed\\support-compat-28.0.0\\res\\values-nb\\values-nb.xml", + "source": "D:\\Notes-master1\\app\\src\\main\\res\\values-zh-rCN\\arrays.xml", "from": { + "startLines": "-1", + "startColumns": "-1", + "startOffsets": "-1" + }, + "to": { "startLines": "2", "startColumns": "4", - "startOffsets": "55", - "endColumns": "100", - "endOffsets": "151" + "startOffsets": "105", + "endLines": "5", + "endColumns": "19", + "endOffsets": "210" + } + }, + { + "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\transformed\\appcompat-v7-28.0.0\\res\\values-zh-rCN\\values-zh-rCN.xml", + "from": { + "startLines": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1", + "startColumns": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1", + "startOffsets": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1" }, "to": { - "startLines": "30", - "startColumns": "4", - "startOffsets": "2826", - "endColumns": "100", - "endOffsets": "2922" + "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,122", + "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,7851", + "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,7924" + } + }, + { + "source": "D:\\Notes-master1\\app\\src\\main\\res\\values-zh-rCN\\strings.xml", + "from": { + "startLines": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,19,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1", + "startColumns": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,4,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1", + "startOffsets": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,846,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1", + "endColumns": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,42,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1", + "endOffsets": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,884,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1" + }, + "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,121,123,124,126,127,128,129,130,131,132,133,134,135,136", + "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", + "startOffsets": "215,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,6108,6157,6206,6253,6300,6347,6392,6443,6496,6571,6630,6687,6761,6825,6894,6972,7082,7186,7259,7325,7380,7445,7510,7559,7642,7720,7758,7803,7929,7991,8149,8204,8263,8330,8388,8450,8498,8543,8591,8642,8708", + "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,121,123,124,126,127,128,129,130,131,132,133,134,135,136", + "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,42,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,6103,6152,6201,6248,6295,6342,6387,6438,6491,6566,6625,6682,6756,6820,6889,6967,7077,7181,7254,7320,7375,7440,7505,7554,7637,7715,7753,7798,7846,7986,8043,8199,8258,8325,8383,8445,8493,8538,8586,8637,8703,8769" } } ] }, { - "outputFile": "E:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-gu_values-gu.arsc.flat", + "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-night-v8_values-night-v8.arsc.flat", "map": [ { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\86ef1ec83f39cd41be9f0f4ea4f4caae\\transformed\\appcompat-v7-28.0.0\\res\\values-gu\\values-gu.xml", + "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\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:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-is_values-is.arsc.flat", + "map": [ + { + "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\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,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,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\\小超人\\.gradle\\caches\\transforms-3\\21795bd83e308c947c8dfe0c1fc89322\\transformed\\support-compat-28.0.0\\res\\values-gu\\values-gu.xml", + "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\2b9474e47639de47b19dc72cadc6eaea\\transformed\\support-compat-28.0.0\\res\\values-is\\values-is.xml", "from": { "startLines": "2", "startColumns": "4", @@ -1139,18 +1342,28 @@ "to": { "startLines": "30", "startColumns": "4", - "startOffsets": "2882", + "startOffsets": "2865", "endColumns": "100", - "endOffsets": "2978" + "endOffsets": "2961" } } ] }, { - "outputFile": "E:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-az_values-az.arsc.flat", + "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-az_values-az.arsc.flat", "map": [ { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\21795bd83e308c947c8dfe0c1fc89322\\transformed\\support-compat-28.0.0\\res\\values-az\\values-az.xml", + "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\transformed\\appcompat-v7-28.0.0\\res\\values-az\\values-az.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,424,512,619,733,814,893,984,1077,1172,1271,1372,1465,1560,1655,1746,1838,1923,2030,2137,2237,2346,2450,2560,2718,2820", + "endColumns": "107,98,111,87,106,113,80,78,90,92,94,98,100,92,94,94,90,91,84,106,106,99,108,103,109,157,101,82", + "endOffsets": "208,307,419,507,614,728,809,888,979,1072,1167,1266,1367,1460,1555,1650,1741,1833,1918,2025,2132,2232,2341,2445,2555,2713,2815,2898" + } + }, + { + "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\2b9474e47639de47b19dc72cadc6eaea\\transformed\\support-compat-28.0.0\\res\\values-az\\values-az.xml", "from": { "startLines": "2", "startColumns": "4", @@ -1165,34 +1378,24 @@ "endColumns": "100", "endOffsets": "2999" } - }, - { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\86ef1ec83f39cd41be9f0f4ea4f4caae\\transformed\\appcompat-v7-28.0.0\\res\\values-az\\values-az.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,424,512,619,733,814,893,984,1077,1172,1271,1372,1465,1560,1655,1746,1838,1923,2030,2137,2237,2346,2450,2560,2718,2820", - "endColumns": "107,98,111,87,106,113,80,78,90,92,94,98,100,92,94,94,90,91,84,106,106,99,108,103,109,157,101,82", - "endOffsets": "208,307,419,507,614,728,809,888,979,1072,1167,1266,1367,1460,1555,1650,1741,1833,1918,2025,2132,2232,2341,2445,2555,2713,2815,2898" - } } ] }, { - "outputFile": "E:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-lt_values-lt.arsc.flat", + "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-ja_values-ja.arsc.flat", "map": [ { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\86ef1ec83f39cd41be9f0f4ea4f4caae\\transformed\\appcompat-v7-28.0.0\\res\\values-lt\\values-lt.xml", + "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\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,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,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" } }, { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\21795bd83e308c947c8dfe0c1fc89322\\transformed\\support-compat-28.0.0\\res\\values-lt\\values-lt.xml", + "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\2b9474e47639de47b19dc72cadc6eaea\\transformed\\support-compat-28.0.0\\res\\values-ja\\values-ja.xml", "from": { "startLines": "2", "startColumns": "4", @@ -1203,50 +1406,50 @@ "to": { "startLines": "30", "startColumns": "4", - "startOffsets": "2978", + "startOffsets": "2771", "endColumns": "100", - "endOffsets": "3074" + "endOffsets": "2867" } } ] }, { - "outputFile": "E:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-mr_values-mr.arsc.flat", + "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-v23_values-v23.arsc.flat", "map": [ { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\86ef1ec83f39cd41be9f0f4ea4f4caae\\transformed\\appcompat-v7-28.0.0\\res\\values-mr\\values-mr.xml", + "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\transformed\\appcompat-v7-28.0.0\\res\\values-v23\\values-v23.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,322,429,519,620,735,812,890,981,1074,1168,1265,1366,1459,1554,1651,1742,1833,1913,2025,2127,2223,2332,2433,2545,2702,2807", - "endColumns": "110,105,106,89,100,114,76,77,90,92,93,96,100,92,94,96,90,90,79,111,101,95,108,100,111,156,104,79", - "endOffsets": "211,317,424,514,615,730,807,885,976,1069,1163,1260,1361,1454,1549,1646,1737,1828,1908,2020,2122,2218,2327,2428,2540,2697,2802,2882" + "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\\小超人\\.gradle\\caches\\transforms-3\\21795bd83e308c947c8dfe0c1fc89322\\transformed\\support-compat-28.0.0\\res\\values-mr\\values-mr.xml", + "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\transformed\\appcompat-v7-28.0.0\\res\\values-v25\\values-v25.xml", "from": { - "startLines": "2", - "startColumns": "4", - "startOffsets": "55", - "endColumns": "100", - "endOffsets": "151" - }, - "to": { - "startLines": "30", - "startColumns": "4", - "startOffsets": "2887", - "endColumns": "100", - "endOffsets": "2983" + "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": "E:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-km_values-km.arsc.flat", + "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-fr-rCA_values-fr-rCA.arsc.flat", "map": [ { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\21795bd83e308c947c8dfe0c1fc89322\\transformed\\support-compat-28.0.0\\res\\values-km\\values-km.xml", + "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\2b9474e47639de47b19dc72cadc6eaea\\transformed\\support-compat-28.0.0\\res\\values-fr-rCA\\values-fr-rCA.xml", "from": { "startLines": "2", "startColumns": "4", @@ -1257,92 +1460,81 @@ "to": { "startLines": "30", "startColumns": "4", - "startOffsets": "2882", + "startOffsets": "2965", "endColumns": "100", - "endOffsets": "2978" + "endOffsets": "3061" } }, { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\86ef1ec83f39cd41be9f0f4ea4f4caae\\transformed\\appcompat-v7-28.0.0\\res\\values-km\\values-km.xml", + "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\transformed\\appcompat-v7-28.0.0\\res\\values-fr-rCA\\values-fr-rCA.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,308,420,507,611,729,806,883,974,1067,1163,1257,1358,1451,1546,1640,1731,1822,1905,2009,2114,2214,2324,2431,2539,2701,2799", - "endColumns": "102,99,111,86,103,117,76,76,90,92,95,93,100,92,94,93,90,90,82,103,104,99,109,106,107,161,97,82", - "endOffsets": "203,303,415,502,606,724,801,878,969,1062,1158,1252,1353,1446,1541,1635,1726,1817,1900,2004,2109,2209,2319,2426,2534,2696,2794,2877" + "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": "E:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-el_values-el.arsc.flat", + "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-v21_values-v21.arsc.flat", "map": [ { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\86ef1ec83f39cd41be9f0f4ea4f4caae\\transformed\\appcompat-v7-28.0.0\\res\\values-el\\values-el.xml", + "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\2b9474e47639de47b19dc72cadc6eaea\\transformed\\support-compat-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", - "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,334,451,536,641,767,855,941,1032,1125,1221,1315,1416,1509,1604,1701,1792,1883,1968,2079,2189,2291,2402,2511,2619,2779,2879", - "endColumns": "117,110,116,84,104,125,87,85,90,92,95,93,100,92,94,96,90,90,84,110,109,101,110,108,107,159,99,84", - "endOffsets": "218,329,446,531,636,762,850,936,1027,1120,1216,1310,1411,1504,1599,1696,1787,1878,1963,2074,2184,2286,2397,2506,2614,2774,2874,2959" + "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\\小超人\\.gradle\\caches\\transforms-3\\21795bd83e308c947c8dfe0c1fc89322\\transformed\\support-compat-28.0.0\\res\\values-el\\values-el.xml", + "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\transformed\\appcompat-v7-28.0.0\\res\\values-v21\\values-v21.xml", "from": { - "startLines": "2", - "startColumns": "4", - "startOffsets": "55", - "endColumns": "100", - "endOffsets": "151" + "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": "30", - "startColumns": "4", - "startOffsets": "2964", - "endColumns": "100", - "endOffsets": "3060" + "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": "E:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-af_values-af.arsc.flat", + "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-uk_values-uk.arsc.flat", "map": [ { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\21795bd83e308c947c8dfe0c1fc89322\\transformed\\support-compat-28.0.0\\res\\values-af\\values-af.xml", - "from": { - "startLines": "2", - "startColumns": "4", - "startOffsets": "55", - "endColumns": "100", - "endOffsets": "151" - }, - "to": { - "startLines": "30", - "startColumns": "4", - "startOffsets": "2856", - "endColumns": "100", - "endOffsets": "2952" - } - }, - { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\86ef1ec83f39cd41be9f0f4ea4f4caae\\transformed\\appcompat-v7-28.0.0\\res\\values-af\\values-af.xml", + "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\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,209,309,415,500,603,721,797,874,965,1058,1154,1248,1348,1441,1536,1635,1730,1824,1905,2012,2115,2212,2320,2422,2524,2678,2776", - "endColumns": "103,99,105,84,102,117,75,76,90,92,95,93,99,92,94,98,94,93,80,106,102,96,107,101,101,153,97,79", - "endOffsets": "204,304,410,495,598,716,792,869,960,1053,1149,1243,1343,1436,1531,1630,1725,1819,1900,2007,2110,2207,2315,2417,2519,2673,2771,2851" + "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" } - } - ] - }, - { - "outputFile": "E:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-zh-rTW_values-zh-rTW.arsc.flat", - "map": [ + }, { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\21795bd83e308c947c8dfe0c1fc89322\\transformed\\support-compat-28.0.0\\res\\values-zh-rTW\\values-zh-rTW.xml", + "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\2b9474e47639de47b19dc72cadc6eaea\\transformed\\support-compat-28.0.0\\res\\values-uk\\values-uk.xml", "from": { "startLines": "2", "startColumns": "4", @@ -1351,85 +1543,30 @@ "endOffsets": "151" }, "to": { - "startLines": "124", + "startLines": "30", "startColumns": "4", - "startOffsets": "8012", + "startOffsets": "2900", "endColumns": "100", - "endOffsets": "8108" - } - }, - { - "source": "E:\\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": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\86ef1ec83f39cd41be9f0f4ea4f4caae\\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,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": "E:\\Notes-master1\\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" + "endOffsets": "2996" } } ] }, { - "outputFile": "E:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-tl_values-tl.arsc.flat", + "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-vi_values-vi.arsc.flat", "map": [ { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\86ef1ec83f39cd41be9f0f4ea4f4caae\\transformed\\appcompat-v7-28.0.0\\res\\values-tl\\values-tl.xml", + "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\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,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" + "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" } }, { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\21795bd83e308c947c8dfe0c1fc89322\\transformed\\support-compat-28.0.0\\res\\values-tl\\values-tl.xml", + "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\2b9474e47639de47b19dc72cadc6eaea\\transformed\\support-compat-28.0.0\\res\\values-vi\\values-vi.xml", "from": { "startLines": "2", "startColumns": "4", @@ -1440,18 +1577,18 @@ "to": { "startLines": "30", "startColumns": "4", - "startOffsets": "2949", + "startOffsets": "2901", "endColumns": "100", - "endOffsets": "3045" + "endOffsets": "2997" } } ] }, { - "outputFile": "E:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-gl_values-gl.arsc.flat", + "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-pl_values-pl.arsc.flat", "map": [ { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\21795bd83e308c947c8dfe0c1fc89322\\transformed\\support-compat-28.0.0\\res\\values-gl\\values-gl.xml", + "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\2b9474e47639de47b19dc72cadc6eaea\\transformed\\support-compat-28.0.0\\res\\values-pl\\values-pl.xml", "from": { "startLines": "2", "startColumns": "4", @@ -1462,38 +1599,38 @@ "to": { "startLines": "30", "startColumns": "4", - "startOffsets": "2920", + "startOffsets": "2909", "endColumns": "100", - "endOffsets": "3016" + "endOffsets": "3005" } }, { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\86ef1ec83f39cd41be9f0f4ea4f4caae\\transformed\\appcompat-v7-28.0.0\\res\\values-gl\\values-gl.xml", + "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\transformed\\appcompat-v7-28.0.0\\res\\values-pl\\values-pl.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,329,437,522,624,750,834,915,1007,1101,1199,1293,1394,1488,1584,1679,1771,1863,1945,2052,2161,2260,2368,2472,2579,2738,2838", - "endColumns": "111,111,107,84,101,125,83,80,91,93,97,93,100,93,95,94,91,91,81,106,108,98,107,103,106,158,99,81", - "endOffsets": "212,324,432,517,619,745,829,910,1002,1096,1194,1288,1389,1483,1579,1674,1766,1858,1940,2047,2156,2255,2363,2467,2574,2733,2833,2915" + "startOffsets": "105,221,323,431,517,626,745,823,900,991,1084,1180,1274,1376,1469,1564,1659,1750,1841,1923,2032,2141,2240,2349,2460,2568,2731,2827", + "endColumns": "115,101,107,85,108,118,77,76,90,92,95,93,101,92,94,94,90,90,81,108,108,98,108,110,107,162,95,81", + "endOffsets": "216,318,426,512,621,740,818,895,986,1079,1175,1269,1371,1464,1559,1654,1745,1836,1918,2027,2136,2235,2344,2455,2563,2726,2822,2904" } } ] }, { - "outputFile": "E:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-es_values-es.arsc.flat", + "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-kn_values-kn.arsc.flat", "map": [ { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\86ef1ec83f39cd41be9f0f4ea4f4caae\\transformed\\appcompat-v7-28.0.0\\res\\values-es\\values-es.xml", + "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\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,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,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" } }, { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\21795bd83e308c947c8dfe0c1fc89322\\transformed\\support-compat-28.0.0\\res\\values-es\\values-es.xml", + "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\2b9474e47639de47b19dc72cadc6eaea\\transformed\\support-compat-28.0.0\\res\\values-kn\\values-kn.xml", "from": { "startLines": "2", "startColumns": "4", @@ -1504,28 +1641,18 @@ "to": { "startLines": "30", "startColumns": "4", - "startOffsets": "2924", + "startOffsets": "2948", "endColumns": "100", - "endOffsets": "3020" + "endOffsets": "3044" } } ] }, { - "outputFile": "E:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-tr_values-tr.arsc.flat", + "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-be_values-be.arsc.flat", "map": [ { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\86ef1ec83f39cd41be9f0f4ea4f4caae\\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" - } - }, - { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\21795bd83e308c947c8dfe0c1fc89322\\transformed\\support-compat-28.0.0\\res\\values-tr\\values-tr.xml", + "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\2b9474e47639de47b19dc72cadc6eaea\\transformed\\support-compat-28.0.0\\res\\values-be\\values-be.xml", "from": { "startLines": "2", "startColumns": "4", @@ -1536,18 +1663,38 @@ "to": { "startLines": "30", "startColumns": "4", - "startOffsets": "2865", + "startOffsets": "2915", "endColumns": "100", - "endOffsets": "2961" + "endOffsets": "3011" + } + }, + { + "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\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,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": "E:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-it_values-it.arsc.flat", + "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-ms_values-ms.arsc.flat", "map": [ { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\21795bd83e308c947c8dfe0c1fc89322\\transformed\\support-compat-28.0.0\\res\\values-it\\values-it.xml", + "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\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,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\\fanyi\\.gradle\\caches\\transforms-3\\2b9474e47639de47b19dc72cadc6eaea\\transformed\\support-compat-28.0.0\\res\\values-ms\\values-ms.xml", "from": { "startLines": "2", "startColumns": "4", @@ -1558,28 +1705,18 @@ "to": { "startLines": "30", "startColumns": "4", - "startOffsets": "2906", + "startOffsets": "2881", "endColumns": "100", - "endOffsets": "3002" - } - }, - { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\86ef1ec83f39cd41be9f0f4ea4f4caae\\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,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" + "endOffsets": "2977" } } ] }, { - "outputFile": "E:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-ar_values-ar.arsc.flat", + "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-nl_values-nl.arsc.flat", "map": [ { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\21795bd83e308c947c8dfe0c1fc89322\\transformed\\support-compat-28.0.0\\res\\values-ar\\values-ar.xml", + "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\2b9474e47639de47b19dc72cadc6eaea\\transformed\\support-compat-28.0.0\\res\\values-nl\\values-nl.xml", "from": { "startLines": "2", "startColumns": "4", @@ -1590,54 +1727,38 @@ "to": { "startLines": "30", "startColumns": "4", - "startOffsets": "2860", + "startOffsets": "2921", "endColumns": "100", - "endOffsets": "2956" + "endOffsets": "3017" } }, { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\86ef1ec83f39cd41be9f0f4ea4f4caae\\transformed\\appcompat-v7-28.0.0\\res\\values-ar\\values-ar.xml", + "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\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,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": "E:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-v23_values-v23.arsc.flat", - "map": [ - { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\86ef1ec83f39cd41be9f0f4ea4f4caae\\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" + "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": "E:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-ml_values-ml.arsc.flat", + "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-iw_values-iw.arsc.flat", "map": [ { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\86ef1ec83f39cd41be9f0f4ea4f4caae\\transformed\\appcompat-v7-28.0.0\\res\\values-ml\\values-ml.xml", + "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\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,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,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\\小超人\\.gradle\\caches\\transforms-3\\21795bd83e308c947c8dfe0c1fc89322\\transformed\\support-compat-28.0.0\\res\\values-ml\\values-ml.xml", + "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\2b9474e47639de47b19dc72cadc6eaea\\transformed\\support-compat-28.0.0\\res\\values-iw\\values-iw.xml", "from": { "startLines": "2", "startColumns": "4", @@ -1648,28 +1769,28 @@ "to": { "startLines": "30", "startColumns": "4", - "startOffsets": "2955", + "startOffsets": "2832", "endColumns": "100", - "endOffsets": "3051" + "endOffsets": "2928" } } ] }, { - "outputFile": "E:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-be_values-be.arsc.flat", + "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-fa_values-fa.arsc.flat", "map": [ { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\86ef1ec83f39cd41be9f0f4ea4f4caae\\transformed\\appcompat-v7-28.0.0\\res\\values-be\\values-be.xml", + "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\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,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" + "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\\小超人\\.gradle\\caches\\transforms-3\\21795bd83e308c947c8dfe0c1fc89322\\transformed\\support-compat-28.0.0\\res\\values-be\\values-be.xml", + "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\2b9474e47639de47b19dc72cadc6eaea\\transformed\\support-compat-28.0.0\\res\\values-fa\\values-fa.xml", "from": { "startLines": "2", "startColumns": "4", @@ -1680,28 +1801,28 @@ "to": { "startLines": "30", "startColumns": "4", - "startOffsets": "2915", + "startOffsets": "2903", "endColumns": "100", - "endOffsets": "3011" + "endOffsets": "2999" } } ] }, { - "outputFile": "E:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-ky_values-ky.arsc.flat", + "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-mn_values-mn.arsc.flat", "map": [ { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\86ef1ec83f39cd41be9f0f4ea4f4caae\\transformed\\appcompat-v7-28.0.0\\res\\values-ky\\values-ky.xml", + "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\transformed\\appcompat-v7-28.0.0\\res\\values-mn\\values-mn.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" + "startOffsets": "105,218,318,431,518,624,736,818,900,991,1084,1180,1276,1374,1467,1562,1654,1745,1835,1917,2026,2130,2227,2335,2436,2539,2698,2795", + "endColumns": "112,99,112,86,105,111,81,81,90,92,95,95,97,92,94,91,90,89,81,108,103,96,107,100,102,158,96,80", + "endOffsets": "213,313,426,513,619,731,813,895,986,1079,1175,1271,1369,1462,1557,1649,1740,1830,1912,2021,2125,2222,2330,2431,2534,2693,2790,2871" } }, { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\21795bd83e308c947c8dfe0c1fc89322\\transformed\\support-compat-28.0.0\\res\\values-ky\\values-ky.xml", + "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\2b9474e47639de47b19dc72cadc6eaea\\transformed\\support-compat-28.0.0\\res\\values-mn\\values-mn.xml", "from": { "startLines": "2", "startColumns": "4", @@ -1712,28 +1833,28 @@ "to": { "startLines": "30", "startColumns": "4", - "startOffsets": "2883", + "startOffsets": "2876", "endColumns": "100", - "endOffsets": "2979" + "endOffsets": "2972" } } ] }, { - "outputFile": "E:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-si_values-si.arsc.flat", + "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-zh-rHK_values-zh-rHK.arsc.flat", "map": [ { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\86ef1ec83f39cd41be9f0f4ea4f4caae\\transformed\\appcompat-v7-28.0.0\\res\\values-si\\values-si.xml", + "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\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,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,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" } }, { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\21795bd83e308c947c8dfe0c1fc89322\\transformed\\support-compat-28.0.0\\res\\values-si\\values-si.xml", + "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\2b9474e47639de47b19dc72cadc6eaea\\transformed\\support-compat-28.0.0\\res\\values-zh-rHK\\values-zh-rHK.xml", "from": { "startLines": "2", "startColumns": "4", @@ -1744,18 +1865,18 @@ "to": { "startLines": "30", "startColumns": "4", - "startOffsets": "2903", + "startOffsets": "2746", "endColumns": "100", - "endOffsets": "2999" + "endOffsets": "2842" } } ] }, { - "outputFile": "E:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-da_values-da.arsc.flat", + "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-bg_values-bg.arsc.flat", "map": [ { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\21795bd83e308c947c8dfe0c1fc89322\\transformed\\support-compat-28.0.0\\res\\values-da\\values-da.xml", + "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\2b9474e47639de47b19dc72cadc6eaea\\transformed\\support-compat-28.0.0\\res\\values-bg\\values-bg.xml", "from": { "startLines": "2", "startColumns": "4", @@ -1766,70 +1887,54 @@ "to": { "startLines": "30", "startColumns": "4", - "startOffsets": "2844", + "startOffsets": "2930", "endColumns": "100", - "endOffsets": "2940" + "endOffsets": "3026" } }, { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\86ef1ec83f39cd41be9f0f4ea4f4caae\\transformed\\appcompat-v7-28.0.0\\res\\values-da\\values-da.xml", + "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\transformed\\appcompat-v7-28.0.0\\res\\values-bg\\values-bg.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" + "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": "E:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-sr_values-sr.arsc.flat", + "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-v26_values-v26.arsc.flat", "map": [ { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\21795bd83e308c947c8dfe0c1fc89322\\transformed\\support-compat-28.0.0\\res\\values-sr\\values-sr.xml", + "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\transformed\\appcompat-v7-28.0.0\\res\\values-v26\\values-v26.xml", "from": { - "startLines": "2", - "startColumns": "4", - "startOffsets": "55", - "endColumns": "100", - "endOffsets": "151" - }, - "to": { - "startLines": "30", - "startColumns": "4", - "startOffsets": "2905", - "endColumns": "100", - "endOffsets": "3001" - } - }, - { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\86ef1ec83f39cd41be9f0f4ea4f4caae\\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,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" + "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": "E:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-sv_values-sv.arsc.flat", + "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-el_values-el.arsc.flat", "map": [ { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\86ef1ec83f39cd41be9f0f4ea4f4caae\\transformed\\appcompat-v7-28.0.0\\res\\values-sv\\values-sv.xml", + "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\transformed\\appcompat-v7-28.0.0\\res\\values-el\\values-el.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,223,334,451,536,641,767,855,941,1032,1125,1221,1315,1416,1509,1604,1701,1792,1883,1968,2079,2189,2291,2402,2511,2619,2779,2879", + "endColumns": "117,110,116,84,104,125,87,85,90,92,95,93,100,92,94,96,90,90,84,110,109,101,110,108,107,159,99,84", + "endOffsets": "218,329,446,531,636,762,850,936,1027,1120,1216,1310,1411,1504,1599,1696,1787,1878,1963,2074,2184,2286,2397,2506,2614,2774,2874,2959" } }, { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\21795bd83e308c947c8dfe0c1fc89322\\transformed\\support-compat-28.0.0\\res\\values-sv\\values-sv.xml", + "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\2b9474e47639de47b19dc72cadc6eaea\\transformed\\support-compat-28.0.0\\res\\values-el\\values-el.xml", "from": { "startLines": "2", "startColumns": "4", @@ -1840,28 +1945,18 @@ "to": { "startLines": "30", "startColumns": "4", - "startOffsets": "2863", + "startOffsets": "2964", "endColumns": "100", - "endOffsets": "2959" + "endOffsets": "3060" } } ] }, { - "outputFile": "E:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-ca_values-ca.arsc.flat", + "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-pa_values-pa.arsc.flat", "map": [ { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\86ef1ec83f39cd41be9f0f4ea4f4caae\\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,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" - } - }, - { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\21795bd83e308c947c8dfe0c1fc89322\\transformed\\support-compat-28.0.0\\res\\values-ca\\values-ca.xml", + "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\2b9474e47639de47b19dc72cadc6eaea\\transformed\\support-compat-28.0.0\\res\\values-pa\\values-pa.xml", "from": { "startLines": "2", "startColumns": "4", @@ -1872,28 +1967,53 @@ "to": { "startLines": "30", "startColumns": "4", - "startOffsets": "2915", + "startOffsets": "2839", "endColumns": "100", - "endOffsets": "3011" + "endOffsets": "2935" + } + }, + { + "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\transformed\\appcompat-v7-28.0.0\\res\\values-pa\\values-pa.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,410,496,596,709,786,862,953,1046,1142,1236,1337,1430,1525,1619,1710,1801,1880,1981,2085,2182,2291,2390,2500,2659,2759", + "endColumns": "102,96,104,85,99,112,76,75,90,92,95,93,100,92,94,93,90,90,78,100,103,96,108,98,109,158,99,79", + "endOffsets": "203,300,405,491,591,704,781,857,948,1041,1137,1231,1332,1425,1520,1614,1705,1796,1875,1976,2080,2177,2286,2385,2495,2654,2754,2834" } } ] }, { - "outputFile": "E:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-bn_values-bn.arsc.flat", + "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-large-v4_values-large-v4.arsc.flat", "map": [ { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\86ef1ec83f39cd41be9f0f4ea4f4caae\\transformed\\appcompat-v7-28.0.0\\res\\values-bn\\values-bn.xml", + "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\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:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-sk_values-sk.arsc.flat", + "map": [ + { + "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\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,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,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\\小超人\\.gradle\\caches\\transforms-3\\21795bd83e308c947c8dfe0c1fc89322\\transformed\\support-compat-28.0.0\\res\\values-bn\\values-bn.xml", + "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\2b9474e47639de47b19dc72cadc6eaea\\transformed\\support-compat-28.0.0\\res\\values-sk\\values-sk.xml", "from": { "startLines": "2", "startColumns": "4", @@ -1904,28 +2024,28 @@ "to": { "startLines": "30", "startColumns": "4", - "startOffsets": "2939", + "startOffsets": "2918", "endColumns": "100", - "endOffsets": "3035" + "endOffsets": "3014" } } ] }, { - "outputFile": "E:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-de_values-de.arsc.flat", + "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-en-rGB_values-en-rGB.arsc.flat", "map": [ { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\86ef1ec83f39cd41be9f0f4ea4f4caae\\transformed\\appcompat-v7-28.0.0\\res\\values-de\\values-de.xml", + "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\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,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,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\\小超人\\.gradle\\caches\\transforms-3\\21795bd83e308c947c8dfe0c1fc89322\\transformed\\support-compat-28.0.0\\res\\values-de\\values-de.xml", + "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\2b9474e47639de47b19dc72cadc6eaea\\transformed\\support-compat-28.0.0\\res\\values-en-rGB\\values-en-rGB.xml", "from": { "startLines": "2", "startColumns": "4", @@ -1936,28 +2056,28 @@ "to": { "startLines": "30", "startColumns": "4", - "startOffsets": "2925", + "startOffsets": "2846", "endColumns": "100", - "endOffsets": "3021" + "endOffsets": "2942" } } ] }, { - "outputFile": "E:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-kk_values-kk.arsc.flat", + "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-mr_values-mr.arsc.flat", "map": [ { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\86ef1ec83f39cd41be9f0f4ea4f4caae\\transformed\\appcompat-v7-28.0.0\\res\\values-kk\\values-kk.xml", + "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\transformed\\appcompat-v7-28.0.0\\res\\values-mr\\values-mr.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" + "startOffsets": "105,216,322,429,519,620,735,812,890,981,1074,1168,1265,1366,1459,1554,1651,1742,1833,1913,2025,2127,2223,2332,2433,2545,2702,2807", + "endColumns": "110,105,106,89,100,114,76,77,90,92,93,96,100,92,94,96,90,90,79,111,101,95,108,100,111,156,104,79", + "endOffsets": "211,317,424,514,615,730,807,885,976,1069,1163,1260,1361,1454,1549,1646,1737,1828,1908,2020,2122,2218,2327,2428,2540,2697,2802,2882" } }, { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\21795bd83e308c947c8dfe0c1fc89322\\transformed\\support-compat-28.0.0\\res\\values-kk\\values-kk.xml", + "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\2b9474e47639de47b19dc72cadc6eaea\\transformed\\support-compat-28.0.0\\res\\values-mr\\values-mr.xml", "from": { "startLines": "2", "startColumns": "4", @@ -1968,18 +2088,28 @@ "to": { "startLines": "30", "startColumns": "4", - "startOffsets": "2893", + "startOffsets": "2887", "endColumns": "100", - "endOffsets": "2989" + "endOffsets": "2983" } } ] }, { - "outputFile": "E:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-vi_values-vi.arsc.flat", + "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-gu_values-gu.arsc.flat", "map": [ { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\21795bd83e308c947c8dfe0c1fc89322\\transformed\\support-compat-28.0.0\\res\\values-vi\\values-vi.xml", + "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\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,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\\fanyi\\.gradle\\caches\\transforms-3\\2b9474e47639de47b19dc72cadc6eaea\\transformed\\support-compat-28.0.0\\res\\values-gu\\values-gu.xml", "from": { "startLines": "2", "startColumns": "4", @@ -1990,38 +2120,28 @@ "to": { "startLines": "30", "startColumns": "4", - "startOffsets": "2901", + "startOffsets": "2882", "endColumns": "100", - "endOffsets": "2997" - } - }, - { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\86ef1ec83f39cd41be9f0f4ea4f4caae\\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": "2978" } } ] }, { - "outputFile": "E:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-pl_values-pl.arsc.flat", + "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-tl_values-tl.arsc.flat", "map": [ { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\86ef1ec83f39cd41be9f0f4ea4f4caae\\transformed\\appcompat-v7-28.0.0\\res\\values-pl\\values-pl.xml", + "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\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,221,323,431,517,626,745,823,900,991,1084,1180,1274,1376,1469,1564,1659,1750,1841,1923,2032,2141,2240,2349,2460,2568,2731,2827", - "endColumns": "115,101,107,85,108,118,77,76,90,92,95,93,101,92,94,94,90,90,81,108,108,98,108,110,107,162,95,81", - "endOffsets": "216,318,426,512,621,740,818,895,986,1079,1175,1269,1371,1464,1559,1654,1745,1836,1918,2027,2136,2235,2344,2455,2563,2726,2822,2904" + "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" } }, { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\21795bd83e308c947c8dfe0c1fc89322\\transformed\\support-compat-28.0.0\\res\\values-pl\\values-pl.xml", + "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\2b9474e47639de47b19dc72cadc6eaea\\transformed\\support-compat-28.0.0\\res\\values-tl\\values-tl.xml", "from": { "startLines": "2", "startColumns": "4", @@ -2032,79 +2152,28 @@ "to": { "startLines": "30", "startColumns": "4", - "startOffsets": "2909", + "startOffsets": "2949", "endColumns": "100", - "endOffsets": "3005" - } - } - ] - }, - { - "outputFile": "E:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-port_values-port.arsc.flat", - "map": [ - { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\86ef1ec83f39cd41be9f0f4ea4f4caae\\transformed\\appcompat-v7-28.0.0\\res\\values-port\\values-port.xml", - "from": { - "startLines": "2", - "startColumns": "4", - "startOffsets": "55", - "endColumns": "55", - "endOffsets": "106" - } - } - ] - }, - { - "outputFile": "E:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-v18_values-v18.arsc.flat", - "map": [ - { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\86ef1ec83f39cd41be9f0f4ea4f4caae\\transformed\\appcompat-v7-28.0.0\\res\\values-v18\\values-v18.xml", - "from": { - "startLines": "2", - "startColumns": "4", - "startOffsets": "55", - "endColumns": "48", - "endOffsets": "99" - } - } - ] - }, - { - "outputFile": "E:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-h720dp-v13_values-h720dp-v13.arsc.flat", - "map": [ - { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\86ef1ec83f39cd41be9f0f4ea4f4caae\\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": "3045" } } ] }, { - "outputFile": "E:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-v17_values-v17.arsc.flat", + "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-ka_values-ka.arsc.flat", "map": [ { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\86ef1ec83f39cd41be9f0f4ea4f4caae\\transformed\\appcompat-v7-28.0.0\\res\\values-v17\\values-v17.xml", + "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\transformed\\appcompat-v7-28.0.0\\res\\values-ka\\values-ka.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" + "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" } - } - ] - }, - { - "outputFile": "E:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-ur_values-ur.arsc.flat", - "map": [ + }, { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\21795bd83e308c947c8dfe0c1fc89322\\transformed\\support-compat-28.0.0\\res\\values-ur\\values-ur.xml", + "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\2b9474e47639de47b19dc72cadc6eaea\\transformed\\support-compat-28.0.0\\res\\values-ka\\values-ka.xml", "from": { "startLines": "2", "startColumns": "4", @@ -2115,83 +2184,28 @@ "to": { "startLines": "30", "startColumns": "4", - "startOffsets": "2904", + "startOffsets": "2899", "endColumns": "100", - "endOffsets": "3000" - } - }, - { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\86ef1ec83f39cd41be9f0f4ea4f4caae\\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": "2995" } } ] }, { - "outputFile": "E:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-zh-rCN_values-zh-rCN.arsc.flat", + "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-km_values-km.arsc.flat", "map": [ { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\86ef1ec83f39cd41be9f0f4ea4f4caae\\transformed\\appcompat-v7-28.0.0\\res\\values-zh-rCN\\values-zh-rCN.xml", + "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\transformed\\appcompat-v7-28.0.0\\res\\values-km\\values-km.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": "E:\\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": "E:\\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" + "startOffsets": "105,208,308,420,507,611,729,806,883,974,1067,1163,1257,1358,1451,1546,1640,1731,1822,1905,2009,2114,2214,2324,2431,2539,2701,2799", + "endColumns": "102,99,111,86,103,117,76,76,90,92,95,93,100,92,94,93,90,90,82,103,104,99,109,106,107,161,97,82", + "endOffsets": "203,303,415,502,606,724,801,878,969,1062,1158,1252,1353,1446,1541,1635,1726,1817,1900,2004,2109,2209,2319,2426,2534,2696,2794,2877" } }, { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\21795bd83e308c947c8dfe0c1fc89322\\transformed\\support-compat-28.0.0\\res\\values-zh-rCN\\values-zh-rCN.xml", + "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\2b9474e47639de47b19dc72cadc6eaea\\transformed\\support-compat-28.0.0\\res\\values-km\\values-km.xml", "from": { "startLines": "2", "startColumns": "4", @@ -2200,35 +2214,20 @@ "endOffsets": "151" }, "to": { - "startLines": "124", + "startLines": "30", "startColumns": "4", - "startOffsets": "8005", + "startOffsets": "2882", "endColumns": "100", - "endOffsets": "8101" - } - } - ] - }, - { - "outputFile": "E:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-sw600dp-v13_values-sw600dp-v13.arsc.flat", - "map": [ - { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\86ef1ec83f39cd41be9f0f4ea4f4caae\\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": "2978" } } ] }, { - "outputFile": "E:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-en-rCA_values-en-rCA.arsc.flat", + "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-pt-rPT_values-pt-rPT.arsc.flat", "map": [ { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\21795bd83e308c947c8dfe0c1fc89322\\transformed\\support-compat-28.0.0\\res\\values-en-rCA\\values-en-rCA.xml", + "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\2b9474e47639de47b19dc72cadc6eaea\\transformed\\support-compat-28.0.0\\res\\values-pt-rPT\\values-pt-rPT.xml", "from": { "startLines": "2", "startColumns": "4", @@ -2239,60 +2238,54 @@ "to": { "startLines": "30", "startColumns": "4", - "startOffsets": "2846", + "startOffsets": "2949", "endColumns": "100", - "endOffsets": "2942" + "endOffsets": "3045" } }, { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\86ef1ec83f39cd41be9f0f4ea4f4caae\\transformed\\appcompat-v7-28.0.0\\res\\values-en-rCA\\values-en-rCA.xml", + "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\transformed\\appcompat-v7-28.0.0\\res\\values-pt-rPT\\values-pt-rPT.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,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" } } ] }, { - "outputFile": "E:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-ta_values-ta.arsc.flat", + "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-v17_values-v17.arsc.flat", "map": [ { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\21795bd83e308c947c8dfe0c1fc89322\\transformed\\support-compat-28.0.0\\res\\values-ta\\values-ta.xml", - "from": { - "startLines": "2", - "startColumns": "4", - "startOffsets": "55", - "endColumns": "100", - "endOffsets": "151" - }, - "to": { - "startLines": "30", - "startColumns": "4", - "startOffsets": "2954", - "endColumns": "100", - "endOffsets": "3050" - } - }, - { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\86ef1ec83f39cd41be9f0f4ea4f4caae\\transformed\\appcompat-v7-28.0.0\\res\\values-ta\\values-ta.xml", + "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\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,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" + "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": "E:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-fa_values-fa.arsc.flat", + "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-af_values-af.arsc.flat", "map": [ { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\21795bd83e308c947c8dfe0c1fc89322\\transformed\\support-compat-28.0.0\\res\\values-fa\\values-fa.xml", + "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\transformed\\appcompat-v7-28.0.0\\res\\values-af\\values-af.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,415,500,603,721,797,874,965,1058,1154,1248,1348,1441,1536,1635,1730,1824,1905,2012,2115,2212,2320,2422,2524,2678,2776", + "endColumns": "103,99,105,84,102,117,75,76,90,92,95,93,99,92,94,98,94,93,80,106,102,96,107,101,101,153,97,79", + "endOffsets": "204,304,410,495,598,716,792,869,960,1053,1149,1243,1343,1436,1531,1630,1725,1819,1900,2007,2110,2207,2315,2417,2519,2673,2771,2851" + } + }, + { + "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\2b9474e47639de47b19dc72cadc6eaea\\transformed\\support-compat-28.0.0\\res\\values-af\\values-af.xml", "from": { "startLines": "2", "startColumns": "4", @@ -2303,38 +2296,43 @@ "to": { "startLines": "30", "startColumns": "4", - "startOffsets": "2903", + "startOffsets": "2856", "endColumns": "100", - "endOffsets": "2999" + "endOffsets": "2952" } - }, + } + ] + }, + { + "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-land_values-land.arsc.flat", + "map": [ { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\86ef1ec83f39cd41be9f0f4ea4f4caae\\transformed\\appcompat-v7-28.0.0\\res\\values-fa\\values-fa.xml", + "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\transformed\\appcompat-v7-28.0.0\\res\\values-land\\values-land.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" + "startLines": "2,3,4", + "startColumns": "4,4,4", + "startOffsets": "55,125,196", + "endColumns": "69,70,67", + "endOffsets": "120,191,259" } } ] }, { - "outputFile": "E:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-nl_values-nl.arsc.flat", + "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-eu_values-eu.arsc.flat", "map": [ { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\86ef1ec83f39cd41be9f0f4ea4f4caae\\transformed\\appcompat-v7-28.0.0\\res\\values-nl\\values-nl.xml", + "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\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,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" + "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\\小超人\\.gradle\\caches\\transforms-3\\21795bd83e308c947c8dfe0c1fc89322\\transformed\\support-compat-28.0.0\\res\\values-nl\\values-nl.xml", + "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\2b9474e47639de47b19dc72cadc6eaea\\transformed\\support-compat-28.0.0\\res\\values-eu\\values-eu.xml", "from": { "startLines": "2", "startColumns": "4", @@ -2345,18 +2343,18 @@ "to": { "startLines": "30", "startColumns": "4", - "startOffsets": "2921", + "startOffsets": "2938", "endColumns": "100", - "endOffsets": "3017" + "endOffsets": "3034" } } ] }, { - "outputFile": "E:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-et_values-et.arsc.flat", + "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-gl_values-gl.arsc.flat", "map": [ { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\21795bd83e308c947c8dfe0c1fc89322\\transformed\\support-compat-28.0.0\\res\\values-et\\values-et.xml", + "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\2b9474e47639de47b19dc72cadc6eaea\\transformed\\support-compat-28.0.0\\res\\values-gl\\values-gl.xml", "from": { "startLines": "2", "startColumns": "4", @@ -2367,60 +2365,72 @@ "to": { "startLines": "30", "startColumns": "4", - "startOffsets": "2942", + "startOffsets": "2920", "endColumns": "100", - "endOffsets": "3038" + "endOffsets": "3016" } }, { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\86ef1ec83f39cd41be9f0f4ea4f4caae\\transformed\\appcompat-v7-28.0.0\\res\\values-et\\values-et.xml", + "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\transformed\\appcompat-v7-28.0.0\\res\\values-gl\\values-gl.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" + "startOffsets": "105,217,329,437,522,624,750,834,915,1007,1101,1199,1293,1394,1488,1584,1679,1771,1863,1945,2052,2161,2260,2368,2472,2579,2738,2838", + "endColumns": "111,111,107,84,101,125,83,80,91,93,97,93,100,93,95,94,91,91,81,106,108,98,107,103,106,158,99,81", + "endOffsets": "212,324,432,517,619,745,829,910,1002,1096,1194,1288,1389,1483,1579,1674,1766,1858,1940,2047,2156,2255,2363,2467,2574,2733,2833,2915" } } ] }, { - "outputFile": "E:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-en-rAU_values-en-rAU.arsc.flat", + "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-v16_values-v16.arsc.flat", "map": [ { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\86ef1ec83f39cd41be9f0f4ea4f4caae\\transformed\\appcompat-v7-28.0.0\\res\\values-en-rAU\\values-en-rAU.xml", + "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\transformed\\appcompat-v7-28.0.0\\res\\values-v16\\values-v16.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" + "startLines": "2", + "startColumns": "4", + "startOffsets": "55", + "endLines": "5", + "endColumns": "12", + "endOffsets": "223" + }, + "to": { + "startLines": "3", + "startColumns": "4", + "startOffsets": "121", + "endLines": "6", + "endColumns": "12", + "endOffsets": "289" } }, { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\21795bd83e308c947c8dfe0c1fc89322\\transformed\\support-compat-28.0.0\\res\\values-en-rAU\\values-en-rAU.xml", + "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\2b9474e47639de47b19dc72cadc6eaea\\transformed\\support-compat-28.0.0\\res\\values-v16\\values-v16.xml", "from": { "startLines": "2", "startColumns": "4", "startOffsets": "55", - "endColumns": "100", - "endOffsets": "151" - }, - "to": { - "startLines": "30", - "startColumns": "4", - "startOffsets": "2846", - "endColumns": "100", - "endOffsets": "2942" + "endColumns": "65", + "endOffsets": "116" } } ] }, { - "outputFile": "E:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-en-rIN_values-en-rIN.arsc.flat", + "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-lo_values-lo.arsc.flat", "map": [ { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\21795bd83e308c947c8dfe0c1fc89322\\transformed\\support-compat-28.0.0\\res\\values-en-rIN\\values-en-rIN.xml", + "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\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\\fanyi\\.gradle\\caches\\transforms-3\\2b9474e47639de47b19dc72cadc6eaea\\transformed\\support-compat-28.0.0\\res\\values-lo\\values-lo.xml", "from": { "startLines": "2", "startColumns": "4", @@ -2431,75 +2441,50 @@ "to": { "startLines": "30", "startColumns": "4", - "startOffsets": "2846", + "startOffsets": "2836", "endColumns": "100", - "endOffsets": "2942" - } - }, - { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\86ef1ec83f39cd41be9f0f4ea4f4caae\\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": "E:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-v24_values-v24.arsc.flat", - "map": [ - { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\86ef1ec83f39cd41be9f0f4ea4f4caae\\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" + "endOffsets": "2932" } } ] }, { - "outputFile": "E:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-en-rXC_values-en-rXC.arsc.flat", + "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-or_values-or.arsc.flat", "map": [ { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\86ef1ec83f39cd41be9f0f4ea4f4caae\\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" - } - }, - { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\21795bd83e308c947c8dfe0c1fc89322\\transformed\\support-compat-28.0.0\\res\\values-en-rXC\\values-en-rXC.xml", + "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\2b9474e47639de47b19dc72cadc6eaea\\transformed\\support-compat-28.0.0\\res\\values-or\\values-or.xml", "from": { "startLines": "2", "startColumns": "4", "startOffsets": "55", - "endColumns": "202", - "endOffsets": "253" + "endColumns": "100", + "endOffsets": "151" }, "to": { "startLines": "30", "startColumns": "4", - "startOffsets": "5682", - "endColumns": "202", - "endOffsets": "5880" + "startOffsets": "2936", + "endColumns": "100", + "endOffsets": "3032" + } + }, + { + "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\transformed\\appcompat-v7-28.0.0\\res\\values-or\\values-or.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,334,441,527,631,751,828,905,996,1089,1186,1281,1382,1475,1570,1666,1757,1847,1929,2039,2144,2250,2361,2464,2582,2745,2847", + "endColumns": "118,109,106,85,103,119,76,76,90,92,96,94,100,92,94,95,90,89,81,109,104,105,110,102,117,162,101,88", + "endOffsets": "219,329,436,522,626,746,823,900,991,1084,1181,1276,1377,1470,1565,1661,1752,1842,1924,2034,2139,2245,2356,2459,2577,2740,2842,2931" } } ] }, { - "outputFile": "E:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-uz_values-uz.arsc.flat", + "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-fi_values-fi.arsc.flat", "map": [ { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\21795bd83e308c947c8dfe0c1fc89322\\transformed\\support-compat-28.0.0\\res\\values-uz\\values-uz.xml", + "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\2b9474e47639de47b19dc72cadc6eaea\\transformed\\support-compat-28.0.0\\res\\values-fi\\values-fi.xml", "from": { "startLines": "2", "startColumns": "4", @@ -2510,38 +2495,38 @@ "to": { "startLines": "30", "startColumns": "4", - "startOffsets": "2889", + "startOffsets": "2872", "endColumns": "100", - "endOffsets": "2985" + "endOffsets": "2968" } }, { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\86ef1ec83f39cd41be9f0f4ea4f4caae\\transformed\\appcompat-v7-28.0.0\\res\\values-uz\\values-uz.xml", + "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\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,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,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": "E:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-hu_values-hu.arsc.flat", + "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-as_values-as.arsc.flat", "map": [ { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\86ef1ec83f39cd41be9f0f4ea4f4caae\\transformed\\appcompat-v7-28.0.0\\res\\values-hu\\values-hu.xml", + "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\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,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" + "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\\小超人\\.gradle\\caches\\transforms-3\\21795bd83e308c947c8dfe0c1fc89322\\transformed\\support-compat-28.0.0\\res\\values-hu\\values-hu.xml", + "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\2b9474e47639de47b19dc72cadc6eaea\\transformed\\support-compat-28.0.0\\res\\values-as\\values-as.xml", "from": { "startLines": "2", "startColumns": "4", @@ -2552,44 +2537,60 @@ "to": { "startLines": "30", "startColumns": "4", - "startOffsets": "2961", + "startOffsets": "2950", "endColumns": "100", - "endOffsets": "3057" + "endOffsets": "3046" } } ] }, { - "outputFile": "E:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-hdpi-v4_values-hdpi-v4.arsc.flat", + "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-sl_values-sl.arsc.flat", "map": [ { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\86ef1ec83f39cd41be9f0f4ea4f4caae\\transformed\\appcompat-v7-28.0.0\\res\\values-hdpi-v4\\values-hdpi-v4.xml", + "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\transformed\\appcompat-v7-28.0.0\\res\\values-sl\\values-sl.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" + } + }, + { + "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\2b9474e47639de47b19dc72cadc6eaea\\transformed\\support-compat-28.0.0\\res\\values-sl\\values-sl.xml", "from": { "startLines": "2", "startColumns": "4", "startOffsets": "55", - "endLines": "6", - "endColumns": "13", - "endOffsets": "327" + "endColumns": "100", + "endOffsets": "151" + }, + "to": { + "startLines": "30", + "startColumns": "4", + "startOffsets": "2936", + "endColumns": "100", + "endOffsets": "3032" } } ] }, { - "outputFile": "E:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-as_values-as.arsc.flat", + "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-fr_values-fr.arsc.flat", "map": [ { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\86ef1ec83f39cd41be9f0f4ea4f4caae\\transformed\\appcompat-v7-28.0.0\\res\\values-as\\values-as.xml", + "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\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,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,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\\小超人\\.gradle\\caches\\transforms-3\\21795bd83e308c947c8dfe0c1fc89322\\transformed\\support-compat-28.0.0\\res\\values-as\\values-as.xml", + "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\2b9474e47639de47b19dc72cadc6eaea\\transformed\\support-compat-28.0.0\\res\\values-fr\\values-fr.xml", "from": { "startLines": "2", "startColumns": "4", @@ -2600,34 +2601,18 @@ "to": { "startLines": "30", "startColumns": "4", - "startOffsets": "2950", + "startOffsets": "2945", "endColumns": "100", - "endOffsets": "3046" - } - } - ] - }, - { - "outputFile": "E:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-v26_values-v26.arsc.flat", - "map": [ - { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\86ef1ec83f39cd41be9f0f4ea4f4caae\\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" + "endOffsets": "3041" } } ] }, { - "outputFile": "E:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-sl_values-sl.arsc.flat", + "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-pt-rBR_values-pt-rBR.arsc.flat", "map": [ { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\21795bd83e308c947c8dfe0c1fc89322\\transformed\\support-compat-28.0.0\\res\\values-sl\\values-sl.xml", + "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\2b9474e47639de47b19dc72cadc6eaea\\transformed\\support-compat-28.0.0\\res\\values-pt-rBR\\values-pt-rBR.xml", "from": { "startLines": "2", "startColumns": "4", @@ -2638,28 +2623,28 @@ "to": { "startLines": "30", "startColumns": "4", - "startOffsets": "2936", + "startOffsets": "2929", "endColumns": "100", - "endOffsets": "3032" + "endOffsets": "3025" } }, { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\86ef1ec83f39cd41be9f0f4ea4f4caae\\transformed\\appcompat-v7-28.0.0\\res\\values-sl\\values-sl.xml", + "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\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,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" + "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": "E:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-mk_values-mk.arsc.flat", + "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-mk_values-mk.arsc.flat", "map": [ { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\86ef1ec83f39cd41be9f0f4ea4f4caae\\transformed\\appcompat-v7-28.0.0\\res\\values-mk\\values-mk.xml", + "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\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", @@ -2669,7 +2654,7 @@ } }, { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\21795bd83e308c947c8dfe0c1fc89322\\transformed\\support-compat-28.0.0\\res\\values-mk\\values-mk.xml", + "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\2b9474e47639de47b19dc72cadc6eaea\\transformed\\support-compat-28.0.0\\res\\values-mk\\values-mk.xml", "from": { "startLines": "2", "startColumns": "4", @@ -2688,20 +2673,36 @@ ] }, { - "outputFile": "E:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-lv_values-lv.arsc.flat", + "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-hdpi-v4_values-hdpi-v4.arsc.flat", + "map": [ + { + "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\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:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-pt_values-pt.arsc.flat", "map": [ { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\86ef1ec83f39cd41be9f0f4ea4f4caae\\transformed\\appcompat-v7-28.0.0\\res\\values-lv\\values-lv.xml", + "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\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,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" + "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\\小超人\\.gradle\\caches\\transforms-3\\21795bd83e308c947c8dfe0c1fc89322\\transformed\\support-compat-28.0.0\\res\\values-lv\\values-lv.xml", + "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\2b9474e47639de47b19dc72cadc6eaea\\transformed\\support-compat-28.0.0\\res\\values-pt\\values-pt.xml", "from": { "startLines": "2", "startColumns": "4", @@ -2712,18 +2713,18 @@ "to": { "startLines": "30", "startColumns": "4", - "startOffsets": "3076", + "startOffsets": "2929", "endColumns": "100", - "endOffsets": "3172" + "endOffsets": "3025" } } ] }, { - "outputFile": "E:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-in_values-in.arsc.flat", + "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-sq_values-sq.arsc.flat", "map": [ { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\21795bd83e308c947c8dfe0c1fc89322\\transformed\\support-compat-28.0.0\\res\\values-in\\values-in.xml", + "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\2b9474e47639de47b19dc72cadc6eaea\\transformed\\support-compat-28.0.0\\res\\values-sq\\values-sq.xml", "from": { "startLines": "2", "startColumns": "4", @@ -2734,38 +2735,38 @@ "to": { "startLines": "30", "startColumns": "4", - "startOffsets": "2887", + "startOffsets": "2907", "endColumns": "100", - "endOffsets": "2983" + "endOffsets": "3003" } }, { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\86ef1ec83f39cd41be9f0f4ea4f4caae\\transformed\\appcompat-v7-28.0.0\\res\\values-in\\values-in.xml", + "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\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,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" + "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" } } ] }, { - "outputFile": "E:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-sq_values-sq.arsc.flat", + "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-sw_values-sw.arsc.flat", "map": [ { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\86ef1ec83f39cd41be9f0f4ea4f4caae\\transformed\\appcompat-v7-28.0.0\\res\\values-sq\\values-sq.xml", + "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\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,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,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\\小超人\\.gradle\\caches\\transforms-3\\21795bd83e308c947c8dfe0c1fc89322\\transformed\\support-compat-28.0.0\\res\\values-sq\\values-sq.xml", + "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\2b9474e47639de47b19dc72cadc6eaea\\transformed\\support-compat-28.0.0\\res\\values-sw\\values-sw.xml", "from": { "startLines": "2", "startColumns": "4", @@ -2776,187 +2777,162 @@ "to": { "startLines": "30", "startColumns": "4", - "startOffsets": "2907", + "startOffsets": "2883", "endColumns": "100", - "endOffsets": "3003" - } - } - ] - }, - { - "outputFile": "E:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-v22_values-v22.arsc.flat", - "map": [ - { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\86ef1ec83f39cd41be9f0f4ea4f4caae\\transformed\\appcompat-v7-28.0.0\\res\\values-v22\\values-v22.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" + "endOffsets": "2979" } } ] }, { - "outputFile": "E:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values_values.arsc.flat", + "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values_values.arsc.flat", "map": [ { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\21795bd83e308c947c8dfe0c1fc89322\\transformed\\support-compat-28.0.0\\res\\values\\values.xml", + "source": "D:\\Notes-master1\\app\\src\\main\\res\\values\\dimens.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": "-1,-1,-1,-1,-1", + "startColumns": "-1,-1,-1,-1,-1", + "startOffsets": "-1,-1,-1,-1,-1" }, "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": "189,190,191,192,193", + "startColumns": "4,4,4,4,4", + "startOffsets": "12570,12622,12675,12728,12780", + "endColumns": "51,52,52,51,51", + "endOffsets": "12617,12670,12723,12775,12827" } }, { - "source": "E:\\Notes-master1\\app\\src\\main\\res\\values\\strings.xml", + "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\2b9474e47639de47b19dc72cadc6eaea\\transformed\\support-compat-28.0.0\\res\\values\\values.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" + "startLines": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1", + "startColumns": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1", + "startOffsets": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1" }, "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" + "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,365,1704,1705,1709,1710,1714,1879,1880", + "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", + "startOffsets": "3608,3677,10320,10390,10458,10530,10600,10661,10735,11592,11653,11714,11776,11840,11902,11963,12031,12131,12191,12257,12330,12399,12456,12508,13285,13357,13672,13707,13884,13934,13995,14052,14086,14121,14431,24057,111838,111955,112156,112266,112467,124768,124840", + "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,365,1704,1708,1709,1713,1714,1879,1880", + "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", + "endOffsets": "3672,3735,10385,10453,10525,10595,10656,10730,10803,11648,11709,11771,11835,11897,11958,12026,12126,12186,12252,12325,12394,12451,12503,12565,13352,13428,13702,13737,13929,13990,14047,14081,14116,14151,14496,24123,111950,112151,112261,112462,112591,124835,124902" } }, { - "source": "E:\\Notes-master1\\app\\src\\main\\res\\values\\dimens.xml", + "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\transformed\\appcompat-v7-28.0.0\\res\\values\\values.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" + "startLines": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1", + "startColumns": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1", + "startOffsets": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1" }, "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" + "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,362,377,378,379,380,381,382,390,391,395,399,403,408,414,421,425,429,434,438,442,446,450,454,458,464,468,474,478,484,488,493,497,500,504,510,514,520,524,530,533,537,541,545,549,553,554,555,556,559,562,565,568,572,573,574,575,576,579,581,583,585,590,591,595,601,605,606,608,619,620,624,630,634,635,636,640,667,671,672,676,704,871,897,1065,1091,1122,1130,1136,1150,1172,1177,1182,1192,1201,1210,1214,1221,1229,1236,1237,1246,1249,1252,1256,1260,1264,1267,1268,1272,1276,1286,1291,1298,1304,1305,1308,1312,1317,1319,1321,1324,1327,1329,1333,1336,1343,1346,1349,1353,1355,1359,1361,1363,1365,1369,1377,1385,1397,1403,1412,1415,1426,1429,1434,1435,1455,1513,1572,1573,1583,1592,1593,1595,1599,1602,1605,1608,1611,1614,1617,1620,1624,1627,1630,1633,1637,1640,1644,1648,1649,1650,1651,1652,1653,1654,1655,1656,1657,1658,1659,1660,1661,1662,1663,1664,1665,1666,1667,1668,1670,1672,1673,1674,1675,1676,1677,1678,1679,1681,1682,1684,1685,1687,1689,1690,1692,1693,1694,1695,1696,1697,1699,1700,1701,1702,1703,1715,1717,1719,1749,1750,1751,1752,1753,1754,1755,1756,1757,1758,1759,1760,1761,1763,1764,1765,1766,1767,1768,1770,1774,1778,1779,1780,1781,1782,1783,1784,1785,1787,1789,1791,1793,1795,1796,1797,1798,1800,1802,1804,1805,1806,1807,1808,1809,1810,1811,1812,1813,1814,1815,1818,1819,1820,1821,1823,1825,1826,1828,1829,1831,1833,1835,1836,1837,1838,1839,1840,1841,1842,1843,1844,1845,1846,1848,1849,1850,1851,1853,1854,1855,1856,1857,1859,1861,1863,1865,1866,1867,1868,1869,1870,1871,1872,1873,1874,1875,1876,1877,1878", + "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", + "startOffsets": "481,536,581,630,671,726,785,847,928,989,1064,1140,1217,1295,1380,1462,1538,1614,1691,1769,1875,1981,2060,2140,2197,2255,2329,2404,2469,2535,2595,2656,2728,2801,2868,2936,2995,3054,3113,3172,3231,3285,3339,3392,3446,3500,3554,3740,3814,3893,3966,4040,4111,4183,4255,4328,4385,4443,4516,4590,4664,4739,4811,4884,4954,5025,5085,5203,5272,5341,5411,5485,5561,5625,5702,5778,5855,5920,5989,6066,6141,6210,6278,6355,6421,6482,6579,6644,6713,6812,6883,6942,7000,7057,7116,7180,7251,7323,7395,7467,7539,7606,7674,7742,7801,7864,7928,8018,8109,8169,8235,8302,8368,8438,8502,8555,8668,8726,8789,8854,8919,8994,9067,9139,9188,9249,9310,9371,9433,9497,9561,9625,9690,9753,9813,9874,9940,9999,10059,10121,10192,10252,10808,10894,10981,11071,11158,11246,11328,11411,11501,12832,12884,12942,12987,13053,13117,13174,13231,13433,13490,13538,13587,13638,13742,13789,13838,14156,14188,14252,14314,14374,14894,14968,15038,15116,15170,15240,15325,15373,15419,15490,15568,15646,15718,15792,15866,15940,16020,16093,16162,16234,16311,16372,16435,16501,16565,16636,16699,16764,16828,16889,16950,17002,17075,17149,17218,17293,17367,17441,17582,23865,24961,25039,25129,25217,25313,25403,25985,26074,26321,26602,26854,27139,27532,28009,28231,28453,28729,28956,29186,29416,29646,29876,30103,30522,30748,31173,31403,31831,32050,32333,32541,32672,32899,33325,33550,33977,34198,34623,34743,35019,35320,35644,35935,36249,36386,36517,36622,36864,37031,37235,37443,37714,37826,37938,38043,38160,38374,38520,38660,38746,39094,39182,39428,39846,40095,40177,40275,40867,40967,41219,41643,41898,41992,42081,42318,44342,44584,44686,44939,47095,57224,58740,68968,70496,72253,72879,73299,74360,75625,75881,76117,76664,77158,77763,77961,78541,79105,79480,79598,80136,80293,80489,80762,81018,81188,81329,81393,81675,81961,82637,82901,83239,83592,83686,83872,84178,84440,84565,84692,84931,85142,85261,85454,85631,86086,86267,86389,86648,86761,86948,87050,87157,87286,87561,88069,88565,89442,89736,90306,90455,91187,91359,91695,91787,92847,97129,101554,101616,102194,102778,102869,102982,103211,103371,103523,103694,103860,104029,104196,104359,104602,104772,104945,105116,105390,105589,105794,106124,106208,106304,106400,106498,106598,106700,106802,106904,107006,107108,107208,107304,107416,107545,107668,107799,107930,108028,108142,108236,108376,108510,108606,108718,108818,108934,109030,109142,109242,109382,109518,109682,109812,109970,110120,110261,110405,110540,110652,110802,110930,111058,111194,111326,111456,111586,111698,112596,112742,112886,114370,114436,114526,114602,114706,114796,114898,115006,115114,115214,115294,115386,115484,115594,115672,115778,115870,115974,116084,116206,116369,116526,116606,116706,116796,116906,117000,117106,117198,117298,117410,117524,117640,117756,117850,117964,118076,118178,118298,118420,118502,118606,118726,118852,118950,119044,119132,119244,119360,119482,119594,119769,119885,119971,120063,120175,120299,120366,120492,120560,120688,120832,120960,121029,121124,121239,121352,121451,121560,121671,121782,121883,121988,122088,122218,122309,122432,122526,122638,122724,122828,122924,123012,123130,123234,123338,123464,123552,123660,123760,123850,123960,124044,124146,124230,124284,124348,124454,124564,124648", + "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,362,377,378,379,380,381,389,390,394,398,402,407,413,420,424,428,433,437,441,445,449,453,457,463,467,473,477,483,487,492,496,499,503,509,513,519,523,529,532,536,540,544,548,552,553,554,555,558,561,564,567,571,572,573,574,575,578,580,582,584,589,590,594,600,604,605,607,618,619,623,629,633,634,635,639,666,670,671,675,703,870,896,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,1439,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,1703,1716,1718,1720,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,1878", + "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", + "endOffsets": "531,576,625,666,721,780,842,923,984,1059,1135,1212,1290,1375,1457,1533,1609,1686,1764,1870,1976,2055,2135,2192,2250,2324,2399,2464,2530,2590,2651,2723,2796,2863,2931,2990,3049,3108,3167,3226,3280,3334,3387,3441,3495,3549,3603,3809,3888,3961,4035,4106,4178,4250,4323,4380,4438,4511,4585,4659,4734,4806,4879,4949,5020,5080,5141,5267,5336,5406,5480,5556,5620,5697,5773,5850,5915,5984,6061,6136,6205,6273,6350,6416,6477,6574,6639,6708,6807,6878,6937,6995,7052,7111,7175,7246,7318,7390,7462,7534,7601,7669,7737,7796,7859,7923,8013,8104,8164,8230,8297,8363,8433,8497,8550,8663,8721,8784,8849,8914,8989,9062,9134,9183,9244,9305,9366,9428,9492,9556,9620,9685,9748,9808,9869,9935,9994,10054,10116,10187,10247,10315,10889,10976,11066,11153,11241,11323,11406,11496,11587,12879,12937,12982,13048,13112,13169,13226,13280,13485,13533,13582,13633,13667,13784,13833,13879,14183,14247,14309,14369,14426,14963,15033,15111,15165,15235,15320,15368,15414,15485,15563,15641,15713,15787,15861,15935,16015,16088,16157,16229,16306,16367,16430,16496,16560,16631,16694,16759,16823,16884,16945,16997,17070,17144,17213,17288,17362,17436,17577,17647,23913,25034,25124,25212,25308,25398,25980,26069,26316,26597,26849,27134,27527,28004,28226,28448,28724,28951,29181,29411,29641,29871,30098,30517,30743,31168,31398,31826,32045,32328,32536,32667,32894,33320,33545,33972,34193,34618,34738,35014,35315,35639,35930,36244,36381,36512,36617,36859,37026,37230,37438,37709,37821,37933,38038,38155,38369,38515,38655,38741,39089,39177,39423,39841,40090,40172,40270,40862,40962,41214,41638,41893,41987,42076,42313,44337,44579,44681,44934,47090,57219,58735,68963,70491,72248,72874,73294,74355,75620,75876,76112,76659,77153,77758,77956,78536,79100,79475,79593,80131,80288,80484,80757,81013,81183,81324,81388,81670,81956,82632,82896,83234,83587,83681,83867,84173,84435,84560,84687,84926,85137,85256,85449,85626,86081,86262,86384,86643,86756,86943,87045,87152,87281,87556,88064,88560,89437,89731,90301,90450,91182,91354,91690,91782,92060,97124,101549,101611,102189,102773,102864,102977,103206,103366,103518,103689,103855,104024,104191,104354,104597,104767,104940,105111,105385,105584,105789,106119,106203,106299,106395,106493,106593,106695,106797,106899,107001,107103,107203,107299,107411,107540,107663,107794,107925,108023,108137,108231,108371,108505,108601,108713,108813,108929,109025,109137,109237,109377,109513,109677,109807,109965,110115,110256,110400,110535,110647,110797,110925,111053,111189,111321,111451,111581,111693,111833,112737,112881,113019,114431,114521,114597,114701,114791,114893,115001,115109,115209,115289,115381,115479,115589,115667,115773,115865,115969,116079,116201,116364,116521,116601,116701,116791,116901,116995,117101,117193,117293,117405,117519,117635,117751,117845,117959,118071,118173,118293,118415,118497,118601,118721,118847,118945,119039,119127,119239,119355,119477,119589,119764,119880,119966,120058,120170,120294,120361,120487,120555,120683,120827,120955,121024,121119,121234,121347,121446,121555,121666,121777,121878,121983,122083,122213,122304,122427,122521,122633,122719,122823,122919,123007,123125,123229,123333,123459,123547,123655,123755,123845,123955,124039,124141,124225,124279,124343,124449,124559,124643,124763" } }, { - "source": "E:\\Notes-master1\\app\\src\\main\\res\\values\\colors.xml", + "source": "D:\\Notes-master1\\app\\src\\main\\res\\values\\styles.xml", "from": { - "startLines": "18", - "startColumns": "4", - "startOffsets": "712", - "endColumns": "56", - "endOffsets": "764" + "startLines": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1", + "startColumns": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1", + "startOffsets": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1" }, "to": { - "startLines": "82", - "startColumns": "4", - "startOffsets": "5258", - "endColumns": "56", - "endOffsets": "5310" + "startLines": "1440,1444,1448,1452,1721,1725,1729,1733,1737,1741,1745", + "startColumns": "4,4,4,4,4,4,4,4,4,4,4", + "startOffsets": "92065,92269,92480,92687,113024,113207,113392,113577,113780,113986,114169", + "endLines": "1443,1447,1451,1454,1724,1728,1732,1736,1740,1744,1748", + "endColumns": "12,12,12,12,12,12,12,12,12,12,12", + "endOffsets": "92264,92475,92682,92842,113202,113387,113572,113775,113981,114164,114365" } }, { - "source": "E:\\Notes-master1\\app\\src\\main\\res\\values\\styles.xml", + "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\4433a4478073ef0c67208fcc6161f90b\\transformed\\coordinatorlayout-28.0.0\\res\\values\\values.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": "-1,-1", + "startColumns": "-1,-1", + "startOffsets": "-1,-1" }, "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": "12,1881", + "startColumns": "4,4", + "startOffsets": "420,124907", + "endLines": "12,1883", + "endColumns": "60,12", + "endOffsets": "476,125047" } }, { - "source": "E:\\Notes-master1\\app\\src\\main\\res\\values\\arrays.xml", + "source": "D:\\Notes-master1\\app\\src\\main\\res\\values\\colors.xml", "from": { - "startLines": "19,26", - "startColumns": "4,4", - "startOffsets": "739,1047", - "endLines": "24,29", - "endColumns": "19,19", - "endOffsets": "1041,1162" + "startLines": "-1", + "startColumns": "-1", + "startOffsets": "-1" }, "to": { - "startLines": "2,8", - "startColumns": "4,4", - "startOffsets": "105,412", - "endLines": "7,11", - "endColumns": "19,19", - "endOffsets": "407,527" + "startLines": "82", + "startColumns": "4", + "startOffsets": "5146", + "endColumns": "56", + "endOffsets": "5198" } }, { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\82952f08b31bd35f2fe29eb30da1d402\\transformed\\coordinatorlayout-28.0.0\\res\\values\\values.xml", + "source": "D:\\Notes-master1\\app\\src\\main\\res\\values\\strings.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": "131,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,19,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1", + "startColumns": "4,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,4,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1", + "startOffsets": "8292,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,846,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1", + "endLines": "135,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,19,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1", + "endColumns": "14,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,46,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1", + "endOffsets": "8700,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,888,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1" }, "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": "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,359,360,361,363,364,366,367,368,369,370,371,372,373,374,375,376", + "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", + "startOffsets": "14501,17652,17748,17831,17927,17996,18039,18091,18143,18192,18255,18313,18364,18448,18542,18650,18721,18805,18888,18954,19037,19139,19200,19262,19313,19391,19444,19504,19609,19668,19770,19825,19896,19945,20002,20060,20107,20166,20223,20294,20355,20412,20462,20514,20567,20617,20667,20727,20780,20846,20908,20971,21020,21067,21122,21210,21268,21330,21380,21425,21468,21528,21595,21650,21697,21752,21805,21852,21905,21961,22009,22064,22117,22201,22268,22332,22428,22502,22583,22672,22835,22979,23058,23133,23215,23274,23354,23434,23489,23611,23714,23755,23808,23918,23992,24128,24196,24282,24362,24431,24525,24584,24639,24701,24761,24871", + "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,359,360,361,363,364,366,367,368,369,370,371,372,373,374,375,376", + "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,56,57,46,58,56,70,60,56,49,51,52,49,49,59,52,65,61,62,48,46,54,87,57,61,49,44,42,59,66,54,46,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": "14889,17743,17826,17922,17991,18034,18086,18138,18187,18250,18308,18359,18443,18537,18645,18716,18800,18883,18949,19032,19134,19195,19257,19308,19386,19439,19499,19604,19663,19765,19820,19891,19940,19997,20055,20102,20161,20218,20289,20350,20407,20457,20509,20562,20612,20662,20722,20775,20841,20903,20966,21015,21062,21117,21205,21263,21325,21375,21420,21463,21523,21590,21645,21692,21747,21800,21847,21900,21956,22004,22059,22112,22196,22263,22327,22423,22497,22578,22667,22830,22974,23053,23128,23210,23269,23349,23429,23484,23606,23709,23750,23803,23860,23987,24052,24191,24277,24357,24426,24520,24579,24634,24696,24756,24866,24956" } }, { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\86ef1ec83f39cd41be9f0f4ea4f4caae\\transformed\\appcompat-v7-28.0.0\\res\\values\\values.xml", + "source": "D:\\Notes-master1\\app\\src\\main\\res\\values\\arrays.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": "-1,-1", + "startColumns": "-1,-1", + "startOffsets": "-1,-1" }, "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": "2,8", + "startColumns": "4,4", + "startOffsets": "105,300", + "endLines": "7,11", + "endColumns": "19,19", + "endOffsets": "295,415" } } ] }, { - "outputFile": "E:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-is_values-is.arsc.flat", + "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-hi_values-hi.arsc.flat", "map": [ { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\21795bd83e308c947c8dfe0c1fc89322\\transformed\\support-compat-28.0.0\\res\\values-is\\values-is.xml", + "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\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,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\\fanyi\\.gradle\\caches\\transforms-3\\2b9474e47639de47b19dc72cadc6eaea\\transformed\\support-compat-28.0.0\\res\\values-hi\\values-hi.xml", "from": { "startLines": "2", "startColumns": "4", @@ -2967,38 +2943,28 @@ "to": { "startLines": "30", "startColumns": "4", - "startOffsets": "2865", + "startOffsets": "2892", "endColumns": "100", - "endOffsets": "2961" - } - }, - { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\86ef1ec83f39cd41be9f0f4ea4f4caae\\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" + "endOffsets": "2988" } } ] }, { - "outputFile": "E:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-am_values-am.arsc.flat", + "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-hr_values-hr.arsc.flat", "map": [ { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\86ef1ec83f39cd41be9f0f4ea4f4caae\\transformed\\appcompat-v7-28.0.0\\res\\values-am\\values-am.xml", + "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\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,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" + "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\\小超人\\.gradle\\caches\\transforms-3\\21795bd83e308c947c8dfe0c1fc89322\\transformed\\support-compat-28.0.0\\res\\values-am\\values-am.xml", + "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\2b9474e47639de47b19dc72cadc6eaea\\transformed\\support-compat-28.0.0\\res\\values-hr\\values-hr.xml", "from": { "startLines": "2", "startColumns": "4", @@ -3009,60 +2975,59 @@ "to": { "startLines": "30", "startColumns": "4", - "startOffsets": "2817", + "startOffsets": "2926", "endColumns": "100", - "endOffsets": "2913" + "endOffsets": "3022" } } ] }, { - "outputFile": "E:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-zh-rHK_values-zh-rHK.arsc.flat", + "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-v22_values-v22.arsc.flat", "map": [ { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\21795bd83e308c947c8dfe0c1fc89322\\transformed\\support-compat-28.0.0\\res\\values-zh-rHK\\values-zh-rHK.xml", + "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\transformed\\appcompat-v7-28.0.0\\res\\values-v22\\values-v22.xml", "from": { - "startLines": "2", - "startColumns": "4", - "startOffsets": "55", - "endColumns": "100", - "endOffsets": "151" - }, - "to": { - "startLines": "30", - "startColumns": "4", - "startOffsets": "2746", - "endColumns": "100", - "endOffsets": "2842" + "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-ldltr-v21_values-ldltr-v21.arsc.flat", + "map": [ { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\86ef1ec83f39cd41be9f0f4ea4f4caae\\transformed\\appcompat-v7-28.0.0\\res\\values-zh-rHK\\values-zh-rHK.xml", + "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\transformed\\appcompat-v7-28.0.0\\res\\values-ldltr-v21\\values-ldltr-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,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" + "startLines": "2", + "startColumns": "4", + "startOffsets": "55", + "endColumns": "112", + "endOffsets": "163" } } ] }, { - "outputFile": "E:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-cs_values-cs.arsc.flat", + "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-kk_values-kk.arsc.flat", "map": [ { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\86ef1ec83f39cd41be9f0f4ea4f4caae\\transformed\\appcompat-v7-28.0.0\\res\\values-cs\\values-cs.xml", + "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\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,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" + "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" } }, { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\21795bd83e308c947c8dfe0c1fc89322\\transformed\\support-compat-28.0.0\\res\\values-cs\\values-cs.xml", + "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\2b9474e47639de47b19dc72cadc6eaea\\transformed\\support-compat-28.0.0\\res\\values-kk\\values-kk.xml", "from": { "startLines": "2", "startColumns": "4", @@ -3073,18 +3038,18 @@ "to": { "startLines": "30", "startColumns": "4", - "startOffsets": "2891", + "startOffsets": "2893", "endColumns": "100", - "endOffsets": "2987" + "endOffsets": "2989" } } ] }, { - "outputFile": "E:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-b+sr+Latn_values-b+sr+Latn.arsc.flat", + "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-ne_values-ne.arsc.flat", "map": [ { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\21795bd83e308c947c8dfe0c1fc89322\\transformed\\support-compat-28.0.0\\res\\values-b+sr+Latn\\values-b+sr+Latn.xml", + "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\2b9474e47639de47b19dc72cadc6eaea\\transformed\\support-compat-28.0.0\\res\\values-ne\\values-ne.xml", "from": { "startLines": "2", "startColumns": "4", @@ -3095,38 +3060,28 @@ "to": { "startLines": "30", "startColumns": "4", - "startOffsets": "2912", + "startOffsets": "2988", "endColumns": "100", - "endOffsets": "3008" + "endOffsets": "3084" } }, { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\86ef1ec83f39cd41be9f0f4ea4f4caae\\transformed\\appcompat-v7-28.0.0\\res\\values-b+sr+Latn\\values-b+sr+Latn.xml", + "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\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,424,510,614,732,814,895,986,1079,1175,1269,1370,1463,1558,1663,1754,1845,1933,2039,2147,2248,2353,2461,2562,2731,2828", - "endColumns": "108,103,105,85,103,117,81,80,90,92,95,93,100,92,94,104,90,90,87,105,107,100,104,107,100,168,96,83", - "endOffsets": "209,313,419,505,609,727,809,890,981,1074,1170,1264,1365,1458,1553,1658,1749,1840,1928,2034,2142,2243,2348,2456,2557,2726,2823,2907" + "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" } } ] }, { - "outputFile": "E:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-es-rUS_values-es-rUS.arsc.flat", + "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-b+sr+Latn_values-b+sr+Latn.arsc.flat", "map": [ { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\86ef1ec83f39cd41be9f0f4ea4f4caae\\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,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\\小超人\\.gradle\\caches\\transforms-3\\21795bd83e308c947c8dfe0c1fc89322\\transformed\\support-compat-28.0.0\\res\\values-es-rUS\\values-es-rUS.xml", + "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\2b9474e47639de47b19dc72cadc6eaea\\transformed\\support-compat-28.0.0\\res\\values-b+sr+Latn\\values-b+sr+Latn.xml", "from": { "startLines": "2", "startColumns": "4", @@ -3137,28 +3092,38 @@ "to": { "startLines": "30", "startColumns": "4", - "startOffsets": "2920", + "startOffsets": "2912", "endColumns": "100", - "endOffsets": "3016" + "endOffsets": "3008" + } + }, + { + "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\transformed\\appcompat-v7-28.0.0\\res\\values-b+sr+Latn\\values-b+sr+Latn.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,424,510,614,732,814,895,986,1079,1175,1269,1370,1463,1558,1663,1754,1845,1933,2039,2147,2248,2353,2461,2562,2731,2828", + "endColumns": "108,103,105,85,103,117,81,80,90,92,95,93,100,92,94,104,90,90,87,105,107,100,104,107,100,168,96,83", + "endOffsets": "209,313,419,505,609,727,809,890,981,1074,1170,1264,1365,1458,1553,1658,1749,1840,1928,2034,2142,2243,2348,2456,2557,2726,2823,2907" } } ] }, { - "outputFile": "E:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-ka_values-ka.arsc.flat", + "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-zu_values-zu.arsc.flat", "map": [ { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\86ef1ec83f39cd41be9f0f4ea4f4caae\\transformed\\appcompat-v7-28.0.0\\res\\values-ka\\values-ka.xml", + "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\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,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,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" } }, { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\21795bd83e308c947c8dfe0c1fc89322\\transformed\\support-compat-28.0.0\\res\\values-ka\\values-ka.xml", + "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\2b9474e47639de47b19dc72cadc6eaea\\transformed\\support-compat-28.0.0\\res\\values-zu\\values-zu.xml", "from": { "startLines": "2", "startColumns": "4", @@ -3169,43 +3134,43 @@ "to": { "startLines": "30", "startColumns": "4", - "startOffsets": "2899", + "startOffsets": "2898", "endColumns": "100", - "endOffsets": "2995" + "endOffsets": "2994" } } ] }, { - "outputFile": "E:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-ldltr-v21_values-ldltr-v21.arsc.flat", + "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-h720dp-v13_values-h720dp-v13.arsc.flat", "map": [ { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\86ef1ec83f39cd41be9f0f4ea4f4caae\\transformed\\appcompat-v7-28.0.0\\res\\values-ldltr-v21\\values-ldltr-v21.xml", + "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\transformed\\appcompat-v7-28.0.0\\res\\values-h720dp-v13\\values-h720dp-v13.xml", "from": { "startLines": "2", "startColumns": "4", "startOffsets": "55", - "endColumns": "112", - "endOffsets": "163" + "endColumns": "66", + "endOffsets": "117" } } ] }, { - "outputFile": "E:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-te_values-te.arsc.flat", + "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-ro_values-ro.arsc.flat", "map": [ { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\86ef1ec83f39cd41be9f0f4ea4f4caae\\transformed\\appcompat-v7-28.0.0\\res\\values-te\\values-te.xml", + "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\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,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" + "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\\小超人\\.gradle\\caches\\transforms-3\\21795bd83e308c947c8dfe0c1fc89322\\transformed\\support-compat-28.0.0\\res\\values-te\\values-te.xml", + "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\2b9474e47639de47b19dc72cadc6eaea\\transformed\\support-compat-28.0.0\\res\\values-ro\\values-ro.xml", "from": { "startLines": "2", "startColumns": "4", @@ -3216,18 +3181,43 @@ "to": { "startLines": "30", "startColumns": "4", - "startOffsets": "2946", + "startOffsets": "2953", "endColumns": "100", - "endOffsets": "3042" + "endOffsets": "3049" + } + } + ] + }, + { + "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-xlarge-v4_values-xlarge-v4.arsc.flat", + "map": [ + { + "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\transformed\\appcompat-v7-28.0.0\\res\\values-xlarge-v4\\values-xlarge-v4.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" } } ] }, { - "outputFile": "E:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-my_values-my.arsc.flat", + "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-ur_values-ur.arsc.flat", "map": [ { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\21795bd83e308c947c8dfe0c1fc89322\\transformed\\support-compat-28.0.0\\res\\values-my\\values-my.xml", + "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\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" + } + }, + { + "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\2b9474e47639de47b19dc72cadc6eaea\\transformed\\support-compat-28.0.0\\res\\values-ur\\values-ur.xml", "from": { "startLines": "2", "startColumns": "4", @@ -3238,38 +3228,28 @@ "to": { "startLines": "30", "startColumns": "4", - "startOffsets": "2979", + "startOffsets": "2904", "endColumns": "100", - "endOffsets": "3075" - } - }, - { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\86ef1ec83f39cd41be9f0f4ea4f4caae\\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,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" + "endOffsets": "3000" } } ] }, { - "outputFile": "E:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-ko_values-ko.arsc.flat", + "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-et_values-et.arsc.flat", "map": [ { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\86ef1ec83f39cd41be9f0f4ea4f4caae\\transformed\\appcompat-v7-28.0.0\\res\\values-ko\\values-ko.xml", + "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\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,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" + "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" } }, { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\21795bd83e308c947c8dfe0c1fc89322\\transformed\\support-compat-28.0.0\\res\\values-ko\\values-ko.xml", + "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\2b9474e47639de47b19dc72cadc6eaea\\transformed\\support-compat-28.0.0\\res\\values-et\\values-et.xml", "from": { "startLines": "2", "startColumns": "4", @@ -3280,43 +3260,28 @@ "to": { "startLines": "30", "startColumns": "4", - "startOffsets": "2756", + "startOffsets": "2942", "endColumns": "100", - "endOffsets": "2852" - } - } - ] - }, - { - "outputFile": "E:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-xlarge-v4_values-xlarge-v4.arsc.flat", - "map": [ - { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\86ef1ec83f39cd41be9f0f4ea4f4caae\\transformed\\appcompat-v7-28.0.0\\res\\values-xlarge-v4\\values-xlarge-v4.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" + "endOffsets": "3038" } } ] }, { - "outputFile": "E:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-fr-rCA_values-fr-rCA.arsc.flat", + "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-ta_values-ta.arsc.flat", "map": [ { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\86ef1ec83f39cd41be9f0f4ea4f4caae\\transformed\\appcompat-v7-28.0.0\\res\\values-fr-rCA\\values-fr-rCA.xml", + "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\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,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" + "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" } }, { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\21795bd83e308c947c8dfe0c1fc89322\\transformed\\support-compat-28.0.0\\res\\values-fr-rCA\\values-fr-rCA.xml", + "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\2b9474e47639de47b19dc72cadc6eaea\\transformed\\support-compat-28.0.0\\res\\values-ta\\values-ta.xml", "from": { "startLines": "2", "startColumns": "4", @@ -3327,9 +3292,9 @@ "to": { "startLines": "30", "startColumns": "4", - "startOffsets": "2965", + "startOffsets": "2954", "endColumns": "100", - "endOffsets": "3061" + "endOffsets": "3050" } } ] diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-af.json b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-af.json index 91afab2b..7e3dc470 100644 --- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-af.json +++ b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-af.json @@ -1,10 +1,20 @@ { "logs": [ { - "outputFile": "E:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-af\\values-af.xml", + "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-af\\values-af.xml", "map": [ { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\21795bd83e308c947c8dfe0c1fc89322\\transformed\\support-compat-28.0.0\\res\\values-af\\values-af.xml", + "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\transformed\\appcompat-v7-28.0.0\\res\\values-af\\values-af.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,415,500,603,721,797,874,965,1058,1154,1248,1348,1441,1536,1635,1730,1824,1905,2012,2115,2212,2320,2422,2524,2678,2776", + "endColumns": "103,99,105,84,102,117,75,76,90,92,95,93,99,92,94,98,94,93,80,106,102,96,107,101,101,153,97,79", + "endOffsets": "204,304,410,495,598,716,792,869,960,1053,1149,1243,1343,1436,1531,1630,1725,1819,1900,2007,2110,2207,2315,2417,2519,2673,2771,2851" + } + }, + { + "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\2b9474e47639de47b19dc72cadc6eaea\\transformed\\support-compat-28.0.0\\res\\values-af\\values-af.xml", "from": { "startLines": "2", "startColumns": "4", @@ -19,16 +29,6 @@ "endColumns": "100", "endOffsets": "2952" } - }, - { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\86ef1ec83f39cd41be9f0f4ea4f4caae\\transformed\\appcompat-v7-28.0.0\\res\\values-af\\values-af.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,415,500,603,721,797,874,965,1058,1154,1248,1348,1441,1536,1635,1730,1824,1905,2012,2115,2212,2320,2422,2524,2678,2776", - "endColumns": "103,99,105,84,102,117,75,76,90,92,95,93,99,92,94,98,94,93,80,106,102,96,107,101,101,153,97,79", - "endOffsets": "204,304,410,495,598,716,792,869,960,1053,1149,1243,1343,1436,1531,1630,1725,1819,1900,2007,2110,2207,2315,2417,2519,2673,2771,2851" - } } ] } diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-am.json b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-am.json index 26d3411a..f69864c8 100644 --- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-am.json +++ b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-am.json @@ -1,10 +1,10 @@ { "logs": [ { - "outputFile": "E:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-am\\values-am.xml", + "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-am\\values-am.xml", "map": [ { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\86ef1ec83f39cd41be9f0f4ea4f4caae\\transformed\\appcompat-v7-28.0.0\\res\\values-am\\values-am.xml", + "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\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", @@ -14,7 +14,7 @@ } }, { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\21795bd83e308c947c8dfe0c1fc89322\\transformed\\support-compat-28.0.0\\res\\values-am\\values-am.xml", + "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\2b9474e47639de47b19dc72cadc6eaea\\transformed\\support-compat-28.0.0\\res\\values-am\\values-am.xml", "from": { "startLines": "2", "startColumns": "4", diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ar.json b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ar.json index 23ba2192..597e82c5 100644 --- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ar.json +++ b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ar.json @@ -1,10 +1,10 @@ { "logs": [ { - "outputFile": "E:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-ar\\values-ar.xml", + "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-ar\\values-ar.xml", "map": [ { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\21795bd83e308c947c8dfe0c1fc89322\\transformed\\support-compat-28.0.0\\res\\values-ar\\values-ar.xml", + "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\2b9474e47639de47b19dc72cadc6eaea\\transformed\\support-compat-28.0.0\\res\\values-ar\\values-ar.xml", "from": { "startLines": "2", "startColumns": "4", @@ -21,7 +21,7 @@ } }, { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\86ef1ec83f39cd41be9f0f4ea4f4caae\\transformed\\appcompat-v7-28.0.0\\res\\values-ar\\values-ar.xml", + "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\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", diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-as.json b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-as.json index 2b890cff..bcdd564e 100644 --- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-as.json +++ b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-as.json @@ -1,10 +1,10 @@ { "logs": [ { - "outputFile": "E:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-as\\values-as.xml", + "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-as\\values-as.xml", "map": [ { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\86ef1ec83f39cd41be9f0f4ea4f4caae\\transformed\\appcompat-v7-28.0.0\\res\\values-as\\values-as.xml", + "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\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", @@ -14,7 +14,7 @@ } }, { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\21795bd83e308c947c8dfe0c1fc89322\\transformed\\support-compat-28.0.0\\res\\values-as\\values-as.xml", + "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\2b9474e47639de47b19dc72cadc6eaea\\transformed\\support-compat-28.0.0\\res\\values-as\\values-as.xml", "from": { "startLines": "2", "startColumns": "4", diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-az.json b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-az.json index aa94cc37..505dfe20 100644 --- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-az.json +++ b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-az.json @@ -1,10 +1,20 @@ { "logs": [ { - "outputFile": "E:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-az\\values-az.xml", + "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-az\\values-az.xml", "map": [ { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\21795bd83e308c947c8dfe0c1fc89322\\transformed\\support-compat-28.0.0\\res\\values-az\\values-az.xml", + "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\transformed\\appcompat-v7-28.0.0\\res\\values-az\\values-az.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,424,512,619,733,814,893,984,1077,1172,1271,1372,1465,1560,1655,1746,1838,1923,2030,2137,2237,2346,2450,2560,2718,2820", + "endColumns": "107,98,111,87,106,113,80,78,90,92,94,98,100,92,94,94,90,91,84,106,106,99,108,103,109,157,101,82", + "endOffsets": "208,307,419,507,614,728,809,888,979,1072,1167,1266,1367,1460,1555,1650,1741,1833,1918,2025,2132,2232,2341,2445,2555,2713,2815,2898" + } + }, + { + "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\2b9474e47639de47b19dc72cadc6eaea\\transformed\\support-compat-28.0.0\\res\\values-az\\values-az.xml", "from": { "startLines": "2", "startColumns": "4", @@ -19,16 +29,6 @@ "endColumns": "100", "endOffsets": "2999" } - }, - { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\86ef1ec83f39cd41be9f0f4ea4f4caae\\transformed\\appcompat-v7-28.0.0\\res\\values-az\\values-az.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,424,512,619,733,814,893,984,1077,1172,1271,1372,1465,1560,1655,1746,1838,1923,2030,2137,2237,2346,2450,2560,2718,2820", - "endColumns": "107,98,111,87,106,113,80,78,90,92,94,98,100,92,94,94,90,91,84,106,106,99,108,103,109,157,101,82", - "endOffsets": "208,307,419,507,614,728,809,888,979,1072,1167,1266,1367,1460,1555,1650,1741,1833,1918,2025,2132,2232,2341,2445,2555,2713,2815,2898" - } } ] } diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-b+sr+Latn.json b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-b+sr+Latn.json index 4f1e9a75..851faeee 100644 --- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-b+sr+Latn.json +++ b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-b+sr+Latn.json @@ -1,10 +1,10 @@ { "logs": [ { - "outputFile": "E:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-b+sr+Latn\\values-b+sr+Latn.xml", + "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-b+sr+Latn\\values-b+sr+Latn.xml", "map": [ { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\21795bd83e308c947c8dfe0c1fc89322\\transformed\\support-compat-28.0.0\\res\\values-b+sr+Latn\\values-b+sr+Latn.xml", + "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\2b9474e47639de47b19dc72cadc6eaea\\transformed\\support-compat-28.0.0\\res\\values-b+sr+Latn\\values-b+sr+Latn.xml", "from": { "startLines": "2", "startColumns": "4", @@ -21,7 +21,7 @@ } }, { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\86ef1ec83f39cd41be9f0f4ea4f4caae\\transformed\\appcompat-v7-28.0.0\\res\\values-b+sr+Latn\\values-b+sr+Latn.xml", + "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\transformed\\appcompat-v7-28.0.0\\res\\values-b+sr+Latn\\values-b+sr+Latn.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", diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-be.json b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-be.json index ed01a823..144e35fd 100644 --- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-be.json +++ b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-be.json @@ -1,20 +1,10 @@ { "logs": [ { - "outputFile": "E:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-be\\values-be.xml", + "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-be\\values-be.xml", "map": [ { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\86ef1ec83f39cd41be9f0f4ea4f4caae\\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,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" - } - }, - { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\21795bd83e308c947c8dfe0c1fc89322\\transformed\\support-compat-28.0.0\\res\\values-be\\values-be.xml", + "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\2b9474e47639de47b19dc72cadc6eaea\\transformed\\support-compat-28.0.0\\res\\values-be\\values-be.xml", "from": { "startLines": "2", "startColumns": "4", @@ -29,6 +19,16 @@ "endColumns": "100", "endOffsets": "3011" } + }, + { + "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\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,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" + } } ] } diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-bg.json b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-bg.json index e6929600..173ae3b0 100644 --- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-bg.json +++ b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-bg.json @@ -1,10 +1,10 @@ { "logs": [ { - "outputFile": "E:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-bg\\values-bg.xml", + "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-bg\\values-bg.xml", "map": [ { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\21795bd83e308c947c8dfe0c1fc89322\\transformed\\support-compat-28.0.0\\res\\values-bg\\values-bg.xml", + "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\2b9474e47639de47b19dc72cadc6eaea\\transformed\\support-compat-28.0.0\\res\\values-bg\\values-bg.xml", "from": { "startLines": "2", "startColumns": "4", @@ -21,7 +21,7 @@ } }, { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\86ef1ec83f39cd41be9f0f4ea4f4caae\\transformed\\appcompat-v7-28.0.0\\res\\values-bg\\values-bg.xml", + "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\transformed\\appcompat-v7-28.0.0\\res\\values-bg\\values-bg.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", diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-bn.json b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-bn.json index ccd2386f..1ab94d49 100644 --- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-bn.json +++ b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-bn.json @@ -1,20 +1,10 @@ { "logs": [ { - "outputFile": "E:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-bn\\values-bn.xml", + "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-bn\\values-bn.xml", "map": [ { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\86ef1ec83f39cd41be9f0f4ea4f4caae\\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" - } - }, - { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\21795bd83e308c947c8dfe0c1fc89322\\transformed\\support-compat-28.0.0\\res\\values-bn\\values-bn.xml", + "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\2b9474e47639de47b19dc72cadc6eaea\\transformed\\support-compat-28.0.0\\res\\values-bn\\values-bn.xml", "from": { "startLines": "2", "startColumns": "4", @@ -29,6 +19,16 @@ "endColumns": "100", "endOffsets": "3035" } + }, + { + "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\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" + } } ] } diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-bs.json b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-bs.json index a94d955d..c5b68406 100644 --- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-bs.json +++ b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-bs.json @@ -1,10 +1,10 @@ { "logs": [ { - "outputFile": "E:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-bs\\values-bs.xml", + "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-bs\\values-bs.xml", "map": [ { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\86ef1ec83f39cd41be9f0f4ea4f4caae\\transformed\\appcompat-v7-28.0.0\\res\\values-bs\\values-bs.xml", + "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\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", @@ -14,7 +14,7 @@ } }, { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\21795bd83e308c947c8dfe0c1fc89322\\transformed\\support-compat-28.0.0\\res\\values-bs\\values-bs.xml", + "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\2b9474e47639de47b19dc72cadc6eaea\\transformed\\support-compat-28.0.0\\res\\values-bs\\values-bs.xml", "from": { "startLines": "2", "startColumns": "4", diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ca.json b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ca.json index 288707a3..71f4a71d 100644 --- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ca.json +++ b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ca.json @@ -1,10 +1,10 @@ { "logs": [ { - "outputFile": "E:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-ca\\values-ca.xml", + "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-ca\\values-ca.xml", "map": [ { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\86ef1ec83f39cd41be9f0f4ea4f4caae\\transformed\\appcompat-v7-28.0.0\\res\\values-ca\\values-ca.xml", + "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\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", @@ -14,7 +14,7 @@ } }, { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\21795bd83e308c947c8dfe0c1fc89322\\transformed\\support-compat-28.0.0\\res\\values-ca\\values-ca.xml", + "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\2b9474e47639de47b19dc72cadc6eaea\\transformed\\support-compat-28.0.0\\res\\values-ca\\values-ca.xml", "from": { "startLines": "2", "startColumns": "4", diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-cs.json b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-cs.json index e2f37c60..fe997d74 100644 --- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-cs.json +++ b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-cs.json @@ -1,10 +1,10 @@ { "logs": [ { - "outputFile": "E:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-cs\\values-cs.xml", + "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-cs\\values-cs.xml", "map": [ { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\86ef1ec83f39cd41be9f0f4ea4f4caae\\transformed\\appcompat-v7-28.0.0\\res\\values-cs\\values-cs.xml", + "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\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", @@ -14,7 +14,7 @@ } }, { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\21795bd83e308c947c8dfe0c1fc89322\\transformed\\support-compat-28.0.0\\res\\values-cs\\values-cs.xml", + "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\2b9474e47639de47b19dc72cadc6eaea\\transformed\\support-compat-28.0.0\\res\\values-cs\\values-cs.xml", "from": { "startLines": "2", "startColumns": "4", diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-da.json b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-da.json index 8a134344..2314f6bd 100644 --- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-da.json +++ b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-da.json @@ -1,10 +1,20 @@ { "logs": [ { - "outputFile": "E:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-da\\values-da.xml", + "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-da\\values-da.xml", "map": [ { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\21795bd83e308c947c8dfe0c1fc89322\\transformed\\support-compat-28.0.0\\res\\values-da\\values-da.xml", + "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\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\\fanyi\\.gradle\\caches\\transforms-3\\2b9474e47639de47b19dc72cadc6eaea\\transformed\\support-compat-28.0.0\\res\\values-da\\values-da.xml", "from": { "startLines": "2", "startColumns": "4", @@ -19,16 +29,6 @@ "endColumns": "100", "endOffsets": "2940" } - }, - { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\86ef1ec83f39cd41be9f0f4ea4f4caae\\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" - } } ] } diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-de.json b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-de.json index 2ef0426e..3ec28dc3 100644 --- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-de.json +++ b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-de.json @@ -1,10 +1,10 @@ { "logs": [ { - "outputFile": "E:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-de\\values-de.xml", + "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-de\\values-de.xml", "map": [ { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\86ef1ec83f39cd41be9f0f4ea4f4caae\\transformed\\appcompat-v7-28.0.0\\res\\values-de\\values-de.xml", + "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\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", @@ -14,7 +14,7 @@ } }, { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\21795bd83e308c947c8dfe0c1fc89322\\transformed\\support-compat-28.0.0\\res\\values-de\\values-de.xml", + "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\2b9474e47639de47b19dc72cadc6eaea\\transformed\\support-compat-28.0.0\\res\\values-de\\values-de.xml", "from": { "startLines": "2", "startColumns": "4", diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-el.json b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-el.json index 26479d66..75bd0936 100644 --- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-el.json +++ b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-el.json @@ -1,10 +1,10 @@ { "logs": [ { - "outputFile": "E:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-el\\values-el.xml", + "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-el\\values-el.xml", "map": [ { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\86ef1ec83f39cd41be9f0f4ea4f4caae\\transformed\\appcompat-v7-28.0.0\\res\\values-el\\values-el.xml", + "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\transformed\\appcompat-v7-28.0.0\\res\\values-el\\values-el.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", @@ -14,7 +14,7 @@ } }, { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\21795bd83e308c947c8dfe0c1fc89322\\transformed\\support-compat-28.0.0\\res\\values-el\\values-el.xml", + "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\2b9474e47639de47b19dc72cadc6eaea\\transformed\\support-compat-28.0.0\\res\\values-el\\values-el.xml", "from": { "startLines": "2", "startColumns": "4", diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-en-rAU.json b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-en-rAU.json index d143b13f..690614b0 100644 --- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-en-rAU.json +++ b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-en-rAU.json @@ -1,20 +1,10 @@ { "logs": [ { - "outputFile": "E:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-en-rAU\\values-en-rAU.xml", + "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-en-rAU\\values-en-rAU.xml", "map": [ { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\86ef1ec83f39cd41be9f0f4ea4f4caae\\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" - } - }, - { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\21795bd83e308c947c8dfe0c1fc89322\\transformed\\support-compat-28.0.0\\res\\values-en-rAU\\values-en-rAU.xml", + "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\2b9474e47639de47b19dc72cadc6eaea\\transformed\\support-compat-28.0.0\\res\\values-en-rAU\\values-en-rAU.xml", "from": { "startLines": "2", "startColumns": "4", @@ -29,6 +19,16 @@ "endColumns": "100", "endOffsets": "2942" } + }, + { + "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\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" + } } ] } diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-en-rCA.json b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-en-rCA.json index 03b4cc32..e71c23d8 100644 --- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-en-rCA.json +++ b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-en-rCA.json @@ -1,10 +1,20 @@ { "logs": [ { - "outputFile": "E:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-en-rCA\\values-en-rCA.xml", + "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-en-rCA\\values-en-rCA.xml", "map": [ { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\21795bd83e308c947c8dfe0c1fc89322\\transformed\\support-compat-28.0.0\\res\\values-en-rCA\\values-en-rCA.xml", + "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\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,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\\fanyi\\.gradle\\caches\\transforms-3\\2b9474e47639de47b19dc72cadc6eaea\\transformed\\support-compat-28.0.0\\res\\values-en-rCA\\values-en-rCA.xml", "from": { "startLines": "2", "startColumns": "4", @@ -19,16 +29,6 @@ "endColumns": "100", "endOffsets": "2942" } - }, - { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\86ef1ec83f39cd41be9f0f4ea4f4caae\\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,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" - } } ] } diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-en-rGB.json b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-en-rGB.json index 04c5a4b8..2294738a 100644 --- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-en-rGB.json +++ b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-en-rGB.json @@ -1,10 +1,10 @@ { "logs": [ { - "outputFile": "E:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-en-rGB\\values-en-rGB.xml", + "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-en-rGB\\values-en-rGB.xml", "map": [ { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\86ef1ec83f39cd41be9f0f4ea4f4caae\\transformed\\appcompat-v7-28.0.0\\res\\values-en-rGB\\values-en-rGB.xml", + "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\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", @@ -14,7 +14,7 @@ } }, { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\21795bd83e308c947c8dfe0c1fc89322\\transformed\\support-compat-28.0.0\\res\\values-en-rGB\\values-en-rGB.xml", + "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\2b9474e47639de47b19dc72cadc6eaea\\transformed\\support-compat-28.0.0\\res\\values-en-rGB\\values-en-rGB.xml", "from": { "startLines": "2", "startColumns": "4", diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-en-rIN.json b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-en-rIN.json index fdb8232d..e499222f 100644 --- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-en-rIN.json +++ b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-en-rIN.json @@ -1,10 +1,20 @@ { "logs": [ { - "outputFile": "E:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-en-rIN\\values-en-rIN.xml", + "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-en-rIN\\values-en-rIN.xml", "map": [ { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\21795bd83e308c947c8dfe0c1fc89322\\transformed\\support-compat-28.0.0\\res\\values-en-rIN\\values-en-rIN.xml", + "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\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" + } + }, + { + "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\2b9474e47639de47b19dc72cadc6eaea\\transformed\\support-compat-28.0.0\\res\\values-en-rIN\\values-en-rIN.xml", "from": { "startLines": "2", "startColumns": "4", @@ -19,16 +29,6 @@ "endColumns": "100", "endOffsets": "2942" } - }, - { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\86ef1ec83f39cd41be9f0f4ea4f4caae\\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" - } } ] } diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-en-rXC.json b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-en-rXC.json index 025b4a28..aeb72487 100644 --- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-en-rXC.json +++ b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-en-rXC.json @@ -1,20 +1,10 @@ { "logs": [ { - "outputFile": "E:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-en-rXC\\values-en-rXC.xml", + "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-en-rXC\\values-en-rXC.xml", "map": [ { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\86ef1ec83f39cd41be9f0f4ea4f4caae\\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" - } - }, - { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\21795bd83e308c947c8dfe0c1fc89322\\transformed\\support-compat-28.0.0\\res\\values-en-rXC\\values-en-rXC.xml", + "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\2b9474e47639de47b19dc72cadc6eaea\\transformed\\support-compat-28.0.0\\res\\values-en-rXC\\values-en-rXC.xml", "from": { "startLines": "2", "startColumns": "4", @@ -29,6 +19,16 @@ "endColumns": "202", "endOffsets": "5880" } + }, + { + "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\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" + } } ] } diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-es-rUS.json b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-es-rUS.json index 0477e184..3de2f6a4 100644 --- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-es-rUS.json +++ b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-es-rUS.json @@ -1,10 +1,10 @@ { "logs": [ { - "outputFile": "E:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-es-rUS\\values-es-rUS.xml", + "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-es-rUS\\values-es-rUS.xml", "map": [ { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\86ef1ec83f39cd41be9f0f4ea4f4caae\\transformed\\appcompat-v7-28.0.0\\res\\values-es-rUS\\values-es-rUS.xml", + "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\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", @@ -14,7 +14,7 @@ } }, { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\21795bd83e308c947c8dfe0c1fc89322\\transformed\\support-compat-28.0.0\\res\\values-es-rUS\\values-es-rUS.xml", + "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\2b9474e47639de47b19dc72cadc6eaea\\transformed\\support-compat-28.0.0\\res\\values-es-rUS\\values-es-rUS.xml", "from": { "startLines": "2", "startColumns": "4", diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-es.json b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-es.json index e1a9295c..a4b0b100 100644 --- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-es.json +++ b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-es.json @@ -1,10 +1,10 @@ { "logs": [ { - "outputFile": "E:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-es\\values-es.xml", + "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-es\\values-es.xml", "map": [ { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\86ef1ec83f39cd41be9f0f4ea4f4caae\\transformed\\appcompat-v7-28.0.0\\res\\values-es\\values-es.xml", + "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\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", @@ -14,7 +14,7 @@ } }, { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\21795bd83e308c947c8dfe0c1fc89322\\transformed\\support-compat-28.0.0\\res\\values-es\\values-es.xml", + "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\2b9474e47639de47b19dc72cadc6eaea\\transformed\\support-compat-28.0.0\\res\\values-es\\values-es.xml", "from": { "startLines": "2", "startColumns": "4", diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-et.json b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-et.json index 409ea59f..c72b88bc 100644 --- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-et.json +++ b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-et.json @@ -1,10 +1,20 @@ { "logs": [ { - "outputFile": "E:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-et\\values-et.xml", + "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-et\\values-et.xml", "map": [ { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\21795bd83e308c947c8dfe0c1fc89322\\transformed\\support-compat-28.0.0\\res\\values-et\\values-et.xml", + "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\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" + } + }, + { + "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\2b9474e47639de47b19dc72cadc6eaea\\transformed\\support-compat-28.0.0\\res\\values-et\\values-et.xml", "from": { "startLines": "2", "startColumns": "4", @@ -19,16 +29,6 @@ "endColumns": "100", "endOffsets": "3038" } - }, - { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\86ef1ec83f39cd41be9f0f4ea4f4caae\\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" - } } ] } diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-eu.json b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-eu.json index 8e146889..b0b95347 100644 --- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-eu.json +++ b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-eu.json @@ -1,10 +1,10 @@ { "logs": [ { - "outputFile": "E:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-eu\\values-eu.xml", + "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-eu\\values-eu.xml", "map": [ { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\86ef1ec83f39cd41be9f0f4ea4f4caae\\transformed\\appcompat-v7-28.0.0\\res\\values-eu\\values-eu.xml", + "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\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", @@ -14,7 +14,7 @@ } }, { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\21795bd83e308c947c8dfe0c1fc89322\\transformed\\support-compat-28.0.0\\res\\values-eu\\values-eu.xml", + "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\2b9474e47639de47b19dc72cadc6eaea\\transformed\\support-compat-28.0.0\\res\\values-eu\\values-eu.xml", "from": { "startLines": "2", "startColumns": "4", diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-fa.json b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-fa.json index 6ebf365e..77541e3c 100644 --- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-fa.json +++ b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-fa.json @@ -1,10 +1,20 @@ { "logs": [ { - "outputFile": "E:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-fa\\values-fa.xml", + "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-fa\\values-fa.xml", "map": [ { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\21795bd83e308c947c8dfe0c1fc89322\\transformed\\support-compat-28.0.0\\res\\values-fa\\values-fa.xml", + "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\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\\fanyi\\.gradle\\caches\\transforms-3\\2b9474e47639de47b19dc72cadc6eaea\\transformed\\support-compat-28.0.0\\res\\values-fa\\values-fa.xml", "from": { "startLines": "2", "startColumns": "4", @@ -19,16 +29,6 @@ "endColumns": "100", "endOffsets": "2999" } - }, - { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\86ef1ec83f39cd41be9f0f4ea4f4caae\\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" - } } ] } diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-fi.json b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-fi.json index 8f7a8dd1..22648755 100644 --- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-fi.json +++ b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-fi.json @@ -1,10 +1,10 @@ { "logs": [ { - "outputFile": "E:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-fi\\values-fi.xml", + "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-fi\\values-fi.xml", "map": [ { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\21795bd83e308c947c8dfe0c1fc89322\\transformed\\support-compat-28.0.0\\res\\values-fi\\values-fi.xml", + "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\2b9474e47639de47b19dc72cadc6eaea\\transformed\\support-compat-28.0.0\\res\\values-fi\\values-fi.xml", "from": { "startLines": "2", "startColumns": "4", @@ -21,7 +21,7 @@ } }, { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\86ef1ec83f39cd41be9f0f4ea4f4caae\\transformed\\appcompat-v7-28.0.0\\res\\values-fi\\values-fi.xml", + "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\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", diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-fr-rCA.json b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-fr-rCA.json index 616ca4c3..4df32b42 100644 --- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-fr-rCA.json +++ b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-fr-rCA.json @@ -1,20 +1,10 @@ { "logs": [ { - "outputFile": "E:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-fr-rCA\\values-fr-rCA.xml", + "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-fr-rCA\\values-fr-rCA.xml", "map": [ { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\86ef1ec83f39cd41be9f0f4ea4f4caae\\transformed\\appcompat-v7-28.0.0\\res\\values-fr-rCA\\values-fr-rCA.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" - } - }, - { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\21795bd83e308c947c8dfe0c1fc89322\\transformed\\support-compat-28.0.0\\res\\values-fr-rCA\\values-fr-rCA.xml", + "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\2b9474e47639de47b19dc72cadc6eaea\\transformed\\support-compat-28.0.0\\res\\values-fr-rCA\\values-fr-rCA.xml", "from": { "startLines": "2", "startColumns": "4", @@ -29,6 +19,16 @@ "endColumns": "100", "endOffsets": "3061" } + }, + { + "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\transformed\\appcompat-v7-28.0.0\\res\\values-fr-rCA\\values-fr-rCA.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" + } } ] } diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-fr.json b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-fr.json index 8ddaa8bf..ad48e379 100644 --- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-fr.json +++ b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-fr.json @@ -1,10 +1,10 @@ { "logs": [ { - "outputFile": "E:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-fr\\values-fr.xml", + "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-fr\\values-fr.xml", "map": [ { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\86ef1ec83f39cd41be9f0f4ea4f4caae\\transformed\\appcompat-v7-28.0.0\\res\\values-fr\\values-fr.xml", + "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\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", @@ -14,7 +14,7 @@ } }, { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\21795bd83e308c947c8dfe0c1fc89322\\transformed\\support-compat-28.0.0\\res\\values-fr\\values-fr.xml", + "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\2b9474e47639de47b19dc72cadc6eaea\\transformed\\support-compat-28.0.0\\res\\values-fr\\values-fr.xml", "from": { "startLines": "2", "startColumns": "4", diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-gl.json b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-gl.json index 7f5b96c9..a7ad3c9c 100644 --- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-gl.json +++ b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-gl.json @@ -1,10 +1,10 @@ { "logs": [ { - "outputFile": "E:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-gl\\values-gl.xml", + "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-gl\\values-gl.xml", "map": [ { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\21795bd83e308c947c8dfe0c1fc89322\\transformed\\support-compat-28.0.0\\res\\values-gl\\values-gl.xml", + "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\2b9474e47639de47b19dc72cadc6eaea\\transformed\\support-compat-28.0.0\\res\\values-gl\\values-gl.xml", "from": { "startLines": "2", "startColumns": "4", @@ -21,7 +21,7 @@ } }, { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\86ef1ec83f39cd41be9f0f4ea4f4caae\\transformed\\appcompat-v7-28.0.0\\res\\values-gl\\values-gl.xml", + "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\transformed\\appcompat-v7-28.0.0\\res\\values-gl\\values-gl.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", diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-gu.json b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-gu.json index b54f2639..62630fa4 100644 --- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-gu.json +++ b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-gu.json @@ -1,10 +1,10 @@ { "logs": [ { - "outputFile": "E:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-gu\\values-gu.xml", + "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-gu\\values-gu.xml", "map": [ { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\86ef1ec83f39cd41be9f0f4ea4f4caae\\transformed\\appcompat-v7-28.0.0\\res\\values-gu\\values-gu.xml", + "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\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", @@ -14,7 +14,7 @@ } }, { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\21795bd83e308c947c8dfe0c1fc89322\\transformed\\support-compat-28.0.0\\res\\values-gu\\values-gu.xml", + "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\2b9474e47639de47b19dc72cadc6eaea\\transformed\\support-compat-28.0.0\\res\\values-gu\\values-gu.xml", "from": { "startLines": "2", "startColumns": "4", diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-h720dp-v13.json b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-h720dp-v13.json index e5bcff80..63571bfe 100644 --- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-h720dp-v13.json +++ b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-h720dp-v13.json @@ -1,10 +1,10 @@ { "logs": [ { - "outputFile": "E:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-h720dp-v13\\values-h720dp-v13.xml", + "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-h720dp-v13\\values-h720dp-v13.xml", "map": [ { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\86ef1ec83f39cd41be9f0f4ea4f4caae\\transformed\\appcompat-v7-28.0.0\\res\\values-h720dp-v13\\values-h720dp-v13.xml", + "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\transformed\\appcompat-v7-28.0.0\\res\\values-h720dp-v13\\values-h720dp-v13.xml", "from": { "startLines": "2", "startColumns": "4", diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-hdpi-v4.json b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-hdpi-v4.json index d37e6e2c..b827bbb5 100644 --- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-hdpi-v4.json +++ b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-hdpi-v4.json @@ -1,10 +1,10 @@ { "logs": [ { - "outputFile": "E:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-hdpi-v4\\values-hdpi-v4.xml", + "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-hdpi-v4\\values-hdpi-v4.xml", "map": [ { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\86ef1ec83f39cd41be9f0f4ea4f4caae\\transformed\\appcompat-v7-28.0.0\\res\\values-hdpi-v4\\values-hdpi-v4.xml", + "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\transformed\\appcompat-v7-28.0.0\\res\\values-hdpi-v4\\values-hdpi-v4.xml", "from": { "startLines": "2", "startColumns": "4", diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-hi.json b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-hi.json index 5629824b..33973fb8 100644 --- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-hi.json +++ b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-hi.json @@ -1,10 +1,10 @@ { "logs": [ { - "outputFile": "E:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-hi\\values-hi.xml", + "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-hi\\values-hi.xml", "map": [ { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\86ef1ec83f39cd41be9f0f4ea4f4caae\\transformed\\appcompat-v7-28.0.0\\res\\values-hi\\values-hi.xml", + "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\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", @@ -14,7 +14,7 @@ } }, { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\21795bd83e308c947c8dfe0c1fc89322\\transformed\\support-compat-28.0.0\\res\\values-hi\\values-hi.xml", + "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\2b9474e47639de47b19dc72cadc6eaea\\transformed\\support-compat-28.0.0\\res\\values-hi\\values-hi.xml", "from": { "startLines": "2", "startColumns": "4", diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-hr.json b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-hr.json index f198d704..57f3c3d0 100644 --- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-hr.json +++ b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-hr.json @@ -1,10 +1,10 @@ { "logs": [ { - "outputFile": "E:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-hr\\values-hr.xml", + "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-hr\\values-hr.xml", "map": [ { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\86ef1ec83f39cd41be9f0f4ea4f4caae\\transformed\\appcompat-v7-28.0.0\\res\\values-hr\\values-hr.xml", + "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\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", @@ -14,7 +14,7 @@ } }, { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\21795bd83e308c947c8dfe0c1fc89322\\transformed\\support-compat-28.0.0\\res\\values-hr\\values-hr.xml", + "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\2b9474e47639de47b19dc72cadc6eaea\\transformed\\support-compat-28.0.0\\res\\values-hr\\values-hr.xml", "from": { "startLines": "2", "startColumns": "4", diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-hu.json b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-hu.json index c6b4a751..f59c8c33 100644 --- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-hu.json +++ b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-hu.json @@ -1,20 +1,10 @@ { "logs": [ { - "outputFile": "E:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-hu\\values-hu.xml", + "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-hu\\values-hu.xml", "map": [ { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\86ef1ec83f39cd41be9f0f4ea4f4caae\\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\\小超人\\.gradle\\caches\\transforms-3\\21795bd83e308c947c8dfe0c1fc89322\\transformed\\support-compat-28.0.0\\res\\values-hu\\values-hu.xml", + "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\2b9474e47639de47b19dc72cadc6eaea\\transformed\\support-compat-28.0.0\\res\\values-hu\\values-hu.xml", "from": { "startLines": "2", "startColumns": "4", @@ -29,6 +19,16 @@ "endColumns": "100", "endOffsets": "3057" } + }, + { + "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\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" + } } ] } diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-hy.json b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-hy.json index f499469d..d373e958 100644 --- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-hy.json +++ b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-hy.json @@ -1,10 +1,10 @@ { "logs": [ { - "outputFile": "E:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-hy\\values-hy.xml", + "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-hy\\values-hy.xml", "map": [ { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\21795bd83e308c947c8dfe0c1fc89322\\transformed\\support-compat-28.0.0\\res\\values-hy\\values-hy.xml", + "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\2b9474e47639de47b19dc72cadc6eaea\\transformed\\support-compat-28.0.0\\res\\values-hy\\values-hy.xml", "from": { "startLines": "2", "startColumns": "4", @@ -21,7 +21,7 @@ } }, { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\86ef1ec83f39cd41be9f0f4ea4f4caae\\transformed\\appcompat-v7-28.0.0\\res\\values-hy\\values-hy.xml", + "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\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", diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-in.json b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-in.json index 4295c5d2..bae9e07d 100644 --- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-in.json +++ b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-in.json @@ -1,10 +1,10 @@ { "logs": [ { - "outputFile": "E:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-in\\values-in.xml", + "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-in\\values-in.xml", "map": [ { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\21795bd83e308c947c8dfe0c1fc89322\\transformed\\support-compat-28.0.0\\res\\values-in\\values-in.xml", + "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\2b9474e47639de47b19dc72cadc6eaea\\transformed\\support-compat-28.0.0\\res\\values-in\\values-in.xml", "from": { "startLines": "2", "startColumns": "4", @@ -21,7 +21,7 @@ } }, { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\86ef1ec83f39cd41be9f0f4ea4f4caae\\transformed\\appcompat-v7-28.0.0\\res\\values-in\\values-in.xml", + "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\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", diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-is.json b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-is.json index f67f595f..76167cc5 100644 --- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-is.json +++ b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-is.json @@ -1,10 +1,20 @@ { "logs": [ { - "outputFile": "E:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-is\\values-is.xml", + "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-is\\values-is.xml", "map": [ { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\21795bd83e308c947c8dfe0c1fc89322\\transformed\\support-compat-28.0.0\\res\\values-is\\values-is.xml", + "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\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\\fanyi\\.gradle\\caches\\transforms-3\\2b9474e47639de47b19dc72cadc6eaea\\transformed\\support-compat-28.0.0\\res\\values-is\\values-is.xml", "from": { "startLines": "2", "startColumns": "4", @@ -19,16 +29,6 @@ "endColumns": "100", "endOffsets": "2961" } - }, - { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\86ef1ec83f39cd41be9f0f4ea4f4caae\\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" - } } ] } diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-it.json b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-it.json index 02b361a2..7ea9178b 100644 --- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-it.json +++ b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-it.json @@ -1,10 +1,20 @@ { "logs": [ { - "outputFile": "E:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-it\\values-it.xml", + "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-it\\values-it.xml", "map": [ { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\21795bd83e308c947c8dfe0c1fc89322\\transformed\\support-compat-28.0.0\\res\\values-it\\values-it.xml", + "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\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,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\\fanyi\\.gradle\\caches\\transforms-3\\2b9474e47639de47b19dc72cadc6eaea\\transformed\\support-compat-28.0.0\\res\\values-it\\values-it.xml", "from": { "startLines": "2", "startColumns": "4", @@ -19,16 +29,6 @@ "endColumns": "100", "endOffsets": "3002" } - }, - { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\86ef1ec83f39cd41be9f0f4ea4f4caae\\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,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" - } } ] } diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-iw.json b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-iw.json index 48700dcf..ba81cc97 100644 --- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-iw.json +++ b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-iw.json @@ -1,10 +1,10 @@ { "logs": [ { - "outputFile": "E:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-iw\\values-iw.xml", + "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-iw\\values-iw.xml", "map": [ { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\86ef1ec83f39cd41be9f0f4ea4f4caae\\transformed\\appcompat-v7-28.0.0\\res\\values-iw\\values-iw.xml", + "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\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", @@ -14,7 +14,7 @@ } }, { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\21795bd83e308c947c8dfe0c1fc89322\\transformed\\support-compat-28.0.0\\res\\values-iw\\values-iw.xml", + "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\2b9474e47639de47b19dc72cadc6eaea\\transformed\\support-compat-28.0.0\\res\\values-iw\\values-iw.xml", "from": { "startLines": "2", "startColumns": "4", diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ja.json b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ja.json index 6a804cfe..18098167 100644 --- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ja.json +++ b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ja.json @@ -1,10 +1,10 @@ { "logs": [ { - "outputFile": "E:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-ja\\values-ja.xml", + "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-ja\\values-ja.xml", "map": [ { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\86ef1ec83f39cd41be9f0f4ea4f4caae\\transformed\\appcompat-v7-28.0.0\\res\\values-ja\\values-ja.xml", + "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\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", @@ -14,7 +14,7 @@ } }, { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\21795bd83e308c947c8dfe0c1fc89322\\transformed\\support-compat-28.0.0\\res\\values-ja\\values-ja.xml", + "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\2b9474e47639de47b19dc72cadc6eaea\\transformed\\support-compat-28.0.0\\res\\values-ja\\values-ja.xml", "from": { "startLines": "2", "startColumns": "4", diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ka.json b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ka.json index b0ad745d..8f292a91 100644 --- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ka.json +++ b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ka.json @@ -1,10 +1,10 @@ { "logs": [ { - "outputFile": "E:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-ka\\values-ka.xml", + "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-ka\\values-ka.xml", "map": [ { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\86ef1ec83f39cd41be9f0f4ea4f4caae\\transformed\\appcompat-v7-28.0.0\\res\\values-ka\\values-ka.xml", + "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\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", @@ -14,7 +14,7 @@ } }, { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\21795bd83e308c947c8dfe0c1fc89322\\transformed\\support-compat-28.0.0\\res\\values-ka\\values-ka.xml", + "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\2b9474e47639de47b19dc72cadc6eaea\\transformed\\support-compat-28.0.0\\res\\values-ka\\values-ka.xml", "from": { "startLines": "2", "startColumns": "4", diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-kk.json b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-kk.json index 1bf0977d..5e12b7f3 100644 --- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-kk.json +++ b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-kk.json @@ -1,10 +1,10 @@ { "logs": [ { - "outputFile": "E:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-kk\\values-kk.xml", + "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-kk\\values-kk.xml", "map": [ { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\86ef1ec83f39cd41be9f0f4ea4f4caae\\transformed\\appcompat-v7-28.0.0\\res\\values-kk\\values-kk.xml", + "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\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", @@ -14,7 +14,7 @@ } }, { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\21795bd83e308c947c8dfe0c1fc89322\\transformed\\support-compat-28.0.0\\res\\values-kk\\values-kk.xml", + "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\2b9474e47639de47b19dc72cadc6eaea\\transformed\\support-compat-28.0.0\\res\\values-kk\\values-kk.xml", "from": { "startLines": "2", "startColumns": "4", diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-km.json b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-km.json index 77603b35..e0c76d71 100644 --- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-km.json +++ b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-km.json @@ -1,10 +1,20 @@ { "logs": [ { - "outputFile": "E:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-km\\values-km.xml", + "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-km\\values-km.xml", "map": [ { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\21795bd83e308c947c8dfe0c1fc89322\\transformed\\support-compat-28.0.0\\res\\values-km\\values-km.xml", + "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\transformed\\appcompat-v7-28.0.0\\res\\values-km\\values-km.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,308,420,507,611,729,806,883,974,1067,1163,1257,1358,1451,1546,1640,1731,1822,1905,2009,2114,2214,2324,2431,2539,2701,2799", + "endColumns": "102,99,111,86,103,117,76,76,90,92,95,93,100,92,94,93,90,90,82,103,104,99,109,106,107,161,97,82", + "endOffsets": "203,303,415,502,606,724,801,878,969,1062,1158,1252,1353,1446,1541,1635,1726,1817,1900,2004,2109,2209,2319,2426,2534,2696,2794,2877" + } + }, + { + "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\2b9474e47639de47b19dc72cadc6eaea\\transformed\\support-compat-28.0.0\\res\\values-km\\values-km.xml", "from": { "startLines": "2", "startColumns": "4", @@ -19,16 +29,6 @@ "endColumns": "100", "endOffsets": "2978" } - }, - { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\86ef1ec83f39cd41be9f0f4ea4f4caae\\transformed\\appcompat-v7-28.0.0\\res\\values-km\\values-km.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,308,420,507,611,729,806,883,974,1067,1163,1257,1358,1451,1546,1640,1731,1822,1905,2009,2114,2214,2324,2431,2539,2701,2799", - "endColumns": "102,99,111,86,103,117,76,76,90,92,95,93,100,92,94,93,90,90,82,103,104,99,109,106,107,161,97,82", - "endOffsets": "203,303,415,502,606,724,801,878,969,1062,1158,1252,1353,1446,1541,1635,1726,1817,1900,2004,2109,2209,2319,2426,2534,2696,2794,2877" - } } ] } diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-kn.json b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-kn.json index 97ca5ae3..9bf234af 100644 --- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-kn.json +++ b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-kn.json @@ -1,10 +1,20 @@ { "logs": [ { - "outputFile": "E:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-kn\\values-kn.xml", + "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-kn\\values-kn.xml", "map": [ { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\21795bd83e308c947c8dfe0c1fc89322\\transformed\\support-compat-28.0.0\\res\\values-kn\\values-kn.xml", + "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\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,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" + } + }, + { + "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\2b9474e47639de47b19dc72cadc6eaea\\transformed\\support-compat-28.0.0\\res\\values-kn\\values-kn.xml", "from": { "startLines": "2", "startColumns": "4", @@ -19,16 +29,6 @@ "endColumns": "100", "endOffsets": "3044" } - }, - { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\86ef1ec83f39cd41be9f0f4ea4f4caae\\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,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" - } } ] } diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ko.json b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ko.json index 1507849d..981e4171 100644 --- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ko.json +++ b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ko.json @@ -1,10 +1,10 @@ { "logs": [ { - "outputFile": "E:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-ko\\values-ko.xml", + "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-ko\\values-ko.xml", "map": [ { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\86ef1ec83f39cd41be9f0f4ea4f4caae\\transformed\\appcompat-v7-28.0.0\\res\\values-ko\\values-ko.xml", + "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\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", @@ -14,7 +14,7 @@ } }, { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\21795bd83e308c947c8dfe0c1fc89322\\transformed\\support-compat-28.0.0\\res\\values-ko\\values-ko.xml", + "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\2b9474e47639de47b19dc72cadc6eaea\\transformed\\support-compat-28.0.0\\res\\values-ko\\values-ko.xml", "from": { "startLines": "2", "startColumns": "4", diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ky.json b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ky.json index fcc7bd57..6c247ac8 100644 --- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ky.json +++ b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ky.json @@ -1,10 +1,10 @@ { "logs": [ { - "outputFile": "E:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-ky\\values-ky.xml", + "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-ky\\values-ky.xml", "map": [ { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\86ef1ec83f39cd41be9f0f4ea4f4caae\\transformed\\appcompat-v7-28.0.0\\res\\values-ky\\values-ky.xml", + "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\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", @@ -14,7 +14,7 @@ } }, { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\21795bd83e308c947c8dfe0c1fc89322\\transformed\\support-compat-28.0.0\\res\\values-ky\\values-ky.xml", + "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\2b9474e47639de47b19dc72cadc6eaea\\transformed\\support-compat-28.0.0\\res\\values-ky\\values-ky.xml", "from": { "startLines": "2", "startColumns": "4", diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-land.json b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-land.json index 6196db8e..54664b90 100644 --- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-land.json +++ b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-land.json @@ -1,10 +1,10 @@ { "logs": [ { - "outputFile": "E:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-land\\values-land.xml", + "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-land\\values-land.xml", "map": [ { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\86ef1ec83f39cd41be9f0f4ea4f4caae\\transformed\\appcompat-v7-28.0.0\\res\\values-land\\values-land.xml", + "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\transformed\\appcompat-v7-28.0.0\\res\\values-land\\values-land.xml", "from": { "startLines": "2,3,4", "startColumns": "4,4,4", diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-large-v4.json b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-large-v4.json index 770eaf2e..0d771d32 100644 --- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-large-v4.json +++ b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-large-v4.json @@ -1,10 +1,10 @@ { "logs": [ { - "outputFile": "E:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-large-v4\\values-large-v4.xml", + "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-large-v4\\values-large-v4.xml", "map": [ { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\86ef1ec83f39cd41be9f0f4ea4f4caae\\transformed\\appcompat-v7-28.0.0\\res\\values-large-v4\\values-large-v4.xml", + "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\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", diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ldltr-v21.json b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ldltr-v21.json index 3d680e6a..84fc0665 100644 --- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ldltr-v21.json +++ b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ldltr-v21.json @@ -1,10 +1,10 @@ { "logs": [ { - "outputFile": "E:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-ldltr-v21\\values-ldltr-v21.xml", + "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-ldltr-v21\\values-ldltr-v21.xml", "map": [ { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\86ef1ec83f39cd41be9f0f4ea4f4caae\\transformed\\appcompat-v7-28.0.0\\res\\values-ldltr-v21\\values-ldltr-v21.xml", + "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\transformed\\appcompat-v7-28.0.0\\res\\values-ldltr-v21\\values-ldltr-v21.xml", "from": { "startLines": "2", "startColumns": "4", diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-lo.json b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-lo.json index 20424d32..c94e6a17 100644 --- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-lo.json +++ b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-lo.json @@ -1,10 +1,10 @@ { "logs": [ { - "outputFile": "E:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-lo\\values-lo.xml", + "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-lo\\values-lo.xml", "map": [ { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\86ef1ec83f39cd41be9f0f4ea4f4caae\\transformed\\appcompat-v7-28.0.0\\res\\values-lo\\values-lo.xml", + "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\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", @@ -14,7 +14,7 @@ } }, { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\21795bd83e308c947c8dfe0c1fc89322\\transformed\\support-compat-28.0.0\\res\\values-lo\\values-lo.xml", + "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\2b9474e47639de47b19dc72cadc6eaea\\transformed\\support-compat-28.0.0\\res\\values-lo\\values-lo.xml", "from": { "startLines": "2", "startColumns": "4", diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-lt.json b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-lt.json index c5a7303d..224c20cc 100644 --- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-lt.json +++ b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-lt.json @@ -1,20 +1,10 @@ { "logs": [ { - "outputFile": "E:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-lt\\values-lt.xml", + "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-lt\\values-lt.xml", "map": [ { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\86ef1ec83f39cd41be9f0f4ea4f4caae\\transformed\\appcompat-v7-28.0.0\\res\\values-lt\\values-lt.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" - } - }, - { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\21795bd83e308c947c8dfe0c1fc89322\\transformed\\support-compat-28.0.0\\res\\values-lt\\values-lt.xml", + "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\2b9474e47639de47b19dc72cadc6eaea\\transformed\\support-compat-28.0.0\\res\\values-lt\\values-lt.xml", "from": { "startLines": "2", "startColumns": "4", @@ -29,6 +19,16 @@ "endColumns": "100", "endOffsets": "3074" } + }, + { + "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\transformed\\appcompat-v7-28.0.0\\res\\values-lt\\values-lt.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" + } } ] } diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-lv.json b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-lv.json index f1ce9dd3..5580aa67 100644 --- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-lv.json +++ b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-lv.json @@ -1,10 +1,10 @@ { "logs": [ { - "outputFile": "E:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-lv\\values-lv.xml", + "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-lv\\values-lv.xml", "map": [ { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\86ef1ec83f39cd41be9f0f4ea4f4caae\\transformed\\appcompat-v7-28.0.0\\res\\values-lv\\values-lv.xml", + "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\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", @@ -14,7 +14,7 @@ } }, { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\21795bd83e308c947c8dfe0c1fc89322\\transformed\\support-compat-28.0.0\\res\\values-lv\\values-lv.xml", + "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\2b9474e47639de47b19dc72cadc6eaea\\transformed\\support-compat-28.0.0\\res\\values-lv\\values-lv.xml", "from": { "startLines": "2", "startColumns": "4", diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-mk.json b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-mk.json index ccbef480..673c4ea9 100644 --- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-mk.json +++ b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-mk.json @@ -1,10 +1,10 @@ { "logs": [ { - "outputFile": "E:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-mk\\values-mk.xml", + "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-mk\\values-mk.xml", "map": [ { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\86ef1ec83f39cd41be9f0f4ea4f4caae\\transformed\\appcompat-v7-28.0.0\\res\\values-mk\\values-mk.xml", + "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\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", @@ -14,7 +14,7 @@ } }, { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\21795bd83e308c947c8dfe0c1fc89322\\transformed\\support-compat-28.0.0\\res\\values-mk\\values-mk.xml", + "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\2b9474e47639de47b19dc72cadc6eaea\\transformed\\support-compat-28.0.0\\res\\values-mk\\values-mk.xml", "from": { "startLines": "2", "startColumns": "4", diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ml.json b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ml.json index c35f5673..89686385 100644 --- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ml.json +++ b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ml.json @@ -1,20 +1,10 @@ { "logs": [ { - "outputFile": "E:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-ml\\values-ml.xml", + "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-ml\\values-ml.xml", "map": [ { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\86ef1ec83f39cd41be9f0f4ea4f4caae\\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\\小超人\\.gradle\\caches\\transforms-3\\21795bd83e308c947c8dfe0c1fc89322\\transformed\\support-compat-28.0.0\\res\\values-ml\\values-ml.xml", + "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\2b9474e47639de47b19dc72cadc6eaea\\transformed\\support-compat-28.0.0\\res\\values-ml\\values-ml.xml", "from": { "startLines": "2", "startColumns": "4", @@ -29,6 +19,16 @@ "endColumns": "100", "endOffsets": "3051" } + }, + { + "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\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" + } } ] } diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-mn.json b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-mn.json index b0e57158..6dd0a0fd 100644 --- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-mn.json +++ b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-mn.json @@ -1,10 +1,20 @@ { "logs": [ { - "outputFile": "E:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-mn\\values-mn.xml", + "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-mn\\values-mn.xml", "map": [ { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\21795bd83e308c947c8dfe0c1fc89322\\transformed\\support-compat-28.0.0\\res\\values-mn\\values-mn.xml", + "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\transformed\\appcompat-v7-28.0.0\\res\\values-mn\\values-mn.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,218,318,431,518,624,736,818,900,991,1084,1180,1276,1374,1467,1562,1654,1745,1835,1917,2026,2130,2227,2335,2436,2539,2698,2795", + "endColumns": "112,99,112,86,105,111,81,81,90,92,95,95,97,92,94,91,90,89,81,108,103,96,107,100,102,158,96,80", + "endOffsets": "213,313,426,513,619,731,813,895,986,1079,1175,1271,1369,1462,1557,1649,1740,1830,1912,2021,2125,2222,2330,2431,2534,2693,2790,2871" + } + }, + { + "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\2b9474e47639de47b19dc72cadc6eaea\\transformed\\support-compat-28.0.0\\res\\values-mn\\values-mn.xml", "from": { "startLines": "2", "startColumns": "4", @@ -19,16 +29,6 @@ "endColumns": "100", "endOffsets": "2972" } - }, - { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\86ef1ec83f39cd41be9f0f4ea4f4caae\\transformed\\appcompat-v7-28.0.0\\res\\values-mn\\values-mn.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,218,318,431,518,624,736,818,900,991,1084,1180,1276,1374,1467,1562,1654,1745,1835,1917,2026,2130,2227,2335,2436,2539,2698,2795", - "endColumns": "112,99,112,86,105,111,81,81,90,92,95,95,97,92,94,91,90,89,81,108,103,96,107,100,102,158,96,80", - "endOffsets": "213,313,426,513,619,731,813,895,986,1079,1175,1271,1369,1462,1557,1649,1740,1830,1912,2021,2125,2222,2330,2431,2534,2693,2790,2871" - } } ] } diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-mr.json b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-mr.json index 7026cd76..598e4943 100644 --- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-mr.json +++ b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-mr.json @@ -1,10 +1,10 @@ { "logs": [ { - "outputFile": "E:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-mr\\values-mr.xml", + "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-mr\\values-mr.xml", "map": [ { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\86ef1ec83f39cd41be9f0f4ea4f4caae\\transformed\\appcompat-v7-28.0.0\\res\\values-mr\\values-mr.xml", + "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\transformed\\appcompat-v7-28.0.0\\res\\values-mr\\values-mr.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", @@ -14,7 +14,7 @@ } }, { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\21795bd83e308c947c8dfe0c1fc89322\\transformed\\support-compat-28.0.0\\res\\values-mr\\values-mr.xml", + "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\2b9474e47639de47b19dc72cadc6eaea\\transformed\\support-compat-28.0.0\\res\\values-mr\\values-mr.xml", "from": { "startLines": "2", "startColumns": "4", diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ms.json b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ms.json index b11bb307..9a2e5c62 100644 --- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ms.json +++ b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ms.json @@ -1,10 +1,10 @@ { "logs": [ { - "outputFile": "E:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-ms\\values-ms.xml", + "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-ms\\values-ms.xml", "map": [ { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\86ef1ec83f39cd41be9f0f4ea4f4caae\\transformed\\appcompat-v7-28.0.0\\res\\values-ms\\values-ms.xml", + "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\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", @@ -14,7 +14,7 @@ } }, { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\21795bd83e308c947c8dfe0c1fc89322\\transformed\\support-compat-28.0.0\\res\\values-ms\\values-ms.xml", + "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\2b9474e47639de47b19dc72cadc6eaea\\transformed\\support-compat-28.0.0\\res\\values-ms\\values-ms.xml", "from": { "startLines": "2", "startColumns": "4", diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-my.json b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-my.json index a2702806..a787edf6 100644 --- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-my.json +++ b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-my.json @@ -1,10 +1,20 @@ { "logs": [ { - "outputFile": "E:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-my\\values-my.xml", + "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-my\\values-my.xml", "map": [ { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\21795bd83e308c947c8dfe0c1fc89322\\transformed\\support-compat-28.0.0\\res\\values-my\\values-my.xml", + "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\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,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\\fanyi\\.gradle\\caches\\transforms-3\\2b9474e47639de47b19dc72cadc6eaea\\transformed\\support-compat-28.0.0\\res\\values-my\\values-my.xml", "from": { "startLines": "2", "startColumns": "4", @@ -19,16 +29,6 @@ "endColumns": "100", "endOffsets": "3075" } - }, - { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\86ef1ec83f39cd41be9f0f4ea4f4caae\\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,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" - } } ] } diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-nb.json b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-nb.json index 7bc6343f..95be5572 100644 --- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-nb.json +++ b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-nb.json @@ -1,20 +1,10 @@ { "logs": [ { - "outputFile": "E:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-nb\\values-nb.xml", + "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-nb\\values-nb.xml", "map": [ { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\86ef1ec83f39cd41be9f0f4ea4f4caae\\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" - } - }, - { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\21795bd83e308c947c8dfe0c1fc89322\\transformed\\support-compat-28.0.0\\res\\values-nb\\values-nb.xml", + "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\2b9474e47639de47b19dc72cadc6eaea\\transformed\\support-compat-28.0.0\\res\\values-nb\\values-nb.xml", "from": { "startLines": "2", "startColumns": "4", @@ -29,6 +19,16 @@ "endColumns": "100", "endOffsets": "2922" } + }, + { + "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\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" + } } ] } diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ne.json b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ne.json index d32bf803..6bdc54e5 100644 --- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ne.json +++ b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ne.json @@ -1,10 +1,10 @@ { "logs": [ { - "outputFile": "E:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-ne\\values-ne.xml", + "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-ne\\values-ne.xml", "map": [ { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\21795bd83e308c947c8dfe0c1fc89322\\transformed\\support-compat-28.0.0\\res\\values-ne\\values-ne.xml", + "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\2b9474e47639de47b19dc72cadc6eaea\\transformed\\support-compat-28.0.0\\res\\values-ne\\values-ne.xml", "from": { "startLines": "2", "startColumns": "4", @@ -21,7 +21,7 @@ } }, { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\86ef1ec83f39cd41be9f0f4ea4f4caae\\transformed\\appcompat-v7-28.0.0\\res\\values-ne\\values-ne.xml", + "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\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", diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-night-v8.json b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-night-v8.json index 82a4afb3..c8a2f8cd 100644 --- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-night-v8.json +++ b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-night-v8.json @@ -1,10 +1,10 @@ { "logs": [ { - "outputFile": "E:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-night-v8\\values-night-v8.xml", + "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-night-v8\\values-night-v8.xml", "map": [ { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\86ef1ec83f39cd41be9f0f4ea4f4caae\\transformed\\appcompat-v7-28.0.0\\res\\values-night-v8\\values-night-v8.xml", + "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\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", diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-nl.json b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-nl.json index b7f04633..720ca288 100644 --- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-nl.json +++ b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-nl.json @@ -1,20 +1,10 @@ { "logs": [ { - "outputFile": "E:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-nl\\values-nl.xml", + "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-nl\\values-nl.xml", "map": [ { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\86ef1ec83f39cd41be9f0f4ea4f4caae\\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,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" - } - }, - { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\21795bd83e308c947c8dfe0c1fc89322\\transformed\\support-compat-28.0.0\\res\\values-nl\\values-nl.xml", + "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\2b9474e47639de47b19dc72cadc6eaea\\transformed\\support-compat-28.0.0\\res\\values-nl\\values-nl.xml", "from": { "startLines": "2", "startColumns": "4", @@ -29,6 +19,16 @@ "endColumns": "100", "endOffsets": "3017" } + }, + { + "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\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,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" + } } ] } diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-or.json b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-or.json index 3933a0c1..6607e40e 100644 --- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-or.json +++ b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-or.json @@ -1,20 +1,10 @@ { "logs": [ { - "outputFile": "E:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-or\\values-or.xml", + "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-or\\values-or.xml", "map": [ { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\86ef1ec83f39cd41be9f0f4ea4f4caae\\transformed\\appcompat-v7-28.0.0\\res\\values-or\\values-or.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,334,441,527,631,751,828,905,996,1089,1186,1281,1382,1475,1570,1666,1757,1847,1929,2039,2144,2250,2361,2464,2582,2745,2847", - "endColumns": "118,109,106,85,103,119,76,76,90,92,96,94,100,92,94,95,90,89,81,109,104,105,110,102,117,162,101,88", - "endOffsets": "219,329,436,522,626,746,823,900,991,1084,1181,1276,1377,1470,1565,1661,1752,1842,1924,2034,2139,2245,2356,2459,2577,2740,2842,2931" - } - }, - { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\21795bd83e308c947c8dfe0c1fc89322\\transformed\\support-compat-28.0.0\\res\\values-or\\values-or.xml", + "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\2b9474e47639de47b19dc72cadc6eaea\\transformed\\support-compat-28.0.0\\res\\values-or\\values-or.xml", "from": { "startLines": "2", "startColumns": "4", @@ -29,6 +19,16 @@ "endColumns": "100", "endOffsets": "3032" } + }, + { + "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\transformed\\appcompat-v7-28.0.0\\res\\values-or\\values-or.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,334,441,527,631,751,828,905,996,1089,1186,1281,1382,1475,1570,1666,1757,1847,1929,2039,2144,2250,2361,2464,2582,2745,2847", + "endColumns": "118,109,106,85,103,119,76,76,90,92,96,94,100,92,94,95,90,89,81,109,104,105,110,102,117,162,101,88", + "endOffsets": "219,329,436,522,626,746,823,900,991,1084,1181,1276,1377,1470,1565,1661,1752,1842,1924,2034,2139,2245,2356,2459,2577,2740,2842,2931" + } } ] } diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-pa.json b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-pa.json index 8ae41dc9..57518596 100644 --- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-pa.json +++ b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-pa.json @@ -1,20 +1,10 @@ { "logs": [ { - "outputFile": "E:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-pa\\values-pa.xml", + "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-pa\\values-pa.xml", "map": [ { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\86ef1ec83f39cd41be9f0f4ea4f4caae\\transformed\\appcompat-v7-28.0.0\\res\\values-pa\\values-pa.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,410,496,596,709,786,862,953,1046,1142,1236,1337,1430,1525,1619,1710,1801,1880,1981,2085,2182,2291,2390,2500,2659,2759", - "endColumns": "102,96,104,85,99,112,76,75,90,92,95,93,100,92,94,93,90,90,78,100,103,96,108,98,109,158,99,79", - "endOffsets": "203,300,405,491,591,704,781,857,948,1041,1137,1231,1332,1425,1520,1614,1705,1796,1875,1976,2080,2177,2286,2385,2495,2654,2754,2834" - } - }, - { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\21795bd83e308c947c8dfe0c1fc89322\\transformed\\support-compat-28.0.0\\res\\values-pa\\values-pa.xml", + "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\2b9474e47639de47b19dc72cadc6eaea\\transformed\\support-compat-28.0.0\\res\\values-pa\\values-pa.xml", "from": { "startLines": "2", "startColumns": "4", @@ -29,6 +19,16 @@ "endColumns": "100", "endOffsets": "2935" } + }, + { + "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\transformed\\appcompat-v7-28.0.0\\res\\values-pa\\values-pa.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,410,496,596,709,786,862,953,1046,1142,1236,1337,1430,1525,1619,1710,1801,1880,1981,2085,2182,2291,2390,2500,2659,2759", + "endColumns": "102,96,104,85,99,112,76,75,90,92,95,93,100,92,94,93,90,90,78,100,103,96,108,98,109,158,99,79", + "endOffsets": "203,300,405,491,591,704,781,857,948,1041,1137,1231,1332,1425,1520,1614,1705,1796,1875,1976,2080,2177,2286,2385,2495,2654,2754,2834" + } } ] } diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-pl.json b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-pl.json index 96c5f855..6b5a93b4 100644 --- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-pl.json +++ b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-pl.json @@ -1,20 +1,10 @@ { "logs": [ { - "outputFile": "E:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-pl\\values-pl.xml", + "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-pl\\values-pl.xml", "map": [ { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\86ef1ec83f39cd41be9f0f4ea4f4caae\\transformed\\appcompat-v7-28.0.0\\res\\values-pl\\values-pl.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,323,431,517,626,745,823,900,991,1084,1180,1274,1376,1469,1564,1659,1750,1841,1923,2032,2141,2240,2349,2460,2568,2731,2827", - "endColumns": "115,101,107,85,108,118,77,76,90,92,95,93,101,92,94,94,90,90,81,108,108,98,108,110,107,162,95,81", - "endOffsets": "216,318,426,512,621,740,818,895,986,1079,1175,1269,1371,1464,1559,1654,1745,1836,1918,2027,2136,2235,2344,2455,2563,2726,2822,2904" - } - }, - { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\21795bd83e308c947c8dfe0c1fc89322\\transformed\\support-compat-28.0.0\\res\\values-pl\\values-pl.xml", + "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\2b9474e47639de47b19dc72cadc6eaea\\transformed\\support-compat-28.0.0\\res\\values-pl\\values-pl.xml", "from": { "startLines": "2", "startColumns": "4", @@ -29,6 +19,16 @@ "endColumns": "100", "endOffsets": "3005" } + }, + { + "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\transformed\\appcompat-v7-28.0.0\\res\\values-pl\\values-pl.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,323,431,517,626,745,823,900,991,1084,1180,1274,1376,1469,1564,1659,1750,1841,1923,2032,2141,2240,2349,2460,2568,2731,2827", + "endColumns": "115,101,107,85,108,118,77,76,90,92,95,93,101,92,94,94,90,90,81,108,108,98,108,110,107,162,95,81", + "endOffsets": "216,318,426,512,621,740,818,895,986,1079,1175,1269,1371,1464,1559,1654,1745,1836,1918,2027,2136,2235,2344,2455,2563,2726,2822,2904" + } } ] } diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-port.json b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-port.json index baede5ea..e3db0a07 100644 --- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-port.json +++ b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-port.json @@ -1,10 +1,10 @@ { "logs": [ { - "outputFile": "E:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-port\\values-port.xml", + "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-port\\values-port.xml", "map": [ { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\86ef1ec83f39cd41be9f0f4ea4f4caae\\transformed\\appcompat-v7-28.0.0\\res\\values-port\\values-port.xml", + "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\transformed\\appcompat-v7-28.0.0\\res\\values-port\\values-port.xml", "from": { "startLines": "2", "startColumns": "4", diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-pt-rBR.json b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-pt-rBR.json index 6c5fdb47..dab22548 100644 --- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-pt-rBR.json +++ b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-pt-rBR.json @@ -1,20 +1,10 @@ { "logs": [ { - "outputFile": "E:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-pt-rBR\\values-pt-rBR.xml", + "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-pt-rBR\\values-pt-rBR.xml", "map": [ { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\86ef1ec83f39cd41be9f0f4ea4f4caae\\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" - } - }, - { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\21795bd83e308c947c8dfe0c1fc89322\\transformed\\support-compat-28.0.0\\res\\values-pt-rBR\\values-pt-rBR.xml", + "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\2b9474e47639de47b19dc72cadc6eaea\\transformed\\support-compat-28.0.0\\res\\values-pt-rBR\\values-pt-rBR.xml", "from": { "startLines": "2", "startColumns": "4", @@ -29,6 +19,16 @@ "endColumns": "100", "endOffsets": "3025" } + }, + { + "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\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" + } } ] } diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-pt-rPT.json b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-pt-rPT.json index 251cc73e..e31a82c6 100644 --- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-pt-rPT.json +++ b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-pt-rPT.json @@ -1,10 +1,10 @@ { "logs": [ { - "outputFile": "E:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-pt-rPT\\values-pt-rPT.xml", + "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-pt-rPT\\values-pt-rPT.xml", "map": [ { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\21795bd83e308c947c8dfe0c1fc89322\\transformed\\support-compat-28.0.0\\res\\values-pt-rPT\\values-pt-rPT.xml", + "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\2b9474e47639de47b19dc72cadc6eaea\\transformed\\support-compat-28.0.0\\res\\values-pt-rPT\\values-pt-rPT.xml", "from": { "startLines": "2", "startColumns": "4", @@ -21,7 +21,7 @@ } }, { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\86ef1ec83f39cd41be9f0f4ea4f4caae\\transformed\\appcompat-v7-28.0.0\\res\\values-pt-rPT\\values-pt-rPT.xml", + "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\transformed\\appcompat-v7-28.0.0\\res\\values-pt-rPT\\values-pt-rPT.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", diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-pt.json b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-pt.json index 71a0dbde..8725495b 100644 --- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-pt.json +++ b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-pt.json @@ -1,10 +1,10 @@ { "logs": [ { - "outputFile": "E:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-pt\\values-pt.xml", + "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-pt\\values-pt.xml", "map": [ { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\86ef1ec83f39cd41be9f0f4ea4f4caae\\transformed\\appcompat-v7-28.0.0\\res\\values-pt\\values-pt.xml", + "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\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", @@ -14,7 +14,7 @@ } }, { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\21795bd83e308c947c8dfe0c1fc89322\\transformed\\support-compat-28.0.0\\res\\values-pt\\values-pt.xml", + "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\2b9474e47639de47b19dc72cadc6eaea\\transformed\\support-compat-28.0.0\\res\\values-pt\\values-pt.xml", "from": { "startLines": "2", "startColumns": "4", diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ro.json b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ro.json index aba20dd3..ad2a3b50 100644 --- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ro.json +++ b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ro.json @@ -1,10 +1,20 @@ { "logs": [ { - "outputFile": "E:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-ro\\values-ro.xml", + "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-ro\\values-ro.xml", "map": [ { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\21795bd83e308c947c8dfe0c1fc89322\\transformed\\support-compat-28.0.0\\res\\values-ro\\values-ro.xml", + "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\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,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\\fanyi\\.gradle\\caches\\transforms-3\\2b9474e47639de47b19dc72cadc6eaea\\transformed\\support-compat-28.0.0\\res\\values-ro\\values-ro.xml", "from": { "startLines": "2", "startColumns": "4", @@ -19,16 +29,6 @@ "endColumns": "100", "endOffsets": "3049" } - }, - { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\86ef1ec83f39cd41be9f0f4ea4f4caae\\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,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" - } } ] } diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ru.json b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ru.json index b644fe20..b9ad58a1 100644 --- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ru.json +++ b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ru.json @@ -1,10 +1,20 @@ { "logs": [ { - "outputFile": "E:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-ru\\values-ru.xml", + "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-ru\\values-ru.xml", "map": [ { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\21795bd83e308c947c8dfe0c1fc89322\\transformed\\support-compat-28.0.0\\res\\values-ru\\values-ru.xml", + "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\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" + } + }, + { + "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\2b9474e47639de47b19dc72cadc6eaea\\transformed\\support-compat-28.0.0\\res\\values-ru\\values-ru.xml", "from": { "startLines": "2", "startColumns": "4", @@ -19,16 +29,6 @@ "endColumns": "100", "endOffsets": "3009" } - }, - { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\86ef1ec83f39cd41be9f0f4ea4f4caae\\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" - } } ] } diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-si.json b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-si.json index 70b34abc..56f7e587 100644 --- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-si.json +++ b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-si.json @@ -1,10 +1,10 @@ { "logs": [ { - "outputFile": "E:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-si\\values-si.xml", + "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-si\\values-si.xml", "map": [ { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\86ef1ec83f39cd41be9f0f4ea4f4caae\\transformed\\appcompat-v7-28.0.0\\res\\values-si\\values-si.xml", + "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\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", @@ -14,7 +14,7 @@ } }, { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\21795bd83e308c947c8dfe0c1fc89322\\transformed\\support-compat-28.0.0\\res\\values-si\\values-si.xml", + "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\2b9474e47639de47b19dc72cadc6eaea\\transformed\\support-compat-28.0.0\\res\\values-si\\values-si.xml", "from": { "startLines": "2", "startColumns": "4", diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-sk.json b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-sk.json index 79c3596c..eebfdada 100644 --- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-sk.json +++ b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-sk.json @@ -1,10 +1,10 @@ { "logs": [ { - "outputFile": "E:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-sk\\values-sk.xml", + "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-sk\\values-sk.xml", "map": [ { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\86ef1ec83f39cd41be9f0f4ea4f4caae\\transformed\\appcompat-v7-28.0.0\\res\\values-sk\\values-sk.xml", + "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\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", @@ -14,7 +14,7 @@ } }, { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\21795bd83e308c947c8dfe0c1fc89322\\transformed\\support-compat-28.0.0\\res\\values-sk\\values-sk.xml", + "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\2b9474e47639de47b19dc72cadc6eaea\\transformed\\support-compat-28.0.0\\res\\values-sk\\values-sk.xml", "from": { "startLines": "2", "startColumns": "4", diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-sl.json b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-sl.json index 51080007..548f4c55 100644 --- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-sl.json +++ b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-sl.json @@ -1,10 +1,20 @@ { "logs": [ { - "outputFile": "E:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-sl\\values-sl.xml", + "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-sl\\values-sl.xml", "map": [ { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\21795bd83e308c947c8dfe0c1fc89322\\transformed\\support-compat-28.0.0\\res\\values-sl\\values-sl.xml", + "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\transformed\\appcompat-v7-28.0.0\\res\\values-sl\\values-sl.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" + } + }, + { + "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\2b9474e47639de47b19dc72cadc6eaea\\transformed\\support-compat-28.0.0\\res\\values-sl\\values-sl.xml", "from": { "startLines": "2", "startColumns": "4", @@ -19,16 +29,6 @@ "endColumns": "100", "endOffsets": "3032" } - }, - { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\86ef1ec83f39cd41be9f0f4ea4f4caae\\transformed\\appcompat-v7-28.0.0\\res\\values-sl\\values-sl.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" - } } ] } diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-sq.json b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-sq.json index 7505a8f4..f850338f 100644 --- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-sq.json +++ b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-sq.json @@ -1,20 +1,10 @@ { "logs": [ { - "outputFile": "E:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-sq\\values-sq.xml", + "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-sq\\values-sq.xml", "map": [ { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\86ef1ec83f39cd41be9f0f4ea4f4caae\\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\\小超人\\.gradle\\caches\\transforms-3\\21795bd83e308c947c8dfe0c1fc89322\\transformed\\support-compat-28.0.0\\res\\values-sq\\values-sq.xml", + "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\2b9474e47639de47b19dc72cadc6eaea\\transformed\\support-compat-28.0.0\\res\\values-sq\\values-sq.xml", "from": { "startLines": "2", "startColumns": "4", @@ -29,6 +19,16 @@ "endColumns": "100", "endOffsets": "3003" } + }, + { + "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\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" + } } ] } diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-sr.json b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-sr.json index 5da4199a..dfc27614 100644 --- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-sr.json +++ b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-sr.json @@ -1,10 +1,10 @@ { "logs": [ { - "outputFile": "E:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-sr\\values-sr.xml", + "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-sr\\values-sr.xml", "map": [ { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\21795bd83e308c947c8dfe0c1fc89322\\transformed\\support-compat-28.0.0\\res\\values-sr\\values-sr.xml", + "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\2b9474e47639de47b19dc72cadc6eaea\\transformed\\support-compat-28.0.0\\res\\values-sr\\values-sr.xml", "from": { "startLines": "2", "startColumns": "4", @@ -21,7 +21,7 @@ } }, { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\86ef1ec83f39cd41be9f0f4ea4f4caae\\transformed\\appcompat-v7-28.0.0\\res\\values-sr\\values-sr.xml", + "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\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", diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-sv.json b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-sv.json index f339b4ee..405182af 100644 --- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-sv.json +++ b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-sv.json @@ -1,10 +1,10 @@ { "logs": [ { - "outputFile": "E:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-sv\\values-sv.xml", + "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-sv\\values-sv.xml", "map": [ { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\86ef1ec83f39cd41be9f0f4ea4f4caae\\transformed\\appcompat-v7-28.0.0\\res\\values-sv\\values-sv.xml", + "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\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", @@ -14,7 +14,7 @@ } }, { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\21795bd83e308c947c8dfe0c1fc89322\\transformed\\support-compat-28.0.0\\res\\values-sv\\values-sv.xml", + "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\2b9474e47639de47b19dc72cadc6eaea\\transformed\\support-compat-28.0.0\\res\\values-sv\\values-sv.xml", "from": { "startLines": "2", "startColumns": "4", diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-sw.json b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-sw.json index 9758e016..570b9c9d 100644 --- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-sw.json +++ b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-sw.json @@ -1,10 +1,10 @@ { "logs": [ { - "outputFile": "E:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-sw\\values-sw.xml", + "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-sw\\values-sw.xml", "map": [ { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\86ef1ec83f39cd41be9f0f4ea4f4caae\\transformed\\appcompat-v7-28.0.0\\res\\values-sw\\values-sw.xml", + "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\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", @@ -14,7 +14,7 @@ } }, { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\21795bd83e308c947c8dfe0c1fc89322\\transformed\\support-compat-28.0.0\\res\\values-sw\\values-sw.xml", + "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\2b9474e47639de47b19dc72cadc6eaea\\transformed\\support-compat-28.0.0\\res\\values-sw\\values-sw.xml", "from": { "startLines": "2", "startColumns": "4", diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-sw600dp-v13.json b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-sw600dp-v13.json index 3f2fe651..40c93dfd 100644 --- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-sw600dp-v13.json +++ b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-sw600dp-v13.json @@ -1,10 +1,10 @@ { "logs": [ { - "outputFile": "E:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-sw600dp-v13\\values-sw600dp-v13.xml", + "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-sw600dp-v13\\values-sw600dp-v13.xml", "map": [ { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\86ef1ec83f39cd41be9f0f4ea4f4caae\\transformed\\appcompat-v7-28.0.0\\res\\values-sw600dp-v13\\values-sw600dp-v13.xml", + "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\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", diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ta.json b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ta.json index ad0acdcb..79670c2b 100644 --- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ta.json +++ b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ta.json @@ -1,10 +1,20 @@ { "logs": [ { - "outputFile": "E:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-ta\\values-ta.xml", + "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-ta\\values-ta.xml", "map": [ { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\21795bd83e308c947c8dfe0c1fc89322\\transformed\\support-compat-28.0.0\\res\\values-ta\\values-ta.xml", + "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\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,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" + } + }, + { + "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\2b9474e47639de47b19dc72cadc6eaea\\transformed\\support-compat-28.0.0\\res\\values-ta\\values-ta.xml", "from": { "startLines": "2", "startColumns": "4", @@ -19,16 +29,6 @@ "endColumns": "100", "endOffsets": "3050" } - }, - { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\86ef1ec83f39cd41be9f0f4ea4f4caae\\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,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" - } } ] } diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-te.json b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-te.json index e2b58c97..b1668d66 100644 --- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-te.json +++ b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-te.json @@ -1,10 +1,10 @@ { "logs": [ { - "outputFile": "E:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-te\\values-te.xml", + "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-te\\values-te.xml", "map": [ { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\86ef1ec83f39cd41be9f0f4ea4f4caae\\transformed\\appcompat-v7-28.0.0\\res\\values-te\\values-te.xml", + "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\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", @@ -14,7 +14,7 @@ } }, { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\21795bd83e308c947c8dfe0c1fc89322\\transformed\\support-compat-28.0.0\\res\\values-te\\values-te.xml", + "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\2b9474e47639de47b19dc72cadc6eaea\\transformed\\support-compat-28.0.0\\res\\values-te\\values-te.xml", "from": { "startLines": "2", "startColumns": "4", diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-th.json b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-th.json index 92f40b64..48714a55 100644 --- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-th.json +++ b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-th.json @@ -1,10 +1,10 @@ { "logs": [ { - "outputFile": "E:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-th\\values-th.xml", + "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-th\\values-th.xml", "map": [ { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\86ef1ec83f39cd41be9f0f4ea4f4caae\\transformed\\appcompat-v7-28.0.0\\res\\values-th\\values-th.xml", + "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\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", @@ -14,7 +14,7 @@ } }, { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\21795bd83e308c947c8dfe0c1fc89322\\transformed\\support-compat-28.0.0\\res\\values-th\\values-th.xml", + "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\2b9474e47639de47b19dc72cadc6eaea\\transformed\\support-compat-28.0.0\\res\\values-th\\values-th.xml", "from": { "startLines": "2", "startColumns": "4", diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-tl.json b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-tl.json index 2ba1a9e7..079cb21b 100644 --- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-tl.json +++ b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-tl.json @@ -1,10 +1,10 @@ { "logs": [ { - "outputFile": "E:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-tl\\values-tl.xml", + "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-tl\\values-tl.xml", "map": [ { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\86ef1ec83f39cd41be9f0f4ea4f4caae\\transformed\\appcompat-v7-28.0.0\\res\\values-tl\\values-tl.xml", + "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\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", @@ -14,7 +14,7 @@ } }, { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\21795bd83e308c947c8dfe0c1fc89322\\transformed\\support-compat-28.0.0\\res\\values-tl\\values-tl.xml", + "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\2b9474e47639de47b19dc72cadc6eaea\\transformed\\support-compat-28.0.0\\res\\values-tl\\values-tl.xml", "from": { "startLines": "2", "startColumns": "4", diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-tr.json b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-tr.json index e356f588..4b2be661 100644 --- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-tr.json +++ b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-tr.json @@ -1,10 +1,10 @@ { "logs": [ { - "outputFile": "E:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-tr\\values-tr.xml", + "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-tr\\values-tr.xml", "map": [ { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\86ef1ec83f39cd41be9f0f4ea4f4caae\\transformed\\appcompat-v7-28.0.0\\res\\values-tr\\values-tr.xml", + "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\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", @@ -14,7 +14,7 @@ } }, { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\21795bd83e308c947c8dfe0c1fc89322\\transformed\\support-compat-28.0.0\\res\\values-tr\\values-tr.xml", + "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\2b9474e47639de47b19dc72cadc6eaea\\transformed\\support-compat-28.0.0\\res\\values-tr\\values-tr.xml", "from": { "startLines": "2", "startColumns": "4", diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-uk.json b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-uk.json index 4ac69a40..ed36c186 100644 --- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-uk.json +++ b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-uk.json @@ -1,10 +1,10 @@ { "logs": [ { - "outputFile": "E:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-uk\\values-uk.xml", + "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-uk\\values-uk.xml", "map": [ { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\86ef1ec83f39cd41be9f0f4ea4f4caae\\transformed\\appcompat-v7-28.0.0\\res\\values-uk\\values-uk.xml", + "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\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", @@ -14,7 +14,7 @@ } }, { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\21795bd83e308c947c8dfe0c1fc89322\\transformed\\support-compat-28.0.0\\res\\values-uk\\values-uk.xml", + "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\2b9474e47639de47b19dc72cadc6eaea\\transformed\\support-compat-28.0.0\\res\\values-uk\\values-uk.xml", "from": { "startLines": "2", "startColumns": "4", diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ur.json b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ur.json index 21fec40b..6dea14ea 100644 --- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ur.json +++ b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ur.json @@ -1,10 +1,20 @@ { "logs": [ { - "outputFile": "E:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-ur\\values-ur.xml", + "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-ur\\values-ur.xml", "map": [ { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\21795bd83e308c947c8dfe0c1fc89322\\transformed\\support-compat-28.0.0\\res\\values-ur\\values-ur.xml", + "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\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" + } + }, + { + "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\2b9474e47639de47b19dc72cadc6eaea\\transformed\\support-compat-28.0.0\\res\\values-ur\\values-ur.xml", "from": { "startLines": "2", "startColumns": "4", @@ -19,16 +29,6 @@ "endColumns": "100", "endOffsets": "3000" } - }, - { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\86ef1ec83f39cd41be9f0f4ea4f4caae\\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" - } } ] } diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-uz.json b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-uz.json index a71abf0b..1b335b88 100644 --- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-uz.json +++ b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-uz.json @@ -1,10 +1,10 @@ { "logs": [ { - "outputFile": "E:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-uz\\values-uz.xml", + "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-uz\\values-uz.xml", "map": [ { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\21795bd83e308c947c8dfe0c1fc89322\\transformed\\support-compat-28.0.0\\res\\values-uz\\values-uz.xml", + "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\2b9474e47639de47b19dc72cadc6eaea\\transformed\\support-compat-28.0.0\\res\\values-uz\\values-uz.xml", "from": { "startLines": "2", "startColumns": "4", @@ -21,7 +21,7 @@ } }, { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\86ef1ec83f39cd41be9f0f4ea4f4caae\\transformed\\appcompat-v7-28.0.0\\res\\values-uz\\values-uz.xml", + "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\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", diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-v16.json b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-v16.json index d87bf6f3..e319e905 100644 --- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-v16.json +++ b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-v16.json @@ -1,10 +1,10 @@ { "logs": [ { - "outputFile": "E:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-v16\\values-v16.xml", + "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-v16\\values-v16.xml", "map": [ { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\86ef1ec83f39cd41be9f0f4ea4f4caae\\transformed\\appcompat-v7-28.0.0\\res\\values-v16\\values-v16.xml", + "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\transformed\\appcompat-v7-28.0.0\\res\\values-v16\\values-v16.xml", "from": { "startLines": "2", "startColumns": "4", @@ -23,7 +23,7 @@ } }, { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\21795bd83e308c947c8dfe0c1fc89322\\transformed\\support-compat-28.0.0\\res\\values-v16\\values-v16.xml", + "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\2b9474e47639de47b19dc72cadc6eaea\\transformed\\support-compat-28.0.0\\res\\values-v16\\values-v16.xml", "from": { "startLines": "2", "startColumns": "4", diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-v17.json b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-v17.json index 7e6b519c..196ce675 100644 --- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-v17.json +++ b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-v17.json @@ -1,10 +1,10 @@ { "logs": [ { - "outputFile": "E:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-v17\\values-v17.xml", + "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-v17\\values-v17.xml", "map": [ { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\86ef1ec83f39cd41be9f0f4ea4f4caae\\transformed\\appcompat-v7-28.0.0\\res\\values-v17\\values-v17.xml", + "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\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", diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-v18.json b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-v18.json index 3e049d71..451c9b38 100644 --- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-v18.json +++ b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-v18.json @@ -1,10 +1,10 @@ { "logs": [ { - "outputFile": "E:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-v18\\values-v18.xml", + "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-v18\\values-v18.xml", "map": [ { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\86ef1ec83f39cd41be9f0f4ea4f4caae\\transformed\\appcompat-v7-28.0.0\\res\\values-v18\\values-v18.xml", + "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\transformed\\appcompat-v7-28.0.0\\res\\values-v18\\values-v18.xml", "from": { "startLines": "2", "startColumns": "4", diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-v21.json b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-v21.json index f9f0039e..7caa783a 100644 --- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-v21.json +++ b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-v21.json @@ -1,10 +1,10 @@ { "logs": [ { - "outputFile": "E:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-v21\\values-v21.xml", + "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-v21\\values-v21.xml", "map": [ { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\21795bd83e308c947c8dfe0c1fc89322\\transformed\\support-compat-28.0.0\\res\\values-v21\\values-v21.xml", + "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\2b9474e47639de47b19dc72cadc6eaea\\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", @@ -23,7 +23,7 @@ } }, { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\86ef1ec83f39cd41be9f0f4ea4f4caae\\transformed\\appcompat-v7-28.0.0\\res\\values-v21\\values-v21.xml", + "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\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", diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-v22.json b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-v22.json index dae8fca6..4e0553cd 100644 --- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-v22.json +++ b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-v22.json @@ -1,10 +1,10 @@ { "logs": [ { - "outputFile": "E:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-v22\\values-v22.xml", + "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-v22\\values-v22.xml", "map": [ { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\86ef1ec83f39cd41be9f0f4ea4f4caae\\transformed\\appcompat-v7-28.0.0\\res\\values-v22\\values-v22.xml", + "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\transformed\\appcompat-v7-28.0.0\\res\\values-v22\\values-v22.xml", "from": { "startLines": "2,3,4,9", "startColumns": "4,4,4,4", diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-v23.json b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-v23.json index ea6acd74..7ac78df2 100644 --- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-v23.json +++ b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-v23.json @@ -1,10 +1,10 @@ { "logs": [ { - "outputFile": "E:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-v23\\values-v23.xml", + "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-v23\\values-v23.xml", "map": [ { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\86ef1ec83f39cd41be9f0f4ea4f4caae\\transformed\\appcompat-v7-28.0.0\\res\\values-v23\\values-v23.xml", + "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\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", diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-v24.json b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-v24.json index 441a2d4c..a192bf99 100644 --- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-v24.json +++ b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-v24.json @@ -1,10 +1,10 @@ { "logs": [ { - "outputFile": "E:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-v24\\values-v24.xml", + "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-v24\\values-v24.xml", "map": [ { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\86ef1ec83f39cd41be9f0f4ea4f4caae\\transformed\\appcompat-v7-28.0.0\\res\\values-v24\\values-v24.xml", + "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\transformed\\appcompat-v7-28.0.0\\res\\values-v24\\values-v24.xml", "from": { "startLines": "2,3", "startColumns": "4,4", diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-v25.json b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-v25.json index bf31e837..e04866ba 100644 --- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-v25.json +++ b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-v25.json @@ -1,10 +1,10 @@ { "logs": [ { - "outputFile": "E:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-v25\\values-v25.xml", + "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-v25\\values-v25.xml", "map": [ { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\86ef1ec83f39cd41be9f0f4ea4f4caae\\transformed\\appcompat-v7-28.0.0\\res\\values-v25\\values-v25.xml", + "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\transformed\\appcompat-v7-28.0.0\\res\\values-v25\\values-v25.xml", "from": { "startLines": "2,3,4,6", "startColumns": "4,4,4,4", diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-v26.json b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-v26.json index 4f68eadf..e59b5280 100644 --- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-v26.json +++ b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-v26.json @@ -1,10 +1,10 @@ { "logs": [ { - "outputFile": "E:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-v26\\values-v26.xml", + "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-v26\\values-v26.xml", "map": [ { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\86ef1ec83f39cd41be9f0f4ea4f4caae\\transformed\\appcompat-v7-28.0.0\\res\\values-v26\\values-v26.xml", + "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\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", diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-v28.json b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-v28.json index 8650a0fa..e901c08c 100644 --- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-v28.json +++ b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-v28.json @@ -1,10 +1,10 @@ { "logs": [ { - "outputFile": "E:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-v28\\values-v28.xml", + "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-v28\\values-v28.xml", "map": [ { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\86ef1ec83f39cd41be9f0f4ea4f4caae\\transformed\\appcompat-v7-28.0.0\\res\\values-v28\\values-v28.xml", + "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\transformed\\appcompat-v7-28.0.0\\res\\values-v28\\values-v28.xml", "from": { "startLines": "2,3,4,8", "startColumns": "4,4,4,4", diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-vi.json b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-vi.json index c0cd87d7..a4f43c32 100644 --- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-vi.json +++ b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-vi.json @@ -1,10 +1,20 @@ { "logs": [ { - "outputFile": "E:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-vi\\values-vi.xml", + "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-vi\\values-vi.xml", "map": [ { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\21795bd83e308c947c8dfe0c1fc89322\\transformed\\support-compat-28.0.0\\res\\values-vi\\values-vi.xml", + "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\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" + } + }, + { + "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\2b9474e47639de47b19dc72cadc6eaea\\transformed\\support-compat-28.0.0\\res\\values-vi\\values-vi.xml", "from": { "startLines": "2", "startColumns": "4", @@ -19,16 +29,6 @@ "endColumns": "100", "endOffsets": "2997" } - }, - { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\86ef1ec83f39cd41be9f0f4ea4f4caae\\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" - } } ] } diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-watch-v20.json b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-watch-v20.json index d5acf925..8776509e 100644 --- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-watch-v20.json +++ b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-watch-v20.json @@ -1,10 +1,10 @@ { "logs": [ { - "outputFile": "E:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-watch-v20\\values-watch-v20.xml", + "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-watch-v20\\values-watch-v20.xml", "map": [ { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\86ef1ec83f39cd41be9f0f4ea4f4caae\\transformed\\appcompat-v7-28.0.0\\res\\values-watch-v20\\values-watch-v20.xml", + "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\transformed\\appcompat-v7-28.0.0\\res\\values-watch-v20\\values-watch-v20.xml", "from": { "startLines": "2,5,8", "startColumns": "4,4,4", diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-watch-v21.json b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-watch-v21.json index 19327393..1857bda0 100644 --- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-watch-v21.json +++ b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-watch-v21.json @@ -1,10 +1,10 @@ { "logs": [ { - "outputFile": "E:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-watch-v21\\values-watch-v21.xml", + "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-watch-v21\\values-watch-v21.xml", "map": [ { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\86ef1ec83f39cd41be9f0f4ea4f4caae\\transformed\\appcompat-v7-28.0.0\\res\\values-watch-v21\\values-watch-v21.xml", + "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\transformed\\appcompat-v7-28.0.0\\res\\values-watch-v21\\values-watch-v21.xml", "from": { "startLines": "2,6,10", "startColumns": "4,4,4", diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-xlarge-v4.json b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-xlarge-v4.json index 3df570ba..662bab11 100644 --- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-xlarge-v4.json +++ b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-xlarge-v4.json @@ -1,10 +1,10 @@ { "logs": [ { - "outputFile": "E:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-xlarge-v4\\values-xlarge-v4.xml", + "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-xlarge-v4\\values-xlarge-v4.xml", "map": [ { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\86ef1ec83f39cd41be9f0f4ea4f4caae\\transformed\\appcompat-v7-28.0.0\\res\\values-xlarge-v4\\values-xlarge-v4.xml", + "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\transformed\\appcompat-v7-28.0.0\\res\\values-xlarge-v4\\values-xlarge-v4.xml", "from": { "startLines": "2,3,4,5,6,7", "startColumns": "4,4,4,4,4,4", diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rCN.json b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rCN.json index 443db0c7..a0e99b50 100644 --- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rCN.json +++ b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rCN.json @@ -1,53 +1,29 @@ { "logs": [ { - "outputFile": "E:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-zh-rCN\\values-zh-rCN.xml", + "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-zh-rCN\\values-zh-rCN.xml", "map": [ { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\86ef1ec83f39cd41be9f0f4ea4f4caae\\transformed\\appcompat-v7-28.0.0\\res\\values-zh-rCN\\values-zh-rCN.xml", + "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\2b9474e47639de47b19dc72cadc6eaea\\transformed\\support-compat-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": "E:\\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" + "startLines": "-1", + "startColumns": "-1", + "startOffsets": "-1" }, "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": "125", + "startColumns": "4", + "startOffsets": "8048", + "endColumns": "100", + "endOffsets": "8144" } }, { - "source": "E:\\Notes-master1\\app\\src\\main\\res\\values-zh-rCN\\arrays.xml", + "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" + "startLines": "-1", + "startColumns": "-1", + "startOffsets": "-1" }, "to": { "startLines": "2", @@ -59,20 +35,36 @@ } }, { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\21795bd83e308c947c8dfe0c1fc89322\\transformed\\support-compat-28.0.0\\res\\values-zh-rCN\\values-zh-rCN.xml", + "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\transformed\\appcompat-v7-28.0.0\\res\\values-zh-rCN\\values-zh-rCN.xml", "from": { - "startLines": "2", - "startColumns": "4", - "startOffsets": "55", - "endColumns": "100", - "endOffsets": "151" + "startLines": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1", + "startColumns": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1", + "startOffsets": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1" }, "to": { - "startLines": "124", - "startColumns": "4", - "startOffsets": "8005", - "endColumns": "100", - "endOffsets": "8101" + "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,122", + "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,7851", + "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,7924" + } + }, + { + "source": "D:\\Notes-master1\\app\\src\\main\\res\\values-zh-rCN\\strings.xml", + "from": { + "startLines": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,19,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1", + "startColumns": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,4,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1", + "startOffsets": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,846,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1", + "endColumns": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,42,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1", + "endOffsets": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,884,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1" + }, + "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,121,123,124,126,127,128,129,130,131,132,133,134,135,136", + "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", + "startOffsets": "215,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,6108,6157,6206,6253,6300,6347,6392,6443,6496,6571,6630,6687,6761,6825,6894,6972,7082,7186,7259,7325,7380,7445,7510,7559,7642,7720,7758,7803,7929,7991,8149,8204,8263,8330,8388,8450,8498,8543,8591,8642,8708", + "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,121,123,124,126,127,128,129,130,131,132,133,134,135,136", + "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,42,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,6103,6152,6201,6248,6295,6342,6387,6438,6491,6566,6625,6682,6756,6820,6889,6967,7077,7181,7254,7320,7375,7440,7505,7554,7637,7715,7753,7798,7846,7986,8043,8199,8258,8325,8383,8445,8493,8538,8586,8637,8703,8769" } } ] diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rHK.json b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rHK.json index 7913ed99..93577bba 100644 --- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rHK.json +++ b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rHK.json @@ -1,10 +1,20 @@ { "logs": [ { - "outputFile": "E:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-zh-rHK\\values-zh-rHK.xml", + "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-zh-rHK\\values-zh-rHK.xml", "map": [ { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\21795bd83e308c947c8dfe0c1fc89322\\transformed\\support-compat-28.0.0\\res\\values-zh-rHK\\values-zh-rHK.xml", + "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\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" + } + }, + { + "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\2b9474e47639de47b19dc72cadc6eaea\\transformed\\support-compat-28.0.0\\res\\values-zh-rHK\\values-zh-rHK.xml", "from": { "startLines": "2", "startColumns": "4", @@ -19,16 +29,6 @@ "endColumns": "100", "endOffsets": "2842" } - }, - { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\86ef1ec83f39cd41be9f0f4ea4f4caae\\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" - } } ] } diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rTW.json b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rTW.json index 3247dc79..3cad9955 100644 --- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rTW.json +++ b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rTW.json @@ -1,70 +1,62 @@ { "logs": [ { - "outputFile": "E:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-zh-rTW\\values-zh-rTW.xml", + "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-zh-rTW\\values-zh-rTW.xml", "map": [ { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\21795bd83e308c947c8dfe0c1fc89322\\transformed\\support-compat-28.0.0\\res\\values-zh-rTW\\values-zh-rTW.xml", + "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\transformed\\appcompat-v7-28.0.0\\res\\values-zh-rTW\\values-zh-rTW.xml", "from": { - "startLines": "2", - "startColumns": "4", - "startOffsets": "55", - "endColumns": "100", - "endOffsets": "151" + "startLines": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1", + "startColumns": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1", + "startOffsets": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1" }, "to": { - "startLines": "124", - "startColumns": "4", - "startOffsets": "8012", - "endColumns": "100", - "endOffsets": "8108" + "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,122", + "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,7858", + "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,7931" } }, { - "source": "E:\\Notes-master1\\app\\src\\main\\res\\values-zh-rTW\\strings.xml", + "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\2b9474e47639de47b19dc72cadc6eaea\\transformed\\support-compat-28.0.0\\res\\values-zh-rTW\\values-zh-rTW.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": "-1", + "startColumns": "-1", + "startOffsets": "-1" }, "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": "125", + "startColumns": "4", + "startOffsets": "8055", + "endColumns": "100", + "endOffsets": "8151" } }, { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\86ef1ec83f39cd41be9f0f4ea4f4caae\\transformed\\appcompat-v7-28.0.0\\res\\values-zh-rTW\\values-zh-rTW.xml", + "source": "D:\\Notes-master1\\app\\src\\main\\res\\values-zh-rTW\\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,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" + "startLines": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,19,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1", + "startColumns": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,4,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1", + "startOffsets": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,846,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1", + "endColumns": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,42,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1", + "endOffsets": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,884,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1" }, "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" + "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,121,123,124,126,127,128,129,130,131,132,133,134,135,136", + "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", + "startOffsets": "215,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,6115,6164,6213,6260,6307,6354,6399,6450,6503,6578,6637,6694,6768,6832,6901,6979,7089,7193,7266,7332,7387,7452,7517,7566,7649,7727,7765,7810,7936,7998,8156,8211,8270,8337,8395,8457,8505,8550,8598,8649,8715", + "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,121,123,124,126,127,128,129,130,131,132,133,134,135,136", + "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,42,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,6110,6159,6208,6255,6302,6349,6394,6445,6498,6573,6632,6689,6763,6827,6896,6974,7084,7188,7261,7327,7382,7447,7512,7561,7644,7722,7760,7805,7853,7993,8050,8206,8265,8332,8390,8452,8500,8545,8593,8644,8710,8776" } }, { - "source": "E:\\Notes-master1\\app\\src\\main\\res\\values-zh-rTW\\arrays.xml", + "source": "D:\\Notes-master1\\app\\src\\main\\res\\values-zh-rTW\\arrays.xml", "from": { - "startLines": "18", - "startColumns": "4", - "startOffsets": "712", - "endLines": "21", - "endColumns": "19", - "endOffsets": "817" + "startLines": "-1", + "startColumns": "-1", + "startOffsets": "-1" }, "to": { "startLines": "2", diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zu.json b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zu.json index 19ae32ae..0cbb315b 100644 --- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zu.json +++ b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zu.json @@ -1,10 +1,10 @@ { "logs": [ { - "outputFile": "E:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-zu\\values-zu.xml", + "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-zu\\values-zu.xml", "map": [ { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\86ef1ec83f39cd41be9f0f4ea4f4caae\\transformed\\appcompat-v7-28.0.0\\res\\values-zu\\values-zu.xml", + "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\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", @@ -14,7 +14,7 @@ } }, { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\21795bd83e308c947c8dfe0c1fc89322\\transformed\\support-compat-28.0.0\\res\\values-zu\\values-zu.xml", + "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\2b9474e47639de47b19dc72cadc6eaea\\transformed\\support-compat-28.0.0\\res\\values-zu\\values-zu.xml", "from": { "startLines": "2", "startColumns": "4", diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values.json b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values.json index 0f4aa63c..223d254d 100644 --- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values.json +++ b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values.json @@ -1,154 +1,135 @@ { "logs": [ { - "outputFile": "E:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values\\values.xml", + "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values\\values.xml", "map": [ { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\21795bd83e308c947c8dfe0c1fc89322\\transformed\\support-compat-28.0.0\\res\\values\\values.xml", + "source": "D:\\Notes-master1\\app\\src\\main\\res\\values\\dimens.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": "-1,-1,-1,-1,-1", + "startColumns": "-1,-1,-1,-1,-1", + "startOffsets": "-1,-1,-1,-1,-1" }, "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": "189,190,191,192,193", + "startColumns": "4,4,4,4,4", + "startOffsets": "12570,12622,12675,12728,12780", + "endColumns": "51,52,52,51,51", + "endOffsets": "12617,12670,12723,12775,12827" } }, { - "source": "E:\\Notes-master1\\app\\src\\main\\res\\values\\strings.xml", + "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\2b9474e47639de47b19dc72cadc6eaea\\transformed\\support-compat-28.0.0\\res\\values\\values.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" + "startLines": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1", + "startColumns": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1", + "startOffsets": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1" }, "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" + "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,365,1704,1705,1709,1710,1714,1879,1880", + "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", + "startOffsets": "3608,3677,10320,10390,10458,10530,10600,10661,10735,11592,11653,11714,11776,11840,11902,11963,12031,12131,12191,12257,12330,12399,12456,12508,13285,13357,13672,13707,13884,13934,13995,14052,14086,14121,14431,24057,111838,111955,112156,112266,112467,124768,124840", + "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,365,1704,1708,1709,1713,1714,1879,1880", + "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", + "endOffsets": "3672,3735,10385,10453,10525,10595,10656,10730,10803,11648,11709,11771,11835,11897,11958,12026,12126,12186,12252,12325,12394,12451,12503,12565,13352,13428,13702,13737,13929,13990,14047,14081,14116,14151,14496,24123,111950,112151,112261,112462,112591,124835,124902" } }, { - "source": "E:\\Notes-master1\\app\\src\\main\\res\\values\\dimens.xml", + "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\transformed\\appcompat-v7-28.0.0\\res\\values\\values.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" + "startLines": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1", + "startColumns": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1", + "startOffsets": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1" }, "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" + "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,362,377,378,379,380,381,382,390,391,395,399,403,408,414,421,425,429,434,438,442,446,450,454,458,464,468,474,478,484,488,493,497,500,504,510,514,520,524,530,533,537,541,545,549,553,554,555,556,559,562,565,568,572,573,574,575,576,579,581,583,585,590,591,595,601,605,606,608,619,620,624,630,634,635,636,640,667,671,672,676,704,871,897,1065,1091,1122,1130,1136,1150,1172,1177,1182,1192,1201,1210,1214,1221,1229,1236,1237,1246,1249,1252,1256,1260,1264,1267,1268,1272,1276,1286,1291,1298,1304,1305,1308,1312,1317,1319,1321,1324,1327,1329,1333,1336,1343,1346,1349,1353,1355,1359,1361,1363,1365,1369,1377,1385,1397,1403,1412,1415,1426,1429,1434,1435,1455,1513,1572,1573,1583,1592,1593,1595,1599,1602,1605,1608,1611,1614,1617,1620,1624,1627,1630,1633,1637,1640,1644,1648,1649,1650,1651,1652,1653,1654,1655,1656,1657,1658,1659,1660,1661,1662,1663,1664,1665,1666,1667,1668,1670,1672,1673,1674,1675,1676,1677,1678,1679,1681,1682,1684,1685,1687,1689,1690,1692,1693,1694,1695,1696,1697,1699,1700,1701,1702,1703,1715,1717,1719,1749,1750,1751,1752,1753,1754,1755,1756,1757,1758,1759,1760,1761,1763,1764,1765,1766,1767,1768,1770,1774,1778,1779,1780,1781,1782,1783,1784,1785,1787,1789,1791,1793,1795,1796,1797,1798,1800,1802,1804,1805,1806,1807,1808,1809,1810,1811,1812,1813,1814,1815,1818,1819,1820,1821,1823,1825,1826,1828,1829,1831,1833,1835,1836,1837,1838,1839,1840,1841,1842,1843,1844,1845,1846,1848,1849,1850,1851,1853,1854,1855,1856,1857,1859,1861,1863,1865,1866,1867,1868,1869,1870,1871,1872,1873,1874,1875,1876,1877,1878", + "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", + "startOffsets": "481,536,581,630,671,726,785,847,928,989,1064,1140,1217,1295,1380,1462,1538,1614,1691,1769,1875,1981,2060,2140,2197,2255,2329,2404,2469,2535,2595,2656,2728,2801,2868,2936,2995,3054,3113,3172,3231,3285,3339,3392,3446,3500,3554,3740,3814,3893,3966,4040,4111,4183,4255,4328,4385,4443,4516,4590,4664,4739,4811,4884,4954,5025,5085,5203,5272,5341,5411,5485,5561,5625,5702,5778,5855,5920,5989,6066,6141,6210,6278,6355,6421,6482,6579,6644,6713,6812,6883,6942,7000,7057,7116,7180,7251,7323,7395,7467,7539,7606,7674,7742,7801,7864,7928,8018,8109,8169,8235,8302,8368,8438,8502,8555,8668,8726,8789,8854,8919,8994,9067,9139,9188,9249,9310,9371,9433,9497,9561,9625,9690,9753,9813,9874,9940,9999,10059,10121,10192,10252,10808,10894,10981,11071,11158,11246,11328,11411,11501,12832,12884,12942,12987,13053,13117,13174,13231,13433,13490,13538,13587,13638,13742,13789,13838,14156,14188,14252,14314,14374,14894,14968,15038,15116,15170,15240,15325,15373,15419,15490,15568,15646,15718,15792,15866,15940,16020,16093,16162,16234,16311,16372,16435,16501,16565,16636,16699,16764,16828,16889,16950,17002,17075,17149,17218,17293,17367,17441,17582,23865,24961,25039,25129,25217,25313,25403,25985,26074,26321,26602,26854,27139,27532,28009,28231,28453,28729,28956,29186,29416,29646,29876,30103,30522,30748,31173,31403,31831,32050,32333,32541,32672,32899,33325,33550,33977,34198,34623,34743,35019,35320,35644,35935,36249,36386,36517,36622,36864,37031,37235,37443,37714,37826,37938,38043,38160,38374,38520,38660,38746,39094,39182,39428,39846,40095,40177,40275,40867,40967,41219,41643,41898,41992,42081,42318,44342,44584,44686,44939,47095,57224,58740,68968,70496,72253,72879,73299,74360,75625,75881,76117,76664,77158,77763,77961,78541,79105,79480,79598,80136,80293,80489,80762,81018,81188,81329,81393,81675,81961,82637,82901,83239,83592,83686,83872,84178,84440,84565,84692,84931,85142,85261,85454,85631,86086,86267,86389,86648,86761,86948,87050,87157,87286,87561,88069,88565,89442,89736,90306,90455,91187,91359,91695,91787,92847,97129,101554,101616,102194,102778,102869,102982,103211,103371,103523,103694,103860,104029,104196,104359,104602,104772,104945,105116,105390,105589,105794,106124,106208,106304,106400,106498,106598,106700,106802,106904,107006,107108,107208,107304,107416,107545,107668,107799,107930,108028,108142,108236,108376,108510,108606,108718,108818,108934,109030,109142,109242,109382,109518,109682,109812,109970,110120,110261,110405,110540,110652,110802,110930,111058,111194,111326,111456,111586,111698,112596,112742,112886,114370,114436,114526,114602,114706,114796,114898,115006,115114,115214,115294,115386,115484,115594,115672,115778,115870,115974,116084,116206,116369,116526,116606,116706,116796,116906,117000,117106,117198,117298,117410,117524,117640,117756,117850,117964,118076,118178,118298,118420,118502,118606,118726,118852,118950,119044,119132,119244,119360,119482,119594,119769,119885,119971,120063,120175,120299,120366,120492,120560,120688,120832,120960,121029,121124,121239,121352,121451,121560,121671,121782,121883,121988,122088,122218,122309,122432,122526,122638,122724,122828,122924,123012,123130,123234,123338,123464,123552,123660,123760,123850,123960,124044,124146,124230,124284,124348,124454,124564,124648", + "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,362,377,378,379,380,381,389,390,394,398,402,407,413,420,424,428,433,437,441,445,449,453,457,463,467,473,477,483,487,492,496,499,503,509,513,519,523,529,532,536,540,544,548,552,553,554,555,558,561,564,567,571,572,573,574,575,578,580,582,584,589,590,594,600,604,605,607,618,619,623,629,633,634,635,639,666,670,671,675,703,870,896,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,1439,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,1703,1716,1718,1720,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,1878", + "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", + "endOffsets": "531,576,625,666,721,780,842,923,984,1059,1135,1212,1290,1375,1457,1533,1609,1686,1764,1870,1976,2055,2135,2192,2250,2324,2399,2464,2530,2590,2651,2723,2796,2863,2931,2990,3049,3108,3167,3226,3280,3334,3387,3441,3495,3549,3603,3809,3888,3961,4035,4106,4178,4250,4323,4380,4438,4511,4585,4659,4734,4806,4879,4949,5020,5080,5141,5267,5336,5406,5480,5556,5620,5697,5773,5850,5915,5984,6061,6136,6205,6273,6350,6416,6477,6574,6639,6708,6807,6878,6937,6995,7052,7111,7175,7246,7318,7390,7462,7534,7601,7669,7737,7796,7859,7923,8013,8104,8164,8230,8297,8363,8433,8497,8550,8663,8721,8784,8849,8914,8989,9062,9134,9183,9244,9305,9366,9428,9492,9556,9620,9685,9748,9808,9869,9935,9994,10054,10116,10187,10247,10315,10889,10976,11066,11153,11241,11323,11406,11496,11587,12879,12937,12982,13048,13112,13169,13226,13280,13485,13533,13582,13633,13667,13784,13833,13879,14183,14247,14309,14369,14426,14963,15033,15111,15165,15235,15320,15368,15414,15485,15563,15641,15713,15787,15861,15935,16015,16088,16157,16229,16306,16367,16430,16496,16560,16631,16694,16759,16823,16884,16945,16997,17070,17144,17213,17288,17362,17436,17577,17647,23913,25034,25124,25212,25308,25398,25980,26069,26316,26597,26849,27134,27527,28004,28226,28448,28724,28951,29181,29411,29641,29871,30098,30517,30743,31168,31398,31826,32045,32328,32536,32667,32894,33320,33545,33972,34193,34618,34738,35014,35315,35639,35930,36244,36381,36512,36617,36859,37026,37230,37438,37709,37821,37933,38038,38155,38369,38515,38655,38741,39089,39177,39423,39841,40090,40172,40270,40862,40962,41214,41638,41893,41987,42076,42313,44337,44579,44681,44934,47090,57219,58735,68963,70491,72248,72874,73294,74355,75620,75876,76112,76659,77153,77758,77956,78536,79100,79475,79593,80131,80288,80484,80757,81013,81183,81324,81388,81670,81956,82632,82896,83234,83587,83681,83867,84173,84435,84560,84687,84926,85137,85256,85449,85626,86081,86262,86384,86643,86756,86943,87045,87152,87281,87556,88064,88560,89437,89731,90301,90450,91182,91354,91690,91782,92060,97124,101549,101611,102189,102773,102864,102977,103206,103366,103518,103689,103855,104024,104191,104354,104597,104767,104940,105111,105385,105584,105789,106119,106203,106299,106395,106493,106593,106695,106797,106899,107001,107103,107203,107299,107411,107540,107663,107794,107925,108023,108137,108231,108371,108505,108601,108713,108813,108929,109025,109137,109237,109377,109513,109677,109807,109965,110115,110256,110400,110535,110647,110797,110925,111053,111189,111321,111451,111581,111693,111833,112737,112881,113019,114431,114521,114597,114701,114791,114893,115001,115109,115209,115289,115381,115479,115589,115667,115773,115865,115969,116079,116201,116364,116521,116601,116701,116791,116901,116995,117101,117193,117293,117405,117519,117635,117751,117845,117959,118071,118173,118293,118415,118497,118601,118721,118847,118945,119039,119127,119239,119355,119477,119589,119764,119880,119966,120058,120170,120294,120361,120487,120555,120683,120827,120955,121024,121119,121234,121347,121446,121555,121666,121777,121878,121983,122083,122213,122304,122427,122521,122633,122719,122823,122919,123007,123125,123229,123333,123459,123547,123655,123755,123845,123955,124039,124141,124225,124279,124343,124449,124559,124643,124763" } }, { - "source": "E:\\Notes-master1\\app\\src\\main\\res\\values\\colors.xml", + "source": "D:\\Notes-master1\\app\\src\\main\\res\\values\\styles.xml", "from": { - "startLines": "18", - "startColumns": "4", - "startOffsets": "712", - "endColumns": "56", - "endOffsets": "764" + "startLines": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1", + "startColumns": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1", + "startOffsets": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1" }, "to": { - "startLines": "82", - "startColumns": "4", - "startOffsets": "5258", - "endColumns": "56", - "endOffsets": "5310" + "startLines": "1440,1444,1448,1452,1721,1725,1729,1733,1737,1741,1745", + "startColumns": "4,4,4,4,4,4,4,4,4,4,4", + "startOffsets": "92065,92269,92480,92687,113024,113207,113392,113577,113780,113986,114169", + "endLines": "1443,1447,1451,1454,1724,1728,1732,1736,1740,1744,1748", + "endColumns": "12,12,12,12,12,12,12,12,12,12,12", + "endOffsets": "92264,92475,92682,92842,113202,113387,113572,113775,113981,114164,114365" } }, { - "source": "E:\\Notes-master1\\app\\src\\main\\res\\values\\styles.xml", + "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\4433a4478073ef0c67208fcc6161f90b\\transformed\\coordinatorlayout-28.0.0\\res\\values\\values.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": "-1,-1", + "startColumns": "-1,-1", + "startOffsets": "-1,-1" }, "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": "12,1881", + "startColumns": "4,4", + "startOffsets": "420,124907", + "endLines": "12,1883", + "endColumns": "60,12", + "endOffsets": "476,125047" } }, { - "source": "E:\\Notes-master1\\app\\src\\main\\res\\values\\arrays.xml", + "source": "D:\\Notes-master1\\app\\src\\main\\res\\values\\colors.xml", "from": { - "startLines": "19,26", - "startColumns": "4,4", - "startOffsets": "739,1047", - "endLines": "24,29", - "endColumns": "19,19", - "endOffsets": "1041,1162" + "startLines": "-1", + "startColumns": "-1", + "startOffsets": "-1" }, "to": { - "startLines": "2,8", - "startColumns": "4,4", - "startOffsets": "105,412", - "endLines": "7,11", - "endColumns": "19,19", - "endOffsets": "407,527" + "startLines": "82", + "startColumns": "4", + "startOffsets": "5146", + "endColumns": "56", + "endOffsets": "5198" } }, { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\82952f08b31bd35f2fe29eb30da1d402\\transformed\\coordinatorlayout-28.0.0\\res\\values\\values.xml", + "source": "D:\\Notes-master1\\app\\src\\main\\res\\values\\strings.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": "131,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,19,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1", + "startColumns": "4,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,4,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1", + "startOffsets": "8292,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,846,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1", + "endLines": "135,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,19,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1", + "endColumns": "14,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,46,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1", + "endOffsets": "8700,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,888,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1" }, "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": "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,359,360,361,363,364,366,367,368,369,370,371,372,373,374,375,376", + "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", + "startOffsets": "14501,17652,17748,17831,17927,17996,18039,18091,18143,18192,18255,18313,18364,18448,18542,18650,18721,18805,18888,18954,19037,19139,19200,19262,19313,19391,19444,19504,19609,19668,19770,19825,19896,19945,20002,20060,20107,20166,20223,20294,20355,20412,20462,20514,20567,20617,20667,20727,20780,20846,20908,20971,21020,21067,21122,21210,21268,21330,21380,21425,21468,21528,21595,21650,21697,21752,21805,21852,21905,21961,22009,22064,22117,22201,22268,22332,22428,22502,22583,22672,22835,22979,23058,23133,23215,23274,23354,23434,23489,23611,23714,23755,23808,23918,23992,24128,24196,24282,24362,24431,24525,24584,24639,24701,24761,24871", + "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,359,360,361,363,364,366,367,368,369,370,371,372,373,374,375,376", + "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,56,57,46,58,56,70,60,56,49,51,52,49,49,59,52,65,61,62,48,46,54,87,57,61,49,44,42,59,66,54,46,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": "14889,17743,17826,17922,17991,18034,18086,18138,18187,18250,18308,18359,18443,18537,18645,18716,18800,18883,18949,19032,19134,19195,19257,19308,19386,19439,19499,19604,19663,19765,19820,19891,19940,19997,20055,20102,20161,20218,20289,20350,20407,20457,20509,20562,20612,20662,20722,20775,20841,20903,20966,21015,21062,21117,21205,21263,21325,21375,21420,21463,21523,21590,21645,21692,21747,21800,21847,21900,21956,22004,22059,22112,22196,22263,22327,22423,22497,22578,22667,22830,22974,23053,23128,23210,23269,23349,23429,23484,23606,23709,23750,23803,23860,23987,24052,24191,24277,24357,24426,24520,24579,24634,24696,24756,24866,24956" } }, { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\86ef1ec83f39cd41be9f0f4ea4f4caae\\transformed\\appcompat-v7-28.0.0\\res\\values\\values.xml", + "source": "D:\\Notes-master1\\app\\src\\main\\res\\values\\arrays.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": "-1,-1", + "startColumns": "-1,-1", + "startOffsets": "-1,-1" }, "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": "2,8", + "startColumns": "4,4", + "startOffsets": "105,300", + "endLines": "7,11", + "endColumns": "19,19", + "endOffsets": "295,415" } } ] 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 index f6b33b7b..760f2c63 100644 --- 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 @@ -1,382 +1,386 @@ [ { - "merged": "E:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_icon_app.png.flat", - "source": "E:\\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_single.9.png.flat", + "source": "D:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_red_single.9.png" }, { - "merged": "E:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_title_alert.png.flat", - "source": "E:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\title_alert.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": "E:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_middle.9.png.flat", - "source": "E:\\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_edit_red.9.png.flat", + "source": "D:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\edit_red.9.png" }, { - "merged": "E:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_up.9.png.flat", - "source": "E:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_red_up.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": "E:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_single.9.png.flat", - "source": "E:\\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_new_note_normal.png.flat", + "source": "D:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\new_note_normal.png" }, { - "merged": "E:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_blue.png.flat", - "source": "E:\\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_white_down.9.png.flat", + "source": "D:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_white_down.9.png" }, { - "merged": "E:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_note_edit_list_item.xml.flat", - "source": "E:\\Notes-master1\\app\\src\\main\\res\\layout\\note_edit_list_item.xml" + "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": "E:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_size_selector_bg.9.png.flat", - "source": "E:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\font_size_selector_bg.9.png" + "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": "E:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_blue_single.9.png.flat", - "source": "E:\\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_font_normal.png.flat", + "source": "D:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\font_normal.png" }, { - "merged": "E:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_note_list_footer.xml.flat", - "source": "E:\\Notes-master1\\app\\src\\main\\res\\layout\\note_list_footer.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": "E:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_white.9.png.flat", - "source": "E:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\edit_white.9.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": "E:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_red.9.png.flat", - "source": "E:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\edit_title_red.9.png" + "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": "E:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_down.9.png.flat", - "source": "E:\\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_list_blue_down.9.png.flat", + "source": "D:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_blue_down.9.png" }, { - "merged": "E:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_bg_btn_set_color.png.flat", - "source": "E:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\bg_btn_set_color.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": "E:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_menu_move.png.flat", - "source": "E:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\menu_move.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": "E:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_green.png.flat", - "source": "E:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\widget_2x_green.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": "E:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_call_record.png.flat", - "source": "E:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\call_record.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": "E:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_small.png.flat", - "source": "E:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\font_small.png" + "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": "E:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_widget_4x.xml.flat", - "source": "E:\\Notes-master1\\app\\src\\main\\res\\layout\\widget_4x.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": "E:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_down.9.png.flat", - "source": "E:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_red_down.9.png" + "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": "E:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_title_bar_bg.9.png.flat", - "source": "E:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\title_bar_bg.9.png" + "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": "E:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_single.9.png.flat", - "source": "E:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_yellow_single.9.png" + "merged": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\menu_trash_folder.xml.flat", + "source": "D:\\Notes-master1\\app\\src\\main\\res\\menu\\trash_folder.xml" }, { - "merged": "E:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\menu_call_record_folder.xml.flat", - "source": "E:\\Notes-master1\\app\\src\\main\\res\\menu\\call_record_folder.xml" + "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": "E:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_super.png.flat", - "source": "E:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\font_super.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": "E:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_up.9.png.flat", - "source": "E:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_yellow_up.9.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": "E:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_yellow.9.png.flat", - "source": "E:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\edit_yellow.9.png" + "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": "E:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\color_primary_text_dark.xml.flat", - "source": "E:\\Notes-master1\\app\\src\\main\\res\\color\\primary_text_dark.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": "E:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_menu_delete.png.flat", - "source": "E:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\menu_delete.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": "E:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_add_account_text.xml.flat", - "source": "E:\\Notes-master1\\app\\src\\main\\res\\layout\\add_account_text.xml" + "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": "E:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\color_secondary_text_dark.xml.flat", - "source": "E:\\Notes-master1\\app\\src\\main\\res\\color\\secondary_text_dark.xml" + "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": "E:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_bg_color_btn_mask.png.flat", - "source": "E:\\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_list_yellow_single.9.png.flat", + "source": "D:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_yellow_single.9.png" }, { - "merged": "E:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_note_edit_color_selector_panel.png.flat", - "source": "E:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\note_edit_color_selector_panel.png" + "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": "E:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\menu_call_note_edit.xml.flat", - "source": "E:\\Notes-master1\\app\\src\\main\\res\\menu\\call_note_edit.xml" + "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": "E:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_search_result.png.flat", - "source": "E:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\search_result.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": "E:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\raw_introduction.flat", - "source": "E:\\Notes-master1\\app\\src\\main\\res\\raw\\introduction" + "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": "E:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\menu_note_list_options.xml.flat", - "source": "E:\\Notes-master1\\app\\src\\main\\res\\menu\\note_list_options.xml" + "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": "E:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\xml_widget_4x_info.xml.flat", - "source": "E:\\Notes-master1\\app\\src\\main\\res\\xml\\widget_4x_info.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": "E:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_middle.9.png.flat", - "source": "E:\\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_edit_white.9.png.flat", + "source": "D:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\edit_white.9.png" }, { - "merged": "E:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_folder.9.png.flat", - "source": "E:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_folder.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": "E:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_red.png.flat", - "source": "E:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\widget_2x_red.png" + "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": "E:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_notification.png.flat", - "source": "E:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\notification.png" + "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": "E:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_note_edit.xml.flat", - "source": "E:\\Notes-master1\\app\\src\\main\\res\\layout\\note_edit.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": "E:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_up.9.png.flat", - "source": "E:\\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_edit_blue.9.png.flat", + "source": "D:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\edit_blue.9.png" }, { - "merged": "E:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_new_note_pressed.png.flat", - "source": "E:\\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_red_middle.9.png.flat", + "source": "D:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_red_middle.9.png" }, { - "merged": "E:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_green_single.9.png.flat", - "source": "E:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_green_single.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": "E:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_account_dialog_title.xml.flat", - "source": "E:\\Notes-master1\\app\\src\\main\\res\\layout\\account_dialog_title.xml" + "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": "E:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_green_middle.9.png.flat", - "source": "E:\\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_font_large.png.flat", + "source": "D:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\font_large.png" }, { - "merged": "E:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_white.png.flat", - "source": "E:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\widget_2x_white.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": "E:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_blue.9.png.flat", - "source": "E:\\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_list_yellow_down.9.png.flat", + "source": "D:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_yellow_down.9.png" }, { - "merged": "E:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_green_down.9.png.flat", - "source": "E:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_green_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": "E:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_green_up.9.png.flat", - "source": "E:\\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_edit_yellow.9.png.flat", + "source": "D:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\edit_yellow.9.png" }, { - "merged": "E:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_new_note_normal.png.flat", - "source": "E:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\new_note_normal.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": "E:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_normal.png.flat", - "source": "E:\\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": "E:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable_new_note.xml.flat", - "source": "E:\\Notes-master1\\app\\src\\main\\res\\drawable\\new_note.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": "E:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_red.9.png.flat", - "source": "E:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\edit_red.9.png" + "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": "E:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\xml_searchable.xml.flat", - "source": "E:\\Notes-master1\\app\\src\\main\\res\\xml\\searchable.xml" + "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": "E:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\xml_preferences.xml.flat", - "source": "E:\\Notes-master1\\app\\src\\main\\res\\xml\\preferences.xml" + "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": "E:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_datetime_picker.xml.flat", - "source": "E:\\Notes-master1\\app\\src\\main\\res\\layout\\datetime_picker.xml" + "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": "E:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_selected.png.flat", - "source": "E:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\selected.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": "E:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_yellow.png.flat", - "source": "E:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\widget_4x_yellow.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": "E:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_single.9.png.flat", - "source": "E:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_white_single.9.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": "E:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_green.9.png.flat", - "source": "E:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\edit_title_green.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": "E:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_white.png.flat", - "source": "E:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\widget_4x_white.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": "E:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_folder_list_item.xml.flat", - "source": "E:\\Notes-master1\\app\\src\\main\\res\\layout\\folder_list_item.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": "E:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\menu_note_list.xml.flat", - "source": "E:\\Notes-master1\\app\\src\\main\\res\\menu\\note_list.xml" + "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": "E:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_footer_bg.9.png.flat", - "source": "E:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_footer_bg.9.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": "E:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_note_item.xml.flat", - "source": "E:\\Notes-master1\\app\\src\\main\\res\\layout\\note_item.xml" + "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": "E:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_note_list.xml.flat", - "source": "E:\\Notes-master1\\app\\src\\main\\res\\layout\\note_list.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": "E:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_dialog_edit_text.xml.flat", - "source": "E:\\Notes-master1\\app\\src\\main\\res\\layout\\dialog_edit_text.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": "E:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_blue.png.flat", - "source": "E:\\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_blue.9.png.flat", + "source": "D:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\edit_title_blue.9.png" }, { - "merged": "E:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_down.9.png.flat", - "source": "E:\\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_menu_delete.png.flat", + "source": "D:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\menu_delete.png" }, { - "merged": "E:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_blue_up.9.png.flat", - "source": "E:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_blue_up.9.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": "E:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_yellow.png.flat", - "source": "E:\\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_blue_middle.9.png.flat", + "source": "D:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_blue_middle.9.png" }, { - "merged": "E:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_red.png.flat", - "source": "E:\\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_blue_single.9.png.flat", + "source": "D:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_blue_single.9.png" }, { - "merged": "E:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\xml_widget_2x_info.xml.flat", - "source": "E:\\Notes-master1\\app\\src\\main\\res\\xml\\widget_2x_info.xml" + "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": "E:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_green.9.png.flat", - "source": "E:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\edit_green.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": "E:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_large.png.flat", - "source": "E:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\font_large.png" + "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": "E:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_white.9.png.flat", - "source": "E:\\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_new_note_pressed.png.flat", + "source": "D:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\new_note_pressed.png" }, { - "merged": "E:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_background.png.flat", - "source": "E:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_background.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": "E:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_settings_header.xml.flat", - "source": "E:\\Notes-master1\\app\\src\\main\\res\\layout\\settings_header.xml" + "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": "E:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_middle.9.png.flat", - "source": "E:\\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_list_red_down.9.png.flat", + "source": "D:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_red_down.9.png" }, { - "merged": "E:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_clock.png.flat", - "source": "E:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\clock.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": "E:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_blue_middle.9.png.flat", - "source": "E:\\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_title_alert.png.flat", + "source": "D:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\title_alert.png" }, { - "merged": "E:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_blue.9.png.flat", - "source": "E:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\edit_blue.9.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": "E:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_note_list_dropdown_menu.xml.flat", - "source": "E:\\Notes-master1\\app\\src\\main\\res\\layout\\note_list_dropdown_menu.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": "E:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_dropdown_icon.9.png.flat", - "source": "E:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\dropdown_icon.9.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": "E:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\menu_sub_folder.xml.flat", - "source": "E:\\Notes-master1\\app\\src\\main\\res\\menu\\sub_folder.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": "E:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\menu_note_edit.xml.flat", - "source": "E:\\Notes-master1\\app\\src\\main\\res\\menu\\note_edit.xml" + "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": "E:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_green.png.flat", - "source": "E:\\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_4x_blue.png.flat", + "source": "D:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\widget_4x_blue.png" }, { - "merged": "E:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_yellow.9.png.flat", - "source": "E:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\edit_title_yellow.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": "E:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_blue_down.9.png.flat", - "source": "E:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_blue_down.9.png" + "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": "E:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_widget_2x.xml.flat", - "source": "E:\\Notes-master1\\app\\src\\main\\res\\layout\\widget_2x.xml" + "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": "E:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\menu_note_list_dropdown.xml.flat", - "source": "E:\\Notes-master1\\app\\src\\main\\res\\menu\\note_list_dropdown.xml" + "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": "E:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\raw-zh-rCN_introduction.flat", - "source": "E:\\Notes-master1\\app\\src\\main\\res\\raw-zh-rCN\\introduction" + "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": "E:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_delete.png.flat", - "source": "E:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\delete.png" + "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\\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 diff --git a/src/Notes-master1/app/build/intermediates/processed_res/debug/out/resources-debug.ap_ b/src/Notes-master1/app/build/intermediates/processed_res/debug/out/resources-debug.ap_ index 24229a30..cf6cff47 100644 Binary files a/src/Notes-master1/app/build/intermediates/processed_res/debug/out/resources-debug.ap_ and b/src/Notes-master1/app/build/intermediates/processed_res/debug/out/resources-debug.ap_ differ diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/aebd9aa4afe98009f21e5858f24f2451a1e1008426ade6cb8b372e1bc66ae504_0.jar b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/aebd9aa4afe98009f21e5858f24f2451a1e1008426ade6cb8b372e1bc66ae504_0.jar new file mode 100644 index 00000000..70e9dbce Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/aebd9aa4afe98009f21e5858f24f2451a1e1008426ade6cb8b372e1bc66ae504_0.jar differ diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/aebd9aa4afe98009f21e5858f24f2451a1e1008426ade6cb8b372e1bc66ae504_1.jar b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/aebd9aa4afe98009f21e5858f24f2451a1e1008426ade6cb8b372e1bc66ae504_1.jar new file mode 100644 index 00000000..40945672 Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/aebd9aa4afe98009f21e5858f24f2451a1e1008426ade6cb8b372e1bc66ae504_1.jar differ diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/aebd9aa4afe98009f21e5858f24f2451a1e1008426ade6cb8b372e1bc66ae504_2.jar b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/aebd9aa4afe98009f21e5858f24f2451a1e1008426ade6cb8b372e1bc66ae504_2.jar new file mode 100644 index 00000000..414f8856 Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/aebd9aa4afe98009f21e5858f24f2451a1e1008426ade6cb8b372e1bc66ae504_2.jar differ diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/aebd9aa4afe98009f21e5858f24f2451a1e1008426ade6cb8b372e1bc66ae504_3.jar b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/aebd9aa4afe98009f21e5858f24f2451a1e1008426ade6cb8b372e1bc66ae504_3.jar new file mode 100644 index 00000000..6f3f7801 Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/aebd9aa4afe98009f21e5858f24f2451a1e1008426ade6cb8b372e1bc66ae504_3.jar differ diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$CallNote.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$CallNote.dex index d8ec2c4e..7200f8ef 100644 Binary files a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$CallNote.dex and b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$CallNote.dex differ diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$NoteColumns.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$NoteColumns.dex index e32f11d3..650a8321 100644 Binary files a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$NoteColumns.dex and b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$NoteColumns.dex differ diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$TextNote.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$TextNote.dex index 2f5ecfbd..fdbfacea 100644 Binary files a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$TextNote.dex and b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$TextNote.dex differ diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/NotesDatabaseHelper.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/NotesDatabaseHelper.dex index ea6f71e5..0750f7ed 100644 Binary files a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/NotesDatabaseHelper.dex and b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/NotesDatabaseHelper.dex differ diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskASyncTask.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskASyncTask.dex index 982e61cd..14d6ea00 100644 Binary files a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskASyncTask.dex and b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskASyncTask.dex differ diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskManager.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskManager.dex index 6cf35ebc..78db36ed 100644 Binary files a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskManager.dex and b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskManager.dex differ diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/Note$NoteData.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/Note$NoteData.dex index 3d1900e8..9b620804 100644 Binary files a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/Note$NoteData.dex and b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/Note$NoteData.dex differ diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/Note.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/Note.dex index eb6b38fe..9b16d2c7 100644 Binary files a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/Note.dex and b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/Note.dex differ diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/DataUtils.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/DataUtils.dex index 341cb7a9..4f3799b1 100644 Binary files a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/DataUtils.dex and b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/DataUtils.dex differ diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/AlarmAlertActivity.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/AlarmAlertActivity.dex index c31eaec0..741181ad 100644 Binary files a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/AlarmAlertActivity.dex and b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/AlarmAlertActivity.dex differ diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker.dex index 1168c8ca..52a90688 100644 Binary files a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker.dex and b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker.dex differ diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/FoldersListAdapter$FolderListItem.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/FoldersListAdapter$FolderListItem.dex index f9e5acf8..491a3aa2 100644 Binary files a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/FoldersListAdapter$FolderListItem.dex and b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/FoldersListAdapter$FolderListItem.dex differ diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/FoldersListAdapter.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/FoldersListAdapter.dex index 3be640ce..0159016f 100644 Binary files a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/FoldersListAdapter.dex and b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/FoldersListAdapter.dex differ diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$1.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$1.dex index 748bf685..c355a1b6 100644 Binary files a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$1.dex and b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$1.dex differ diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$2.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$2.dex index 8c1cb0b4..4c548ae3 100644 Binary files a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$2.dex and b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$2.dex differ diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$3.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$3.dex index 07a806b3..44ce3315 100644 Binary files a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$3.dex and b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$3.dex differ diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$4.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$4.dex new file mode 100644 index 00000000..a599b0b5 Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$4.dex differ diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$HeadViewHolder.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$HeadViewHolder.dex index ae525bb8..8d916afb 100644 Binary files a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$HeadViewHolder.dex and b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$HeadViewHolder.dex differ diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity.dex index ccb40c0e..9fdcb20a 100644 Binary files a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity.dex and b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity.dex differ diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditText.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditText.dex index 586e887e..efd6b58f 100644 Binary files a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditText.dex and b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditText.dex differ diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$1.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$1.dex index 5fe6e681..37318484 100644 Binary files a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$1.dex and b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$1.dex differ diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$2.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$2.dex index 65816f8e..a26f61d9 100644 Binary files a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$2.dex and b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$2.dex differ diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$3.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$3.dex index b556a49b..f3bb0642 100644 Binary files a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$3.dex and b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$3.dex differ diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$4.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$4.dex index 8298addf..6362dc13 100644 Binary files a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$4.dex and b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$4.dex differ diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$5.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$5.dex index 9fa3e253..bd61caf7 100644 Binary files a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$5.dex and b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$5.dex differ diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$6.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$6.dex index 50591675..be53fc55 100644 Binary files a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$6.dex and b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$6.dex differ diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$7.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$7.dex index 092da520..13defdb3 100644 Binary files a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$7.dex and b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$7.dex differ diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$8.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$8.dex index 2ba8b3d1..55f11385 100644 Binary files a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$8.dex and b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$8.dex differ diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$9.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$9.dex index 0ada1248..f97e90f7 100644 Binary files a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$9.dex and b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$9.dex differ diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$BackgroundQueryHandler.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$BackgroundQueryHandler.dex index 236492b9..2f50f770 100644 Binary files a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$BackgroundQueryHandler.dex and b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$BackgroundQueryHandler.dex differ diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ListEditState.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ListEditState.dex index 0c5462d4..f55c2a85 100644 Binary files a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ListEditState.dex and b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ListEditState.dex differ diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback$1.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback$1.dex index 6eabdd4c..f3588bb5 100644 Binary files a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback$1.dex and b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback$1.dex differ diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback$2.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback$2.dex index 6d3f5deb..204e8d72 100644 Binary files a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback$2.dex and b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback$2.dex differ diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback.dex index 61212243..8d7a5a7f 100644 Binary files a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback.dex and b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback.dex differ diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$NewNoteOnTouchListener.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$NewNoteOnTouchListener.dex index c00fc9ee..301b2089 100644 Binary files a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$NewNoteOnTouchListener.dex and b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$NewNoteOnTouchListener.dex differ diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.dex index 85bb68ca..fa72ff7d 100644 Binary files a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.dex and b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.dex differ diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity.dex index 516622c3..5f3af67c 100644 Binary files a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity.dex and b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity.dex differ diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListItem.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListItem.dex index 93756613..536d7413 100644 Binary files a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListItem.dex and b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListItem.dex differ diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$1.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$1.dex index 794b0e7d..03a13336 100644 Binary files a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$1.dex and b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$1.dex differ diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$GTaskReceiver.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$GTaskReceiver.dex index 66d5b0f7..f26ce1bc 100644 Binary files a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$GTaskReceiver.dex and b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$GTaskReceiver.dex differ diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity.dex index f26719ea..bdfe02dc 100644 Binary files a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity.dex and b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity.dex differ diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/widget/NoteWidgetProvider.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/widget/NoteWidgetProvider.dex index 1e7402d8..68b38ea3 100644 Binary files a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/widget/NoteWidgetProvider.dex and b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/widget/NoteWidgetProvider.dex differ diff --git a/src/Notes-master1/app/build/intermediates/runtime_symbol_list/debug/R.txt b/src/Notes-master1/app/build/intermediates/runtime_symbol_list/debug/R.txt index 38637a74..0b5f66d8 100644 --- a/src/Notes-master1/app/build/intermediates/runtime_symbol_list/debug/R.txt +++ b/src/Notes-master1/app/build/intermediates/runtime_symbol_list/debug/R.txt @@ -761,102 +761,105 @@ int id ll_font_normal 0x7f080064 int id ll_font_small 0x7f080065 int id ll_font_super 0x7f080066 int id menu_alert 0x7f080067 -int id menu_delete 0x7f080068 -int id menu_delete_remind 0x7f080069 -int id menu_export_text 0x7f08006a -int id menu_font_size 0x7f08006b -int id menu_list_mode 0x7f08006c -int id menu_new_folder 0x7f08006d -int id menu_new_note 0x7f08006e -int id menu_search 0x7f08006f -int id menu_send_to_desktop 0x7f080070 -int id menu_setting 0x7f080071 -int id menu_share 0x7f080072 -int id menu_sync 0x7f080073 -int id message 0x7f080074 -int id middle 0x7f080075 -int id minute 0x7f080076 -int id move 0x7f080077 -int id multiply 0x7f080078 -int id navigation_bar 0x7f080079 -int id never 0x7f08007a -int id none 0x7f08007b -int id normal 0x7f08007c -int id note_bg_color_selector 0x7f08007d -int id note_edit_list 0x7f08007e -int id note_edit_view 0x7f08007f -int id note_item 0x7f080080 -int id note_title 0x7f080081 -int id notes_list 0x7f080082 -int id notification_background 0x7f080083 -int id notification_main_column 0x7f080084 -int id notification_main_column_container 0x7f080085 -int id parentPanel 0x7f080086 -int id prefenerece_sync_status_textview 0x7f080087 -int id preference_sync_button 0x7f080088 -int id progress_circular 0x7f080089 -int id progress_horizontal 0x7f08008a -int id radio 0x7f08008b -int id right 0x7f08008c -int id right_icon 0x7f08008d -int id right_side 0x7f08008e -int id screen 0x7f08008f -int id scrollIndicatorDown 0x7f080090 -int id scrollIndicatorUp 0x7f080091 -int id scrollView 0x7f080092 -int id search_badge 0x7f080093 -int id search_bar 0x7f080094 -int id search_button 0x7f080095 -int id search_close_btn 0x7f080096 -int id search_edit_frame 0x7f080097 -int id search_go_btn 0x7f080098 -int id search_mag_icon 0x7f080099 -int id search_plate 0x7f08009a -int id search_src_text 0x7f08009b -int id search_voice_btn 0x7f08009c -int id select_dialog_listview 0x7f08009d -int id selection_menu 0x7f08009e -int id shortcut 0x7f08009f -int id showCustom 0x7f0800a0 -int id showHome 0x7f0800a1 -int id showTitle 0x7f0800a2 -int id spacer 0x7f0800a3 -int id split_action_bar 0x7f0800a4 -int id src_atop 0x7f0800a5 -int id src_in 0x7f0800a6 -int id src_over 0x7f0800a7 -int id start 0x7f0800a8 -int id submenuarrow 0x7f0800a9 -int id submit_area 0x7f0800aa -int id sv_note_edit 0x7f0800ab -int id tabMode 0x7f0800ac -int id tag_transition_group 0x7f0800ad -int id tag_unhandled_key_event_manager 0x7f0800ae -int id tag_unhandled_key_listeners 0x7f0800af -int id text 0x7f0800b0 -int id text2 0x7f0800b1 -int id textSpacerNoButtons 0x7f0800b2 -int id textSpacerNoTitle 0x7f0800b3 -int id time 0x7f0800b4 -int id title 0x7f0800b5 -int id titleDividerNoCustom 0x7f0800b6 -int id title_template 0x7f0800b7 -int id top 0x7f0800b8 -int id topPanel 0x7f0800b9 -int id tv_alert_date 0x7f0800ba -int id tv_folder_name 0x7f0800bb -int id tv_modified_date 0x7f0800bc -int id tv_name 0x7f0800bd -int id tv_time 0x7f0800be -int id tv_title 0x7f0800bf -int id tv_title_bar 0x7f0800c0 -int id uniform 0x7f0800c1 -int id up 0x7f0800c2 -int id useLogo 0x7f0800c3 -int id widget_bg_image 0x7f0800c4 -int id widget_text 0x7f0800c5 -int id withText 0x7f0800c6 -int id wrap_content 0x7f0800c7 +int id menu_change_view 0x7f080068 +int id menu_delete 0x7f080069 +int id menu_delete_remind 0x7f08006a +int id menu_export_text 0x7f08006b +int id menu_font_size 0x7f08006c +int id menu_list_mode 0x7f08006d +int id menu_new_folder 0x7f08006e +int id menu_new_note 0x7f08006f +int id menu_restore 0x7f080070 +int id menu_search 0x7f080071 +int id menu_send_to_desktop 0x7f080072 +int id menu_setting 0x7f080073 +int id menu_share 0x7f080074 +int id menu_sync 0x7f080075 +int id message 0x7f080076 +int id middle 0x7f080077 +int id minute 0x7f080078 +int id move 0x7f080079 +int id multiply 0x7f08007a +int id navigation_bar 0x7f08007b +int id never 0x7f08007c +int id none 0x7f08007d +int id normal 0x7f08007e +int id note_bg_color_selector 0x7f08007f +int id note_edit_list 0x7f080080 +int id note_edit_view 0x7f080081 +int id note_item 0x7f080082 +int id note_title 0x7f080083 +int id notes_list 0x7f080084 +int id notification_background 0x7f080085 +int id notification_main_column 0x7f080086 +int id notification_main_column_container 0x7f080087 +int id parentPanel 0x7f080088 +int id prefenerece_sync_status_textview 0x7f080089 +int id preference_sync_button 0x7f08008a +int id progress_circular 0x7f08008b +int id progress_horizontal 0x7f08008c +int id radio 0x7f08008d +int id right 0x7f08008e +int id right_icon 0x7f08008f +int id right_side 0x7f080090 +int id screen 0x7f080091 +int id scrollIndicatorDown 0x7f080092 +int id scrollIndicatorUp 0x7f080093 +int id scrollView 0x7f080094 +int id search_badge 0x7f080095 +int id search_bar 0x7f080096 +int id search_button 0x7f080097 +int id search_close_btn 0x7f080098 +int id search_edit_frame 0x7f080099 +int id search_go_btn 0x7f08009a +int id search_mag_icon 0x7f08009b +int id search_plate 0x7f08009c +int id search_src_text 0x7f08009d +int id search_voice_btn 0x7f08009e +int id select_dialog_listview 0x7f08009f +int id selection_menu 0x7f0800a0 +int id shortcut 0x7f0800a1 +int id showCustom 0x7f0800a2 +int id showHome 0x7f0800a3 +int id showTitle 0x7f0800a4 +int id spacer 0x7f0800a5 +int id split_action_bar 0x7f0800a6 +int id src_atop 0x7f0800a7 +int id src_in 0x7f0800a8 +int id src_over 0x7f0800a9 +int id start 0x7f0800aa +int id submenuarrow 0x7f0800ab +int id submit_area 0x7f0800ac +int id sv_note_edit 0x7f0800ad +int id tabMode 0x7f0800ae +int id tag_transition_group 0x7f0800af +int id tag_unhandled_key_event_manager 0x7f0800b0 +int id tag_unhandled_key_listeners 0x7f0800b1 +int id text 0x7f0800b2 +int id text2 0x7f0800b3 +int id textSpacerNoButtons 0x7f0800b4 +int id textSpacerNoTitle 0x7f0800b5 +int id text_num 0x7f0800b6 +int id time 0x7f0800b7 +int id title 0x7f0800b8 +int id titleDividerNoCustom 0x7f0800b9 +int id title_template 0x7f0800ba +int id top 0x7f0800bb +int id topPanel 0x7f0800bc +int id tv_alert_date 0x7f0800bd +int id tv_folder_name 0x7f0800be +int id tv_modified_date 0x7f0800bf +int id tv_name 0x7f0800c0 +int id tv_time 0x7f0800c1 +int id tv_title 0x7f0800c2 +int id tv_title_bar 0x7f0800c3 +int id uniform 0x7f0800c4 +int id up 0x7f0800c5 +int id useLogo 0x7f0800c6 +int id widget_bg_image 0x7f0800c7 +int id widget_text 0x7f0800c8 +int id withText 0x7f0800c9 +int id wrap_content 0x7f0800ca int integer abc_config_activityDefaultDur 0x7f090000 int integer abc_config_activityShortDur 0x7f090001 int integer cancel_button_image_alpha 0x7f090002 @@ -921,6 +924,7 @@ int menu note_list 0x7f0b0003 int menu note_list_dropdown 0x7f0b0004 int menu note_list_options 0x7f0b0005 int menu sub_folder 0x7f0b0006 +int menu trash_folder 0x7f0b0007 int plurals search_results_title 0x7f0c0000 int raw introduction 0x7f0d0000 int string abc_action_bar_home_description 0x7f0e0000 @@ -994,78 +998,81 @@ int string format_move_notes_to_folder 0x7f0e0043 int string hint_foler_name 0x7f0e0044 int string info_note_enter_desktop 0x7f0e0045 int string menu_alert 0x7f0e0046 -int string menu_create_folder 0x7f0e0047 -int string menu_delete 0x7f0e0048 -int string menu_deselect_all 0x7f0e0049 -int string menu_export_text 0x7f0e004a -int string menu_folder_change_name 0x7f0e004b -int string menu_folder_delete 0x7f0e004c -int string menu_folder_view 0x7f0e004d -int string menu_font_large 0x7f0e004e -int string menu_font_normal 0x7f0e004f -int string menu_font_size 0x7f0e0050 -int string menu_font_small 0x7f0e0051 -int string menu_font_super 0x7f0e0052 -int string menu_list_mode 0x7f0e0053 -int string menu_move 0x7f0e0054 -int string menu_move_parent_folder 0x7f0e0055 -int string menu_normal_mode 0x7f0e0056 -int string menu_remove_remind 0x7f0e0057 -int string menu_search 0x7f0e0058 -int string menu_select_all 0x7f0e0059 -int string menu_select_none 0x7f0e005a -int string menu_select_title 0x7f0e005b -int string menu_send_to_desktop 0x7f0e005c -int string menu_setting 0x7f0e005d -int string menu_share 0x7f0e005e -int string menu_sync 0x7f0e005f -int string menu_sync_cancel 0x7f0e0060 -int string menu_title_select_folder 0x7f0e0061 -int string note_alert_expired 0x7f0e0062 -int string note_link_email 0x7f0e0063 -int string note_link_other 0x7f0e0064 -int string note_link_tel 0x7f0e0065 -int string note_link_web 0x7f0e0066 -int string notealert_enter 0x7f0e0067 -int string notealert_ok 0x7f0e0068 -int string notelist_menu_new 0x7f0e0069 -int string notelist_string_info 0x7f0e006a -int string preferences_account_summary 0x7f0e006b -int string preferences_account_title 0x7f0e006c -int string preferences_add_account 0x7f0e006d -int string preferences_bg_random_appear_title 0x7f0e006e -int string preferences_button_sync_cancel 0x7f0e006f -int string preferences_button_sync_immediately 0x7f0e0070 -int string preferences_dialog_change_account_title 0x7f0e0071 -int string preferences_dialog_change_account_warn_msg 0x7f0e0072 -int string preferences_dialog_select_account_tips 0x7f0e0073 -int string preferences_dialog_select_account_title 0x7f0e0074 -int string preferences_last_sync_time 0x7f0e0075 -int string preferences_last_sync_time_format 0x7f0e0076 -int string preferences_menu_cancel 0x7f0e0077 -int string preferences_menu_change_account 0x7f0e0078 -int string preferences_menu_remove_account 0x7f0e0079 -int string preferences_title 0x7f0e007a -int string preferences_toast_cannot_change_account 0x7f0e007b -int string preferences_toast_success_set_accout 0x7f0e007c -int string search 0x7f0e007d -int string search_hint 0x7f0e007e -int string search_label 0x7f0e007f -int string search_menu_title 0x7f0e0080 -int string search_setting_description 0x7f0e0081 -int string set_remind_time_message 0x7f0e0082 -int string status_bar_notification_info_overflow 0x7f0e0083 -int string success_sdcard_export 0x7f0e0084 -int string success_sync_account 0x7f0e0085 -int string sync_progress_init_list 0x7f0e0086 -int string sync_progress_login 0x7f0e0087 -int string sync_progress_syncing 0x7f0e0088 -int string ticker_cancel 0x7f0e0089 -int string ticker_fail 0x7f0e008a -int string ticker_success 0x7f0e008b -int string ticker_syncing 0x7f0e008c -int string widget_havenot_content 0x7f0e008d -int string widget_under_visit_mode 0x7f0e008e +int string menu_change_view 0x7f0e0047 +int string menu_create_folder 0x7f0e0048 +int string menu_delete 0x7f0e0049 +int string menu_deselect_all 0x7f0e004a +int string menu_export_text 0x7f0e004b +int string menu_folder_change_name 0x7f0e004c +int string menu_folder_delete 0x7f0e004d +int string menu_folder_view 0x7f0e004e +int string menu_font_large 0x7f0e004f +int string menu_font_normal 0x7f0e0050 +int string menu_font_size 0x7f0e0051 +int string menu_font_small 0x7f0e0052 +int string menu_font_super 0x7f0e0053 +int string menu_list_mode 0x7f0e0054 +int string menu_move 0x7f0e0055 +int string menu_move_parent_folder 0x7f0e0056 +int string menu_normal_mode 0x7f0e0057 +int string menu_remove_remind 0x7f0e0058 +int string menu_restore 0x7f0e0059 +int string menu_search 0x7f0e005a +int string menu_select_all 0x7f0e005b +int string menu_select_none 0x7f0e005c +int string menu_select_title 0x7f0e005d +int string menu_send_to_desktop 0x7f0e005e +int string menu_setting 0x7f0e005f +int string menu_share 0x7f0e0060 +int string menu_sync 0x7f0e0061 +int string menu_sync_cancel 0x7f0e0062 +int string menu_title_select_folder 0x7f0e0063 +int string note_alert_expired 0x7f0e0064 +int string note_length 0x7f0e0065 +int string note_link_email 0x7f0e0066 +int string note_link_other 0x7f0e0067 +int string note_link_tel 0x7f0e0068 +int string note_link_web 0x7f0e0069 +int string notealert_enter 0x7f0e006a +int string notealert_ok 0x7f0e006b +int string notelist_menu_new 0x7f0e006c +int string notelist_string_info 0x7f0e006d +int string preferences_account_summary 0x7f0e006e +int string preferences_account_title 0x7f0e006f +int string preferences_add_account 0x7f0e0070 +int string preferences_bg_random_appear_title 0x7f0e0071 +int string preferences_button_sync_cancel 0x7f0e0072 +int string preferences_button_sync_immediately 0x7f0e0073 +int string preferences_dialog_change_account_title 0x7f0e0074 +int string preferences_dialog_change_account_warn_msg 0x7f0e0075 +int string preferences_dialog_select_account_tips 0x7f0e0076 +int string preferences_dialog_select_account_title 0x7f0e0077 +int string preferences_last_sync_time 0x7f0e0078 +int string preferences_last_sync_time_format 0x7f0e0079 +int string preferences_menu_cancel 0x7f0e007a +int string preferences_menu_change_account 0x7f0e007b +int string preferences_menu_remove_account 0x7f0e007c +int string preferences_title 0x7f0e007d +int string preferences_toast_cannot_change_account 0x7f0e007e +int string preferences_toast_success_set_accout 0x7f0e007f +int string search 0x7f0e0080 +int string search_hint 0x7f0e0081 +int string search_label 0x7f0e0082 +int string search_menu_title 0x7f0e0083 +int string search_setting_description 0x7f0e0084 +int string set_remind_time_message 0x7f0e0085 +int string status_bar_notification_info_overflow 0x7f0e0086 +int string success_sdcard_export 0x7f0e0087 +int string success_sync_account 0x7f0e0088 +int string sync_progress_init_list 0x7f0e0089 +int string sync_progress_login 0x7f0e008a +int string sync_progress_syncing 0x7f0e008b +int string ticker_cancel 0x7f0e008c +int string ticker_fail 0x7f0e008d +int string ticker_success 0x7f0e008e +int string ticker_syncing 0x7f0e008f +int string widget_havenot_content 0x7f0e0090 +int string widget_under_visit_mode 0x7f0e0091 int style AlertDialog_AppCompat 0x7f0f0000 int style AlertDialog_AppCompat_Light 0x7f0f0001 int style Animation_AppCompat_Dialog 0x7f0f0002 diff --git a/src/Notes-master1/app/build/intermediates/signing_config_versions/debug/signing-config-versions.json b/src/Notes-master1/app/build/intermediates/signing_config_versions/debug/signing-config-versions.json index 1920ca85..bb4deaa8 100644 --- a/src/Notes-master1/app/build/intermediates/signing_config_versions/debug/signing-config-versions.json +++ b/src/Notes-master1/app/build/intermediates/signing_config_versions/debug/signing-config-versions.json @@ -1 +1 @@ -{"enableV1Signing":true,"enableV2Signing":false,"enableV3Signing":false,"enableV4Signing":false} \ No newline at end of file +{"enableV1Signing":true,"enableV2Signing":true,"enableV3Signing":false,"enableV4Signing":false} \ No newline at end of file diff --git a/src/Notes-master1/app/build/intermediates/stable_resource_ids_file/debug/stableIds.txt b/src/Notes-master1/app/build/intermediates/stable_resource_ids_file/debug/stableIds.txt index 9ea8c49a..d9937235 100644 --- a/src/Notes-master1/app/build/intermediates/stable_resource_ids_file/debug/stableIds.txt +++ b/src/Notes-master1/app/build/intermediates/stable_resource_ids_file/debug/stableIds.txt @@ -18,7 +18,6 @@ net.micode.notes:styleable/DrawerArrowToggle = 0x7f100014 net.micode.notes:styleable/ActionMenuView = 0x7f100003 net.micode.notes:style/Widget.Support.CoordinatorLayout = 0x7f0f0164 net.micode.notes:style/Widget.Compat.NotificationActionContainer = 0x7f0f0162 -net.micode.notes:style/Widget.AppCompat.Toolbar.Button.Navigation = 0x7f0f0161 net.micode.notes:style/Widget.AppCompat.Toolbar = 0x7f0f0160 net.micode.notes:styleable/MenuGroup = 0x7f10001c net.micode.notes:style/Widget.AppCompat.Spinner.Underlined = 0x7f0f015e @@ -202,58 +201,59 @@ net.micode.notes:style/Base.AlertDialog.AppCompat = 0x7f0f0005 net.micode.notes:style/Animation.AppCompat.Tooltip = 0x7f0f0004 net.micode.notes:style/TextAppearance.AppCompat.Light.SearchResult.Title = 0x7f0f00cd net.micode.notes:style/Animation.AppCompat.DropDownUp = 0x7f0f0003 -net.micode.notes:string/widget_havenot_content = 0x7f0e008d -net.micode.notes:string/ticker_success = 0x7f0e008b -net.micode.notes:string/ticker_fail = 0x7f0e008a -net.micode.notes:string/ticker_cancel = 0x7f0e0089 -net.micode.notes:string/success_sync_account = 0x7f0e0085 -net.micode.notes:string/success_sdcard_export = 0x7f0e0084 -net.micode.notes:string/status_bar_notification_info_overflow = 0x7f0e0083 -net.micode.notes:string/set_remind_time_message = 0x7f0e0082 -net.micode.notes:string/search_menu_title = 0x7f0e0080 -net.micode.notes:string/search = 0x7f0e007d +net.micode.notes:string/widget_havenot_content = 0x7f0e0090 +net.micode.notes:string/ticker_success = 0x7f0e008e +net.micode.notes:string/ticker_fail = 0x7f0e008d +net.micode.notes:string/ticker_cancel = 0x7f0e008c +net.micode.notes:string/success_sync_account = 0x7f0e0088 +net.micode.notes:string/success_sdcard_export = 0x7f0e0087 +net.micode.notes:string/status_bar_notification_info_overflow = 0x7f0e0086 +net.micode.notes:string/set_remind_time_message = 0x7f0e0085 +net.micode.notes:string/search_menu_title = 0x7f0e0083 +net.micode.notes:string/search = 0x7f0e0080 net.micode.notes:style/Base.TextAppearance.AppCompat.Widget.Button.Colored = 0x7f0f0031 -net.micode.notes:string/preferences_toast_success_set_accout = 0x7f0e007c -net.micode.notes:string/preferences_toast_cannot_change_account = 0x7f0e007b +net.micode.notes:string/preferences_toast_success_set_accout = 0x7f0e007f +net.micode.notes:string/preferences_toast_cannot_change_account = 0x7f0e007e net.micode.notes:style/Base.TextAppearance.AppCompat.SearchResult = 0x7f0f001e -net.micode.notes:string/preferences_title = 0x7f0e007a -net.micode.notes:string/preferences_menu_remove_account = 0x7f0e0079 -net.micode.notes:string/preferences_last_sync_time_format = 0x7f0e0076 -net.micode.notes:string/preferences_last_sync_time = 0x7f0e0075 +net.micode.notes:string/preferences_title = 0x7f0e007d +net.micode.notes:string/preferences_menu_remove_account = 0x7f0e007c +net.micode.notes:string/preferences_last_sync_time_format = 0x7f0e0079 +net.micode.notes:string/preferences_last_sync_time = 0x7f0e0078 net.micode.notes:style/RtlOverlay.Widget.AppCompat.PopupMenuItem.InternalGroup = 0x7f0f00b2 -net.micode.notes:string/preferences_dialog_select_account_tips = 0x7f0e0073 -net.micode.notes:string/preferences_button_sync_immediately = 0x7f0e0070 +net.micode.notes:string/preferences_dialog_select_account_tips = 0x7f0e0076 +net.micode.notes:string/preferences_button_sync_immediately = 0x7f0e0073 net.micode.notes:styleable/GradientColorItem = 0x7f100018 -net.micode.notes:string/preferences_bg_random_appear_title = 0x7f0e006e -net.micode.notes:string/preferences_add_account = 0x7f0e006d -net.micode.notes:string/preferences_account_title = 0x7f0e006c -net.micode.notes:string/preferences_account_summary = 0x7f0e006b -net.micode.notes:string/notelist_string_info = 0x7f0e006a -net.micode.notes:string/notealert_ok = 0x7f0e0068 -net.micode.notes:string/note_link_web = 0x7f0e0066 -net.micode.notes:string/note_link_tel = 0x7f0e0065 -net.micode.notes:string/note_link_email = 0x7f0e0063 -net.micode.notes:string/note_alert_expired = 0x7f0e0062 +net.micode.notes:string/preferences_bg_random_appear_title = 0x7f0e0071 +net.micode.notes:string/preferences_add_account = 0x7f0e0070 +net.micode.notes:string/preferences_account_title = 0x7f0e006f +net.micode.notes:string/preferences_account_summary = 0x7f0e006e +net.micode.notes:string/notelist_string_info = 0x7f0e006d +net.micode.notes:string/notealert_ok = 0x7f0e006b +net.micode.notes:string/note_link_web = 0x7f0e0069 +net.micode.notes:string/note_link_tel = 0x7f0e0068 +net.micode.notes:string/note_link_email = 0x7f0e0066 +net.micode.notes:string/note_length = 0x7f0e0065 +net.micode.notes:string/note_alert_expired = 0x7f0e0064 net.micode.notes:style/Base.V23.Theme.AppCompat = 0x7f0f0058 -net.micode.notes:string/menu_sync_cancel = 0x7f0e0060 -net.micode.notes:string/menu_sync = 0x7f0e005f -net.micode.notes:string/menu_share = 0x7f0e005e +net.micode.notes:string/menu_sync_cancel = 0x7f0e0062 +net.micode.notes:string/menu_sync = 0x7f0e0061 +net.micode.notes:string/menu_share = 0x7f0e0060 net.micode.notes:style/TextAppearanceUnderMenuIcon = 0x7f0f00fd -net.micode.notes:string/menu_setting = 0x7f0e005d -net.micode.notes:string/menu_send_to_desktop = 0x7f0e005c -net.micode.notes:string/menu_select_all = 0x7f0e0059 +net.micode.notes:string/menu_setting = 0x7f0e005f +net.micode.notes:string/menu_send_to_desktop = 0x7f0e005e +net.micode.notes:string/menu_select_all = 0x7f0e005b net.micode.notes:style/AlertDialog.AppCompat = 0x7f0f0000 -net.micode.notes:string/menu_search = 0x7f0e0058 +net.micode.notes:string/menu_search = 0x7f0e005a net.micode.notes:style/Theme.AppCompat.DayNight = 0x7f0f0100 -net.micode.notes:string/menu_remove_remind = 0x7f0e0057 -net.micode.notes:string/menu_font_super = 0x7f0e0052 -net.micode.notes:string/menu_font_normal = 0x7f0e004f -net.micode.notes:string/menu_font_large = 0x7f0e004e -net.micode.notes:string/menu_folder_delete = 0x7f0e004c -net.micode.notes:string/menu_folder_change_name = 0x7f0e004b -net.micode.notes:string/search_label = 0x7f0e007f -net.micode.notes:string/menu_export_text = 0x7f0e004a -net.micode.notes:string/menu_delete = 0x7f0e0048 +net.micode.notes:string/menu_remove_remind = 0x7f0e0058 +net.micode.notes:string/menu_font_super = 0x7f0e0053 +net.micode.notes:string/menu_font_normal = 0x7f0e0050 +net.micode.notes:string/menu_font_large = 0x7f0e004f +net.micode.notes:string/menu_folder_delete = 0x7f0e004d +net.micode.notes:string/menu_folder_change_name = 0x7f0e004c +net.micode.notes:string/search_label = 0x7f0e0082 +net.micode.notes:string/menu_export_text = 0x7f0e004b +net.micode.notes:string/menu_delete = 0x7f0e0049 net.micode.notes:string/info_note_enter_desktop = 0x7f0e0045 net.micode.notes:style/TextAppearance.Widget.AppCompat.Toolbar.Subtitle = 0x7f0f00f5 net.micode.notes:string/format_move_notes_to_folder = 0x7f0e0043 @@ -284,7 +284,7 @@ net.micode.notes:style/Base.TextAppearance.AppCompat.Small = 0x7f0f0021 net.micode.notes:string/abc_searchview_description_query = 0x7f0e0020 net.micode.notes:string/abc_searchview_description_clear = 0x7f0e001f net.micode.notes:string/abc_search_hint = 0x7f0e001e -net.micode.notes:string/sync_progress_login = 0x7f0e0087 +net.micode.notes:string/sync_progress_login = 0x7f0e008a net.micode.notes:string/abc_prepend_shortcut_label = 0x7f0e001d net.micode.notes:string/abc_menu_shift_shortcut_label = 0x7f0e001a net.micode.notes:string/abc_menu_function_shortcut_label = 0x7f0e0018 @@ -303,6 +303,7 @@ net.micode.notes:string/abc_font_family_title_material = 0x7f0e0013 net.micode.notes:string/abc_action_bar_home_description = 0x7f0e0000 net.micode.notes:raw/introduction = 0x7f0d0000 net.micode.notes:plurals/search_results_title = 0x7f0c0000 +net.micode.notes:menu/trash_folder = 0x7f0b0007 net.micode.notes:menu/sub_folder = 0x7f0b0006 net.micode.notes:menu/note_list_options = 0x7f0b0005 net.micode.notes:style/TextAppearance.AppCompat.Widget.TextView.SpinnerItem = 0x7f0f00ee @@ -329,7 +330,7 @@ net.micode.notes:layout/abc_search_dropdown_item_icons_2line = 0x7f0a0018 net.micode.notes:layout/abc_screen_simple = 0x7f0a0015 net.micode.notes:layout/abc_popup_menu_item_layout = 0x7f0a0013 net.micode.notes:layout/abc_list_menu_item_radio = 0x7f0a0011 -net.micode.notes:string/widget_under_visit_mode = 0x7f0e008e +net.micode.notes:string/widget_under_visit_mode = 0x7f0e0091 net.micode.notes:layout/abc_list_menu_item_layout = 0x7f0a0010 net.micode.notes:layout/abc_expanded_menu_layout = 0x7f0a000d net.micode.notes:layout/abc_dialog_title_material = 0x7f0a000c @@ -339,7 +340,7 @@ net.micode.notes:style/Base.Widget.AppCompat.CompoundButton.CheckBox = 0x7f0f007 net.micode.notes:layout/abc_alert_dialog_material = 0x7f0a0009 net.micode.notes:style/Theme.AppCompat.Light = 0x7f0f010b net.micode.notes:style/Animation.AppCompat.Dialog = 0x7f0f0002 -net.micode.notes:string/menu_move_parent_folder = 0x7f0e0055 +net.micode.notes:string/menu_move_parent_folder = 0x7f0e0056 net.micode.notes:layout/abc_alert_dialog_button_bar_material = 0x7f0a0008 net.micode.notes:layout/abc_activity_chooser_view = 0x7f0a0006 net.micode.notes:styleable/AnimatedStateListDrawableTransition = 0x7f100009 @@ -347,59 +348,63 @@ net.micode.notes:layout/abc_action_mode_bar = 0x7f0a0004 net.micode.notes:layout/abc_action_menu_item_layout = 0x7f0a0002 net.micode.notes:layout/abc_action_bar_up_container = 0x7f0a0001 net.micode.notes:integer/status_bar_notification_info_maxnum = 0x7f090004 -net.micode.notes:id/wrap_content = 0x7f0800c7 -net.micode.notes:id/withText = 0x7f0800c6 -net.micode.notes:id/tv_title_bar = 0x7f0800c0 +net.micode.notes:id/wrap_content = 0x7f0800ca +net.micode.notes:id/withText = 0x7f0800c9 +net.micode.notes:id/tv_title_bar = 0x7f0800c3 net.micode.notes:style/TextAppearance.AppCompat.Widget.ActionMode.Subtitle = 0x7f0f00e1 net.micode.notes:layout/abc_list_menu_item_icon = 0x7f0a000f -net.micode.notes:id/tv_modified_date = 0x7f0800bc -net.micode.notes:id/tv_alert_date = 0x7f0800ba -net.micode.notes:id/title_template = 0x7f0800b7 -net.micode.notes:id/time = 0x7f0800b4 +net.micode.notes:id/tv_modified_date = 0x7f0800bf +net.micode.notes:id/tv_alert_date = 0x7f0800bd +net.micode.notes:id/title_template = 0x7f0800ba +net.micode.notes:id/time = 0x7f0800b7 +net.micode.notes:id/text_num = 0x7f0800b6 net.micode.notes:style/Theme.AppCompat.DialogWhenLarge = 0x7f0f010a -net.micode.notes:id/textSpacerNoButtons = 0x7f0800b2 -net.micode.notes:id/tag_unhandled_key_listeners = 0x7f0800af -net.micode.notes:id/tag_unhandled_key_event_manager = 0x7f0800ae +net.micode.notes:id/textSpacerNoButtons = 0x7f0800b4 +net.micode.notes:id/tag_unhandled_key_listeners = 0x7f0800b1 +net.micode.notes:id/tag_unhandled_key_event_manager = 0x7f0800b0 net.micode.notes:style/TextAppearance.AppCompat.Light.Widget.PopupMenu.Small = 0x7f0f00cf -net.micode.notes:id/tag_transition_group = 0x7f0800ad +net.micode.notes:id/tag_transition_group = 0x7f0800af net.micode.notes:layout/abc_screen_toolbar = 0x7f0a0017 -net.micode.notes:id/tabMode = 0x7f0800ac -net.micode.notes:id/submit_area = 0x7f0800aa -net.micode.notes:string/notealert_enter = 0x7f0e0067 -net.micode.notes:id/src_over = 0x7f0800a7 +net.micode.notes:id/tabMode = 0x7f0800ae +net.micode.notes:id/submit_area = 0x7f0800ac +net.micode.notes:string/notealert_enter = 0x7f0e006a +net.micode.notes:id/src_over = 0x7f0800a9 net.micode.notes:string/error_note_empty_for_send_to_desktop = 0x7f0e0034 -net.micode.notes:id/spacer = 0x7f0800a3 +net.micode.notes:id/spacer = 0x7f0800a5 net.micode.notes:style/Base.Widget.AppCompat.ActionMode = 0x7f0f006f -net.micode.notes:id/shortcut = 0x7f08009f -net.micode.notes:id/selection_menu = 0x7f08009e -net.micode.notes:id/search_plate = 0x7f08009a -net.micode.notes:id/search_close_btn = 0x7f080096 -net.micode.notes:id/search_bar = 0x7f080094 -net.micode.notes:id/scrollIndicatorUp = 0x7f080091 -net.micode.notes:id/right_side = 0x7f08008e +net.micode.notes:id/shortcut = 0x7f0800a1 +net.micode.notes:id/selection_menu = 0x7f0800a0 +net.micode.notes:id/search_plate = 0x7f08009c +net.micode.notes:id/search_close_btn = 0x7f080098 +net.micode.notes:id/search_bar = 0x7f080096 +net.micode.notes:id/scrollIndicatorUp = 0x7f080093 +net.micode.notes:id/right_side = 0x7f080090 net.micode.notes:layout/abc_alert_dialog_title_material = 0x7f0a000a -net.micode.notes:id/right_icon = 0x7f08008d +net.micode.notes:id/right_icon = 0x7f08008f net.micode.notes:string/abc_searchview_description_voice = 0x7f0e0023 -net.micode.notes:id/preference_sync_button = 0x7f080088 +net.micode.notes:id/preference_sync_button = 0x7f08008a net.micode.notes:style/RtlOverlay.Widget.AppCompat.Search.DropDown.Query = 0x7f0f00ba net.micode.notes:attr/fontProviderFetchTimeout = 0x7f030078 -net.micode.notes:id/parentPanel = 0x7f080086 -net.micode.notes:id/notification_main_column_container = 0x7f080085 +net.micode.notes:id/parentPanel = 0x7f080088 +net.micode.notes:id/notification_main_column_container = 0x7f080087 net.micode.notes:style/Widget.AppCompat.ListView.Menu = 0x7f0f014e -net.micode.notes:id/notification_main_column = 0x7f080084 +net.micode.notes:id/notification_main_column = 0x7f080086 net.micode.notes:style/TextAppearance.AppCompat.Widget.PopupMenu.Small = 0x7f0f00ec -net.micode.notes:id/notification_background = 0x7f080083 -net.micode.notes:string/menu_list_mode = 0x7f0e0053 +net.micode.notes:id/notification_background = 0x7f080085 +net.micode.notes:string/menu_list_mode = 0x7f0e0054 net.micode.notes:drawable/abc_list_divider_material = 0x7f070028 -net.micode.notes:id/note_title = 0x7f080081 +net.micode.notes:id/note_title = 0x7f080083 net.micode.notes:attr/actionModeBackground = 0x7f030010 -net.micode.notes:id/normal = 0x7f08007c +net.micode.notes:id/normal = 0x7f08007e net.micode.notes:attr/actionModeSplitBackground = 0x7f03001a -net.micode.notes:id/never = 0x7f08007a -net.micode.notes:id/multiply = 0x7f080078 -net.micode.notes:id/middle = 0x7f080075 -net.micode.notes:id/menu_search = 0x7f08006f -net.micode.notes:id/menu_delete_remind = 0x7f080069 +net.micode.notes:id/never = 0x7f08007c +net.micode.notes:id/multiply = 0x7f08007a +net.micode.notes:id/middle = 0x7f080077 +net.micode.notes:id/menu_search = 0x7f080071 +net.micode.notes:id/menu_restore = 0x7f080070 +net.micode.notes:id/menu_delete_remind = 0x7f08006a +net.micode.notes:style/Widget.AppCompat.Toolbar.Button.Navigation = 0x7f0f0161 +net.micode.notes:id/menu_change_view = 0x7f080068 net.micode.notes:id/menu_alert = 0x7f080067 net.micode.notes:style/Widget.AppCompat.SeekBar = 0x7f0f0159 net.micode.notes:drawable/notification_bg_normal = 0x7f07008d @@ -411,20 +416,20 @@ net.micode.notes:color/abc_background_cache_hint_selector_material_dark = 0x7f05 net.micode.notes:id/ll_font_normal = 0x7f080064 net.micode.notes:integer/abc_config_activityShortDur = 0x7f090001 net.micode.notes:id/list_item = 0x7f080062 -net.micode.notes:id/top = 0x7f0800b8 +net.micode.notes:id/top = 0x7f0800bb net.micode.notes:id/fill_horizontal = 0x7f080041 net.micode.notes:id/left = 0x7f08005e net.micode.notes:style/TextAppearance.AppCompat.Display4 = 0x7f0f00c7 net.micode.notes:id/iv_super_select = 0x7f08005d net.micode.notes:style/Base.TextAppearance.AppCompat.Widget.ActionBar.Subtitle = 0x7f0f0029 -net.micode.notes:id/note_edit_view = 0x7f08007f +net.micode.notes:id/note_edit_view = 0x7f080081 net.micode.notes:style/TextAppearanceNormal = 0x7f0f00f9 net.micode.notes:id/iv_small_select = 0x7f08005c net.micode.notes:drawable/notification_action_background = 0x7f070088 net.micode.notes:id/iv_bg_white_select = 0x7f080057 net.micode.notes:attr/actionModePasteDrawable = 0x7f030016 net.micode.notes:id/iv_bg_red_select = 0x7f080055 -net.micode.notes:id/widget_text = 0x7f0800c5 +net.micode.notes:id/widget_text = 0x7f0800c8 net.micode.notes:attr/indeterminateProgressStyle = 0x7f030089 net.micode.notes:id/iv_bg_green_select = 0x7f080053 net.micode.notes:style/TextAppearance.AppCompat.Subhead = 0x7f0f00d7 @@ -467,7 +472,7 @@ net.micode.notes:style/Widget.AppCompat.PopupMenu = 0x7f0f014f net.micode.notes:id/center_vertical = 0x7f08002b net.micode.notes:id/btn_new_note = 0x7f080025 net.micode.notes:style/Base.Theme.AppCompat.Dialog.FixedSize = 0x7f0f0040 -net.micode.notes:id/note_item = 0x7f080080 +net.micode.notes:id/note_item = 0x7f080082 net.micode.notes:style/Theme.AppCompat.Dialog.MinWidth = 0x7f0f0109 net.micode.notes:id/italic = 0x7f08004e net.micode.notes:style/Base.Theme.AppCompat.Light.DarkActionBar = 0x7f0f0044 @@ -477,7 +482,7 @@ net.micode.notes:id/bottom = 0x7f080024 net.micode.notes:id/beginning = 0x7f080022 net.micode.notes:attr/colorControlHighlight = 0x7f03004f net.micode.notes:id/async = 0x7f080021 -net.micode.notes:id/title = 0x7f0800b5 +net.micode.notes:id/title = 0x7f0800b8 net.micode.notes:id/iv_bg_white = 0x7f080056 net.micode.notes:dimen/compat_button_inset_horizontal_material = 0x7f06004b net.micode.notes:id/amPm = 0x7f080020 @@ -488,7 +493,7 @@ net.micode.notes:string/delete_remind_time_message = 0x7f0e0032 net.micode.notes:id/actions = 0x7f08001a net.micode.notes:id/action_text = 0x7f080019 net.micode.notes:style/Base.TextAppearance.AppCompat.Widget.PopupMenu.Header = 0x7f0f0034 -net.micode.notes:string/notelist_menu_new = 0x7f0e0069 +net.micode.notes:string/notelist_menu_new = 0x7f0e006c net.micode.notes:color/material_grey_50 = 0x7f050037 net.micode.notes:id/action_mode_close_button = 0x7f080017 net.micode.notes:id/action_mode_bar = 0x7f080015 @@ -507,7 +512,7 @@ net.micode.notes:attr/buttonBarPositiveButtonStyle = 0x7f03003b net.micode.notes:id/FUNCTION = 0x7f080002 net.micode.notes:id/iv_bg_blue_select = 0x7f080051 net.micode.notes:attr/autoSizeMinTextSize = 0x7f03002d -net.micode.notes:id/none = 0x7f08007b +net.micode.notes:id/none = 0x7f08007d net.micode.notes:drawable/widget_4x_red = 0x7f0700a1 net.micode.notes:drawable/widget_2x_white = 0x7f07009d net.micode.notes:drawable/widget_2x_green = 0x7f07009b @@ -527,17 +532,17 @@ net.micode.notes:attr/fontFamily = 0x7f030074 net.micode.notes:drawable/notify_panel_notification_icon_bg = 0x7f070093 net.micode.notes:string/abc_font_family_caption_material = 0x7f0e000b net.micode.notes:drawable/notification_template_icon_bg = 0x7f070090 -net.micode.notes:string/search_hint = 0x7f0e007e -net.micode.notes:id/text = 0x7f0800b0 +net.micode.notes:string/search_hint = 0x7f0e0081 +net.micode.notes:id/text = 0x7f0800b2 net.micode.notes:drawable/notification_icon_background = 0x7f07008f net.micode.notes:drawable/notification_bg_normal_pressed = 0x7f07008e net.micode.notes:drawable/abc_edit_text_material = 0x7f070012 net.micode.notes:drawable/notification_bg_low_pressed = 0x7f07008c -net.micode.notes:id/src_in = 0x7f0800a6 +net.micode.notes:id/src_in = 0x7f0800a8 net.micode.notes:attr/paddingStart = 0x7f0300ae net.micode.notes:drawable/notification_bg_low_normal = 0x7f07008b net.micode.notes:style/Base.Widget.AppCompat.Button = 0x7f0f0072 -net.micode.notes:id/note_bg_color_selector = 0x7f08007d +net.micode.notes:id/note_bg_color_selector = 0x7f08007f net.micode.notes:style/Base.Widget.AppCompat.Button.Borderless = 0x7f0f0073 net.micode.notes:style/Base.TextAppearance.AppCompat.SearchResult.Title = 0x7f0f0020 net.micode.notes:anim/abc_tooltip_exit = 0x7f01000b @@ -564,7 +569,7 @@ net.micode.notes:drawable/abc_ic_star_half_black_36dp = 0x7f070023 net.micode.notes:drawable/list_red_middle = 0x7f070076 net.micode.notes:drawable/list_green_down = 0x7f070071 net.micode.notes:style/Widget.AppCompat.ActionBar = 0x7f0f011a -net.micode.notes:id/showCustom = 0x7f0800a0 +net.micode.notes:id/showCustom = 0x7f0800a2 net.micode.notes:id/disableHome = 0x7f080039 net.micode.notes:style/Widget.AppCompat.Light.ActionBar.Solid = 0x7f0f0135 net.micode.notes:drawable/list_footer_bg = 0x7f070070 @@ -574,14 +579,14 @@ net.micode.notes:drawable/list_folder = 0x7f07006f net.micode.notes:id/ifRoom = 0x7f08004b net.micode.notes:drawable/list_blue_up = 0x7f07006e net.micode.notes:dimen/tooltip_margin = 0x7f060071 -net.micode.notes:id/menu_font_size = 0x7f08006b +net.micode.notes:id/menu_font_size = 0x7f08006c net.micode.notes:drawable/list_blue_single = 0x7f07006d net.micode.notes:style/TextAppearance.AppCompat.Title.Inverse = 0x7f0f00da net.micode.notes:string/hint_foler_name = 0x7f0e0044 net.micode.notes:drawable/abc_cab_background_top_material = 0x7f07000e net.micode.notes:drawable/font_super = 0x7f070068 -net.micode.notes:string/menu_deselect_all = 0x7f0e0049 -net.micode.notes:id/minute = 0x7f080076 +net.micode.notes:string/menu_deselect_all = 0x7f0e004a +net.micode.notes:id/minute = 0x7f080078 net.micode.notes:drawable/font_small = 0x7f070067 net.micode.notes:id/iv_medium_select = 0x7f08005b net.micode.notes:attr/selectableItemBackgroundBorderless = 0x7f0300c4 @@ -601,10 +606,10 @@ net.micode.notes:drawable/abc_item_background_holo_dark = 0x7f070026 net.micode.notes:drawable/abc_text_select_handle_middle_mtrl_light = 0x7f07004b net.micode.notes:attr/searchViewStyle = 0x7f0300c1 net.micode.notes:drawable/widget_4x_green = 0x7f0700a0 -net.micode.notes:id/topPanel = 0x7f0800b9 +net.micode.notes:id/topPanel = 0x7f0800bc net.micode.notes:dimen/abc_edit_text_inset_bottom_material = 0x7f06002c net.micode.notes:drawable/abc_tab_indicator_mtrl_alpha = 0x7f070046 -net.micode.notes:id/tv_folder_name = 0x7f0800bb +net.micode.notes:id/tv_folder_name = 0x7f0800be net.micode.notes:drawable/abc_btn_switch_to_on_mtrl_00012 = 0x7f07000c net.micode.notes:drawable/abc_switch_track_mtrl_alpha = 0x7f070044 net.micode.notes:style/Widget.AppCompat.Spinner.DropDown.ActionBar = 0x7f0f015d @@ -631,9 +636,9 @@ net.micode.notes:drawable/abc_scrubber_control_off_mtrl_alpha = 0x7f070039 net.micode.notes:drawable/abc_ratingbar_indicator_material = 0x7f070036 net.micode.notes:style/Base.TextAppearance.AppCompat.Widget.ActionMode.Subtitle = 0x7f0f002d net.micode.notes:drawable/abc_popup_background_mtrl_mult = 0x7f070035 -net.micode.notes:id/search_button = 0x7f080095 +net.micode.notes:id/search_button = 0x7f080097 net.micode.notes:drawable/list_blue_down = 0x7f07006b -net.micode.notes:id/menu_new_note = 0x7f08006e +net.micode.notes:id/menu_new_note = 0x7f08006f net.micode.notes:string/abc_action_bar_up_description = 0x7f0e0001 net.micode.notes:id/iv_bg_green = 0x7f080052 net.micode.notes:drawable/abc_list_selector_holo_light = 0x7f070033 @@ -653,19 +658,19 @@ net.micode.notes:drawable/abc_ic_star_black_48dp = 0x7f070021 net.micode.notes:color/abc_primary_text_material_dark = 0x7f05000a net.micode.notes:drawable/list_red_down = 0x7f070075 net.micode.notes:drawable/list_blue_middle = 0x7f07006c -net.micode.notes:string/preferences_menu_cancel = 0x7f0e0077 +net.micode.notes:string/preferences_menu_cancel = 0x7f0e007a net.micode.notes:drawable/abc_ic_star_black_36dp = 0x7f070020 net.micode.notes:drawable/abc_ic_star_black_16dp = 0x7f07001f net.micode.notes:drawable/abc_ic_menu_selectall_mtrl_alpha = 0x7f07001c net.micode.notes:drawable/note_edit_color_selector_panel = 0x7f070086 net.micode.notes:id/date = 0x7f080035 -net.micode.notes:id/search_voice_btn = 0x7f08009c +net.micode.notes:id/search_voice_btn = 0x7f08009e net.micode.notes:drawable/abc_ic_menu_paste_mtrl_am_alpha = 0x7f07001b net.micode.notes:drawable/abc_ic_menu_overflow_material = 0x7f07001a net.micode.notes:style/Platform.V21.AppCompat.Light = 0x7f0f00aa net.micode.notes:drawable/abc_ic_menu_cut_mtrl_alpha = 0x7f070019 -net.micode.notes:string/preferences_button_sync_cancel = 0x7f0e006f -net.micode.notes:id/search_edit_frame = 0x7f080097 +net.micode.notes:string/preferences_button_sync_cancel = 0x7f0e0072 +net.micode.notes:id/search_edit_frame = 0x7f080099 net.micode.notes:drawable/abc_ic_go_search_api_material = 0x7f070017 net.micode.notes:style/TextAppearance.AppCompat.Widget.ActionBar.Subtitle.Inverse = 0x7f0f00de net.micode.notes:drawable/abc_ic_commit_search_api_mtrl_alpha = 0x7f070016 @@ -708,11 +713,11 @@ net.micode.notes:id/iv_alert_icon = 0x7f08004f net.micode.notes:color/material_grey_100 = 0x7f050035 net.micode.notes:dimen/text_font_size_large = 0x7f06006a net.micode.notes:dimen/notification_top_pad_large_text = 0x7f060069 -net.micode.notes:id/up = 0x7f0800c2 +net.micode.notes:id/up = 0x7f0800c5 net.micode.notes:color/abc_tint_default = 0x7f050013 -net.micode.notes:id/menu_delete = 0x7f080068 +net.micode.notes:id/menu_delete = 0x7f080069 net.micode.notes:drawable/abc_control_background_material = 0x7f070010 -net.micode.notes:id/src_atop = 0x7f0800a5 +net.micode.notes:id/src_atop = 0x7f0800a7 net.micode.notes:color/abc_primary_text_disable_only_material_dark = 0x7f050008 net.micode.notes:dimen/notification_right_icon_size = 0x7f060063 net.micode.notes:dimen/notification_main_column_padding_top = 0x7f060061 @@ -720,13 +725,13 @@ net.micode.notes:style/TextAppearance.AppCompat.Widget.ActionMode.Subtitle.Inver net.micode.notes:dimen/notification_large_icon_width = 0x7f060060 net.micode.notes:attr/navigationContentDescription = 0x7f0300a7 net.micode.notes:attr/progressBarPadding = 0x7f0300b7 -net.micode.notes:id/menu_list_mode = 0x7f08006c +net.micode.notes:id/menu_list_mode = 0x7f08006d net.micode.notes:style/TextAppearance.Compat.Notification.Info = 0x7f0f00f0 net.micode.notes:style/TextAppearance.AppCompat.Headline = 0x7f0f00c8 net.micode.notes:dimen/notification_large_icon_height = 0x7f06005f net.micode.notes:dimen/notification_content_margin_start = 0x7f06005e net.micode.notes:dimen/notification_action_icon_size = 0x7f06005b -net.micode.notes:id/widget_bg_image = 0x7f0800c4 +net.micode.notes:id/widget_bg_image = 0x7f0800c7 net.micode.notes:dimen/hint_alpha_material_dark = 0x7f060057 net.micode.notes:dimen/highlight_alpha_material_dark = 0x7f060055 net.micode.notes:dimen/compat_button_padding_vertical_material = 0x7f06004e @@ -735,8 +740,8 @@ net.micode.notes:dimen/disabled_alpha_material_light = 0x7f060053 net.micode.notes:attr/colorControlNormal = 0x7f030050 net.micode.notes:dimen/disabled_alpha_material_dark = 0x7f060052 net.micode.notes:style/TextAppearancePrimaryItem = 0x7f0f00fa -net.micode.notes:id/tv_time = 0x7f0800be -net.micode.notes:id/prefenerece_sync_status_textview = 0x7f080087 +net.micode.notes:id/tv_time = 0x7f0800c1 +net.micode.notes:id/prefenerece_sync_status_textview = 0x7f080089 net.micode.notes:style/Widget.AppCompat.CompoundButton.CheckBox = 0x7f0f012d net.micode.notes:dimen/compat_notification_large_icon_max_height = 0x7f060050 net.micode.notes:style/Widget.Compat.NotificationActionText = 0x7f0f0163 @@ -754,13 +759,13 @@ net.micode.notes:color/primary_material_dark = 0x7f050040 net.micode.notes:dimen/abc_text_size_subtitle_material_toolbar = 0x7f060048 net.micode.notes:id/contentPanel = 0x7f080032 net.micode.notes:dimen/abc_text_size_menu_material = 0x7f060045 -net.micode.notes:id/right = 0x7f08008c +net.micode.notes:id/right = 0x7f08008e net.micode.notes:dimen/abc_text_size_large_material = 0x7f060042 net.micode.notes:dimen/abc_text_size_display_4_material = 0x7f060040 net.micode.notes:dimen/abc_seekbar_track_background_height_material = 0x7f060035 net.micode.notes:dimen/abc_text_size_display_3_material = 0x7f06003f net.micode.notes:dimen/abc_text_size_display_1_material = 0x7f06003d -net.micode.notes:id/note_edit_list = 0x7f08007e +net.micode.notes:id/note_edit_list = 0x7f080080 net.micode.notes:attr/progressBarStyle = 0x7f0300b8 net.micode.notes:dimen/abc_text_size_button_material = 0x7f06003b net.micode.notes:style/Base.Widget.AppCompat.ActionBar.Solid = 0x7f0f0068 @@ -790,14 +795,14 @@ net.micode.notes:style/TextAppearance.AppCompat.Menu = 0x7f0f00d2 net.micode.notes:layout/note_list_footer = 0x7f0a0026 net.micode.notes:dimen/abc_disabled_alpha_material_dark = 0x7f060027 net.micode.notes:dimen/abc_dialog_padding_top_material = 0x7f060025 -net.micode.notes:id/start = 0x7f0800a8 +net.micode.notes:id/start = 0x7f0800aa net.micode.notes:dimen/abc_dialog_padding_material = 0x7f060024 net.micode.notes:color/switch_thumb_disabled_material_dark = 0x7f05004e net.micode.notes:dimen/abc_dialog_list_padding_top_no_title = 0x7f060021 net.micode.notes:dimen/abc_dialog_fixed_width_minor = 0x7f06001f net.micode.notes:style/Base.TextAppearance.AppCompat.Widget.TextView.SpinnerItem = 0x7f0f0038 net.micode.notes:drawable/abc_btn_check_to_on_mtrl_015 = 0x7f070005 -net.micode.notes:string/search_setting_description = 0x7f0e0081 +net.micode.notes:string/search_setting_description = 0x7f0e0084 net.micode.notes:attr/defaultQueryHint = 0x7f030060 net.micode.notes:dimen/abc_dialog_title_divider_material = 0x7f060026 net.micode.notes:dimen/abc_dialog_fixed_height_minor = 0x7f06001d @@ -820,7 +825,7 @@ net.micode.notes:drawable/abc_text_select_handle_left_mtrl_light = 0x7f070049 net.micode.notes:dimen/abc_button_inset_horizontal_material = 0x7f060012 net.micode.notes:style/ThemeOverlay.AppCompat.Dark.ActionBar = 0x7f0f0116 net.micode.notes:dimen/abc_action_button_min_width_overflow_material = 0x7f06000f -net.micode.notes:string/menu_font_size = 0x7f0e0050 +net.micode.notes:string/menu_font_size = 0x7f0e0051 net.micode.notes:attr/iconifiedByDefault = 0x7f030087 net.micode.notes:dimen/abc_action_button_min_width_material = 0x7f06000e net.micode.notes:attr/actionModeCloseButtonStyle = 0x7f030011 @@ -867,7 +872,7 @@ net.micode.notes:color/material_grey_600 = 0x7f050038 net.micode.notes:style/Base.Widget.AppCompat.RatingBar.Small = 0x7f0f0096 net.micode.notes:drawable/abc_textfield_search_activated_mtrl_alpha = 0x7f070050 net.micode.notes:drawable/abc_btn_check_material = 0x7f070003 -net.micode.notes:id/sv_note_edit = 0x7f0800ab +net.micode.notes:id/sv_note_edit = 0x7f0800ad net.micode.notes:color/tooltip_background_dark = 0x7f050054 net.micode.notes:color/abc_search_url_text_pressed = 0x7f05000e net.micode.notes:dimen/notification_small_icon_background_padding = 0x7f060065 @@ -878,7 +883,7 @@ net.micode.notes:xml/widget_4x_info = 0x7f110003 net.micode.notes:color/material_deep_teal_200 = 0x7f050033 net.micode.notes:attr/listPreferredItemPaddingRight = 0x7f0300a1 net.micode.notes:layout/select_dialog_multichoice_material = 0x7f0a002e -net.micode.notes:id/search_badge = 0x7f080093 +net.micode.notes:id/search_badge = 0x7f080095 net.micode.notes:attr/autoCompleteTextViewStyle = 0x7f03002b net.micode.notes:color/foreground_material_dark = 0x7f05002c net.micode.notes:drawable/abc_vector_test = 0x7f070053 @@ -912,7 +917,7 @@ net.micode.notes:layout/abc_screen_content_include = 0x7f0a0014 net.micode.notes:color/material_grey_300 = 0x7f050036 net.micode.notes:color/abc_secondary_text_material_dark = 0x7f050010 net.micode.notes:color/bright_foreground_inverse_material_light = 0x7f050021 -net.micode.notes:string/ticker_syncing = 0x7f0e008c +net.micode.notes:string/ticker_syncing = 0x7f0e008f net.micode.notes:string/call_record_folder_name = 0x7f0e002f net.micode.notes:color/background_material_light = 0x7f05001d net.micode.notes:color/background_material_dark = 0x7f05001c @@ -925,7 +930,7 @@ net.micode.notes:id/et_edit_text = 0x7f08003c net.micode.notes:attr/actionBarStyle = 0x7f030005 net.micode.notes:string/error_sync_internal = 0x7f0e0039 net.micode.notes:color/abc_tint_switch_track = 0x7f050017 -net.micode.notes:id/notes_list = 0x7f080082 +net.micode.notes:id/notes_list = 0x7f080084 net.micode.notes:color/abc_tint_spinner = 0x7f050016 net.micode.notes:drawable/abc_ic_ab_back_material = 0x7f070013 net.micode.notes:attr/autoSizeStepGranularity = 0x7f03002f @@ -943,7 +948,7 @@ net.micode.notes:color/abc_primary_text_material_light = 0x7f05000b net.micode.notes:color/secondary_text_default_material_light = 0x7f05004b net.micode.notes:attr/initialActivityCount = 0x7f03008a net.micode.notes:color/abc_btn_colored_text_material = 0x7f050003 -net.micode.notes:id/submenuarrow = 0x7f0800a9 +net.micode.notes:id/submenuarrow = 0x7f0800ab net.micode.notes:drawable/abc_ic_menu_share_mtrl_alpha = 0x7f07001d net.micode.notes:styleable/ActionBarLayout = 0x7f100001 net.micode.notes:style/Base.V28.Theme.AppCompat.Light = 0x7f0f005e @@ -953,7 +958,7 @@ net.micode.notes:styleable/LinearLayoutCompat_Layout = 0x7f10001a net.micode.notes:id/action_menu_divider = 0x7f080013 net.micode.notes:drawable/abc_text_select_handle_left_mtrl_dark = 0x7f070048 net.micode.notes:attr/alertDialogButtonGroupStyle = 0x7f030022 -net.micode.notes:string/menu_normal_mode = 0x7f0e0056 +net.micode.notes:string/menu_normal_mode = 0x7f0e0057 net.micode.notes:string/format_exported_file_location = 0x7f0e0041 net.micode.notes:bool/abc_config_actionMenuItemAllCaps = 0x7f040002 net.micode.notes:dimen/abc_text_size_headline_material = 0x7f060041 @@ -964,12 +969,12 @@ net.micode.notes:color/bright_foreground_material_dark = 0x7f050022 net.micode.notes:bool/abc_action_bar_embed_tabs = 0x7f040000 net.micode.notes:attr/windowNoTitle = 0x7f03010f net.micode.notes:id/action_menu_presenter = 0x7f080014 -net.micode.notes:string/menu_select_none = 0x7f0e005a +net.micode.notes:string/menu_select_none = 0x7f0e005c net.micode.notes:attr/closeItemLayout = 0x7f030047 net.micode.notes:style/Widget.AppCompat.Light.PopupMenu = 0x7f0f0146 net.micode.notes:dimen/abc_alert_dialog_button_bar_height = 0x7f060010 net.micode.notes:drawable/abc_list_divider_mtrl_alpha = 0x7f070029 -net.micode.notes:id/search_mag_icon = 0x7f080099 +net.micode.notes:id/search_mag_icon = 0x7f08009b net.micode.notes:array/menu_share_ways = 0x7f020001 net.micode.notes:attr/textAppearanceLargePopupMenu = 0x7f0300dd net.micode.notes:attr/windowFixedHeightMinor = 0x7f03010a @@ -979,9 +984,6 @@ net.micode.notes:drawable/abc_list_focused_holo = 0x7f07002a net.micode.notes:attr/textAppearanceListItemSecondary = 0x7f0300df net.micode.notes:drawable/new_note = 0x7f070083 net.micode.notes:attr/ttcIndex = 0x7f030103 -net.micode.notes:id/showTitle = 0x7f0800a2 -net.micode.notes:attr/editTextStyle = 0x7f03006f -net.micode.notes:id/progress_circular = 0x7f080089 net.micode.notes:anim/abc_slide_out_bottom = 0x7f010008 net.micode.notes:attr/background = 0x7f030031 net.micode.notes:dimen/abc_action_bar_content_inset_with_nav = 0x7f060001 @@ -991,14 +993,14 @@ net.micode.notes:layout/abc_activity_chooser_view_list_item = 0x7f0a0007 net.micode.notes:attr/tooltipFrameBackground = 0x7f0300fe net.micode.notes:style/TextAppearance.AppCompat.Widget.ActionMode.Title = 0x7f0f00e3 net.micode.notes:style/Base.TextAppearance.AppCompat.Menu = 0x7f0f001d -net.micode.notes:id/menu_new_folder = 0x7f08006d +net.micode.notes:id/menu_new_folder = 0x7f08006e net.micode.notes:string/abc_searchview_description_search = 0x7f0e0021 net.micode.notes:drawable/call_record = 0x7f070056 net.micode.notes:style/TextAppearance.AppCompat.SearchResult.Title = 0x7f0f00d4 net.micode.notes:attr/singleChoiceItemLayout = 0x7f0300c9 net.micode.notes:attr/titleTextColor = 0x7f0300f9 net.micode.notes:attr/titleTextAppearance = 0x7f0300f8 -net.micode.notes:string/note_link_other = 0x7f0e0064 +net.micode.notes:string/note_link_other = 0x7f0e0067 net.micode.notes:drawable/abc_textfield_activated_mtrl_alpha = 0x7f07004e net.micode.notes:dimen/notification_subtext_size = 0x7f060067 net.micode.notes:attr/titleMarginStart = 0x7f0300f5 @@ -1017,7 +1019,7 @@ net.micode.notes:attr/layout_insetEdge = 0x7f030094 net.micode.notes:style/Platform.V21.AppCompat = 0x7f0f00a9 net.micode.notes:attr/textColorAlertDialogListItem = 0x7f0300e5 net.micode.notes:string/app_widget2x2 = 0x7f0e002c -net.micode.notes:id/split_action_bar = 0x7f0800a4 +net.micode.notes:id/split_action_bar = 0x7f0800a6 net.micode.notes:attr/paddingBottomNoButtons = 0x7f0300ac net.micode.notes:style/Base.Animation.AppCompat.Dialog = 0x7f0f0007 net.micode.notes:attr/buttonPanelSideLayout = 0x7f03003f @@ -1034,7 +1036,7 @@ net.micode.notes:id/ll_font_large = 0x7f080063 net.micode.notes:id/cb_edit_item = 0x7f080028 net.micode.notes:string/button_delete = 0x7f0e002e net.micode.notes:attr/trackTintMode = 0x7f030102 -net.micode.notes:id/progress_horizontal = 0x7f08008a +net.micode.notes:id/progress_horizontal = 0x7f08008c net.micode.notes:color/secondary_text_default_material_dark = 0x7f05004a net.micode.notes:dimen/abc_text_size_display_2_material = 0x7f06003e net.micode.notes:attr/barLength = 0x7f030036 @@ -1042,15 +1044,15 @@ net.micode.notes:attr/actionMenuTextColor = 0x7f03000f net.micode.notes:style/Base.V7.Theme.AppCompat.Light.Dialog = 0x7f0f0062 net.micode.notes:attr/switchStyle = 0x7f0300da net.micode.notes:id/action_select_all = 0x7f080018 -net.micode.notes:id/scrollIndicatorDown = 0x7f080090 +net.micode.notes:id/scrollIndicatorDown = 0x7f080092 net.micode.notes:attr/textColorSearchUrl = 0x7f0300e6 net.micode.notes:attr/switchPadding = 0x7f0300d9 net.micode.notes:attr/suggestionRowLayout = 0x7f0300d7 net.micode.notes:attr/subtitleTextStyle = 0x7f0300d6 -net.micode.notes:string/menu_move = 0x7f0e0054 +net.micode.notes:string/menu_move = 0x7f0e0055 net.micode.notes:dimen/abc_action_bar_stacked_max_height = 0x7f060009 net.micode.notes:style/Theme.AppCompat.DayNight.NoActionBar = 0x7f0f0106 -net.micode.notes:id/search_go_btn = 0x7f080098 +net.micode.notes:id/search_go_btn = 0x7f08009a net.micode.notes:drawable/notification_template_icon_low_bg = 0x7f070091 net.micode.notes:attr/divider = 0x7f030065 net.micode.notes:attr/subtitleTextColor = 0x7f0300d5 @@ -1059,21 +1061,21 @@ net.micode.notes:string/abc_menu_ctrl_shortcut_label = 0x7f0e0015 net.micode.notes:layout/abc_popup_menu_header_item_layout = 0x7f0a0012 net.micode.notes:dimen/abc_switch_padding = 0x7f060038 net.micode.notes:style/Widget.AppCompat.ProgressBar.Horizontal = 0x7f0f0153 -net.micode.notes:string/sync_progress_init_list = 0x7f0e0086 +net.micode.notes:string/sync_progress_init_list = 0x7f0e0089 net.micode.notes:color/foreground_material_light = 0x7f05002d -net.micode.notes:id/radio = 0x7f08008b +net.micode.notes:id/radio = 0x7f08008d net.micode.notes:attr/state_above_anchor = 0x7f0300cf net.micode.notes:attr/itemPadding = 0x7f03008c net.micode.notes:attr/dividerPadding = 0x7f030067 net.micode.notes:layout/note_edit = 0x7f0a0021 net.micode.notes:attr/srcCompat = 0x7f0300ce net.micode.notes:drawable/abc_ic_voice_search_api_material = 0x7f070025 -net.micode.notes:id/search_src_text = 0x7f08009b +net.micode.notes:id/search_src_text = 0x7f08009d net.micode.notes:dimen/abc_action_bar_default_padding_start_material = 0x7f060004 net.micode.notes:color/primary_dark_material_light = 0x7f05003f -net.micode.notes:id/text2 = 0x7f0800b1 +net.micode.notes:id/text2 = 0x7f0800b3 net.micode.notes:drawable/abc_btn_radio_material = 0x7f070008 -net.micode.notes:id/menu_share = 0x7f080072 +net.micode.notes:id/menu_share = 0x7f080074 net.micode.notes:attr/showTitle = 0x7f0300c8 net.micode.notes:attr/isLightTheme = 0x7f03008b net.micode.notes:style/Base.Widget.AppCompat.ActivityChooserView = 0x7f0f0070 @@ -1119,16 +1121,16 @@ net.micode.notes:attr/checkedTextViewStyle = 0x7f030045 net.micode.notes:drawable/edit_title_green = 0x7f07005e net.micode.notes:drawable/abc_seekbar_thumb_material = 0x7f07003e net.micode.notes:drawable/abc_item_background_holo_light = 0x7f070027 -net.micode.notes:string/menu_folder_view = 0x7f0e004d +net.micode.notes:string/menu_folder_view = 0x7f0e004e net.micode.notes:color/ripple_material_light = 0x7f050048 net.micode.notes:attr/navigationMode = 0x7f0300a9 -net.micode.notes:id/menu_export_text = 0x7f08006a +net.micode.notes:id/menu_export_text = 0x7f08006b net.micode.notes:attr/logo = 0x7f0300a2 net.micode.notes:attr/listPopupWindowStyle = 0x7f03009c net.micode.notes:style/Widget.AppCompat.RatingBar.Small = 0x7f0f0156 net.micode.notes:attr/thumbTintMode = 0x7f0300eb net.micode.notes:attr/actionBarPopupTheme = 0x7f030002 -net.micode.notes:string/preferences_dialog_select_account_title = 0x7f0e0074 +net.micode.notes:string/preferences_dialog_select_account_title = 0x7f0e0077 net.micode.notes:layout/abc_action_bar_title_item = 0x7f0a0000 net.micode.notes:attr/listPreferredItemHeightSmall = 0x7f03009f net.micode.notes:style/Base.V7.Widget.AppCompat.EditText = 0x7f0f0065 @@ -1156,7 +1158,7 @@ net.micode.notes:attr/layout_anchorGravity = 0x7f030091 net.micode.notes:color/primary_dark_material_dark = 0x7f05003e net.micode.notes:attr/layout_anchor = 0x7f030090 net.micode.notes:style/Platform.ThemeOverlay.AppCompat.Light = 0x7f0f00a8 -net.micode.notes:string/menu_font_small = 0x7f0e0051 +net.micode.notes:string/menu_font_small = 0x7f0e0052 net.micode.notes:drawable/list_background = 0x7f07006a net.micode.notes:style/Theme.AppCompat.Light.NoActionBar = 0x7f0f0111 net.micode.notes:color/abc_color_highlight_material = 0x7f050004 @@ -1183,10 +1185,10 @@ net.micode.notes:attr/iconTint = 0x7f030085 net.micode.notes:attr/textAppearanceListItemSmall = 0x7f0300e0 net.micode.notes:attr/layout = 0x7f03008f net.micode.notes:style/Base.Widget.AppCompat.ActionBar.TabView = 0x7f0f006b -net.micode.notes:id/tv_name = 0x7f0800bd +net.micode.notes:id/tv_name = 0x7f0800c0 net.micode.notes:attr/icon = 0x7f030084 net.micode.notes:style/Widget.AppCompat.Button = 0x7f0f0125 -net.micode.notes:id/uniform = 0x7f0800c1 +net.micode.notes:id/uniform = 0x7f0800c4 net.micode.notes:attr/multiChoiceItemLayout = 0x7f0300a6 net.micode.notes:id/iv_bg_blue = 0x7f080050 net.micode.notes:attr/colorAccent = 0x7f03004b @@ -1199,7 +1201,7 @@ net.micode.notes:style/Base.Widget.AppCompat.Light.ActionBar.TabView = 0x7f0f008 net.micode.notes:drawable/bg_btn_set_color = 0x7f070054 net.micode.notes:style/TextAppearance.AppCompat.Widget.PopupMenu.Large = 0x7f0f00eb net.micode.notes:dimen/hint_pressed_alpha_material_light = 0x7f06005a -net.micode.notes:id/titleDividerNoCustom = 0x7f0800b6 +net.micode.notes:id/titleDividerNoCustom = 0x7f0800b9 net.micode.notes:attr/fontVariationSettings = 0x7f03007c net.micode.notes:layout/note_edit_list_item = 0x7f0a0022 net.micode.notes:attr/fontStyle = 0x7f03007b @@ -1211,7 +1213,10 @@ net.micode.notes:attr/expandActivityOverflowButtonDrawable = 0x7f030071 net.micode.notes:style/Base.Widget.AppCompat.RatingBar.Indicator = 0x7f0f0095 net.micode.notes:drawable/abc_ic_arrow_drop_right_black_24dp = 0x7f070014 net.micode.notes:attr/lastBaselineToBottomHeight = 0x7f03008e -net.micode.notes:id/textSpacerNoTitle = 0x7f0800b3 +net.micode.notes:id/showTitle = 0x7f0800a4 +net.micode.notes:id/progress_circular = 0x7f08008b +net.micode.notes:attr/editTextStyle = 0x7f03006f +net.micode.notes:id/textSpacerNoTitle = 0x7f0800b5 net.micode.notes:attr/editTextColor = 0x7f03006e net.micode.notes:attr/editTextBackground = 0x7f03006d net.micode.notes:id/iv_bg_yellow_select = 0x7f080059 @@ -1224,11 +1229,11 @@ net.micode.notes:attr/dividerVertical = 0x7f030068 net.micode.notes:dimen/abc_seekbar_track_progress_height_material = 0x7f060036 net.micode.notes:attr/textAppearanceSmallPopupMenu = 0x7f0300e4 net.micode.notes:style/Base.Widget.AppCompat.SeekBar.Discrete = 0x7f0f009a -net.micode.notes:id/navigation_bar = 0x7f080079 -net.micode.notes:id/menu_sync = 0x7f080073 +net.micode.notes:id/navigation_bar = 0x7f08007b +net.micode.notes:id/menu_sync = 0x7f080075 net.micode.notes:style/Widget.AppCompat.ProgressBar = 0x7f0f0152 net.micode.notes:dimen/abc_text_size_title_material = 0x7f060049 -net.micode.notes:id/menu_setting = 0x7f080071 +net.micode.notes:id/menu_setting = 0x7f080073 net.micode.notes:drawable/edit_title_blue = 0x7f07005d net.micode.notes:style/Theme.AppCompat = 0x7f0f00fe net.micode.notes:attr/dialogTheme = 0x7f030063 @@ -1258,10 +1263,10 @@ net.micode.notes:styleable/TextAppearance = 0x7f100027 net.micode.notes:style/TextAppearance.AppCompat.Widget.Switch = 0x7f0f00ed net.micode.notes:dimen/abc_control_corner_material = 0x7f060018 net.micode.notes:string/abc_font_family_display_1_material = 0x7f0e000c -net.micode.notes:id/useLogo = 0x7f0800c3 +net.micode.notes:id/useLogo = 0x7f0800c6 net.micode.notes:attr/contentInsetStartWithNavigation = 0x7f03005c net.micode.notes:attr/contentInsetStart = 0x7f03005b -net.micode.notes:string/menu_select_title = 0x7f0e005b +net.micode.notes:string/menu_select_title = 0x7f0e005d net.micode.notes:color/material_blue_grey_950 = 0x7f050032 net.micode.notes:id/CTRL = 0x7f080001 net.micode.notes:style/Base.TextAppearance.AppCompat.Title = 0x7f0f0025 @@ -1269,25 +1274,26 @@ net.micode.notes:dimen/abc_dropdownitem_text_padding_right = 0x7f06002b net.micode.notes:attr/paddingTopNoTitle = 0x7f0300af net.micode.notes:attr/contentInsetRight = 0x7f03005a net.micode.notes:style/Base.AlertDialog.AppCompat.Light = 0x7f0f0006 -net.micode.notes:id/menu_send_to_desktop = 0x7f080070 +net.micode.notes:id/menu_send_to_desktop = 0x7f080072 net.micode.notes:id/end = 0x7f08003b net.micode.notes:color/bright_foreground_disabled_material_light = 0x7f05001f net.micode.notes:attr/dropDownListViewStyle = 0x7f03006b net.micode.notes:attr/thumbTextPadding = 0x7f0300e9 net.micode.notes:style/RtlUnderlay.Widget.AppCompat.ActionButton = 0x7f0f00bd net.micode.notes:style/Base.TextAppearance.AppCompat.Button = 0x7f0f000f +net.micode.notes:string/menu_restore = 0x7f0e0059 net.micode.notes:string/app_widget4x4 = 0x7f0e002d net.micode.notes:id/action_mode_bar_stub = 0x7f080016 net.micode.notes:attr/colorPrimaryDark = 0x7f030053 net.micode.notes:style/Widget.AppCompat.ActionButton = 0x7f0f011f net.micode.notes:style/Base.Animation.AppCompat.Tooltip = 0x7f0f0009 -net.micode.notes:string/sync_progress_syncing = 0x7f0e0088 +net.micode.notes:string/sync_progress_syncing = 0x7f0e008b net.micode.notes:attr/contentInsetEnd = 0x7f030057 net.micode.notes:style/AlertDialog.AppCompat.Light = 0x7f0f0001 net.micode.notes:attr/panelBackground = 0x7f0300b0 net.micode.notes:string/abc_capital_off = 0x7f0e0006 net.micode.notes:attr/imageButtonStyle = 0x7f030088 -net.micode.notes:id/showHome = 0x7f0800a1 +net.micode.notes:id/showHome = 0x7f0800a3 net.micode.notes:dimen/abc_action_bar_content_inset_material = 0x7f060000 net.micode.notes:drawable/edit_blue = 0x7f07005a net.micode.notes:style/Widget.AppCompat.TextView.SpinnerItem = 0x7f0f015f @@ -1318,15 +1324,16 @@ net.micode.notes:attr/textAppearanceSearchResultSubtitle = 0x7f0300e2 net.micode.notes:id/collapseActionView = 0x7f080030 net.micode.notes:dimen/abc_dialog_fixed_height_major = 0x7f06001c net.micode.notes:style/TextAppearance.AppCompat.Widget.Button.Borderless.Colored = 0x7f0f00e6 +net.micode.notes:string/menu_change_view = 0x7f0e0047 net.micode.notes:dimen/abc_action_bar_subtitle_bottom_margin_material = 0x7f06000b net.micode.notes:attr/checkboxStyle = 0x7f030044 net.micode.notes:drawable/widget_2x_yellow = 0x7f07009e net.micode.notes:attr/preserveIconSpacing = 0x7f0300b6 -net.micode.notes:string/menu_title_select_folder = 0x7f0e0061 +net.micode.notes:string/menu_title_select_folder = 0x7f0e0063 net.micode.notes:drawable/bg_color_btn_mask = 0x7f070055 net.micode.notes:string/abc_menu_enter_shortcut_label = 0x7f0e0017 net.micode.notes:color/bright_foreground_inverse_material_dark = 0x7f050020 -net.micode.notes:id/message = 0x7f080074 +net.micode.notes:id/message = 0x7f080076 net.micode.notes:drawable/dropdown_icon = 0x7f070059 net.micode.notes:drawable/abc_scrubber_primary_mtrl_alpha = 0x7f07003c net.micode.notes:style/Widget.AppCompat.Spinner = 0x7f0f015b @@ -1341,7 +1348,7 @@ net.micode.notes:attr/gapBetweenBars = 0x7f03007e net.micode.notes:style/TextAppearance.AppCompat = 0x7f0f00bf net.micode.notes:layout/abc_tooltip = 0x7f0a001b net.micode.notes:attr/buttonStyleSmall = 0x7f030041 -net.micode.notes:string/preferences_dialog_change_account_warn_msg = 0x7f0e0072 +net.micode.notes:string/preferences_dialog_change_account_warn_msg = 0x7f0e0075 net.micode.notes:color/primary_text_default_material_light = 0x7f050044 net.micode.notes:menu/call_note_edit = 0x7f0b0000 net.micode.notes:attr/switchMinWidth = 0x7f0300d8 @@ -1368,7 +1375,7 @@ net.micode.notes:attr/actionBarSize = 0x7f030003 net.micode.notes:style/Base.V21.ThemeOverlay.AppCompat.Dialog = 0x7f0f0055 net.micode.notes:string/abc_font_family_display_2_material = 0x7f0e000d net.micode.notes:layout/datetime_picker = 0x7f0a001e -net.micode.notes:id/scrollView = 0x7f080092 +net.micode.notes:id/scrollView = 0x7f080094 net.micode.notes:attr/activityChooserViewStyle = 0x7f030021 net.micode.notes:attr/actionDropDownStyle = 0x7f03000c net.micode.notes:attr/textAllCaps = 0x7f0300dc @@ -1381,7 +1388,7 @@ net.micode.notes:attr/buttonTint = 0x7f030042 net.micode.notes:id/iv_bg_yellow = 0x7f080058 net.micode.notes:style/Base.Theme.AppCompat.DialogWhenLarge = 0x7f0f0042 net.micode.notes:attr/tickMark = 0x7f0300ec -net.micode.notes:id/move = 0x7f080077 +net.micode.notes:id/move = 0x7f080079 net.micode.notes:id/iv_bg_red = 0x7f080054 net.micode.notes:attr/actionOverflowMenuStyle = 0x7f03001e net.micode.notes:color/abc_input_method_navigation_guard = 0x7f050007 @@ -1390,7 +1397,7 @@ net.micode.notes:attr/color = 0x7f03004a net.micode.notes:color/accent_material_dark = 0x7f050018 net.micode.notes:attr/layout_dodgeInsetEdges = 0x7f030093 net.micode.notes:drawable/notification_bg = 0x7f070089 -net.micode.notes:string/preferences_dialog_change_account_title = 0x7f0e0071 +net.micode.notes:string/preferences_dialog_change_account_title = 0x7f0e0074 net.micode.notes:dimen/text_font_size_super = 0x7f06006e net.micode.notes:attr/alertDialogStyle = 0x7f030024 net.micode.notes:layout/abc_select_dialog_material = 0x7f0a001a @@ -1426,7 +1433,7 @@ net.micode.notes:dimen/abc_alert_dialog_button_dimen = 0x7f060011 net.micode.notes:attr/windowFixedHeightMajor = 0x7f030109 net.micode.notes:attr/ratingBarStyleSmall = 0x7f0300be net.micode.notes:id/delete = 0x7f080038 -net.micode.notes:string/preferences_menu_change_account = 0x7f0e0078 +net.micode.notes:string/preferences_menu_change_account = 0x7f0e007b net.micode.notes:attr/borderlessButtonStyle = 0x7f030037 net.micode.notes:dimen/abc_dialog_min_width_major = 0x7f060022 net.micode.notes:attr/drawerArrowStyle = 0x7f03006a @@ -1448,21 +1455,21 @@ net.micode.notes:drawable/widget_2x_red = 0x7f07009c net.micode.notes:string/abc_shareactionprovider_share_with = 0x7f0e0024 net.micode.notes:attr/actionBarSplitStyle = 0x7f030004 net.micode.notes:style/Widget.AppCompat.ActionBar.TabView = 0x7f0f011e -net.micode.notes:id/select_dialog_listview = 0x7f08009d +net.micode.notes:id/select_dialog_listview = 0x7f08009f net.micode.notes:attr/actionModeShareDrawable = 0x7f030019 net.micode.notes:styleable/CoordinatorLayout = 0x7f100012 net.micode.notes:layout/abc_action_mode_close_item_material = 0x7f0a0005 net.micode.notes:attr/listItemLayout = 0x7f030099 -net.micode.notes:id/screen = 0x7f08008f +net.micode.notes:id/screen = 0x7f080091 net.micode.notes:drawable/edit_title_red = 0x7f07005f net.micode.notes:drawable/abc_list_selector_background_transition_holo_dark = 0x7f07002e -net.micode.notes:id/tv_title = 0x7f0800bf +net.micode.notes:id/tv_title = 0x7f0800c2 net.micode.notes:color/ripple_material_dark = 0x7f050047 net.micode.notes:style/TextAppearance.AppCompat.Widget.PopupMenu.Header = 0x7f0f00ea net.micode.notes:anim/abc_popup_exit = 0x7f010004 net.micode.notes:integer/cancel_button_image_alpha = 0x7f090002 net.micode.notes:dimen/abc_text_size_medium_material = 0x7f060043 -net.micode.notes:string/menu_create_folder = 0x7f0e0047 +net.micode.notes:string/menu_create_folder = 0x7f0e0048 net.micode.notes:attr/windowActionBar = 0x7f030106 net.micode.notes:drawable/abc_tab_indicator_material = 0x7f070045 net.micode.notes:styleable/AlertDialog = 0x7f100006 diff --git a/src/Notes-master1/app/build/intermediates/symbol_list_with_package_name/debug/package-aware-r.txt b/src/Notes-master1/app/build/intermediates/symbol_list_with_package_name/debug/package-aware-r.txt index fcdfd9d3..b255f1e4 100644 --- a/src/Notes-master1/app/build/intermediates/symbol_list_with_package_name/debug/package-aware-r.txt +++ b/src/Notes-master1/app/build/intermediates/symbol_list_with_package_name/debug/package-aware-r.txt @@ -762,6 +762,7 @@ id ll_font_normal id ll_font_small id ll_font_super id menu_alert +id menu_change_view id menu_delete id menu_delete_remind id menu_export_text @@ -769,6 +770,7 @@ id menu_font_size id menu_list_mode id menu_new_folder id menu_new_note +id menu_restore id menu_search id menu_send_to_desktop id menu_setting @@ -838,6 +840,7 @@ id text id text2 id textSpacerNoButtons id textSpacerNoTitle +id text_num id time id title id titleDividerNoCustom @@ -922,6 +925,7 @@ menu note_list menu note_list_dropdown menu note_list_options menu sub_folder +menu trash_folder plurals search_results_title raw introduction string abc_action_bar_home_description @@ -995,6 +999,7 @@ string format_move_notes_to_folder string hint_foler_name string info_note_enter_desktop string menu_alert +string menu_change_view string menu_create_folder string menu_delete string menu_deselect_all @@ -1012,6 +1017,7 @@ string menu_move string menu_move_parent_folder string menu_normal_mode string menu_remove_remind +string menu_restore string menu_search string menu_select_all string menu_select_none @@ -1023,6 +1029,7 @@ string menu_sync string menu_sync_cancel string menu_title_select_folder string note_alert_expired +string note_length string note_link_email string note_link_other string note_link_tel diff --git a/src/Notes-master1/app/build/outputs/apk/debug/app-debug.apk b/src/Notes-master1/app/build/outputs/apk/debug/app-debug.apk index 7746080a..10975fc1 100644 Binary files a/src/Notes-master1/app/build/outputs/apk/debug/app-debug.apk and b/src/Notes-master1/app/build/outputs/apk/debug/app-debug.apk differ diff --git a/src/Notes-master1/app/build/outputs/logs/manifest-merger-debug-report.txt b/src/Notes-master1/app/build/outputs/logs/manifest-merger-debug-report.txt index 1a82bb80..f0fc5197 100644 --- a/src/Notes-master1/app/build/outputs/logs/manifest-merger-debug-report.txt +++ b/src/Notes-master1/app/build/outputs/logs/manifest-merger-debug-report.txt @@ -1,319 +1,319 @@ -- Merging decision tree log --- manifest -ADDED from E:\Notes-master1\app\src\main\AndroidManifest.xml:18:1-150:12 -INJECTED from E:\Notes-master1\app\src\main\AndroidManifest.xml:18:1-150:12 -INJECTED from E:\Notes-master1\app\src\main\AndroidManifest.xml:18:1-150:12 -INJECTED from E:\Notes-master1\app\src\main\AndroidManifest.xml:18:1-150:12 -MERGED from [com.android.support:appcompat-v7:28.0.0] C:\Users\С\.gradle\caches\transforms-3\86ef1ec83f39cd41be9f0f4ea4f4caae\transformed\appcompat-v7-28.0.0\AndroidManifest.xml:17:1-22:12 -MERGED from [com.android.support:support-fragment:28.0.0] C:\Users\С\.gradle\caches\transforms-3\192a531daa3105f4a7219058a2e0630a\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\С\.gradle\caches\transforms-3\9bcb446c7bc3e879188d5c8c8a231e94\transformed\animated-vector-drawable-28.0.0\AndroidManifest.xml:17:1-22:12 -MERGED from [com.android.support:support-core-ui:28.0.0] C:\Users\С\.gradle\caches\transforms-3\7a6009b56bb7e7d171372dd2c51fe57b\transformed\support-core-ui-28.0.0\AndroidManifest.xml:17:1-22:12 -MERGED from [com.android.support:support-core-utils:28.0.0] C:\Users\С\.gradle\caches\transforms-3\33e2efbf6f689399cbad4e309f039359\transformed\support-core-utils-28.0.0\AndroidManifest.xml:17:1-22:12 -MERGED from [com.android.support:support-vector-drawable:28.0.0] C:\Users\С\.gradle\caches\transforms-3\40324b64e33e464e2ab02259c275ad57\transformed\support-vector-drawable-28.0.0\AndroidManifest.xml:17:1-22:12 -MERGED from [com.android.support:loader:28.0.0] C:\Users\С\.gradle\caches\transforms-3\f5f208d7e6f038cff501781807be3f02\transformed\loader-28.0.0\AndroidManifest.xml:17:1-22:12 -MERGED from [com.android.support:viewpager:28.0.0] C:\Users\С\.gradle\caches\transforms-3\a7e2401d8d584c0490237cd3520baaf3\transformed\viewpager-28.0.0\AndroidManifest.xml:17:1-22:12 -MERGED from [com.android.support:coordinatorlayout:28.0.0] C:\Users\С\.gradle\caches\transforms-3\82952f08b31bd35f2fe29eb30da1d402\transformed\coordinatorlayout-28.0.0\AndroidManifest.xml:17:1-22:12 -MERGED from [com.android.support:drawerlayout:28.0.0] C:\Users\С\.gradle\caches\transforms-3\c758c7a3b7a26b05fdf62836f3038bee\transformed\drawerlayout-28.0.0\AndroidManifest.xml:17:1-22:12 -MERGED from [com.android.support:slidingpanelayout:28.0.0] C:\Users\С\.gradle\caches\transforms-3\c523a6f194470aab673a03ff24bf026e\transformed\slidingpanelayout-28.0.0\AndroidManifest.xml:17:1-22:12 -MERGED from [com.android.support:customview:28.0.0] C:\Users\С\.gradle\caches\transforms-3\780b99f235cc7f787d5381e832780214\transformed\customview-28.0.0\AndroidManifest.xml:17:1-22:12 -MERGED from [com.android.support:swiperefreshlayout:28.0.0] C:\Users\С\.gradle\caches\transforms-3\2323735431f2df21fd3ac945c54acd43\transformed\swiperefreshlayout-28.0.0\AndroidManifest.xml:17:1-22:12 -MERGED from [com.android.support:asynclayoutinflater:28.0.0] C:\Users\С\.gradle\caches\transforms-3\fa27ce9b4167bb2bca61b3cae5d0f182\transformed\asynclayoutinflater-28.0.0\AndroidManifest.xml:17:1-22:12 -MERGED from [com.android.support:support-compat:28.0.0] C:\Users\С\.gradle\caches\transforms-3\21795bd83e308c947c8dfe0c1fc89322\transformed\support-compat-28.0.0\AndroidManifest.xml:17:1-24:12 -MERGED from [com.android.support:versionedparcelable:28.0.0] C:\Users\С\.gradle\caches\transforms-3\6a748369916ed9cf30454babbea8b524\transformed\versionedparcelable-28.0.0\AndroidManifest.xml:17:1-25:12 -MERGED from [com.android.support:cursoradapter:28.0.0] C:\Users\С\.gradle\caches\transforms-3\d028ad711a3e49fdee14a6fba76b1b78\transformed\cursoradapter-28.0.0\AndroidManifest.xml:17:1-22:12 -MERGED from [android.arch.lifecycle:runtime:1.1.1] C:\Users\С\.gradle\caches\transforms-3\374b9bb541c658826272395a97809e58\transformed\runtime-1.1.1\AndroidManifest.xml:17:1-22:12 -MERGED from [com.android.support:documentfile:28.0.0] C:\Users\С\.gradle\caches\transforms-3\fe0f5b7ff8749fb1bc02aca91191c4fb\transformed\documentfile-28.0.0\AndroidManifest.xml:17:1-22:12 -MERGED from [com.android.support:localbroadcastmanager:28.0.0] C:\Users\С\.gradle\caches\transforms-3\f50079446f7b36e4b1a4ffd69432bd34\transformed\localbroadcastmanager-28.0.0\AndroidManifest.xml:17:1-22:12 -MERGED from [com.android.support:print:28.0.0] C:\Users\С\.gradle\caches\transforms-3\6b9b99a2b5333d73a481b6b9a53cb843\transformed\print-28.0.0\AndroidManifest.xml:17:1-22:12 -MERGED from [android.arch.lifecycle:viewmodel:1.1.1] C:\Users\С\.gradle\caches\transforms-3\94ddae9e21bb94c1684147d11c41122b\transformed\viewmodel-1.1.1\AndroidManifest.xml:17:1-22:12 -MERGED from [android.arch.lifecycle:livedata:1.1.1] C:\Users\С\.gradle\caches\transforms-3\0e11164a2d6c53c07ff110b6166328fd\transformed\livedata-1.1.1\AndroidManifest.xml:17:1-22:12 -MERGED from [android.arch.lifecycle:livedata-core:1.1.1] C:\Users\С\.gradle\caches\transforms-3\20c81a0d6b9d5ce59cc6eb29756bcd98\transformed\livedata-core-1.1.1\AndroidManifest.xml:17:1-22:12 -MERGED from [android.arch.core:runtime:1.1.1] C:\Users\С\.gradle\caches\transforms-3\a858b24e6842bb03c99b47b1e2e71061\transformed\runtime-1.1.1\AndroidManifest.xml:17:1-22:12 -MERGED from [com.android.support:interpolator:28.0.0] C:\Users\С\.gradle\caches\transforms-3\5a8a44c735645797ad7daf28db84fe3f\transformed\interpolator-28.0.0\AndroidManifest.xml:17:1-22:12 -INJECTED from E:\Notes-master1\app\src\main\AndroidManifest.xml:18:1-150:12 -INJECTED from E:\Notes-master1\app\src\main\AndroidManifest.xml:18:1-150:12 -INJECTED from E:\Notes-master1\app\src\main\AndroidManifest.xml:18:1-150:12 +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 +MERGED from [com.android.support:appcompat-v7:28.0.0] C:\Users\fanyi\.gradle\caches\transforms-3\7aa3a488ec69f96886facece9aaa9406\transformed\appcompat-v7-28.0.0\AndroidManifest.xml:17:1-22:12 +MERGED from [com.android.support:support-fragment:28.0.0] C:\Users\fanyi\.gradle\caches\transforms-3\d7823733cf657bf5585e38375aaf86e5\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\fanyi\.gradle\caches\transforms-3\74ce360b3b9c66bbcf1c66588559d812\transformed\animated-vector-drawable-28.0.0\AndroidManifest.xml:17:1-22:12 +MERGED from [com.android.support:support-core-ui:28.0.0] C:\Users\fanyi\.gradle\caches\transforms-3\45df4f746735ea8ab3ad0e8906de9541\transformed\support-core-ui-28.0.0\AndroidManifest.xml:17:1-22:12 +MERGED from [com.android.support:support-core-utils:28.0.0] C:\Users\fanyi\.gradle\caches\transforms-3\5cb2d487a895b5aabe42009af262fba0\transformed\support-core-utils-28.0.0\AndroidManifest.xml:17:1-22:12 +MERGED from [com.android.support:support-vector-drawable:28.0.0] C:\Users\fanyi\.gradle\caches\transforms-3\d960eab88d5a997e97e5e5ec2000ba0d\transformed\support-vector-drawable-28.0.0\AndroidManifest.xml:17:1-22:12 +MERGED from [com.android.support:loader:28.0.0] C:\Users\fanyi\.gradle\caches\transforms-3\6df37d2cdd1f465389ff9d0017989317\transformed\loader-28.0.0\AndroidManifest.xml:17:1-22:12 +MERGED from [com.android.support:viewpager:28.0.0] C:\Users\fanyi\.gradle\caches\transforms-3\452364a06fffcaee48eadd03047c4c23\transformed\viewpager-28.0.0\AndroidManifest.xml:17:1-22:12 +MERGED from [com.android.support:coordinatorlayout:28.0.0] C:\Users\fanyi\.gradle\caches\transforms-3\4433a4478073ef0c67208fcc6161f90b\transformed\coordinatorlayout-28.0.0\AndroidManifest.xml:17:1-22:12 +MERGED from [com.android.support:drawerlayout:28.0.0] C:\Users\fanyi\.gradle\caches\transforms-3\0ee83bd761f2ecab299de46cc0b82c50\transformed\drawerlayout-28.0.0\AndroidManifest.xml:17:1-22:12 +MERGED from [com.android.support:slidingpanelayout:28.0.0] C:\Users\fanyi\.gradle\caches\transforms-3\fc1c0fb709ad5aac8409169f636c3f7c\transformed\slidingpanelayout-28.0.0\AndroidManifest.xml:17:1-22:12 +MERGED from [com.android.support:customview:28.0.0] C:\Users\fanyi\.gradle\caches\transforms-3\ee1ff1ac306a58d4885454d76bde2c23\transformed\customview-28.0.0\AndroidManifest.xml:17:1-22:12 +MERGED from [com.android.support:swiperefreshlayout:28.0.0] C:\Users\fanyi\.gradle\caches\transforms-3\0d6d2529bfec5eb23fe1bd6143217265\transformed\swiperefreshlayout-28.0.0\AndroidManifest.xml:17:1-22:12 +MERGED from [com.android.support:asynclayoutinflater:28.0.0] C:\Users\fanyi\.gradle\caches\transforms-3\3c2704eea72100dcc15532aed150b55f\transformed\asynclayoutinflater-28.0.0\AndroidManifest.xml:17:1-22:12 +MERGED from [com.android.support:support-compat:28.0.0] C:\Users\fanyi\.gradle\caches\transforms-3\2b9474e47639de47b19dc72cadc6eaea\transformed\support-compat-28.0.0\AndroidManifest.xml:17:1-24:12 +MERGED from [com.android.support:versionedparcelable:28.0.0] C:\Users\fanyi\.gradle\caches\transforms-3\0e979f093d8e2d4d316810ed500ba370\transformed\versionedparcelable-28.0.0\AndroidManifest.xml:17:1-25:12 +MERGED from [com.android.support:cursoradapter:28.0.0] C:\Users\fanyi\.gradle\caches\transforms-3\a4c1b8c2d076cab3d388ef00cc8dcfca\transformed\cursoradapter-28.0.0\AndroidManifest.xml:17:1-22:12 +MERGED from [android.arch.lifecycle:runtime:1.1.1] C:\Users\fanyi\.gradle\caches\transforms-3\17eb0ed45e8407a4a1057238ac0ef32d\transformed\runtime-1.1.1\AndroidManifest.xml:17:1-22:12 +MERGED from [com.android.support:documentfile:28.0.0] C:\Users\fanyi\.gradle\caches\transforms-3\cc09afb8eac4d335fea72e799be32d7d\transformed\documentfile-28.0.0\AndroidManifest.xml:17:1-22:12 +MERGED from [com.android.support:localbroadcastmanager:28.0.0] C:\Users\fanyi\.gradle\caches\transforms-3\5f78356c8e35cbd990e3737969918b8c\transformed\localbroadcastmanager-28.0.0\AndroidManifest.xml:17:1-22:12 +MERGED from [com.android.support:print:28.0.0] C:\Users\fanyi\.gradle\caches\transforms-3\f2b822bb596f2229aa2a487414e6e8c4\transformed\print-28.0.0\AndroidManifest.xml:17:1-22:12 +MERGED from [android.arch.lifecycle:viewmodel:1.1.1] C:\Users\fanyi\.gradle\caches\transforms-3\cff59266d9d4bfef4b3e7fe33cd02e91\transformed\viewmodel-1.1.1\AndroidManifest.xml:17:1-22:12 +MERGED from [android.arch.lifecycle:livedata:1.1.1] C:\Users\fanyi\.gradle\caches\transforms-3\0f019efc887a73e45a3a4cf3278344b8\transformed\livedata-1.1.1\AndroidManifest.xml:17:1-22:12 +MERGED from [android.arch.lifecycle:livedata-core:1.1.1] C:\Users\fanyi\.gradle\caches\transforms-3\ed642353549cd1357a6c2a4682ab3ae3\transformed\livedata-core-1.1.1\AndroidManifest.xml:17:1-22:12 +MERGED from [android.arch.core:runtime:1.1.1] C:\Users\fanyi\.gradle\caches\transforms-3\c360566d4530bcdfdeab7a0798072d85\transformed\runtime-1.1.1\AndroidManifest.xml:17:1-22:12 +MERGED from [com.android.support:interpolator:28.0.0] C:\Users\fanyi\.gradle\caches\transforms-3\28d63aba52764488305f21d67e729d53\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 package - ADDED from E:\Notes-master1\app\src\main\AndroidManifest.xml:19:5-31 - INJECTED from E:\Notes-master1\app\src\main\AndroidManifest.xml - INJECTED from E:\Notes-master1\app\src\main\AndroidManifest.xml + 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 android:versionName - ADDED from E:\Notes-master1\app\src\main\AndroidManifest.xml:21:5-30 - INJECTED from E:\Notes-master1\app\src\main\AndroidManifest.xml - INJECTED from E:\Notes-master1\app\src\main\AndroidManifest.xml + 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 xmlns:android - ADDED from E:\Notes-master1\app\src\main\AndroidManifest.xml:18:11-69 + ADDED from D:\Notes-master1\app\src\main\AndroidManifest.xml:18:11-69 android:versionCode - ADDED from E:\Notes-master1\app\src\main\AndroidManifest.xml:20:5-28 - INJECTED from E:\Notes-master1\app\src\main\AndroidManifest.xml - INJECTED from E:\Notes-master1\app\src\main\AndroidManifest.xml + 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 uses-permission#android.permission.WRITE_EXTERNAL_STORAGE -ADDED from E:\Notes-master1\app\src\main\AndroidManifest.xml:25:5-81 +ADDED from D:\Notes-master1\app\src\main\AndroidManifest.xml:25:5-81 android:name - ADDED from E:\Notes-master1\app\src\main\AndroidManifest.xml:25:22-78 + ADDED from D:\Notes-master1\app\src\main\AndroidManifest.xml:25:22-78 uses-permission#com.android.launcher.permission.INSTALL_SHORTCUT -ADDED from E:\Notes-master1\app\src\main\AndroidManifest.xml:26:5-88 +ADDED from D:\Notes-master1\app\src\main\AndroidManifest.xml:26:5-88 android:name - ADDED from E:\Notes-master1\app\src\main\AndroidManifest.xml:26:22-85 + ADDED from D:\Notes-master1\app\src\main\AndroidManifest.xml:26:22-85 uses-permission#android.permission.INTERNET -ADDED from E:\Notes-master1\app\src\main\AndroidManifest.xml:27:5-67 +ADDED from D:\Notes-master1\app\src\main\AndroidManifest.xml:27:5-67 android:name - ADDED from E:\Notes-master1\app\src\main\AndroidManifest.xml:27:22-64 + ADDED from D:\Notes-master1\app\src\main\AndroidManifest.xml:27:22-64 uses-permission#android.permission.READ_CONTACTS -ADDED from E:\Notes-master1\app\src\main\AndroidManifest.xml:28:5-72 +ADDED from D:\Notes-master1\app\src\main\AndroidManifest.xml:28:5-72 android:name - ADDED from E:\Notes-master1\app\src\main\AndroidManifest.xml:28:22-69 + ADDED from D:\Notes-master1\app\src\main\AndroidManifest.xml:28:22-69 uses-permission#android.permission.MANAGE_ACCOUNTS -ADDED from E:\Notes-master1\app\src\main\AndroidManifest.xml:29:5-74 +ADDED from D:\Notes-master1\app\src\main\AndroidManifest.xml:29:5-74 android:name - ADDED from E:\Notes-master1\app\src\main\AndroidManifest.xml:29:22-71 + ADDED from D:\Notes-master1\app\src\main\AndroidManifest.xml:29:22-71 uses-permission#android.permission.AUTHENTICATE_ACCOUNTS -ADDED from E:\Notes-master1\app\src\main\AndroidManifest.xml:30:5-80 +ADDED from D:\Notes-master1\app\src\main\AndroidManifest.xml:30:5-80 android:name - ADDED from E:\Notes-master1\app\src\main\AndroidManifest.xml:30:22-77 + ADDED from D:\Notes-master1\app\src\main\AndroidManifest.xml:30:22-77 uses-permission#android.permission.GET_ACCOUNTS -ADDED from E:\Notes-master1\app\src\main\AndroidManifest.xml:31:5-71 +ADDED from D:\Notes-master1\app\src\main\AndroidManifest.xml:31:5-71 android:name - ADDED from E:\Notes-master1\app\src\main\AndroidManifest.xml:31:22-68 + ADDED from D:\Notes-master1\app\src\main\AndroidManifest.xml:31:22-68 uses-permission#android.permission.USE_CREDENTIALS -ADDED from E:\Notes-master1\app\src\main\AndroidManifest.xml:32:5-74 +ADDED from D:\Notes-master1\app\src\main\AndroidManifest.xml:32:5-74 android:name - ADDED from E:\Notes-master1\app\src\main\AndroidManifest.xml:32:22-71 + ADDED from D:\Notes-master1\app\src\main\AndroidManifest.xml:32:22-71 uses-permission#android.permission.RECEIVE_BOOT_COMPLETED -ADDED from E:\Notes-master1\app\src\main\AndroidManifest.xml:33:5-81 +ADDED from D:\Notes-master1\app\src\main\AndroidManifest.xml:33:5-81 android:name - ADDED from E:\Notes-master1\app\src\main\AndroidManifest.xml:33:22-78 + ADDED from D:\Notes-master1\app\src\main\AndroidManifest.xml:33:22-78 application -ADDED from E:\Notes-master1\app\src\main\AndroidManifest.xml:35:5-149:19 -MERGED from [com.android.support:support-compat:28.0.0] C:\Users\С\.gradle\caches\transforms-3\21795bd83e308c947c8dfe0c1fc89322\transformed\support-compat-28.0.0\AndroidManifest.xml:22:5-94 -MERGED from [com.android.support:support-compat:28.0.0] C:\Users\С\.gradle\caches\transforms-3\21795bd83e308c947c8dfe0c1fc89322\transformed\support-compat-28.0.0\AndroidManifest.xml:22:5-94 -MERGED from [com.android.support:versionedparcelable:28.0.0] C:\Users\С\.gradle\caches\transforms-3\6a748369916ed9cf30454babbea8b524\transformed\versionedparcelable-28.0.0\AndroidManifest.xml:22:5-23:19 -MERGED from [com.android.support:versionedparcelable:28.0.0] C:\Users\С\.gradle\caches\transforms-3\6a748369916ed9cf30454babbea8b524\transformed\versionedparcelable-28.0.0\AndroidManifest.xml:22:5-23:19 +ADDED from D:\Notes-master1\app\src\main\AndroidManifest.xml:35:5-149:19 +MERGED from [com.android.support:support-compat:28.0.0] C:\Users\fanyi\.gradle\caches\transforms-3\2b9474e47639de47b19dc72cadc6eaea\transformed\support-compat-28.0.0\AndroidManifest.xml:22:5-94 +MERGED from [com.android.support:support-compat:28.0.0] C:\Users\fanyi\.gradle\caches\transforms-3\2b9474e47639de47b19dc72cadc6eaea\transformed\support-compat-28.0.0\AndroidManifest.xml:22:5-94 +MERGED from [com.android.support:versionedparcelable:28.0.0] C:\Users\fanyi\.gradle\caches\transforms-3\0e979f093d8e2d4d316810ed500ba370\transformed\versionedparcelable-28.0.0\AndroidManifest.xml:22:5-23:19 +MERGED from [com.android.support:versionedparcelable:28.0.0] C:\Users\fanyi\.gradle\caches\transforms-3\0e979f093d8e2d4d316810ed500ba370\transformed\versionedparcelable-28.0.0\AndroidManifest.xml:22:5-23:19 android:appComponentFactory - ADDED from [com.android.support:support-compat:28.0.0] C:\Users\С\.gradle\caches\transforms-3\21795bd83e308c947c8dfe0c1fc89322\transformed\support-compat-28.0.0\AndroidManifest.xml:22:18-91 + ADDED from [com.android.support:support-compat:28.0.0] C:\Users\fanyi\.gradle\caches\transforms-3\2b9474e47639de47b19dc72cadc6eaea\transformed\support-compat-28.0.0\AndroidManifest.xml:22:18-91 android:label - ADDED from E:\Notes-master1\app\src\main\AndroidManifest.xml:37:9-41 + ADDED from D:\Notes-master1\app\src\main\AndroidManifest.xml:37:9-41 android:icon - ADDED from E:\Notes-master1\app\src\main\AndroidManifest.xml:36:9-42 + ADDED from D:\Notes-master1\app\src\main\AndroidManifest.xml:36:9-42 activity#net.micode.notes.ui.NotesListActivity -ADDED from E:\Notes-master1\app\src\main\AndroidManifest.xml:38:9-51:20 +ADDED from D:\Notes-master1\app\src\main\AndroidManifest.xml:38:9-51:20 android:label - ADDED from E:\Notes-master1\app\src\main\AndroidManifest.xml:41:13-45 + ADDED from D:\Notes-master1\app\src\main\AndroidManifest.xml:41:13-45 android:launchMode - ADDED from E:\Notes-master1\app\src\main\AndroidManifest.xml:42:13-43 + ADDED from D:\Notes-master1\app\src\main\AndroidManifest.xml:42:13-43 android:windowSoftInputMode - ADDED from E:\Notes-master1\app\src\main\AndroidManifest.xml:45:13-52 + ADDED from D:\Notes-master1\app\src\main\AndroidManifest.xml:45:13-52 android:uiOptions - ADDED from E:\Notes-master1\app\src\main\AndroidManifest.xml:44:13-57 + ADDED from D:\Notes-master1\app\src\main\AndroidManifest.xml:44:13-57 android:configChanges - ADDED from E:\Notes-master1\app\src\main\AndroidManifest.xml:40:13-74 + ADDED from D:\Notes-master1\app\src\main\AndroidManifest.xml:40:13-74 android:theme - ADDED from E:\Notes-master1\app\src\main\AndroidManifest.xml:43:13-71 + ADDED from D:\Notes-master1\app\src\main\AndroidManifest.xml:43:13-71 android:name - ADDED from E:\Notes-master1\app\src\main\AndroidManifest.xml:39:13-49 + ADDED from D:\Notes-master1\app\src\main\AndroidManifest.xml:39:13-49 intent-filter#action:name:android.intent.action.MAIN+category:name:android.intent.category.LAUNCHER -ADDED from E:\Notes-master1\app\src\main\AndroidManifest.xml:47:13-50:29 +ADDED from D:\Notes-master1\app\src\main\AndroidManifest.xml:47:13-50:29 action#android.intent.action.MAIN -ADDED from E:\Notes-master1\app\src\main\AndroidManifest.xml:48:17-69 +ADDED from D:\Notes-master1\app\src\main\AndroidManifest.xml:48:17-69 android:name - ADDED from E:\Notes-master1\app\src\main\AndroidManifest.xml:48:25-66 + ADDED from D:\Notes-master1\app\src\main\AndroidManifest.xml:48:25-66 category#android.intent.category.LAUNCHER -ADDED from E:\Notes-master1\app\src\main\AndroidManifest.xml:49:17-77 +ADDED from D:\Notes-master1\app\src\main\AndroidManifest.xml:49:17-77 android:name - ADDED from E:\Notes-master1\app\src\main\AndroidManifest.xml:49:27-74 + ADDED from D:\Notes-master1\app\src\main\AndroidManifest.xml:49:27-74 activity#net.micode.notes.ui.NoteEditActivity -ADDED from E:\Notes-master1\app\src\main\AndroidManifest.xml:53:9-81:20 +ADDED from D:\Notes-master1\app\src\main\AndroidManifest.xml:53:9-81:20 android:launchMode - ADDED from E:\Notes-master1\app\src\main\AndroidManifest.xml:56:13-43 + ADDED from D:\Notes-master1\app\src\main\AndroidManifest.xml:56:13-43 android:configChanges - ADDED from E:\Notes-master1\app\src\main\AndroidManifest.xml:55:13-74 + ADDED from D:\Notes-master1\app\src\main\AndroidManifest.xml:55:13-74 android:theme - ADDED from E:\Notes-master1\app\src\main\AndroidManifest.xml:57:13-71 + ADDED from D:\Notes-master1\app\src\main\AndroidManifest.xml:57:13-71 android:name - ADDED from E:\Notes-master1\app\src\main\AndroidManifest.xml:54:13-48 + ADDED from D:\Notes-master1\app\src\main\AndroidManifest.xml:54:13-48 intent-filter#action:name:android.intent.action.VIEW+category:name:android.intent.category.DEFAULT+data:mimeType:vnd.android.cursor.item/call_note+data:mimeType:vnd.android.cursor.item/text_note -ADDED from E:\Notes-master1\app\src\main\AndroidManifest.xml:59:13-64:29 +ADDED from D:\Notes-master1\app\src\main\AndroidManifest.xml:59:13-64:29 action#android.intent.action.VIEW -ADDED from E:\Notes-master1\app\src\main\AndroidManifest.xml:60:17-69 +ADDED from D:\Notes-master1\app\src\main\AndroidManifest.xml:60:17-69 android:name - ADDED from E:\Notes-master1\app\src\main\AndroidManifest.xml:60:25-66 + ADDED from D:\Notes-master1\app\src\main\AndroidManifest.xml:60:25-66 category#android.intent.category.DEFAULT -ADDED from E:\Notes-master1\app\src\main\AndroidManifest.xml:61:17-76 +ADDED from D:\Notes-master1\app\src\main\AndroidManifest.xml:61:17-76 android:name - ADDED from E:\Notes-master1\app\src\main\AndroidManifest.xml:61:27-73 + ADDED from D:\Notes-master1\app\src\main\AndroidManifest.xml:61:27-73 data -ADDED from E:\Notes-master1\app\src\main\AndroidManifest.xml:62:17-78 +ADDED from D:\Notes-master1\app\src\main\AndroidManifest.xml:62:17-78 android:mimeType - ADDED from E:\Notes-master1\app\src\main\AndroidManifest.xml:62:23-75 + ADDED from D:\Notes-master1\app\src\main\AndroidManifest.xml:62:23-75 intent-filter#action:name:android.intent.action.INSERT_OR_EDIT+category:name:android.intent.category.DEFAULT+data:mimeType:vnd.android.cursor.item/call_note+data:mimeType:vnd.android.cursor.item/text_note -ADDED from E:\Notes-master1\app\src\main\AndroidManifest.xml:66:13-71:29 +ADDED from D:\Notes-master1\app\src\main\AndroidManifest.xml:66:13-71:29 action#android.intent.action.INSERT_OR_EDIT -ADDED from E:\Notes-master1\app\src\main\AndroidManifest.xml:67:17-79 +ADDED from D:\Notes-master1\app\src\main\AndroidManifest.xml:67:17-79 android:name - ADDED from E:\Notes-master1\app\src\main\AndroidManifest.xml:67:25-76 + ADDED from D:\Notes-master1\app\src\main\AndroidManifest.xml:67:25-76 intent-filter#action:name:android.intent.action.SEARCH+category:name:android.intent.category.DEFAULT -ADDED from E:\Notes-master1\app\src\main\AndroidManifest.xml:73:13-76:29 +ADDED from D:\Notes-master1\app\src\main\AndroidManifest.xml:73:13-76:29 action#android.intent.action.SEARCH -ADDED from E:\Notes-master1\app\src\main\AndroidManifest.xml:74:17-71 +ADDED from D:\Notes-master1\app\src\main\AndroidManifest.xml:74:17-71 android:name - ADDED from E:\Notes-master1\app\src\main\AndroidManifest.xml:74:25-68 + ADDED from D:\Notes-master1\app\src\main\AndroidManifest.xml:74:25-68 meta-data#android.app.searchable -ADDED from E:\Notes-master1\app\src\main\AndroidManifest.xml:78:13-80:54 +ADDED from D:\Notes-master1\app\src\main\AndroidManifest.xml:78:13-80:54 android:resource - ADDED from E:\Notes-master1\app\src\main\AndroidManifest.xml:80:17-51 + ADDED from D:\Notes-master1\app\src\main\AndroidManifest.xml:80:17-51 android:name - ADDED from E:\Notes-master1\app\src\main\AndroidManifest.xml:79:17-54 + ADDED from D:\Notes-master1\app\src\main\AndroidManifest.xml:79:17-54 provider#net.micode.notes.data.NotesProvider -ADDED from E:\Notes-master1\app\src\main\AndroidManifest.xml:83:9-86:43 +ADDED from D:\Notes-master1\app\src\main\AndroidManifest.xml:83:9-86:43 android:authorities - ADDED from E:\Notes-master1\app\src\main\AndroidManifest.xml:85:13-47 + ADDED from D:\Notes-master1\app\src\main\AndroidManifest.xml:85:13-47 android:multiprocess - ADDED from E:\Notes-master1\app\src\main\AndroidManifest.xml:86:13-40 + ADDED from D:\Notes-master1\app\src\main\AndroidManifest.xml:86:13-40 android:name - ADDED from E:\Notes-master1\app\src\main\AndroidManifest.xml:84:13-63 + ADDED from D:\Notes-master1\app\src\main\AndroidManifest.xml:84:13-63 receiver#net.micode.notes.widget.NoteWidgetProvider_2x -ADDED from E:\Notes-master1\app\src\main\AndroidManifest.xml:88:9-100:20 +ADDED from D:\Notes-master1\app\src\main\AndroidManifest.xml:88:9-100:20 android:label - ADDED from E:\Notes-master1\app\src\main\AndroidManifest.xml:90:13-50 + ADDED from D:\Notes-master1\app\src\main\AndroidManifest.xml:90:13-50 android:name - ADDED from E:\Notes-master1\app\src\main\AndroidManifest.xml:89:13-57 + ADDED from D:\Notes-master1\app\src\main\AndroidManifest.xml:89:13-57 intent-filter#action:name:android.appwidget.action.APPWIDGET_DELETED+action:name:android.appwidget.action.APPWIDGET_UPDATE+action:name:android.intent.action.PRIVACY_MODE_CHANGED -ADDED from E:\Notes-master1\app\src\main\AndroidManifest.xml:91:13-95:29 +ADDED from D:\Notes-master1\app\src\main\AndroidManifest.xml:91:13-95:29 action#android.appwidget.action.APPWIDGET_UPDATE -ADDED from E:\Notes-master1\app\src\main\AndroidManifest.xml:92:17-84 +ADDED from D:\Notes-master1\app\src\main\AndroidManifest.xml:92:17-84 android:name - ADDED from E:\Notes-master1\app\src\main\AndroidManifest.xml:92:25-81 + ADDED from D:\Notes-master1\app\src\main\AndroidManifest.xml:92:25-81 action#android.appwidget.action.APPWIDGET_DELETED -ADDED from E:\Notes-master1\app\src\main\AndroidManifest.xml:93:17-85 +ADDED from D:\Notes-master1\app\src\main\AndroidManifest.xml:93:17-85 android:name - ADDED from E:\Notes-master1\app\src\main\AndroidManifest.xml:93:25-82 + ADDED from D:\Notes-master1\app\src\main\AndroidManifest.xml:93:25-82 action#android.intent.action.PRIVACY_MODE_CHANGED -ADDED from E:\Notes-master1\app\src\main\AndroidManifest.xml:94:17-85 +ADDED from D:\Notes-master1\app\src\main\AndroidManifest.xml:94:17-85 android:name - ADDED from E:\Notes-master1\app\src\main\AndroidManifest.xml:94:25-82 + ADDED from D:\Notes-master1\app\src\main\AndroidManifest.xml:94:25-82 meta-data#android.appwidget.provider -ADDED from E:\Notes-master1\app\src\main\AndroidManifest.xml:97:13-99:58 +ADDED from D:\Notes-master1\app\src\main\AndroidManifest.xml:97:13-99:58 android:resource - ADDED from E:\Notes-master1\app\src\main\AndroidManifest.xml:99:17-55 + ADDED from D:\Notes-master1\app\src\main\AndroidManifest.xml:99:17-55 android:name - ADDED from E:\Notes-master1\app\src\main\AndroidManifest.xml:98:17-58 + ADDED from D:\Notes-master1\app\src\main\AndroidManifest.xml:98:17-58 receiver#net.micode.notes.widget.NoteWidgetProvider_4x -ADDED from E:\Notes-master1\app\src\main\AndroidManifest.xml:101:9-114:20 +ADDED from D:\Notes-master1\app\src\main\AndroidManifest.xml:101:9-114:20 android:label - ADDED from E:\Notes-master1\app\src\main\AndroidManifest.xml:103:13-50 + ADDED from D:\Notes-master1\app\src\main\AndroidManifest.xml:103:13-50 android:name - ADDED from E:\Notes-master1\app\src\main\AndroidManifest.xml:102:13-57 + ADDED from D:\Notes-master1\app\src\main\AndroidManifest.xml:102:13-57 receiver#net.micode.notes.ui.AlarmInitReceiver -ADDED from E:\Notes-master1\app\src\main\AndroidManifest.xml:116:9-120:20 +ADDED from D:\Notes-master1\app\src\main\AndroidManifest.xml:116:9-120:20 android:name - ADDED from E:\Notes-master1\app\src\main\AndroidManifest.xml:116:19-55 + ADDED from D:\Notes-master1\app\src\main\AndroidManifest.xml:116:19-55 intent-filter#action:name:android.intent.action.BOOT_COMPLETED -ADDED from E:\Notes-master1\app\src\main\AndroidManifest.xml:117:13-119:29 +ADDED from D:\Notes-master1\app\src\main\AndroidManifest.xml:117:13-119:29 action#android.intent.action.BOOT_COMPLETED -ADDED from E:\Notes-master1\app\src\main\AndroidManifest.xml:118:17-79 +ADDED from D:\Notes-master1\app\src\main\AndroidManifest.xml:118:17-79 android:name - ADDED from E:\Notes-master1\app\src\main\AndroidManifest.xml:118:25-76 + ADDED from D:\Notes-master1\app\src\main\AndroidManifest.xml:118:25-76 receiver#net.micode.notes.ui.AlarmReceiver -ADDED from E:\Notes-master1\app\src\main\AndroidManifest.xml:122:9-125:20 +ADDED from D:\Notes-master1\app\src\main\AndroidManifest.xml:122:9-125:20 android:process - ADDED from E:\Notes-master1\app\src\main\AndroidManifest.xml:124:13-38 + ADDED from D:\Notes-master1\app\src\main\AndroidManifest.xml:124:13-38 android:name - ADDED from E:\Notes-master1\app\src\main\AndroidManifest.xml:123:13-61 + ADDED from D:\Notes-master1\app\src\main\AndroidManifest.xml:123:13-61 activity#net.micode.notes.ui.AlarmAlertActivity -ADDED from E:\Notes-master1\app\src\main\AndroidManifest.xml:127:9-132:20 +ADDED from D:\Notes-master1\app\src\main\AndroidManifest.xml:127:9-132:20 android:label - ADDED from E:\Notes-master1\app\src\main\AndroidManifest.xml:129:13-45 + ADDED from D:\Notes-master1\app\src\main\AndroidManifest.xml:129:13-45 android:launchMode - ADDED from E:\Notes-master1\app\src\main\AndroidManifest.xml:130:13-48 + ADDED from D:\Notes-master1\app\src\main\AndroidManifest.xml:130:13-48 android:theme - ADDED from E:\Notes-master1\app\src\main\AndroidManifest.xml:131:13-75 + ADDED from D:\Notes-master1\app\src\main\AndroidManifest.xml:131:13-75 android:name - ADDED from E:\Notes-master1\app\src\main\AndroidManifest.xml:128:13-50 + ADDED from D:\Notes-master1\app\src\main\AndroidManifest.xml:128:13-50 activity#net.micode.notes.ui.NotesPreferenceActivity -ADDED from E:\Notes-master1\app\src\main\AndroidManifest.xml:134:9-139:20 +ADDED from D:\Notes-master1\app\src\main\AndroidManifest.xml:134:9-139:20 android:label - ADDED from E:\Notes-master1\app\src\main\AndroidManifest.xml:136:13-54 + ADDED from D:\Notes-master1\app\src\main\AndroidManifest.xml:136:13-54 android:launchMode - ADDED from E:\Notes-master1\app\src\main\AndroidManifest.xml:137:13-43 + ADDED from D:\Notes-master1\app\src\main\AndroidManifest.xml:137:13-43 android:theme - ADDED from E:\Notes-master1\app\src\main\AndroidManifest.xml:138:13-60 + ADDED from D:\Notes-master1\app\src\main\AndroidManifest.xml:138:13-60 android:name - ADDED from E:\Notes-master1\app\src\main\AndroidManifest.xml:135:13-71 + ADDED from D:\Notes-master1\app\src\main\AndroidManifest.xml:135:13-71 service#net.micode.notes.gtask.remote.GTaskSyncService -ADDED from E:\Notes-master1\app\src\main\AndroidManifest.xml:141:9-144:19 +ADDED from D:\Notes-master1\app\src\main\AndroidManifest.xml:141:9-144:19 android:exported - ADDED from E:\Notes-master1\app\src\main\AndroidManifest.xml:143:13-37 + ADDED from D:\Notes-master1\app\src\main\AndroidManifest.xml:143:13-37 android:name - ADDED from E:\Notes-master1\app\src\main\AndroidManifest.xml:142:13-74 + ADDED from D:\Notes-master1\app\src\main\AndroidManifest.xml:142:13-74 meta-data#android.app.default_searchable -ADDED from E:\Notes-master1\app\src\main\AndroidManifest.xml:146:9-148:52 +ADDED from D:\Notes-master1\app\src\main\AndroidManifest.xml:146:9-148:52 android:value - ADDED from E:\Notes-master1\app\src\main\AndroidManifest.xml:148:13-49 + ADDED from D:\Notes-master1\app\src\main\AndroidManifest.xml:148:13-49 android:name - ADDED from E:\Notes-master1\app\src\main\AndroidManifest.xml:147:13-58 + ADDED from D:\Notes-master1\app\src\main\AndroidManifest.xml:147:13-58 uses-sdk -INJECTED from E:\Notes-master1\app\src\main\AndroidManifest.xml reason: use-sdk injection requested -INJECTED from E:\Notes-master1\app\src\main\AndroidManifest.xml -INJECTED from E:\Notes-master1\app\src\main\AndroidManifest.xml -MERGED from [com.android.support:appcompat-v7:28.0.0] C:\Users\С\.gradle\caches\transforms-3\86ef1ec83f39cd41be9f0f4ea4f4caae\transformed\appcompat-v7-28.0.0\AndroidManifest.xml:20:5-44 -MERGED from [com.android.support:appcompat-v7:28.0.0] C:\Users\С\.gradle\caches\transforms-3\86ef1ec83f39cd41be9f0f4ea4f4caae\transformed\appcompat-v7-28.0.0\AndroidManifest.xml:20:5-44 -MERGED from [com.android.support:support-fragment:28.0.0] C:\Users\С\.gradle\caches\transforms-3\192a531daa3105f4a7219058a2e0630a\transformed\support-fragment-28.0.0\AndroidManifest.xml:20:5-44 -MERGED from [com.android.support:support-fragment:28.0.0] C:\Users\С\.gradle\caches\transforms-3\192a531daa3105f4a7219058a2e0630a\transformed\support-fragment-28.0.0\AndroidManifest.xml:20:5-44 -MERGED from [com.android.support:animated-vector-drawable:28.0.0] C:\Users\С\.gradle\caches\transforms-3\9bcb446c7bc3e879188d5c8c8a231e94\transformed\animated-vector-drawable-28.0.0\AndroidManifest.xml:20:5-44 -MERGED from [com.android.support:animated-vector-drawable:28.0.0] C:\Users\С\.gradle\caches\transforms-3\9bcb446c7bc3e879188d5c8c8a231e94\transformed\animated-vector-drawable-28.0.0\AndroidManifest.xml:20:5-44 -MERGED from [com.android.support:support-core-ui:28.0.0] C:\Users\С\.gradle\caches\transforms-3\7a6009b56bb7e7d171372dd2c51fe57b\transformed\support-core-ui-28.0.0\AndroidManifest.xml:20:5-44 -MERGED from [com.android.support:support-core-ui:28.0.0] C:\Users\С\.gradle\caches\transforms-3\7a6009b56bb7e7d171372dd2c51fe57b\transformed\support-core-ui-28.0.0\AndroidManifest.xml:20:5-44 -MERGED from [com.android.support:support-core-utils:28.0.0] C:\Users\С\.gradle\caches\transforms-3\33e2efbf6f689399cbad4e309f039359\transformed\support-core-utils-28.0.0\AndroidManifest.xml:20:5-44 -MERGED from [com.android.support:support-core-utils:28.0.0] C:\Users\С\.gradle\caches\transforms-3\33e2efbf6f689399cbad4e309f039359\transformed\support-core-utils-28.0.0\AndroidManifest.xml:20:5-44 -MERGED from [com.android.support:support-vector-drawable:28.0.0] C:\Users\С\.gradle\caches\transforms-3\40324b64e33e464e2ab02259c275ad57\transformed\support-vector-drawable-28.0.0\AndroidManifest.xml:20:5-44 -MERGED from [com.android.support:support-vector-drawable:28.0.0] C:\Users\С\.gradle\caches\transforms-3\40324b64e33e464e2ab02259c275ad57\transformed\support-vector-drawable-28.0.0\AndroidManifest.xml:20:5-44 -MERGED from [com.android.support:loader:28.0.0] C:\Users\С\.gradle\caches\transforms-3\f5f208d7e6f038cff501781807be3f02\transformed\loader-28.0.0\AndroidManifest.xml:20:5-44 -MERGED from [com.android.support:loader:28.0.0] C:\Users\С\.gradle\caches\transforms-3\f5f208d7e6f038cff501781807be3f02\transformed\loader-28.0.0\AndroidManifest.xml:20:5-44 -MERGED from [com.android.support:viewpager:28.0.0] C:\Users\С\.gradle\caches\transforms-3\a7e2401d8d584c0490237cd3520baaf3\transformed\viewpager-28.0.0\AndroidManifest.xml:20:5-44 -MERGED from [com.android.support:viewpager:28.0.0] C:\Users\С\.gradle\caches\transforms-3\a7e2401d8d584c0490237cd3520baaf3\transformed\viewpager-28.0.0\AndroidManifest.xml:20:5-44 -MERGED from [com.android.support:coordinatorlayout:28.0.0] C:\Users\С\.gradle\caches\transforms-3\82952f08b31bd35f2fe29eb30da1d402\transformed\coordinatorlayout-28.0.0\AndroidManifest.xml:20:5-44 -MERGED from [com.android.support:coordinatorlayout:28.0.0] C:\Users\С\.gradle\caches\transforms-3\82952f08b31bd35f2fe29eb30da1d402\transformed\coordinatorlayout-28.0.0\AndroidManifest.xml:20:5-44 -MERGED from [com.android.support:drawerlayout:28.0.0] C:\Users\С\.gradle\caches\transforms-3\c758c7a3b7a26b05fdf62836f3038bee\transformed\drawerlayout-28.0.0\AndroidManifest.xml:20:5-44 -MERGED from [com.android.support:drawerlayout:28.0.0] C:\Users\С\.gradle\caches\transforms-3\c758c7a3b7a26b05fdf62836f3038bee\transformed\drawerlayout-28.0.0\AndroidManifest.xml:20:5-44 -MERGED from [com.android.support:slidingpanelayout:28.0.0] C:\Users\С\.gradle\caches\transforms-3\c523a6f194470aab673a03ff24bf026e\transformed\slidingpanelayout-28.0.0\AndroidManifest.xml:20:5-44 -MERGED from [com.android.support:slidingpanelayout:28.0.0] C:\Users\С\.gradle\caches\transforms-3\c523a6f194470aab673a03ff24bf026e\transformed\slidingpanelayout-28.0.0\AndroidManifest.xml:20:5-44 -MERGED from [com.android.support:customview:28.0.0] C:\Users\С\.gradle\caches\transforms-3\780b99f235cc7f787d5381e832780214\transformed\customview-28.0.0\AndroidManifest.xml:20:5-44 -MERGED from [com.android.support:customview:28.0.0] C:\Users\С\.gradle\caches\transforms-3\780b99f235cc7f787d5381e832780214\transformed\customview-28.0.0\AndroidManifest.xml:20:5-44 -MERGED from [com.android.support:swiperefreshlayout:28.0.0] C:\Users\С\.gradle\caches\transforms-3\2323735431f2df21fd3ac945c54acd43\transformed\swiperefreshlayout-28.0.0\AndroidManifest.xml:20:5-44 -MERGED from [com.android.support:swiperefreshlayout:28.0.0] C:\Users\С\.gradle\caches\transforms-3\2323735431f2df21fd3ac945c54acd43\transformed\swiperefreshlayout-28.0.0\AndroidManifest.xml:20:5-44 -MERGED from [com.android.support:asynclayoutinflater:28.0.0] C:\Users\С\.gradle\caches\transforms-3\fa27ce9b4167bb2bca61b3cae5d0f182\transformed\asynclayoutinflater-28.0.0\AndroidManifest.xml:20:5-44 -MERGED from [com.android.support:asynclayoutinflater:28.0.0] C:\Users\С\.gradle\caches\transforms-3\fa27ce9b4167bb2bca61b3cae5d0f182\transformed\asynclayoutinflater-28.0.0\AndroidManifest.xml:20:5-44 -MERGED from [com.android.support:support-compat:28.0.0] C:\Users\С\.gradle\caches\transforms-3\21795bd83e308c947c8dfe0c1fc89322\transformed\support-compat-28.0.0\AndroidManifest.xml:20:5-44 -MERGED from [com.android.support:support-compat:28.0.0] C:\Users\С\.gradle\caches\transforms-3\21795bd83e308c947c8dfe0c1fc89322\transformed\support-compat-28.0.0\AndroidManifest.xml:20:5-44 -MERGED from [com.android.support:versionedparcelable:28.0.0] C:\Users\С\.gradle\caches\transforms-3\6a748369916ed9cf30454babbea8b524\transformed\versionedparcelable-28.0.0\AndroidManifest.xml:20:5-44 -MERGED from [com.android.support:versionedparcelable:28.0.0] C:\Users\С\.gradle\caches\transforms-3\6a748369916ed9cf30454babbea8b524\transformed\versionedparcelable-28.0.0\AndroidManifest.xml:20:5-44 -MERGED from [com.android.support:cursoradapter:28.0.0] C:\Users\С\.gradle\caches\transforms-3\d028ad711a3e49fdee14a6fba76b1b78\transformed\cursoradapter-28.0.0\AndroidManifest.xml:20:5-44 -MERGED from [com.android.support:cursoradapter:28.0.0] C:\Users\С\.gradle\caches\transforms-3\d028ad711a3e49fdee14a6fba76b1b78\transformed\cursoradapter-28.0.0\AndroidManifest.xml:20:5-44 -MERGED from [android.arch.lifecycle:runtime:1.1.1] C:\Users\С\.gradle\caches\transforms-3\374b9bb541c658826272395a97809e58\transformed\runtime-1.1.1\AndroidManifest.xml:20:5-44 -MERGED from [android.arch.lifecycle:runtime:1.1.1] C:\Users\С\.gradle\caches\transforms-3\374b9bb541c658826272395a97809e58\transformed\runtime-1.1.1\AndroidManifest.xml:20:5-44 -MERGED from [com.android.support:documentfile:28.0.0] C:\Users\С\.gradle\caches\transforms-3\fe0f5b7ff8749fb1bc02aca91191c4fb\transformed\documentfile-28.0.0\AndroidManifest.xml:20:5-44 -MERGED from [com.android.support:documentfile:28.0.0] C:\Users\С\.gradle\caches\transforms-3\fe0f5b7ff8749fb1bc02aca91191c4fb\transformed\documentfile-28.0.0\AndroidManifest.xml:20:5-44 -MERGED from [com.android.support:localbroadcastmanager:28.0.0] C:\Users\С\.gradle\caches\transforms-3\f50079446f7b36e4b1a4ffd69432bd34\transformed\localbroadcastmanager-28.0.0\AndroidManifest.xml:20:5-44 -MERGED from [com.android.support:localbroadcastmanager:28.0.0] C:\Users\С\.gradle\caches\transforms-3\f50079446f7b36e4b1a4ffd69432bd34\transformed\localbroadcastmanager-28.0.0\AndroidManifest.xml:20:5-44 -MERGED from [com.android.support:print:28.0.0] C:\Users\С\.gradle\caches\transforms-3\6b9b99a2b5333d73a481b6b9a53cb843\transformed\print-28.0.0\AndroidManifest.xml:20:5-44 -MERGED from [com.android.support:print:28.0.0] C:\Users\С\.gradle\caches\transforms-3\6b9b99a2b5333d73a481b6b9a53cb843\transformed\print-28.0.0\AndroidManifest.xml:20:5-44 -MERGED from [android.arch.lifecycle:viewmodel:1.1.1] C:\Users\С\.gradle\caches\transforms-3\94ddae9e21bb94c1684147d11c41122b\transformed\viewmodel-1.1.1\AndroidManifest.xml:20:5-44 -MERGED from [android.arch.lifecycle:viewmodel:1.1.1] C:\Users\С\.gradle\caches\transforms-3\94ddae9e21bb94c1684147d11c41122b\transformed\viewmodel-1.1.1\AndroidManifest.xml:20:5-44 -MERGED from [android.arch.lifecycle:livedata:1.1.1] C:\Users\С\.gradle\caches\transforms-3\0e11164a2d6c53c07ff110b6166328fd\transformed\livedata-1.1.1\AndroidManifest.xml:20:5-44 -MERGED from [android.arch.lifecycle:livedata:1.1.1] C:\Users\С\.gradle\caches\transforms-3\0e11164a2d6c53c07ff110b6166328fd\transformed\livedata-1.1.1\AndroidManifest.xml:20:5-44 -MERGED from [android.arch.lifecycle:livedata-core:1.1.1] C:\Users\С\.gradle\caches\transforms-3\20c81a0d6b9d5ce59cc6eb29756bcd98\transformed\livedata-core-1.1.1\AndroidManifest.xml:20:5-44 -MERGED from [android.arch.lifecycle:livedata-core:1.1.1] C:\Users\С\.gradle\caches\transforms-3\20c81a0d6b9d5ce59cc6eb29756bcd98\transformed\livedata-core-1.1.1\AndroidManifest.xml:20:5-44 -MERGED from [android.arch.core:runtime:1.1.1] C:\Users\С\.gradle\caches\transforms-3\a858b24e6842bb03c99b47b1e2e71061\transformed\runtime-1.1.1\AndroidManifest.xml:20:5-44 -MERGED from [android.arch.core:runtime:1.1.1] C:\Users\С\.gradle\caches\transforms-3\a858b24e6842bb03c99b47b1e2e71061\transformed\runtime-1.1.1\AndroidManifest.xml:20:5-44 -MERGED from [com.android.support:interpolator:28.0.0] C:\Users\С\.gradle\caches\transforms-3\5a8a44c735645797ad7daf28db84fe3f\transformed\interpolator-28.0.0\AndroidManifest.xml:20:5-44 -MERGED from [com.android.support:interpolator:28.0.0] C:\Users\С\.gradle\caches\transforms-3\5a8a44c735645797ad7daf28db84fe3f\transformed\interpolator-28.0.0\AndroidManifest.xml:20:5-44 -INJECTED from E:\Notes-master1\app\src\main\AndroidManifest.xml -INJECTED from E:\Notes-master1\app\src\main\AndroidManifest.xml +INJECTED from D:\Notes-master1\app\src\main\AndroidManifest.xml reason: use-sdk injection requested +INJECTED from D:\Notes-master1\app\src\main\AndroidManifest.xml +INJECTED from D:\Notes-master1\app\src\main\AndroidManifest.xml +MERGED from [com.android.support:appcompat-v7:28.0.0] C:\Users\fanyi\.gradle\caches\transforms-3\7aa3a488ec69f96886facece9aaa9406\transformed\appcompat-v7-28.0.0\AndroidManifest.xml:20:5-44 +MERGED from [com.android.support:appcompat-v7:28.0.0] C:\Users\fanyi\.gradle\caches\transforms-3\7aa3a488ec69f96886facece9aaa9406\transformed\appcompat-v7-28.0.0\AndroidManifest.xml:20:5-44 +MERGED from [com.android.support:support-fragment:28.0.0] C:\Users\fanyi\.gradle\caches\transforms-3\d7823733cf657bf5585e38375aaf86e5\transformed\support-fragment-28.0.0\AndroidManifest.xml:20:5-44 +MERGED from [com.android.support:support-fragment:28.0.0] C:\Users\fanyi\.gradle\caches\transforms-3\d7823733cf657bf5585e38375aaf86e5\transformed\support-fragment-28.0.0\AndroidManifest.xml:20:5-44 +MERGED from [com.android.support:animated-vector-drawable:28.0.0] C:\Users\fanyi\.gradle\caches\transforms-3\74ce360b3b9c66bbcf1c66588559d812\transformed\animated-vector-drawable-28.0.0\AndroidManifest.xml:20:5-44 +MERGED from [com.android.support:animated-vector-drawable:28.0.0] C:\Users\fanyi\.gradle\caches\transforms-3\74ce360b3b9c66bbcf1c66588559d812\transformed\animated-vector-drawable-28.0.0\AndroidManifest.xml:20:5-44 +MERGED from [com.android.support:support-core-ui:28.0.0] C:\Users\fanyi\.gradle\caches\transforms-3\45df4f746735ea8ab3ad0e8906de9541\transformed\support-core-ui-28.0.0\AndroidManifest.xml:20:5-44 +MERGED from [com.android.support:support-core-ui:28.0.0] C:\Users\fanyi\.gradle\caches\transforms-3\45df4f746735ea8ab3ad0e8906de9541\transformed\support-core-ui-28.0.0\AndroidManifest.xml:20:5-44 +MERGED from [com.android.support:support-core-utils:28.0.0] C:\Users\fanyi\.gradle\caches\transforms-3\5cb2d487a895b5aabe42009af262fba0\transformed\support-core-utils-28.0.0\AndroidManifest.xml:20:5-44 +MERGED from [com.android.support:support-core-utils:28.0.0] C:\Users\fanyi\.gradle\caches\transforms-3\5cb2d487a895b5aabe42009af262fba0\transformed\support-core-utils-28.0.0\AndroidManifest.xml:20:5-44 +MERGED from [com.android.support:support-vector-drawable:28.0.0] C:\Users\fanyi\.gradle\caches\transforms-3\d960eab88d5a997e97e5e5ec2000ba0d\transformed\support-vector-drawable-28.0.0\AndroidManifest.xml:20:5-44 +MERGED from [com.android.support:support-vector-drawable:28.0.0] C:\Users\fanyi\.gradle\caches\transforms-3\d960eab88d5a997e97e5e5ec2000ba0d\transformed\support-vector-drawable-28.0.0\AndroidManifest.xml:20:5-44 +MERGED from [com.android.support:loader:28.0.0] C:\Users\fanyi\.gradle\caches\transforms-3\6df37d2cdd1f465389ff9d0017989317\transformed\loader-28.0.0\AndroidManifest.xml:20:5-44 +MERGED from [com.android.support:loader:28.0.0] C:\Users\fanyi\.gradle\caches\transforms-3\6df37d2cdd1f465389ff9d0017989317\transformed\loader-28.0.0\AndroidManifest.xml:20:5-44 +MERGED from [com.android.support:viewpager:28.0.0] C:\Users\fanyi\.gradle\caches\transforms-3\452364a06fffcaee48eadd03047c4c23\transformed\viewpager-28.0.0\AndroidManifest.xml:20:5-44 +MERGED from [com.android.support:viewpager:28.0.0] C:\Users\fanyi\.gradle\caches\transforms-3\452364a06fffcaee48eadd03047c4c23\transformed\viewpager-28.0.0\AndroidManifest.xml:20:5-44 +MERGED from [com.android.support:coordinatorlayout:28.0.0] C:\Users\fanyi\.gradle\caches\transforms-3\4433a4478073ef0c67208fcc6161f90b\transformed\coordinatorlayout-28.0.0\AndroidManifest.xml:20:5-44 +MERGED from [com.android.support:coordinatorlayout:28.0.0] C:\Users\fanyi\.gradle\caches\transforms-3\4433a4478073ef0c67208fcc6161f90b\transformed\coordinatorlayout-28.0.0\AndroidManifest.xml:20:5-44 +MERGED from [com.android.support:drawerlayout:28.0.0] C:\Users\fanyi\.gradle\caches\transforms-3\0ee83bd761f2ecab299de46cc0b82c50\transformed\drawerlayout-28.0.0\AndroidManifest.xml:20:5-44 +MERGED from [com.android.support:drawerlayout:28.0.0] C:\Users\fanyi\.gradle\caches\transforms-3\0ee83bd761f2ecab299de46cc0b82c50\transformed\drawerlayout-28.0.0\AndroidManifest.xml:20:5-44 +MERGED from [com.android.support:slidingpanelayout:28.0.0] C:\Users\fanyi\.gradle\caches\transforms-3\fc1c0fb709ad5aac8409169f636c3f7c\transformed\slidingpanelayout-28.0.0\AndroidManifest.xml:20:5-44 +MERGED from [com.android.support:slidingpanelayout:28.0.0] C:\Users\fanyi\.gradle\caches\transforms-3\fc1c0fb709ad5aac8409169f636c3f7c\transformed\slidingpanelayout-28.0.0\AndroidManifest.xml:20:5-44 +MERGED from [com.android.support:customview:28.0.0] C:\Users\fanyi\.gradle\caches\transforms-3\ee1ff1ac306a58d4885454d76bde2c23\transformed\customview-28.0.0\AndroidManifest.xml:20:5-44 +MERGED from [com.android.support:customview:28.0.0] C:\Users\fanyi\.gradle\caches\transforms-3\ee1ff1ac306a58d4885454d76bde2c23\transformed\customview-28.0.0\AndroidManifest.xml:20:5-44 +MERGED from [com.android.support:swiperefreshlayout:28.0.0] C:\Users\fanyi\.gradle\caches\transforms-3\0d6d2529bfec5eb23fe1bd6143217265\transformed\swiperefreshlayout-28.0.0\AndroidManifest.xml:20:5-44 +MERGED from [com.android.support:swiperefreshlayout:28.0.0] C:\Users\fanyi\.gradle\caches\transforms-3\0d6d2529bfec5eb23fe1bd6143217265\transformed\swiperefreshlayout-28.0.0\AndroidManifest.xml:20:5-44 +MERGED from [com.android.support:asynclayoutinflater:28.0.0] C:\Users\fanyi\.gradle\caches\transforms-3\3c2704eea72100dcc15532aed150b55f\transformed\asynclayoutinflater-28.0.0\AndroidManifest.xml:20:5-44 +MERGED from [com.android.support:asynclayoutinflater:28.0.0] C:\Users\fanyi\.gradle\caches\transforms-3\3c2704eea72100dcc15532aed150b55f\transformed\asynclayoutinflater-28.0.0\AndroidManifest.xml:20:5-44 +MERGED from [com.android.support:support-compat:28.0.0] C:\Users\fanyi\.gradle\caches\transforms-3\2b9474e47639de47b19dc72cadc6eaea\transformed\support-compat-28.0.0\AndroidManifest.xml:20:5-44 +MERGED from [com.android.support:support-compat:28.0.0] C:\Users\fanyi\.gradle\caches\transforms-3\2b9474e47639de47b19dc72cadc6eaea\transformed\support-compat-28.0.0\AndroidManifest.xml:20:5-44 +MERGED from [com.android.support:versionedparcelable:28.0.0] C:\Users\fanyi\.gradle\caches\transforms-3\0e979f093d8e2d4d316810ed500ba370\transformed\versionedparcelable-28.0.0\AndroidManifest.xml:20:5-44 +MERGED from [com.android.support:versionedparcelable:28.0.0] C:\Users\fanyi\.gradle\caches\transforms-3\0e979f093d8e2d4d316810ed500ba370\transformed\versionedparcelable-28.0.0\AndroidManifest.xml:20:5-44 +MERGED from [com.android.support:cursoradapter:28.0.0] C:\Users\fanyi\.gradle\caches\transforms-3\a4c1b8c2d076cab3d388ef00cc8dcfca\transformed\cursoradapter-28.0.0\AndroidManifest.xml:20:5-44 +MERGED from [com.android.support:cursoradapter:28.0.0] C:\Users\fanyi\.gradle\caches\transforms-3\a4c1b8c2d076cab3d388ef00cc8dcfca\transformed\cursoradapter-28.0.0\AndroidManifest.xml:20:5-44 +MERGED from [android.arch.lifecycle:runtime:1.1.1] C:\Users\fanyi\.gradle\caches\transforms-3\17eb0ed45e8407a4a1057238ac0ef32d\transformed\runtime-1.1.1\AndroidManifest.xml:20:5-44 +MERGED from [android.arch.lifecycle:runtime:1.1.1] C:\Users\fanyi\.gradle\caches\transforms-3\17eb0ed45e8407a4a1057238ac0ef32d\transformed\runtime-1.1.1\AndroidManifest.xml:20:5-44 +MERGED from [com.android.support:documentfile:28.0.0] C:\Users\fanyi\.gradle\caches\transforms-3\cc09afb8eac4d335fea72e799be32d7d\transformed\documentfile-28.0.0\AndroidManifest.xml:20:5-44 +MERGED from [com.android.support:documentfile:28.0.0] C:\Users\fanyi\.gradle\caches\transforms-3\cc09afb8eac4d335fea72e799be32d7d\transformed\documentfile-28.0.0\AndroidManifest.xml:20:5-44 +MERGED from [com.android.support:localbroadcastmanager:28.0.0] C:\Users\fanyi\.gradle\caches\transforms-3\5f78356c8e35cbd990e3737969918b8c\transformed\localbroadcastmanager-28.0.0\AndroidManifest.xml:20:5-44 +MERGED from [com.android.support:localbroadcastmanager:28.0.0] C:\Users\fanyi\.gradle\caches\transforms-3\5f78356c8e35cbd990e3737969918b8c\transformed\localbroadcastmanager-28.0.0\AndroidManifest.xml:20:5-44 +MERGED from [com.android.support:print:28.0.0] C:\Users\fanyi\.gradle\caches\transforms-3\f2b822bb596f2229aa2a487414e6e8c4\transformed\print-28.0.0\AndroidManifest.xml:20:5-44 +MERGED from [com.android.support:print:28.0.0] C:\Users\fanyi\.gradle\caches\transforms-3\f2b822bb596f2229aa2a487414e6e8c4\transformed\print-28.0.0\AndroidManifest.xml:20:5-44 +MERGED from [android.arch.lifecycle:viewmodel:1.1.1] C:\Users\fanyi\.gradle\caches\transforms-3\cff59266d9d4bfef4b3e7fe33cd02e91\transformed\viewmodel-1.1.1\AndroidManifest.xml:20:5-44 +MERGED from [android.arch.lifecycle:viewmodel:1.1.1] C:\Users\fanyi\.gradle\caches\transforms-3\cff59266d9d4bfef4b3e7fe33cd02e91\transformed\viewmodel-1.1.1\AndroidManifest.xml:20:5-44 +MERGED from [android.arch.lifecycle:livedata:1.1.1] C:\Users\fanyi\.gradle\caches\transforms-3\0f019efc887a73e45a3a4cf3278344b8\transformed\livedata-1.1.1\AndroidManifest.xml:20:5-44 +MERGED from [android.arch.lifecycle:livedata:1.1.1] C:\Users\fanyi\.gradle\caches\transforms-3\0f019efc887a73e45a3a4cf3278344b8\transformed\livedata-1.1.1\AndroidManifest.xml:20:5-44 +MERGED from [android.arch.lifecycle:livedata-core:1.1.1] C:\Users\fanyi\.gradle\caches\transforms-3\ed642353549cd1357a6c2a4682ab3ae3\transformed\livedata-core-1.1.1\AndroidManifest.xml:20:5-44 +MERGED from [android.arch.lifecycle:livedata-core:1.1.1] C:\Users\fanyi\.gradle\caches\transforms-3\ed642353549cd1357a6c2a4682ab3ae3\transformed\livedata-core-1.1.1\AndroidManifest.xml:20:5-44 +MERGED from [android.arch.core:runtime:1.1.1] C:\Users\fanyi\.gradle\caches\transforms-3\c360566d4530bcdfdeab7a0798072d85\transformed\runtime-1.1.1\AndroidManifest.xml:20:5-44 +MERGED from [android.arch.core:runtime:1.1.1] C:\Users\fanyi\.gradle\caches\transforms-3\c360566d4530bcdfdeab7a0798072d85\transformed\runtime-1.1.1\AndroidManifest.xml:20:5-44 +MERGED from [com.android.support:interpolator:28.0.0] C:\Users\fanyi\.gradle\caches\transforms-3\28d63aba52764488305f21d67e729d53\transformed\interpolator-28.0.0\AndroidManifest.xml:20:5-44 +MERGED from [com.android.support:interpolator:28.0.0] C:\Users\fanyi\.gradle\caches\transforms-3\28d63aba52764488305f21d67e729d53\transformed\interpolator-28.0.0\AndroidManifest.xml:20:5-44 +INJECTED from D:\Notes-master1\app\src\main\AndroidManifest.xml +INJECTED from D:\Notes-master1\app\src\main\AndroidManifest.xml android:targetSdkVersion - INJECTED from E:\Notes-master1\app\src\main\AndroidManifest.xml - ADDED from E:\Notes-master1\app\src\main\AndroidManifest.xml - INJECTED from E:\Notes-master1\app\src\main\AndroidManifest.xml + INJECTED from D:\Notes-master1\app\src\main\AndroidManifest.xml + ADDED from D:\Notes-master1\app\src\main\AndroidManifest.xml + INJECTED from D:\Notes-master1\app\src\main\AndroidManifest.xml android:minSdkVersion - INJECTED from E:\Notes-master1\app\src\main\AndroidManifest.xml - ADDED from E:\Notes-master1\app\src\main\AndroidManifest.xml - INJECTED from E:\Notes-master1\app\src\main\AndroidManifest.xml + INJECTED from D:\Notes-master1\app\src\main\AndroidManifest.xml + ADDED from D:\Notes-master1\app\src\main\AndroidManifest.xml + INJECTED from D:\Notes-master1\app\src\main\AndroidManifest.xml diff --git a/src/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/previous-compilation-data.bin b/src/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/previous-compilation-data.bin new file mode 100644 index 00000000..020d14e8 Binary files /dev/null and b/src/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/previous-compilation-data.bin differ diff --git a/src/Notes-master1/app/src/main/java/net/micode/notes/data/Notes.java b/src/Notes-master1/app/src/main/java/net/micode/notes/data/Notes.java index f240604b..0f0248b5 100644 --- a/src/Notes-master1/app/src/main/java/net/micode/notes/data/Notes.java +++ b/src/Notes-master1/app/src/main/java/net/micode/notes/data/Notes.java @@ -165,6 +165,12 @@ public class Notes { *

Type : INTEGER (long)

*/ public static final String VERSION = "version"; + + /** + * The note or folder group + *

Type : INTEGER (long)

+ */ + public static final String GROUP = "group_num"; } public interface DataColumns { diff --git a/src/Notes-master1/app/src/main/java/net/micode/notes/data/NotesDatabaseHelper.java b/src/Notes-master1/app/src/main/java/net/micode/notes/data/NotesDatabaseHelper.java index ffe5d577..b5be803f 100644 --- a/src/Notes-master1/app/src/main/java/net/micode/notes/data/NotesDatabaseHelper.java +++ b/src/Notes-master1/app/src/main/java/net/micode/notes/data/NotesDatabaseHelper.java @@ -30,7 +30,7 @@ import net.micode.notes.data.Notes.NoteColumns; public class NotesDatabaseHelper extends SQLiteOpenHelper { private static final String DB_NAME = "note.db"; - private static final int DB_VERSION = 4; + private static final int DB_VERSION = 5; public interface TABLE { public static final String NOTE = "note"; @@ -60,7 +60,8 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper { NoteColumns.LOCAL_MODIFIED + " INTEGER NOT NULL DEFAULT 0," + NoteColumns.ORIGIN_PARENT_ID + " INTEGER NOT NULL DEFAULT 0," + NoteColumns.GTASK_ID + " TEXT NOT NULL DEFAULT ''," + - NoteColumns.VERSION + " INTEGER NOT NULL DEFAULT 0" + + NoteColumns.VERSION + " INTEGER NOT NULL DEFAULT 0," + + NoteColumns.GROUP + " INTEGER NOT NULL DEFAULT 0" + ")"; private static final String CREATE_DATA_TABLE_SQL = @@ -322,6 +323,11 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper { oldVersion++; } + if (oldVersion == 4){ + upgradeToV5(db); + oldVersion++; + } + if (reCreateTriggers) { reCreateNoteTableTriggers(db); reCreateDataTableTriggers(db); @@ -358,5 +364,12 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper { private void upgradeToV4(SQLiteDatabase db) { db.execSQL("ALTER TABLE " + TABLE.NOTE + " ADD COLUMN " + NoteColumns.VERSION + " INTEGER NOT NULL DEFAULT 0"); + Log.d("ABC", "four"); + } + + private void upgradeToV5(SQLiteDatabase db) { + db.execSQL("ALTER TABLE " + TABLE.NOTE + " ADD COLUMN " + NoteColumns.GROUP + + " INTEGER NOT NULL DEFAULT 0"); + Log.d("ABC", "fif"); } } diff --git a/src/Notes-master1/app/src/main/java/net/micode/notes/model/Note.java b/src/Notes-master1/app/src/main/java/net/micode/notes/model/Note.java index 6706cf67..a7da7a0b 100644 --- a/src/Notes-master1/app/src/main/java/net/micode/notes/model/Note.java +++ b/src/Notes-master1/app/src/main/java/net/micode/notes/model/Note.java @@ -50,6 +50,7 @@ public class Note { values.put(NoteColumns.TYPE, Notes.TYPE_NOTE); values.put(NoteColumns.LOCAL_MODIFIED, 1); values.put(NoteColumns.PARENT_ID, folderId); + values.put(NoteColumns.GROUP, folderId); Uri uri = context.getContentResolver().insert(Notes.CONTENT_NOTE_URI, values); long noteId = 0; diff --git a/src/Notes-master1/app/src/main/java/net/micode/notes/tool/DataUtils.java b/src/Notes-master1/app/src/main/java/net/micode/notes/tool/DataUtils.java index 2a14982e..73940187 100644 --- a/src/Notes-master1/app/src/main/java/net/micode/notes/tool/DataUtils.java +++ b/src/Notes-master1/app/src/main/java/net/micode/notes/tool/DataUtils.java @@ -92,6 +92,7 @@ public class DataUtils { ContentProviderOperation.Builder builder = ContentProviderOperation .newUpdate(ContentUris.withAppendedId(Notes.CONTENT_NOTE_URI, id)); builder.withValue(NoteColumns.PARENT_ID, folderId); + builder.withValue(NoteColumns.GROUP, folderId); builder.withValue(NoteColumns.LOCAL_MODIFIED, 1); operationList.add(builder.build()); } diff --git a/src/Notes-master1/app/src/main/java/net/micode/notes/ui/NoteEditActivity.java b/src/Notes-master1/app/src/main/java/net/micode/notes/ui/NoteEditActivity.java index e4d1b7d6..6a8e86df 100644 --- a/src/Notes-master1/app/src/main/java/net/micode/notes/ui/NoteEditActivity.java +++ b/src/Notes-master1/app/src/main/java/net/micode/notes/ui/NoteEditActivity.java @@ -31,9 +31,11 @@ import android.content.SharedPreferences; import android.graphics.Paint; import android.os.Bundle; import android.preference.PreferenceManager; +import android.text.Editable; import android.text.Spannable; import android.text.SpannableString; import android.text.TextUtils; +import android.text.TextWatcher; import android.text.format.DateUtils; import android.text.style.BackgroundColorSpan; import android.util.Log; @@ -150,6 +152,62 @@ public class NoteEditActivity extends AppCompatActivity implements OnClickListen private String mUserQuery; private Pattern mPattern; + private EditText editText; + private TextView textView; + + + private String Textchange(String oriText){ + StringBuffer stringBuffer = new StringBuffer(oriText); + int Flag1 = -1; + int Flag2 = -1; + do {//不计入表示图片的字符 + Flag1 = stringBuffer.indexOf(""); + if (Flag1 != -1 && Flag2 != -1) { + stringBuffer = stringBuffer.replace(Flag1, Flag2+1, ""); + } + } while (Flag1 != -1 && Flag2 != -1); + + do {//不计入换行字符 + Flag1 = stringBuffer.indexOf("\n"); + + if (Flag1 != -1){ + stringBuffer = stringBuffer.replace(Flag1, Flag1+1, ""); + } + } while (Flag1 != -1); + do {//不计入空格字符 + Flag1 = stringBuffer.indexOf(" "); + + if (Flag1 != -1) { + stringBuffer = stringBuffer.replace(Flag1, Flag1+1, ""); + } + } while (Flag1 != -1); + return stringBuffer.toString(); + } + private void count() { + + editText = (EditText) findViewById(R.id.note_edit_view); + textView = (TextView) findViewById(R.id.text_num); + + mNoteEditor.addTextChangedListener(new TextWatcher() { + int currentLength = 0; + @Override + public void beforeTextChanged(CharSequence s, int start, int count, int after) { + textView.setText("字符数:" + currentLength); + } + + @Override + public void onTextChanged(CharSequence s, int start, int before, int count) { + currentLength = Textchange(mNoteEditor.getText().toString()).length(); + } + + @Override + public void afterTextChanged(Editable s) { + textView.setText("字符数:" + currentLength); + } + }); + } + @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); @@ -160,6 +218,7 @@ public class NoteEditActivity extends AppCompatActivity implements OnClickListen return; } initResources(); + count(); } /** @@ -431,7 +490,7 @@ public class NoteEditActivity extends AppCompatActivity implements OnClickListen if (id == R.id.btn_set_bg_color) { mNoteBgColorSelector.setVisibility(View.VISIBLE); findViewById(sBgSelectorSelectionMap.get(mWorkingNote.getBgColorId())).setVisibility( - - View.VISIBLE); + View.VISIBLE); } else if (sBgSelectorBtnsMap.containsKey(id)) { findViewById(sBgSelectorSelectionMap.get(mWorkingNote.getBgColorId())).setVisibility( View.GONE); @@ -597,7 +656,7 @@ public class NoteEditActivity extends AppCompatActivity implements OnClickListen Log.d(TAG, "Wrong note id, should not happen"); } if (!isSyncMode()) { - if (!DataUtils.batchDeleteNotes(getContentResolver(), ids)) { + if (!DataUtils.batchMoveToFolder(getContentResolver(), ids, Notes.ID_TRASH_FOLER)) { Log.e(TAG, "Delete Note error"); } } else { diff --git a/src/Notes-master1/app/src/main/java/net/micode/notes/ui/NotesListActivity.java b/src/Notes-master1/app/src/main/java/net/micode/notes/ui/NotesListActivity.java index c7512e3b..001ad7ee 100644 --- a/src/Notes-master1/app/src/main/java/net/micode/notes/ui/NotesListActivity.java +++ b/src/Notes-master1/app/src/main/java/net/micode/notes/ui/NotesListActivity.java @@ -65,6 +65,7 @@ import net.micode.notes.R; import net.micode.notes.data.Notes; import net.micode.notes.data.Notes.NoteColumns; import net.micode.notes.gtask.remote.GTaskSyncService; +import net.micode.notes.model.Note; import net.micode.notes.model.WorkingNote; import net.micode.notes.tool.BackupUtils; import net.micode.notes.tool.DataUtils; @@ -90,6 +91,8 @@ public class NotesListActivity extends AppCompatActivity implements OnClickListe private static final int MENU_FOLDER_CHANGE_NAME = 2; + private static int VIEW_WAY = 0; + private static final String PREFERENCE_ADD_INTRODUCTION = "net.micode.notes.introduction"; private enum ListEditState { @@ -133,6 +136,11 @@ public class NotesListActivity extends AppCompatActivity implements OnClickListe + NoteColumns.ID + "=" + Notes.ID_CALL_RECORD_FOLDER + " AND " + NoteColumns.NOTES_COUNT + ">0)"; + private static final String ROOT_FOLDER_SELECTION_ALL = "(" + NoteColumns.TYPE + "<>" + + Notes.TYPE_SYSTEM + " AND " + NoteColumns.PARENT_ID + ">?)" + " OR (" + + NoteColumns.ID + "=" + Notes.ID_CALL_RECORD_FOLDER + " AND " + + NoteColumns.NOTES_COUNT + ">0)"; + private final static int REQUEST_CODE_OPEN_NODE = 102; private final static int REQUEST_CODE_NEW_NODE = 103; @@ -410,12 +418,23 @@ public class NotesListActivity extends AppCompatActivity implements OnClickListe }; private void startAsyncNotesListQuery() { - String selection = (mCurrentFolderId == Notes.ID_ROOT_FOLDER) ? ROOT_FOLDER_SELECTION - : NORMAL_SELECTION; - mBackgroundQueryHandler.startQuery(FOLDER_NOTE_LIST_QUERY_TOKEN, null, - Notes.CONTENT_NOTE_URI, NoteItemData.PROJECTION, selection, new String[] { - String.valueOf(mCurrentFolderId) - }, NoteColumns.TYPE + " DESC," + NoteColumns.MODIFIED_DATE + " DESC"); + if (mCurrentFolderId == Notes.ID_ROOT_FOLDER && VIEW_WAY == 1){ + String selection = (mCurrentFolderId == Notes.ID_ROOT_FOLDER) ? ROOT_FOLDER_SELECTION_ALL + : NORMAL_SELECTION; + mBackgroundQueryHandler.startQuery(FOLDER_NOTE_LIST_QUERY_TOKEN, null, + Notes.CONTENT_NOTE_URI, NoteItemData.PROJECTION, selection, new String[] { + String.valueOf(Notes.ID_TEMPARAY_FOLDER) + }, NoteColumns.GROUP + " ASC," + NoteColumns.TYPE + " DESC," + NoteColumns.MODIFIED_DATE + " DESC"); + } + else { + String selection = (mCurrentFolderId == Notes.ID_ROOT_FOLDER) ? ROOT_FOLDER_SELECTION + : NORMAL_SELECTION; + mBackgroundQueryHandler.startQuery(FOLDER_NOTE_LIST_QUERY_TOKEN, null, + Notes.CONTENT_NOTE_URI, NoteItemData.PROJECTION, selection, new String[] { + String.valueOf(mCurrentFolderId) + }, NoteColumns.TYPE + " DESC," + NoteColumns.MODIFIED_DATE + " DESC"); + } + } private final class BackgroundQueryHandler extends AsyncQueryHandler { @@ -475,12 +494,22 @@ public class NotesListActivity extends AppCompatActivity implements OnClickListe protected HashSet doInBackground(Void... unused) { HashSet widgets = mNotesListAdapter.getSelectedWidget(); if (!isSyncMode()) { - // if not synced, delete notes directly - if (DataUtils.batchDeleteNotes(mContentResolver, mNotesListAdapter - .getSelectedItemIds())) { - } else { - Log.e(TAG, "Delete notes error, should not happens"); + if (mCurrentFolderId == Notes.ID_TRASH_FOLER){ + // if in trash, delete notes directly + if (DataUtils.batchDeleteNotes(mContentResolver, mNotesListAdapter + .getSelectedItemIds())) { + } else { + Log.e(TAG, "Delete notes error, should not happens"); + } } + else{ + //move to trash + if (!DataUtils.batchMoveToFolder(mContentResolver, mNotesListAdapter + .getSelectedItemIds(), Notes.ID_TRASH_FOLER)) { + Log.e(TAG, "Move notes to trash folder error, should not happens"); + } + } + } else { // in sync mode, we'll move the deleted note into the trash // folder @@ -633,6 +662,26 @@ public class NotesListActivity extends AppCompatActivity implements OnClickListe values.put(NoteColumns.SNIPPET, name); values.put(NoteColumns.TYPE, Notes.TYPE_FOLDER); mContentResolver.insert(Notes.CONTENT_NOTE_URI, values); + Cursor cursor = getContentResolver().query(Notes.CONTENT_NOTE_URI, new String[] { + NoteColumns.ID + }, + NoteColumns.SNIPPET + "=?", new String[] { + name + }, null); + //get the folderId to be group + if (cursor.moveToFirst()) { + int NOTE_ID_COLUMN = 0; + long mFolderId = cursor.getLong(NOTE_ID_COLUMN); + ContentValues valuess = new ContentValues(); + valuess.put(NoteColumns.GROUP, mFolderId); + Log.d("FIRST", String.valueOf(mFolderId)); + mContentResolver.update(Notes.CONTENT_NOTE_URI, valuess, NoteColumns.ID + + "=?", new String[] { + String.valueOf(mFolderId) + }); + } + cursor.close(); + } dialog.dismiss(); } @@ -770,7 +819,12 @@ public class NotesListActivity extends AppCompatActivity implements OnClickListe menu.findItem(R.id.menu_sync).setTitle( GTaskSyncService.isSyncing() ? R.string.menu_sync_cancel : R.string.menu_sync); } else if (mState == ListEditState.SUB_FOLDER) { - getMenuInflater().inflate(R.menu.sub_folder, menu); + if (mCurrentFolderId == Notes.ID_TRASH_FOLER){ + getMenuInflater().inflate(R.menu.trash_folder, menu); + } + else { + getMenuInflater().inflate(R.menu.sub_folder, menu); + } } else if (mState == ListEditState.CALL_RECORD_FOLDER) { getMenuInflater().inflate(R.menu.call_record_folder, menu); } else { @@ -813,6 +867,13 @@ public class NotesListActivity extends AppCompatActivity implements OnClickListe case R.id.menu_search: onSearchRequested(); break; + case R.id.menu_restore: + restoreDeletedNodes(); + break; + case R.id.menu_change_view: + VIEW_WAY = 1 - VIEW_WAY; + startAsyncNotesListQuery(); + break; default: break; } @@ -952,4 +1013,12 @@ public class NotesListActivity extends AppCompatActivity implements OnClickListe } return false; } + + private void restoreDeletedNodes(){ + mState = ListEditState.SUB_FOLDER; + mCurrentFolderId = Notes.ID_TRASH_FOLER; + startAsyncNotesListQuery(); + mTitleBar.setText("trash folder"); + mTitleBar.setVisibility(View.VISIBLE); + } } diff --git a/src/Notes-master1/app/src/main/res/layout/note_edit.xml b/src/Notes-master1/app/src/main/res/layout/note_edit.xml index 10b2aa73..6b2ae09e 100644 --- a/src/Notes-master1/app/src/main/res/layout/note_edit.xml +++ b/src/Notes-master1/app/src/main/res/layout/note_edit.xml @@ -47,6 +47,15 @@ android:layout_gravity="center_vertical" android:background="@drawable/title_alert" /> + + + + + + diff --git a/src/Notes-master1/app/src/main/res/menu/trash_folder.xml b/src/Notes-master1/app/src/main/res/menu/trash_folder.xml new file mode 100644 index 00000000..fe187c0c --- /dev/null +++ b/src/Notes-master1/app/src/main/res/menu/trash_folder.xml @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/src/Notes-master1/app/src/main/res/values-zh-rCN/strings.xml b/src/Notes-master1/app/src/main/res/values-zh-rCN/strings.xml index 09f75ed9..b04c0f00 100644 --- a/src/Notes-master1/app/src/main/res/values-zh-rCN/strings.xml +++ b/src/Notes-master1/app/src/main/res/values-zh-rCN/strings.xml @@ -17,6 +17,7 @@ + 字数 便签 便签2x2 便签4x4 diff --git a/src/Notes-master1/app/src/main/res/values-zh-rTW/strings.xml b/src/Notes-master1/app/src/main/res/values-zh-rTW/strings.xml index e29b79bc..8aba2b2e 100644 --- a/src/Notes-master1/app/src/main/res/values-zh-rTW/strings.xml +++ b/src/Notes-master1/app/src/main/res/values-zh-rTW/strings.xml @@ -17,6 +17,7 @@ + 字數 便簽 便簽2x2 便簽4x4 diff --git a/src/Notes-master1/app/src/main/res/values/strings.xml b/src/Notes-master1/app/src/main/res/values/strings.xml index 55df8682..bba74a47 100644 --- a/src/Notes-master1/app/src/main/res/values/strings.xml +++ b/src/Notes-master1/app/src/main/res/values/strings.xml @@ -17,6 +17,7 @@ + Length Notes Notes 2x2 Notes 4x4 @@ -46,6 +47,8 @@ Cancel syncing Settings Search + Restore + Change view Delete Move to folder %d selected diff --git a/src/Notes-master1/gradle/wrapper/gradle-wrapper.properties b/src/Notes-master1/gradle/wrapper/gradle-wrapper.properties index 4ebbc82b..b198923c 100644 --- a/src/Notes-master1/gradle/wrapper/gradle-wrapper.properties +++ b/src/Notes-master1/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Fri Sep 03 10:41:25 CST 2021 +#Wed Nov 03 08:19:04 CST 2021 distributionBase=GRADLE_USER_HOME -distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip distributionPath=wrapper/dists zipStorePath=wrapper/dists zipStoreBase=GRADLE_USER_HOME diff --git a/src/Notes-master1/local.properties b/src/Notes-master1/local.properties index 302c83a6..afd1c97b 100644 --- a/src/Notes-master1/local.properties +++ b/src/Notes-master1/local.properties @@ -2,6 +2,7 @@ # as it contains information specific to your local configuration. # # Location of the SDK. This is only used by Gradle. -# -#Fri Sep 03 10:41:25 CST 2021 -sdk.dir=E\:\\SDK +# For customization when using a Version Control System, please read the +# header note. +#Wed Nov 03 08:18:45 CST 2021 +sdk.dir=D\:\\SDK