diff --git a/src/.gradle/8.0/executionHistory/executionHistory.bin b/src/.gradle/8.0/executionHistory/executionHistory.bin index f7e5d141..e3a9c347 100644 Binary files a/src/.gradle/8.0/executionHistory/executionHistory.bin and b/src/.gradle/8.0/executionHistory/executionHistory.bin differ diff --git a/src/.gradle/8.0/executionHistory/executionHistory.lock b/src/.gradle/8.0/executionHistory/executionHistory.lock index 27e4bcfe..2a60aa71 100644 Binary files a/src/.gradle/8.0/executionHistory/executionHistory.lock and b/src/.gradle/8.0/executionHistory/executionHistory.lock differ diff --git a/src/.gradle/8.0/fileHashes/fileHashes.bin b/src/.gradle/8.0/fileHashes/fileHashes.bin index a5c1a8e7..67323429 100644 Binary files a/src/.gradle/8.0/fileHashes/fileHashes.bin and b/src/.gradle/8.0/fileHashes/fileHashes.bin differ diff --git a/src/.gradle/8.0/fileHashes/fileHashes.lock b/src/.gradle/8.0/fileHashes/fileHashes.lock index fc2f3ee9..5d538059 100644 Binary files a/src/.gradle/8.0/fileHashes/fileHashes.lock and b/src/.gradle/8.0/fileHashes/fileHashes.lock differ diff --git a/src/.gradle/8.0/fileHashes/resourceHashesCache.bin b/src/.gradle/8.0/fileHashes/resourceHashesCache.bin index 50576676..cd08bc8f 100644 Binary files a/src/.gradle/8.0/fileHashes/resourceHashesCache.bin and b/src/.gradle/8.0/fileHashes/resourceHashesCache.bin differ diff --git a/src/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/src/.gradle/buildOutputCleanup/buildOutputCleanup.lock index 8cacd7a9..3f290914 100644 Binary files a/src/.gradle/buildOutputCleanup/buildOutputCleanup.lock and b/src/.gradle/buildOutputCleanup/buildOutputCleanup.lock differ diff --git a/src/.gradle/buildOutputCleanup/outputFiles.bin b/src/.gradle/buildOutputCleanup/outputFiles.bin index de7ccaa0..8375d15a 100644 Binary files a/src/.gradle/buildOutputCleanup/outputFiles.bin and b/src/.gradle/buildOutputCleanup/outputFiles.bin differ diff --git a/src/.gradle/file-system.probe b/src/.gradle/file-system.probe index 6c9ecda3..983223bd 100644 Binary files a/src/.gradle/file-system.probe and b/src/.gradle/file-system.probe differ diff --git a/src/app/build/intermediates/apk/debug/app-debug.apk b/src/app/build/intermediates/apk/debug/app-debug.apk index 1f614d97..447edac1 100644 Binary files a/src/app/build/intermediates/apk/debug/app-debug.apk and b/src/app/build/intermediates/apk/debug/app-debug.apk differ diff --git a/src/app/build/intermediates/compile_app_classes_jar/debug/classes.jar b/src/app/build/intermediates/compile_app_classes_jar/debug/classes.jar index 2455c6bd..53fde2b4 100644 Binary files a/src/app/build/intermediates/compile_app_classes_jar/debug/classes.jar and b/src/app/build/intermediates/compile_app_classes_jar/debug/classes.jar differ diff --git a/src/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_0/graph.bin b/src/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_0/graph.bin index 601f245f..e06d00c2 100644 Binary files a/src/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_0/graph.bin and b/src/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_0/graph.bin differ diff --git a/src/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_1/graph.bin b/src/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_1/graph.bin index 601f245f..fcb8f70b 100644 Binary files a/src/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_1/graph.bin and b/src/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_1/graph.bin differ diff --git a/src/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_4/graph.bin b/src/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_4/graph.bin index 601f245f..4d7e89d8 100644 Binary files a/src/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_4/graph.bin and b/src/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_4/graph.bin differ diff --git a/src/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_5/graph.bin b/src/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_5/graph.bin index 601f245f..650c6b2f 100644 Binary files a/src/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_5/graph.bin and b/src/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_5/graph.bin differ diff --git a/src/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_6/graph.bin b/src/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_6/graph.bin index 601f245f..d939cc85 100644 Binary files a/src/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_6/graph.bin and b/src/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_6/graph.bin differ diff --git a/src/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_7/graph.bin b/src/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_7/graph.bin index 601f245f..37476af8 100644 Binary files a/src/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_7/graph.bin and b/src/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_7/graph.bin differ diff --git a/src/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_b16db364d1a26ed4b60d0403bbc4d120b02b7bcd6879643e8bdf2d4a9e6b4a21_bucket_0/graph.bin b/src/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_b16db364d1a26ed4b60d0403bbc4d120b02b7bcd6879643e8bdf2d4a9e6b4a21_bucket_0/graph.bin deleted file mode 100644 index 601f245f..00000000 Binary files a/src/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_b16db364d1a26ed4b60d0403bbc4d120b02b7bcd6879643e8bdf2d4a9e6b4a21_bucket_0/graph.bin and /dev/null differ diff --git a/src/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_b16db364d1a26ed4b60d0403bbc4d120b02b7bcd6879643e8bdf2d4a9e6b4a21_bucket_1/graph.bin b/src/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_b16db364d1a26ed4b60d0403bbc4d120b02b7bcd6879643e8bdf2d4a9e6b4a21_bucket_1/graph.bin deleted file mode 100644 index 601f245f..00000000 Binary files a/src/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_b16db364d1a26ed4b60d0403bbc4d120b02b7bcd6879643e8bdf2d4a9e6b4a21_bucket_1/graph.bin and /dev/null differ diff --git a/src/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_b16db364d1a26ed4b60d0403bbc4d120b02b7bcd6879643e8bdf2d4a9e6b4a21_bucket_2/graph.bin b/src/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_b16db364d1a26ed4b60d0403bbc4d120b02b7bcd6879643e8bdf2d4a9e6b4a21_bucket_2/graph.bin deleted file mode 100644 index 601f245f..00000000 Binary files a/src/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_b16db364d1a26ed4b60d0403bbc4d120b02b7bcd6879643e8bdf2d4a9e6b4a21_bucket_2/graph.bin and /dev/null differ diff --git a/src/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_b16db364d1a26ed4b60d0403bbc4d120b02b7bcd6879643e8bdf2d4a9e6b4a21_bucket_3/graph.bin b/src/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_b16db364d1a26ed4b60d0403bbc4d120b02b7bcd6879643e8bdf2d4a9e6b4a21_bucket_3/graph.bin deleted file mode 100644 index 601f245f..00000000 Binary files a/src/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_b16db364d1a26ed4b60d0403bbc4d120b02b7bcd6879643e8bdf2d4a9e6b4a21_bucket_3/graph.bin and /dev/null differ diff --git a/src/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_b16db364d1a26ed4b60d0403bbc4d120b02b7bcd6879643e8bdf2d4a9e6b4a21_bucket_4/graph.bin b/src/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_b16db364d1a26ed4b60d0403bbc4d120b02b7bcd6879643e8bdf2d4a9e6b4a21_bucket_4/graph.bin deleted file mode 100644 index 601f245f..00000000 Binary files a/src/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_b16db364d1a26ed4b60d0403bbc4d120b02b7bcd6879643e8bdf2d4a9e6b4a21_bucket_4/graph.bin and /dev/null differ diff --git a/src/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_b16db364d1a26ed4b60d0403bbc4d120b02b7bcd6879643e8bdf2d4a9e6b4a21_bucket_5/graph.bin b/src/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_b16db364d1a26ed4b60d0403bbc4d120b02b7bcd6879643e8bdf2d4a9e6b4a21_bucket_5/graph.bin deleted file mode 100644 index 601f245f..00000000 Binary files a/src/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_b16db364d1a26ed4b60d0403bbc4d120b02b7bcd6879643e8bdf2d4a9e6b4a21_bucket_5/graph.bin and /dev/null differ diff --git a/src/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_b16db364d1a26ed4b60d0403bbc4d120b02b7bcd6879643e8bdf2d4a9e6b4a21_bucket_6/graph.bin b/src/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_b16db364d1a26ed4b60d0403bbc4d120b02b7bcd6879643e8bdf2d4a9e6b4a21_bucket_6/graph.bin deleted file mode 100644 index 601f245f..00000000 Binary files a/src/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_b16db364d1a26ed4b60d0403bbc4d120b02b7bcd6879643e8bdf2d4a9e6b4a21_bucket_6/graph.bin and /dev/null differ diff --git a/src/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_b16db364d1a26ed4b60d0403bbc4d120b02b7bcd6879643e8bdf2d4a9e6b4a21_bucket_7/graph.bin b/src/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_b16db364d1a26ed4b60d0403bbc4d120b02b7bcd6879643e8bdf2d4a9e6b4a21_bucket_7/graph.bin deleted file mode 100644 index 601f245f..00000000 Binary files a/src/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_b16db364d1a26ed4b60d0403bbc4d120b02b7bcd6879643e8bdf2d4a9e6b4a21_bucket_7/graph.bin and /dev/null differ diff --git a/src/app/build/intermediates/desugar_graph/debugAndroidTest/out/currentProject/jar_0ea32af53159dfaf655bd3c4c546210ca958736690d3a485d0045f055459f52a_bucket_0/graph.bin b/src/app/build/intermediates/desugar_graph/debugAndroidTest/out/currentProject/jar_0ea32af53159dfaf655bd3c4c546210ca958736690d3a485d0045f055459f52a_bucket_0/graph.bin deleted file mode 100644 index 601f245f..00000000 Binary files a/src/app/build/intermediates/desugar_graph/debugAndroidTest/out/currentProject/jar_0ea32af53159dfaf655bd3c4c546210ca958736690d3a485d0045f055459f52a_bucket_0/graph.bin and /dev/null differ diff --git a/src/app/build/intermediates/desugar_graph/debugAndroidTest/out/currentProject/jar_0ea32af53159dfaf655bd3c4c546210ca958736690d3a485d0045f055459f52a_bucket_1/graph.bin b/src/app/build/intermediates/desugar_graph/debugAndroidTest/out/currentProject/jar_0ea32af53159dfaf655bd3c4c546210ca958736690d3a485d0045f055459f52a_bucket_1/graph.bin deleted file mode 100644 index 601f245f..00000000 Binary files a/src/app/build/intermediates/desugar_graph/debugAndroidTest/out/currentProject/jar_0ea32af53159dfaf655bd3c4c546210ca958736690d3a485d0045f055459f52a_bucket_1/graph.bin and /dev/null differ diff --git a/src/app/build/intermediates/desugar_graph/debugAndroidTest/out/currentProject/jar_0ea32af53159dfaf655bd3c4c546210ca958736690d3a485d0045f055459f52a_bucket_2/graph.bin b/src/app/build/intermediates/desugar_graph/debugAndroidTest/out/currentProject/jar_0ea32af53159dfaf655bd3c4c546210ca958736690d3a485d0045f055459f52a_bucket_2/graph.bin deleted file mode 100644 index 601f245f..00000000 Binary files a/src/app/build/intermediates/desugar_graph/debugAndroidTest/out/currentProject/jar_0ea32af53159dfaf655bd3c4c546210ca958736690d3a485d0045f055459f52a_bucket_2/graph.bin and /dev/null differ diff --git a/src/app/build/intermediates/desugar_graph/debugAndroidTest/out/currentProject/jar_0ea32af53159dfaf655bd3c4c546210ca958736690d3a485d0045f055459f52a_bucket_3/graph.bin b/src/app/build/intermediates/desugar_graph/debugAndroidTest/out/currentProject/jar_0ea32af53159dfaf655bd3c4c546210ca958736690d3a485d0045f055459f52a_bucket_3/graph.bin deleted file mode 100644 index 601f245f..00000000 Binary files a/src/app/build/intermediates/desugar_graph/debugAndroidTest/out/currentProject/jar_0ea32af53159dfaf655bd3c4c546210ca958736690d3a485d0045f055459f52a_bucket_3/graph.bin and /dev/null differ diff --git a/src/app/build/intermediates/desugar_graph/debugAndroidTest/out/currentProject/jar_0ea32af53159dfaf655bd3c4c546210ca958736690d3a485d0045f055459f52a_bucket_4/graph.bin b/src/app/build/intermediates/desugar_graph/debugAndroidTest/out/currentProject/jar_0ea32af53159dfaf655bd3c4c546210ca958736690d3a485d0045f055459f52a_bucket_4/graph.bin deleted file mode 100644 index 601f245f..00000000 Binary files a/src/app/build/intermediates/desugar_graph/debugAndroidTest/out/currentProject/jar_0ea32af53159dfaf655bd3c4c546210ca958736690d3a485d0045f055459f52a_bucket_4/graph.bin and /dev/null differ diff --git a/src/app/build/intermediates/desugar_graph/debugAndroidTest/out/currentProject/jar_0ea32af53159dfaf655bd3c4c546210ca958736690d3a485d0045f055459f52a_bucket_5/graph.bin b/src/app/build/intermediates/desugar_graph/debugAndroidTest/out/currentProject/jar_0ea32af53159dfaf655bd3c4c546210ca958736690d3a485d0045f055459f52a_bucket_5/graph.bin deleted file mode 100644 index 601f245f..00000000 Binary files a/src/app/build/intermediates/desugar_graph/debugAndroidTest/out/currentProject/jar_0ea32af53159dfaf655bd3c4c546210ca958736690d3a485d0045f055459f52a_bucket_5/graph.bin and /dev/null differ diff --git a/src/app/build/intermediates/desugar_graph/debugAndroidTest/out/currentProject/jar_0ea32af53159dfaf655bd3c4c546210ca958736690d3a485d0045f055459f52a_bucket_6/graph.bin b/src/app/build/intermediates/desugar_graph/debugAndroidTest/out/currentProject/jar_0ea32af53159dfaf655bd3c4c546210ca958736690d3a485d0045f055459f52a_bucket_6/graph.bin deleted file mode 100644 index 601f245f..00000000 Binary files a/src/app/build/intermediates/desugar_graph/debugAndroidTest/out/currentProject/jar_0ea32af53159dfaf655bd3c4c546210ca958736690d3a485d0045f055459f52a_bucket_6/graph.bin and /dev/null differ diff --git a/src/app/build/intermediates/desugar_graph/debugAndroidTest/out/currentProject/jar_0ea32af53159dfaf655bd3c4c546210ca958736690d3a485d0045f055459f52a_bucket_7/graph.bin b/src/app/build/intermediates/desugar_graph/debugAndroidTest/out/currentProject/jar_0ea32af53159dfaf655bd3c4c546210ca958736690d3a485d0045f055459f52a_bucket_7/graph.bin deleted file mode 100644 index 601f245f..00000000 Binary files a/src/app/build/intermediates/desugar_graph/debugAndroidTest/out/currentProject/jar_0ea32af53159dfaf655bd3c4c546210ca958736690d3a485d0045f055459f52a_bucket_7/graph.bin and /dev/null differ diff --git a/src/app/build/intermediates/dex/debug/mergeDexDebug/classes.dex b/src/app/build/intermediates/dex/debug/mergeDexDebug/classes.dex index e127ff43..bd4c4336 100644 Binary files a/src/app/build/intermediates/dex/debug/mergeDexDebug/classes.dex and b/src/app/build/intermediates/dex/debug/mergeDexDebug/classes.dex differ diff --git a/src/app/build/intermediates/dex_archive_input_jar_hashes/debug/out b/src/app/build/intermediates/dex_archive_input_jar_hashes/debug/out index 2c3e11f2..023e5893 100644 Binary files a/src/app/build/intermediates/dex_archive_input_jar_hashes/debug/out and b/src/app/build/intermediates/dex_archive_input_jar_hashes/debug/out differ diff --git a/src/app/build/intermediates/dex_archive_input_jar_hashes/debugAndroidTest/out b/src/app/build/intermediates/dex_archive_input_jar_hashes/debugAndroidTest/out index 0bded20d..a1ecb219 100644 Binary files a/src/app/build/intermediates/dex_archive_input_jar_hashes/debugAndroidTest/out and b/src/app/build/intermediates/dex_archive_input_jar_hashes/debugAndroidTest/out differ diff --git a/src/app/build/intermediates/incremental/debug/mergeDebugResources/compile-file-map.properties b/src/app/build/intermediates/incremental/debug/mergeDebugResources/compile-file-map.properties index 1d013836..f35bb3c5 100644 --- a/src/app/build/intermediates/incremental/debug/mergeDebugResources/compile-file-map.properties +++ b/src/app/build/intermediates/incremental/debug/mergeDebugResources/compile-file-map.properties @@ -1,96 +1,96 @@ -#Sat Dec 09 00:14:06 CST 2023 -net.micode.notes.app-main-6\:/color/primary_text_dark.xml=C\:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\color_primary_text_dark.xml.flat -net.micode.notes.app-main-6\:/color/secondary_text_dark.xml=C\:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\color_secondary_text_dark.xml.flat -net.micode.notes.app-main-6\:/drawable-hdpi/bg_btn_set_color.png=C\:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_bg_btn_set_color.png.flat -net.micode.notes.app-main-6\:/drawable-hdpi/bg_color_btn_mask.png=C\:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_bg_color_btn_mask.png.flat -net.micode.notes.app-main-6\:/drawable-hdpi/call_record.png=C\:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_call_record.png.flat -net.micode.notes.app-main-6\:/drawable-hdpi/clock.png=C\:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_clock.png.flat -net.micode.notes.app-main-6\:/drawable-hdpi/delete.png=C\:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_delete.png.flat -net.micode.notes.app-main-6\:/drawable-hdpi/dropdown_icon.9.png=C\:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_dropdown_icon.9.png.flat -net.micode.notes.app-main-6\:/drawable-hdpi/edit_blue.9.png=C\:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_blue.9.png.flat -net.micode.notes.app-main-6\:/drawable-hdpi/edit_green.9.png=C\:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_green.9.png.flat -net.micode.notes.app-main-6\:/drawable-hdpi/edit_red.9.png=C\:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_red.9.png.flat -net.micode.notes.app-main-6\:/drawable-hdpi/edit_title_blue.9.png=C\:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_blue.9.png.flat -net.micode.notes.app-main-6\:/drawable-hdpi/edit_title_green.9.png=C\:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_green.9.png.flat -net.micode.notes.app-main-6\:/drawable-hdpi/edit_title_red.9.png=C\:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_red.9.png.flat -net.micode.notes.app-main-6\:/drawable-hdpi/edit_title_white.9.png=C\:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_white.9.png.flat -net.micode.notes.app-main-6\:/drawable-hdpi/edit_title_yellow.9.png=C\:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_yellow.9.png.flat -net.micode.notes.app-main-6\:/drawable-hdpi/edit_white.9.png=C\:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_white.9.png.flat -net.micode.notes.app-main-6\:/drawable-hdpi/edit_yellow.9.png=C\:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_yellow.9.png.flat -net.micode.notes.app-main-6\:/drawable-hdpi/font_large.png=C\:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_large.png.flat -net.micode.notes.app-main-6\:/drawable-hdpi/font_normal.png=C\:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_normal.png.flat -net.micode.notes.app-main-6\:/drawable-hdpi/font_size_selector_bg.9.png=C\:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_size_selector_bg.9.png.flat -net.micode.notes.app-main-6\:/drawable-hdpi/font_small.png=C\:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_small.png.flat -net.micode.notes.app-main-6\:/drawable-hdpi/font_super.png=C\:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_super.png.flat -net.micode.notes.app-main-6\:/drawable-hdpi/icon_app.png=C\:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_icon_app.png.flat -net.micode.notes.app-main-6\:/drawable-hdpi/list_background.png=C\:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_background.png.flat -net.micode.notes.app-main-6\:/drawable-hdpi/list_blue_down.9.png=C\:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_blue_down.9.png.flat -net.micode.notes.app-main-6\:/drawable-hdpi/list_blue_middle.9.png=C\:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_blue_middle.9.png.flat -net.micode.notes.app-main-6\:/drawable-hdpi/list_blue_single.9.png=C\:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_blue_single.9.png.flat -net.micode.notes.app-main-6\:/drawable-hdpi/list_blue_up.9.png=C\:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_blue_up.9.png.flat -net.micode.notes.app-main-6\:/drawable-hdpi/list_folder.9.png=C\:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_folder.9.png.flat -net.micode.notes.app-main-6\:/drawable-hdpi/list_footer_bg.9.png=C\:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_footer_bg.9.png.flat -net.micode.notes.app-main-6\:/drawable-hdpi/list_green_down.9.png=C\:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_green_down.9.png.flat -net.micode.notes.app-main-6\:/drawable-hdpi/list_green_middle.9.png=C\:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_green_middle.9.png.flat -net.micode.notes.app-main-6\:/drawable-hdpi/list_green_single.9.png=C\:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_green_single.9.png.flat -net.micode.notes.app-main-6\:/drawable-hdpi/list_green_up.9.png=C\:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_green_up.9.png.flat -net.micode.notes.app-main-6\:/drawable-hdpi/list_red_down.9.png=C\:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_down.9.png.flat -net.micode.notes.app-main-6\:/drawable-hdpi/list_red_middle.9.png=C\:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_middle.9.png.flat -net.micode.notes.app-main-6\:/drawable-hdpi/list_red_single.9.png=C\:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_single.9.png.flat -net.micode.notes.app-main-6\:/drawable-hdpi/list_red_up.9.png=C\:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_up.9.png.flat -net.micode.notes.app-main-6\:/drawable-hdpi/list_white_down.9.png=C\:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_down.9.png.flat -net.micode.notes.app-main-6\:/drawable-hdpi/list_white_middle.9.png=C\:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_middle.9.png.flat -net.micode.notes.app-main-6\:/drawable-hdpi/list_white_single.9.png=C\:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_single.9.png.flat -net.micode.notes.app-main-6\:/drawable-hdpi/list_white_up.9.png=C\:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_up.9.png.flat -net.micode.notes.app-main-6\:/drawable-hdpi/list_yellow_down.9.png=C\:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_down.9.png.flat -net.micode.notes.app-main-6\:/drawable-hdpi/list_yellow_middle.9.png=C\:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_middle.9.png.flat -net.micode.notes.app-main-6\:/drawable-hdpi/list_yellow_single.9.png=C\:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_single.9.png.flat -net.micode.notes.app-main-6\:/drawable-hdpi/list_yellow_up.9.png=C\:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_up.9.png.flat -net.micode.notes.app-main-6\:/drawable-hdpi/menu_delete.png=C\:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_menu_delete.png.flat -net.micode.notes.app-main-6\:/drawable-hdpi/menu_move.png=C\:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_menu_move.png.flat -net.micode.notes.app-main-6\:/drawable-hdpi/new_note_normal.png=C\:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_new_note_normal.png.flat -net.micode.notes.app-main-6\:/drawable-hdpi/new_note_pressed.png=C\:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_new_note_pressed.png.flat -net.micode.notes.app-main-6\:/drawable-hdpi/note_edit_color_selector_panel.png=C\:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_note_edit_color_selector_panel.png.flat -net.micode.notes.app-main-6\:/drawable-hdpi/notification.png=C\:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_notification.png.flat -net.micode.notes.app-main-6\:/drawable-hdpi/search_result.png=C\:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_search_result.png.flat -net.micode.notes.app-main-6\:/drawable-hdpi/selected.png=C\:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_selected.png.flat -net.micode.notes.app-main-6\:/drawable-hdpi/title_alert.png=C\:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_title_alert.png.flat -net.micode.notes.app-main-6\:/drawable-hdpi/title_bar_bg.9.png=C\:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_title_bar_bg.9.png.flat -net.micode.notes.app-main-6\:/drawable-hdpi/widget_2x_blue.png=C\:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_blue.png.flat -net.micode.notes.app-main-6\:/drawable-hdpi/widget_2x_green.png=C\:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_green.png.flat -net.micode.notes.app-main-6\:/drawable-hdpi/widget_2x_red.png=C\:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_red.png.flat -net.micode.notes.app-main-6\:/drawable-hdpi/widget_2x_white.png=C\:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_white.png.flat -net.micode.notes.app-main-6\:/drawable-hdpi/widget_2x_yellow.png=C\:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_yellow.png.flat -net.micode.notes.app-main-6\:/drawable-hdpi/widget_4x_blue.png=C\:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_blue.png.flat -net.micode.notes.app-main-6\:/drawable-hdpi/widget_4x_green.png=C\:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_green.png.flat -net.micode.notes.app-main-6\:/drawable-hdpi/widget_4x_red.png=C\:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_red.png.flat -net.micode.notes.app-main-6\:/drawable-hdpi/widget_4x_white.png=C\:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_white.png.flat -net.micode.notes.app-main-6\:/drawable-hdpi/widget_4x_yellow.png=C\:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_yellow.png.flat -net.micode.notes.app-main-6\:/drawable/new_note.xml=C\:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable_new_note.xml.flat -net.micode.notes.app-main-6\:/layout/account_dialog_title.xml=C\:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\layout_account_dialog_title.xml.flat -net.micode.notes.app-main-6\:/layout/add_account_text.xml=C\:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\layout_add_account_text.xml.flat -net.micode.notes.app-main-6\:/layout/datetime_picker.xml=C\:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\layout_datetime_picker.xml.flat -net.micode.notes.app-main-6\:/layout/dialog_edit_text.xml=C\:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\layout_dialog_edit_text.xml.flat -net.micode.notes.app-main-6\:/layout/folder_list_item.xml=C\:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\layout_folder_list_item.xml.flat -net.micode.notes.app-main-6\:/layout/note_edit.xml=C\:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\layout_note_edit.xml.flat -net.micode.notes.app-main-6\:/layout/note_edit_list_item.xml=C\:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\layout_note_edit_list_item.xml.flat -net.micode.notes.app-main-6\:/layout/note_item.xml=C\:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\layout_note_item.xml.flat -net.micode.notes.app-main-6\:/layout/note_list.xml=C\:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\layout_note_list.xml.flat -net.micode.notes.app-main-6\:/layout/note_list_dropdown_menu.xml=C\:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\layout_note_list_dropdown_menu.xml.flat -net.micode.notes.app-main-6\:/layout/note_list_footer.xml=C\:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\layout_note_list_footer.xml.flat -net.micode.notes.app-main-6\:/layout/settings_header.xml=C\:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\layout_settings_header.xml.flat -net.micode.notes.app-main-6\:/layout/widget_2x.xml=C\:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\layout_widget_2x.xml.flat -net.micode.notes.app-main-6\:/layout/widget_4x.xml=C\:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\layout_widget_4x.xml.flat -net.micode.notes.app-main-6\:/menu/call_note_edit.xml=C\:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\menu_call_note_edit.xml.flat -net.micode.notes.app-main-6\:/menu/call_record_folder.xml=C\:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\menu_call_record_folder.xml.flat -net.micode.notes.app-main-6\:/menu/note_edit.xml=C\:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\menu_note_edit.xml.flat -net.micode.notes.app-main-6\:/menu/note_list.xml=C\:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\menu_note_list.xml.flat -net.micode.notes.app-main-6\:/menu/note_list_dropdown.xml=C\:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\menu_note_list_dropdown.xml.flat -net.micode.notes.app-main-6\:/menu/note_list_options.xml=C\:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\menu_note_list_options.xml.flat -net.micode.notes.app-main-6\:/menu/sub_folder.xml=C\:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\menu_sub_folder.xml.flat -net.micode.notes.app-main-6\:/raw-zh-rCN/introduction=C\:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\raw-zh-rCN_introduction.flat -net.micode.notes.app-main-6\:/raw/introduction=C\:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\raw_introduction.flat -net.micode.notes.app-main-6\:/xml/preferences.xml=C\:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\xml_preferences.xml.flat -net.micode.notes.app-main-6\:/xml/searchable.xml=C\:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\xml_searchable.xml.flat -net.micode.notes.app-main-6\:/xml/widget_2x_info.xml=C\:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\xml_widget_2x_info.xml.flat -net.micode.notes.app-main-6\:/xml/widget_4x_info.xml=C\:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\xml_widget_4x_info.xml.flat +#Thu Dec 21 00:00:04 CST 2023 +net.micode.notes.app-main-6\:/color/primary_text_dark.xml=D\:\\college4\\soft\\ghnb\\src\\app\\build\\intermediates\\merged_res\\debug\\color_primary_text_dark.xml.flat +net.micode.notes.app-main-6\:/color/secondary_text_dark.xml=D\:\\college4\\soft\\ghnb\\src\\app\\build\\intermediates\\merged_res\\debug\\color_secondary_text_dark.xml.flat +net.micode.notes.app-main-6\:/drawable-hdpi/bg_btn_set_color.png=D\:\\college4\\soft\\ghnb\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_bg_btn_set_color.png.flat +net.micode.notes.app-main-6\:/drawable-hdpi/bg_color_btn_mask.png=D\:\\college4\\soft\\ghnb\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_bg_color_btn_mask.png.flat +net.micode.notes.app-main-6\:/drawable-hdpi/call_record.png=D\:\\college4\\soft\\ghnb\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_call_record.png.flat +net.micode.notes.app-main-6\:/drawable-hdpi/clock.png=D\:\\college4\\soft\\ghnb\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_clock.png.flat +net.micode.notes.app-main-6\:/drawable-hdpi/delete.png=D\:\\college4\\soft\\ghnb\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_delete.png.flat +net.micode.notes.app-main-6\:/drawable-hdpi/dropdown_icon.9.png=D\:\\college4\\soft\\ghnb\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_dropdown_icon.9.png.flat +net.micode.notes.app-main-6\:/drawable-hdpi/edit_blue.9.png=D\:\\college4\\soft\\ghnb\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_blue.9.png.flat +net.micode.notes.app-main-6\:/drawable-hdpi/edit_green.9.png=D\:\\college4\\soft\\ghnb\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_green.9.png.flat +net.micode.notes.app-main-6\:/drawable-hdpi/edit_red.9.png=D\:\\college4\\soft\\ghnb\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_red.9.png.flat +net.micode.notes.app-main-6\:/drawable-hdpi/edit_title_blue.9.png=D\:\\college4\\soft\\ghnb\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_blue.9.png.flat +net.micode.notes.app-main-6\:/drawable-hdpi/edit_title_green.9.png=D\:\\college4\\soft\\ghnb\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_green.9.png.flat +net.micode.notes.app-main-6\:/drawable-hdpi/edit_title_red.9.png=D\:\\college4\\soft\\ghnb\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_red.9.png.flat +net.micode.notes.app-main-6\:/drawable-hdpi/edit_title_white.9.png=D\:\\college4\\soft\\ghnb\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_white.9.png.flat +net.micode.notes.app-main-6\:/drawable-hdpi/edit_title_yellow.9.png=D\:\\college4\\soft\\ghnb\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_yellow.9.png.flat +net.micode.notes.app-main-6\:/drawable-hdpi/edit_white.9.png=D\:\\college4\\soft\\ghnb\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_white.9.png.flat +net.micode.notes.app-main-6\:/drawable-hdpi/edit_yellow.9.png=D\:\\college4\\soft\\ghnb\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_yellow.9.png.flat +net.micode.notes.app-main-6\:/drawable-hdpi/font_large.png=D\:\\college4\\soft\\ghnb\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_large.png.flat +net.micode.notes.app-main-6\:/drawable-hdpi/font_normal.png=D\:\\college4\\soft\\ghnb\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_normal.png.flat +net.micode.notes.app-main-6\:/drawable-hdpi/font_size_selector_bg.9.png=D\:\\college4\\soft\\ghnb\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_size_selector_bg.9.png.flat +net.micode.notes.app-main-6\:/drawable-hdpi/font_small.png=D\:\\college4\\soft\\ghnb\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_small.png.flat +net.micode.notes.app-main-6\:/drawable-hdpi/font_super.png=D\:\\college4\\soft\\ghnb\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_super.png.flat +net.micode.notes.app-main-6\:/drawable-hdpi/icon_app.png=D\:\\college4\\soft\\ghnb\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_icon_app.png.flat +net.micode.notes.app-main-6\:/drawable-hdpi/list_background.png=D\:\\college4\\soft\\ghnb\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_background.png.flat +net.micode.notes.app-main-6\:/drawable-hdpi/list_blue_down.9.png=D\:\\college4\\soft\\ghnb\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_blue_down.9.png.flat +net.micode.notes.app-main-6\:/drawable-hdpi/list_blue_middle.9.png=D\:\\college4\\soft\\ghnb\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_blue_middle.9.png.flat +net.micode.notes.app-main-6\:/drawable-hdpi/list_blue_single.9.png=D\:\\college4\\soft\\ghnb\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_blue_single.9.png.flat +net.micode.notes.app-main-6\:/drawable-hdpi/list_blue_up.9.png=D\:\\college4\\soft\\ghnb\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_blue_up.9.png.flat +net.micode.notes.app-main-6\:/drawable-hdpi/list_folder.9.png=D\:\\college4\\soft\\ghnb\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_folder.9.png.flat +net.micode.notes.app-main-6\:/drawable-hdpi/list_footer_bg.9.png=D\:\\college4\\soft\\ghnb\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_footer_bg.9.png.flat +net.micode.notes.app-main-6\:/drawable-hdpi/list_green_down.9.png=D\:\\college4\\soft\\ghnb\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_green_down.9.png.flat +net.micode.notes.app-main-6\:/drawable-hdpi/list_green_middle.9.png=D\:\\college4\\soft\\ghnb\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_green_middle.9.png.flat +net.micode.notes.app-main-6\:/drawable-hdpi/list_green_single.9.png=D\:\\college4\\soft\\ghnb\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_green_single.9.png.flat +net.micode.notes.app-main-6\:/drawable-hdpi/list_green_up.9.png=D\:\\college4\\soft\\ghnb\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_green_up.9.png.flat +net.micode.notes.app-main-6\:/drawable-hdpi/list_red_down.9.png=D\:\\college4\\soft\\ghnb\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_down.9.png.flat +net.micode.notes.app-main-6\:/drawable-hdpi/list_red_middle.9.png=D\:\\college4\\soft\\ghnb\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_middle.9.png.flat +net.micode.notes.app-main-6\:/drawable-hdpi/list_red_single.9.png=D\:\\college4\\soft\\ghnb\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_single.9.png.flat +net.micode.notes.app-main-6\:/drawable-hdpi/list_red_up.9.png=D\:\\college4\\soft\\ghnb\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_up.9.png.flat +net.micode.notes.app-main-6\:/drawable-hdpi/list_white_down.9.png=D\:\\college4\\soft\\ghnb\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_down.9.png.flat +net.micode.notes.app-main-6\:/drawable-hdpi/list_white_middle.9.png=D\:\\college4\\soft\\ghnb\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_middle.9.png.flat +net.micode.notes.app-main-6\:/drawable-hdpi/list_white_single.9.png=D\:\\college4\\soft\\ghnb\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_single.9.png.flat +net.micode.notes.app-main-6\:/drawable-hdpi/list_white_up.9.png=D\:\\college4\\soft\\ghnb\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_up.9.png.flat +net.micode.notes.app-main-6\:/drawable-hdpi/list_yellow_down.9.png=D\:\\college4\\soft\\ghnb\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_down.9.png.flat +net.micode.notes.app-main-6\:/drawable-hdpi/list_yellow_middle.9.png=D\:\\college4\\soft\\ghnb\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_middle.9.png.flat +net.micode.notes.app-main-6\:/drawable-hdpi/list_yellow_single.9.png=D\:\\college4\\soft\\ghnb\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_single.9.png.flat +net.micode.notes.app-main-6\:/drawable-hdpi/list_yellow_up.9.png=D\:\\college4\\soft\\ghnb\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_up.9.png.flat +net.micode.notes.app-main-6\:/drawable-hdpi/menu_delete.png=D\:\\college4\\soft\\ghnb\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_menu_delete.png.flat +net.micode.notes.app-main-6\:/drawable-hdpi/menu_move.png=D\:\\college4\\soft\\ghnb\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_menu_move.png.flat +net.micode.notes.app-main-6\:/drawable-hdpi/new_note_normal.png=D\:\\college4\\soft\\ghnb\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_new_note_normal.png.flat +net.micode.notes.app-main-6\:/drawable-hdpi/new_note_pressed.png=D\:\\college4\\soft\\ghnb\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_new_note_pressed.png.flat +net.micode.notes.app-main-6\:/drawable-hdpi/note_edit_color_selector_panel.png=D\:\\college4\\soft\\ghnb\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_note_edit_color_selector_panel.png.flat +net.micode.notes.app-main-6\:/drawable-hdpi/notification.png=D\:\\college4\\soft\\ghnb\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_notification.png.flat +net.micode.notes.app-main-6\:/drawable-hdpi/search_result.png=D\:\\college4\\soft\\ghnb\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_search_result.png.flat +net.micode.notes.app-main-6\:/drawable-hdpi/selected.png=D\:\\college4\\soft\\ghnb\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_selected.png.flat +net.micode.notes.app-main-6\:/drawable-hdpi/title_alert.png=D\:\\college4\\soft\\ghnb\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_title_alert.png.flat +net.micode.notes.app-main-6\:/drawable-hdpi/title_bar_bg.9.png=D\:\\college4\\soft\\ghnb\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_title_bar_bg.9.png.flat +net.micode.notes.app-main-6\:/drawable-hdpi/widget_2x_blue.png=D\:\\college4\\soft\\ghnb\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_blue.png.flat +net.micode.notes.app-main-6\:/drawable-hdpi/widget_2x_green.png=D\:\\college4\\soft\\ghnb\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_green.png.flat +net.micode.notes.app-main-6\:/drawable-hdpi/widget_2x_red.png=D\:\\college4\\soft\\ghnb\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_red.png.flat +net.micode.notes.app-main-6\:/drawable-hdpi/widget_2x_white.png=D\:\\college4\\soft\\ghnb\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_white.png.flat +net.micode.notes.app-main-6\:/drawable-hdpi/widget_2x_yellow.png=D\:\\college4\\soft\\ghnb\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_yellow.png.flat +net.micode.notes.app-main-6\:/drawable-hdpi/widget_4x_blue.png=D\:\\college4\\soft\\ghnb\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_blue.png.flat +net.micode.notes.app-main-6\:/drawable-hdpi/widget_4x_green.png=D\:\\college4\\soft\\ghnb\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_green.png.flat +net.micode.notes.app-main-6\:/drawable-hdpi/widget_4x_red.png=D\:\\college4\\soft\\ghnb\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_red.png.flat +net.micode.notes.app-main-6\:/drawable-hdpi/widget_4x_white.png=D\:\\college4\\soft\\ghnb\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_white.png.flat +net.micode.notes.app-main-6\:/drawable-hdpi/widget_4x_yellow.png=D\:\\college4\\soft\\ghnb\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_yellow.png.flat +net.micode.notes.app-main-6\:/drawable/new_note.xml=D\:\\college4\\soft\\ghnb\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable_new_note.xml.flat +net.micode.notes.app-main-6\:/layout/account_dialog_title.xml=D\:\\college4\\soft\\ghnb\\src\\app\\build\\intermediates\\merged_res\\debug\\layout_account_dialog_title.xml.flat +net.micode.notes.app-main-6\:/layout/add_account_text.xml=D\:\\college4\\soft\\ghnb\\src\\app\\build\\intermediates\\merged_res\\debug\\layout_add_account_text.xml.flat +net.micode.notes.app-main-6\:/layout/datetime_picker.xml=D\:\\college4\\soft\\ghnb\\src\\app\\build\\intermediates\\merged_res\\debug\\layout_datetime_picker.xml.flat +net.micode.notes.app-main-6\:/layout/dialog_edit_text.xml=D\:\\college4\\soft\\ghnb\\src\\app\\build\\intermediates\\merged_res\\debug\\layout_dialog_edit_text.xml.flat +net.micode.notes.app-main-6\:/layout/folder_list_item.xml=D\:\\college4\\soft\\ghnb\\src\\app\\build\\intermediates\\merged_res\\debug\\layout_folder_list_item.xml.flat +net.micode.notes.app-main-6\:/layout/note_edit.xml=D\:\\college4\\soft\\ghnb\\src\\app\\build\\intermediates\\merged_res\\debug\\layout_note_edit.xml.flat +net.micode.notes.app-main-6\:/layout/note_edit_list_item.xml=D\:\\college4\\soft\\ghnb\\src\\app\\build\\intermediates\\merged_res\\debug\\layout_note_edit_list_item.xml.flat +net.micode.notes.app-main-6\:/layout/note_item.xml=D\:\\college4\\soft\\ghnb\\src\\app\\build\\intermediates\\merged_res\\debug\\layout_note_item.xml.flat +net.micode.notes.app-main-6\:/layout/note_list.xml=D\:\\college4\\soft\\ghnb\\src\\app\\build\\intermediates\\merged_res\\debug\\layout_note_list.xml.flat +net.micode.notes.app-main-6\:/layout/note_list_dropdown_menu.xml=D\:\\college4\\soft\\ghnb\\src\\app\\build\\intermediates\\merged_res\\debug\\layout_note_list_dropdown_menu.xml.flat +net.micode.notes.app-main-6\:/layout/note_list_footer.xml=D\:\\college4\\soft\\ghnb\\src\\app\\build\\intermediates\\merged_res\\debug\\layout_note_list_footer.xml.flat +net.micode.notes.app-main-6\:/layout/settings_header.xml=D\:\\college4\\soft\\ghnb\\src\\app\\build\\intermediates\\merged_res\\debug\\layout_settings_header.xml.flat +net.micode.notes.app-main-6\:/layout/widget_2x.xml=D\:\\college4\\soft\\ghnb\\src\\app\\build\\intermediates\\merged_res\\debug\\layout_widget_2x.xml.flat +net.micode.notes.app-main-6\:/layout/widget_4x.xml=D\:\\college4\\soft\\ghnb\\src\\app\\build\\intermediates\\merged_res\\debug\\layout_widget_4x.xml.flat +net.micode.notes.app-main-6\:/menu/call_note_edit.xml=D\:\\college4\\soft\\ghnb\\src\\app\\build\\intermediates\\merged_res\\debug\\menu_call_note_edit.xml.flat +net.micode.notes.app-main-6\:/menu/call_record_folder.xml=D\:\\college4\\soft\\ghnb\\src\\app\\build\\intermediates\\merged_res\\debug\\menu_call_record_folder.xml.flat +net.micode.notes.app-main-6\:/menu/note_edit.xml=D\:\\college4\\soft\\ghnb\\src\\app\\build\\intermediates\\merged_res\\debug\\menu_note_edit.xml.flat +net.micode.notes.app-main-6\:/menu/note_list.xml=D\:\\college4\\soft\\ghnb\\src\\app\\build\\intermediates\\merged_res\\debug\\menu_note_list.xml.flat +net.micode.notes.app-main-6\:/menu/note_list_dropdown.xml=D\:\\college4\\soft\\ghnb\\src\\app\\build\\intermediates\\merged_res\\debug\\menu_note_list_dropdown.xml.flat +net.micode.notes.app-main-6\:/menu/note_list_options.xml=D\:\\college4\\soft\\ghnb\\src\\app\\build\\intermediates\\merged_res\\debug\\menu_note_list_options.xml.flat +net.micode.notes.app-main-6\:/menu/sub_folder.xml=D\:\\college4\\soft\\ghnb\\src\\app\\build\\intermediates\\merged_res\\debug\\menu_sub_folder.xml.flat +net.micode.notes.app-main-6\:/raw-zh-rCN/introduction=D\:\\college4\\soft\\ghnb\\src\\app\\build\\intermediates\\merged_res\\debug\\raw-zh-rCN_introduction.flat +net.micode.notes.app-main-6\:/raw/introduction=D\:\\college4\\soft\\ghnb\\src\\app\\build\\intermediates\\merged_res\\debug\\raw_introduction.flat +net.micode.notes.app-main-6\:/xml/preferences.xml=D\:\\college4\\soft\\ghnb\\src\\app\\build\\intermediates\\merged_res\\debug\\xml_preferences.xml.flat +net.micode.notes.app-main-6\:/xml/searchable.xml=D\:\\college4\\soft\\ghnb\\src\\app\\build\\intermediates\\merged_res\\debug\\xml_searchable.xml.flat +net.micode.notes.app-main-6\:/xml/widget_2x_info.xml=D\:\\college4\\soft\\ghnb\\src\\app\\build\\intermediates\\merged_res\\debug\\xml_widget_2x_info.xml.flat +net.micode.notes.app-main-6\:/xml/widget_4x_info.xml=D\:\\college4\\soft\\ghnb\\src\\app\\build\\intermediates\\merged_res\\debug\\xml_widget_4x_info.xml.flat diff --git a/src/app/build/intermediates/incremental/debug/mergeDebugResources/merger.xml b/src/app/build/intermediates/incremental/debug/mergeDebugResources/merger.xml index 6445f66e..82c69992 100644 --- a/src/app/build/intermediates/incremental/debug/mergeDebugResources/merger.xml +++ b/src/app/build/intermediates/incremental/debug/mergeDebugResources/merger.xml @@ -1,5 +1,5 @@ - + -%s --%s --%s @@ -7,11 +7,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 syncingSettingsSearchDeleteMove to folder%d selectedNothing selected, the operation is invalidSelect allDeselect allFont sizeSmallMediumLargeSuperEnter check listLeave check listView folderDelete folderChange folder nameThe folder %1$s exist, please renameShareSend to homeRemind meDelete reminderSelect folderParent folderNote added to homeConfirm to delete folder and its notes?Delete selected notesConfirm to delete the selected %d notes?Confirm to delete this note?Have moved selected %1$d notes to %2$s folderSD card busy, not available nowExport failed, please check SD cardThe note is not existSorry, can not set clock on empty noteSorry, can not send and empty note to homeExport successfulExport failExport text file (%1$s) to SD (%2$s) directorySyncing notes...Sync is successfulSync is failedSync is canceledSync is successful with account %1$sSync failed, please check network and account settingsSync failed, internal error occursSync is canceledLogging into %1$s...Getting remote note list...Synchronize local notes with Google Task...SettingsSync accountSync notes with google taskLast sync time %1$syyyy-MM-dd hh:mm:ssAdd accountChange sync accountRemove sync accountCancelSync immediatelyCancel syncingCurrent account %1$sAll sync related information will be deleted, which may result in duplicated items sometimeSync notesPlease select a google account. Local notes will be synced with google task.Cannot change the account because sync is in progress%1$s has been set as the sync accountNew note background color randomDeleteCall notesInput nameSearching NotesSearch notesText in your notesNotessetcancel %1$s result for \"%2$s\" %1$s results for \"%2$s\" - + 短信 邮件 - 便签便签2x2便签4x4没有关联内容，点击新建便签。访客模式下，便签内容不可见...新建便签成功删除提醒创建提醒已过期yyyyMMddMM月dd日 kk:mm知道了查看呼叫电话发送邮件浏览网页打开地图新建文件夹导出文本同步取消同步设置搜索删除移动到文件夹选中了 %d 项没有选中项，操作无效全选取消全选文字大小小正常大超大进入清单模式退出清单模式查看文件夹刪除文件夹修改文件夹名称文件夹 %1$s 已存在，请重新命名分享发送到桌面提醒我删除提醒选择文件夹上一级文件夹已添加到桌面删除确认要删除所选的 %d 条便签吗?确认要删除该条便签吗?确认删除文件夹及所包含的便签吗？已将所选 %1$d 条便签移到 %2$s 文件夹SD卡被占用，不能操作导出文本时发生错误，请检查SD卡要查看的便签不存在不能为空便签设置闹钟提醒不能将空便签发送到桌面导出成功导出失败已将文本文件(%1$s)输出至SD卡(%2$s)目录同步便签...同步成功同步失败同步已取消与%1$s同步成功同步失败，请检查网络和帐号设置同步失败，发生内部错误同步已取消登录%1$s...正在获取服务器便签列表...正在同步本地便签...设置同步账号与google task同步便签记录上次同步于 %1$s添加账号更换账号删除账号取消立即同步取消同步当前帐号 %1$s如更换同步帐号，过去的帐号同步信息将被清空，再次切换的同时可能会造成数据重复同步便签请选择google帐号，便签将与该帐号的google task内容同步。正在同步中，不能修改同步帐号同步帐号已设置为%1$s新建便签背景颜色随机删除通话便签请输入名称正在搜索便签搜索便签便签中的文字便签设置取消 + 便签便签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新建便籤背景顏色隨機刪除通話便籤請輸入名稱正在搜索便籤搜索便籤便籤中的文字便籤設置取消 + 便簽便簽2x2便簽4x4沒有關聯內容，點擊新建便簽。訪客模式下，便籤內容不可見...新建便簽成功刪除提醒創建提醒已過期yyyyMMddMM月dd日 kk:mm知道了查看呼叫電話發送郵件浏覽網頁打開地圖已將所選 %1$d 便籤移到 %2$s 文件夾新建文件夾導出文本同步取消同步設置搜尋刪除移動到文件夾選中了 %d 項沒有選中項，操作無效全選取消全選文字大小小正常大超大進入清單模式退出清單模式查看文件夾刪除文件夾修改文件夾名稱文件夾 %1$s 已存在，請重新命名分享發送到桌面提醒我刪除提醒選擇文件夾上一級文件夾已添加到桌面刪除确认要刪除所選的 %d 條便籤嗎?确认要删除該條便籤嗎?確認刪除檔夾及所包含的便簽嗎？SD卡被佔用，不能操作導出TXT時發生錯誤，請檢查SD卡要查看的便籤不存在不能爲空便籤設置鬧鐘提醒不能將空便籤發送到桌面導出成功導出失敗已將文本文件(%1$s)導出至SD(%2$s)目錄同步便簽...同步成功同步失敗同步已取消與%1$s同步成功同步失敗，請檢查網絡和帳號設置同步失敗，發生內部錯誤同步已取消登陸%1$s...正在獲取服務器便籤列表...正在同步本地便籤...設置同步賬號与google task同步便簽記錄上次同步于 %1$s添加賬號更換賬號刪除賬號取消立即同步取消同步當前帳號 %1$s如更換同步帳號，過去的帳號同步信息將被清空，再次切換的同時可能會造成數據重復同步便簽請選擇google帳號，便簽將與該帳號的google task內容同步。正在同步中，不能修改同步帳號同步帳號已設置為%1$s新建便籤背景顏色隨機刪除通話便籤請輸入名稱正在搜索便籤搜索便籤便籤中的文字便籤設置取消 %1$s 條符合”%2$s“的搜尋結果 - \ No newline at end of file + \ No newline at end of file diff --git a/src/app/build/intermediates/incremental/debug/packageDebugResources/compile-file-map.properties b/src/app/build/intermediates/incremental/debug/packageDebugResources/compile-file-map.properties index fddad53e..afa66d14 100644 --- a/src/app/build/intermediates/incremental/debug/packageDebugResources/compile-file-map.properties +++ b/src/app/build/intermediates/incremental/debug/packageDebugResources/compile-file-map.properties @@ -1,96 +1,96 @@ -#Sat Dec 09 00:14:06 CST 2023 -net.micode.notes.app-main-5\:/color/primary_text_dark.xml=C\:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\color\\primary_text_dark.xml -net.micode.notes.app-main-5\:/color/secondary_text_dark.xml=C\:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\color\\secondary_text_dark.xml -net.micode.notes.app-main-5\:/drawable-hdpi/bg_btn_set_color.png=C\:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\bg_btn_set_color.png -net.micode.notes.app-main-5\:/drawable-hdpi/bg_color_btn_mask.png=C\:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\bg_color_btn_mask.png -net.micode.notes.app-main-5\:/drawable-hdpi/call_record.png=C\:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\call_record.png -net.micode.notes.app-main-5\:/drawable-hdpi/clock.png=C\:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\clock.png -net.micode.notes.app-main-5\:/drawable-hdpi/delete.png=C\:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\delete.png -net.micode.notes.app-main-5\:/drawable-hdpi/dropdown_icon.9.png=C\:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\dropdown_icon.9.png -net.micode.notes.app-main-5\:/drawable-hdpi/edit_blue.9.png=C\:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\edit_blue.9.png -net.micode.notes.app-main-5\:/drawable-hdpi/edit_green.9.png=C\:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\edit_green.9.png -net.micode.notes.app-main-5\:/drawable-hdpi/edit_red.9.png=C\:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\edit_red.9.png -net.micode.notes.app-main-5\:/drawable-hdpi/edit_title_blue.9.png=C\:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\edit_title_blue.9.png -net.micode.notes.app-main-5\:/drawable-hdpi/edit_title_green.9.png=C\:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\edit_title_green.9.png -net.micode.notes.app-main-5\:/drawable-hdpi/edit_title_red.9.png=C\:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\edit_title_red.9.png -net.micode.notes.app-main-5\:/drawable-hdpi/edit_title_white.9.png=C\:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\edit_title_white.9.png -net.micode.notes.app-main-5\:/drawable-hdpi/edit_title_yellow.9.png=C\:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\edit_title_yellow.9.png -net.micode.notes.app-main-5\:/drawable-hdpi/edit_white.9.png=C\:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\edit_white.9.png -net.micode.notes.app-main-5\:/drawable-hdpi/edit_yellow.9.png=C\:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\edit_yellow.9.png -net.micode.notes.app-main-5\:/drawable-hdpi/font_large.png=C\:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\font_large.png -net.micode.notes.app-main-5\:/drawable-hdpi/font_normal.png=C\:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\font_normal.png -net.micode.notes.app-main-5\:/drawable-hdpi/font_size_selector_bg.9.png=C\:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\font_size_selector_bg.9.png -net.micode.notes.app-main-5\:/drawable-hdpi/font_small.png=C\:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\font_small.png -net.micode.notes.app-main-5\:/drawable-hdpi/font_super.png=C\:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\font_super.png -net.micode.notes.app-main-5\:/drawable-hdpi/icon_app.png=C\:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\icon_app.png -net.micode.notes.app-main-5\:/drawable-hdpi/list_background.png=C\:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_background.png -net.micode.notes.app-main-5\:/drawable-hdpi/list_blue_down.9.png=C\:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_blue_down.9.png -net.micode.notes.app-main-5\:/drawable-hdpi/list_blue_middle.9.png=C\:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_blue_middle.9.png -net.micode.notes.app-main-5\:/drawable-hdpi/list_blue_single.9.png=C\:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_blue_single.9.png -net.micode.notes.app-main-5\:/drawable-hdpi/list_blue_up.9.png=C\:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_blue_up.9.png -net.micode.notes.app-main-5\:/drawable-hdpi/list_folder.9.png=C\:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_folder.9.png -net.micode.notes.app-main-5\:/drawable-hdpi/list_footer_bg.9.png=C\:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_footer_bg.9.png -net.micode.notes.app-main-5\:/drawable-hdpi/list_green_down.9.png=C\:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_green_down.9.png -net.micode.notes.app-main-5\:/drawable-hdpi/list_green_middle.9.png=C\:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_green_middle.9.png -net.micode.notes.app-main-5\:/drawable-hdpi/list_green_single.9.png=C\:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_green_single.9.png -net.micode.notes.app-main-5\:/drawable-hdpi/list_green_up.9.png=C\:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_green_up.9.png -net.micode.notes.app-main-5\:/drawable-hdpi/list_red_down.9.png=C\:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_red_down.9.png -net.micode.notes.app-main-5\:/drawable-hdpi/list_red_middle.9.png=C\:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_red_middle.9.png -net.micode.notes.app-main-5\:/drawable-hdpi/list_red_single.9.png=C\:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_red_single.9.png -net.micode.notes.app-main-5\:/drawable-hdpi/list_red_up.9.png=C\:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_red_up.9.png -net.micode.notes.app-main-5\:/drawable-hdpi/list_white_down.9.png=C\:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_white_down.9.png -net.micode.notes.app-main-5\:/drawable-hdpi/list_white_middle.9.png=C\:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_white_middle.9.png -net.micode.notes.app-main-5\:/drawable-hdpi/list_white_single.9.png=C\:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_white_single.9.png -net.micode.notes.app-main-5\:/drawable-hdpi/list_white_up.9.png=C\:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_white_up.9.png -net.micode.notes.app-main-5\:/drawable-hdpi/list_yellow_down.9.png=C\:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_yellow_down.9.png -net.micode.notes.app-main-5\:/drawable-hdpi/list_yellow_middle.9.png=C\:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_yellow_middle.9.png -net.micode.notes.app-main-5\:/drawable-hdpi/list_yellow_single.9.png=C\:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_yellow_single.9.png -net.micode.notes.app-main-5\:/drawable-hdpi/list_yellow_up.9.png=C\:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_yellow_up.9.png -net.micode.notes.app-main-5\:/drawable-hdpi/menu_delete.png=C\:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\menu_delete.png -net.micode.notes.app-main-5\:/drawable-hdpi/menu_move.png=C\:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\menu_move.png -net.micode.notes.app-main-5\:/drawable-hdpi/new_note_normal.png=C\:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\new_note_normal.png -net.micode.notes.app-main-5\:/drawable-hdpi/new_note_pressed.png=C\:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\new_note_pressed.png -net.micode.notes.app-main-5\:/drawable-hdpi/note_edit_color_selector_panel.png=C\:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\note_edit_color_selector_panel.png -net.micode.notes.app-main-5\:/drawable-hdpi/notification.png=C\:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\notification.png -net.micode.notes.app-main-5\:/drawable-hdpi/search_result.png=C\:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\search_result.png -net.micode.notes.app-main-5\:/drawable-hdpi/selected.png=C\:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\selected.png -net.micode.notes.app-main-5\:/drawable-hdpi/title_alert.png=C\:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\title_alert.png -net.micode.notes.app-main-5\:/drawable-hdpi/title_bar_bg.9.png=C\:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\title_bar_bg.9.png -net.micode.notes.app-main-5\:/drawable-hdpi/widget_2x_blue.png=C\:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\widget_2x_blue.png -net.micode.notes.app-main-5\:/drawable-hdpi/widget_2x_green.png=C\:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\widget_2x_green.png -net.micode.notes.app-main-5\:/drawable-hdpi/widget_2x_red.png=C\:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\widget_2x_red.png -net.micode.notes.app-main-5\:/drawable-hdpi/widget_2x_white.png=C\:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\widget_2x_white.png -net.micode.notes.app-main-5\:/drawable-hdpi/widget_2x_yellow.png=C\:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\widget_2x_yellow.png -net.micode.notes.app-main-5\:/drawable-hdpi/widget_4x_blue.png=C\:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\widget_4x_blue.png -net.micode.notes.app-main-5\:/drawable-hdpi/widget_4x_green.png=C\:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\widget_4x_green.png -net.micode.notes.app-main-5\:/drawable-hdpi/widget_4x_red.png=C\:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\widget_4x_red.png -net.micode.notes.app-main-5\:/drawable-hdpi/widget_4x_white.png=C\:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\widget_4x_white.png -net.micode.notes.app-main-5\:/drawable-hdpi/widget_4x_yellow.png=C\:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\widget_4x_yellow.png -net.micode.notes.app-main-5\:/drawable/new_note.xml=C\:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable\\new_note.xml -net.micode.notes.app-main-5\:/layout/account_dialog_title.xml=C\:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\layout\\account_dialog_title.xml -net.micode.notes.app-main-5\:/layout/add_account_text.xml=C\:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\layout\\add_account_text.xml -net.micode.notes.app-main-5\:/layout/datetime_picker.xml=C\:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\layout\\datetime_picker.xml -net.micode.notes.app-main-5\:/layout/dialog_edit_text.xml=C\:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\layout\\dialog_edit_text.xml -net.micode.notes.app-main-5\:/layout/folder_list_item.xml=C\:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\layout\\folder_list_item.xml -net.micode.notes.app-main-5\:/layout/note_edit.xml=C\:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\layout\\note_edit.xml -net.micode.notes.app-main-5\:/layout/note_edit_list_item.xml=C\:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\layout\\note_edit_list_item.xml -net.micode.notes.app-main-5\:/layout/note_item.xml=C\:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\layout\\note_item.xml -net.micode.notes.app-main-5\:/layout/note_list.xml=C\:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\layout\\note_list.xml -net.micode.notes.app-main-5\:/layout/note_list_dropdown_menu.xml=C\:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\layout\\note_list_dropdown_menu.xml -net.micode.notes.app-main-5\:/layout/note_list_footer.xml=C\:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\layout\\note_list_footer.xml -net.micode.notes.app-main-5\:/layout/settings_header.xml=C\:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\layout\\settings_header.xml -net.micode.notes.app-main-5\:/layout/widget_2x.xml=C\:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\layout\\widget_2x.xml -net.micode.notes.app-main-5\:/layout/widget_4x.xml=C\:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\layout\\widget_4x.xml -net.micode.notes.app-main-5\:/menu/call_note_edit.xml=C\:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\menu\\call_note_edit.xml -net.micode.notes.app-main-5\:/menu/call_record_folder.xml=C\:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\menu\\call_record_folder.xml -net.micode.notes.app-main-5\:/menu/note_edit.xml=C\:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\menu\\note_edit.xml -net.micode.notes.app-main-5\:/menu/note_list.xml=C\:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\menu\\note_list.xml -net.micode.notes.app-main-5\:/menu/note_list_dropdown.xml=C\:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\menu\\note_list_dropdown.xml -net.micode.notes.app-main-5\:/menu/note_list_options.xml=C\:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\menu\\note_list_options.xml -net.micode.notes.app-main-5\:/menu/sub_folder.xml=C\:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\menu\\sub_folder.xml -net.micode.notes.app-main-5\:/raw-zh-rCN/introduction=C\:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\raw-zh-rCN\\introduction -net.micode.notes.app-main-5\:/raw/introduction=C\:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\raw\\introduction -net.micode.notes.app-main-5\:/xml/preferences.xml=C\:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\xml\\preferences.xml -net.micode.notes.app-main-5\:/xml/searchable.xml=C\:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\xml\\searchable.xml -net.micode.notes.app-main-5\:/xml/widget_2x_info.xml=C\:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\xml\\widget_2x_info.xml -net.micode.notes.app-main-5\:/xml/widget_4x_info.xml=C\:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\xml\\widget_4x_info.xml +#Thu Dec 21 00:00:04 CST 2023 +net.micode.notes.app-main-5\:/color/primary_text_dark.xml=D\:\\college4\\soft\\ghnb\\src\\app\\build\\intermediates\\packaged_res\\debug\\color\\primary_text_dark.xml +net.micode.notes.app-main-5\:/color/secondary_text_dark.xml=D\:\\college4\\soft\\ghnb\\src\\app\\build\\intermediates\\packaged_res\\debug\\color\\secondary_text_dark.xml +net.micode.notes.app-main-5\:/drawable-hdpi/bg_btn_set_color.png=D\:\\college4\\soft\\ghnb\\src\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\bg_btn_set_color.png +net.micode.notes.app-main-5\:/drawable-hdpi/bg_color_btn_mask.png=D\:\\college4\\soft\\ghnb\\src\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\bg_color_btn_mask.png +net.micode.notes.app-main-5\:/drawable-hdpi/call_record.png=D\:\\college4\\soft\\ghnb\\src\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\call_record.png +net.micode.notes.app-main-5\:/drawable-hdpi/clock.png=D\:\\college4\\soft\\ghnb\\src\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\clock.png +net.micode.notes.app-main-5\:/drawable-hdpi/delete.png=D\:\\college4\\soft\\ghnb\\src\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\delete.png +net.micode.notes.app-main-5\:/drawable-hdpi/dropdown_icon.9.png=D\:\\college4\\soft\\ghnb\\src\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\dropdown_icon.9.png +net.micode.notes.app-main-5\:/drawable-hdpi/edit_blue.9.png=D\:\\college4\\soft\\ghnb\\src\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\edit_blue.9.png +net.micode.notes.app-main-5\:/drawable-hdpi/edit_green.9.png=D\:\\college4\\soft\\ghnb\\src\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\edit_green.9.png +net.micode.notes.app-main-5\:/drawable-hdpi/edit_red.9.png=D\:\\college4\\soft\\ghnb\\src\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\edit_red.9.png +net.micode.notes.app-main-5\:/drawable-hdpi/edit_title_blue.9.png=D\:\\college4\\soft\\ghnb\\src\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\edit_title_blue.9.png +net.micode.notes.app-main-5\:/drawable-hdpi/edit_title_green.9.png=D\:\\college4\\soft\\ghnb\\src\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\edit_title_green.9.png +net.micode.notes.app-main-5\:/drawable-hdpi/edit_title_red.9.png=D\:\\college4\\soft\\ghnb\\src\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\edit_title_red.9.png +net.micode.notes.app-main-5\:/drawable-hdpi/edit_title_white.9.png=D\:\\college4\\soft\\ghnb\\src\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\edit_title_white.9.png +net.micode.notes.app-main-5\:/drawable-hdpi/edit_title_yellow.9.png=D\:\\college4\\soft\\ghnb\\src\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\edit_title_yellow.9.png +net.micode.notes.app-main-5\:/drawable-hdpi/edit_white.9.png=D\:\\college4\\soft\\ghnb\\src\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\edit_white.9.png +net.micode.notes.app-main-5\:/drawable-hdpi/edit_yellow.9.png=D\:\\college4\\soft\\ghnb\\src\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\edit_yellow.9.png +net.micode.notes.app-main-5\:/drawable-hdpi/font_large.png=D\:\\college4\\soft\\ghnb\\src\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\font_large.png +net.micode.notes.app-main-5\:/drawable-hdpi/font_normal.png=D\:\\college4\\soft\\ghnb\\src\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\font_normal.png +net.micode.notes.app-main-5\:/drawable-hdpi/font_size_selector_bg.9.png=D\:\\college4\\soft\\ghnb\\src\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\font_size_selector_bg.9.png +net.micode.notes.app-main-5\:/drawable-hdpi/font_small.png=D\:\\college4\\soft\\ghnb\\src\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\font_small.png +net.micode.notes.app-main-5\:/drawable-hdpi/font_super.png=D\:\\college4\\soft\\ghnb\\src\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\font_super.png +net.micode.notes.app-main-5\:/drawable-hdpi/icon_app.png=D\:\\college4\\soft\\ghnb\\src\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\icon_app.png +net.micode.notes.app-main-5\:/drawable-hdpi/list_background.png=D\:\\college4\\soft\\ghnb\\src\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_background.png +net.micode.notes.app-main-5\:/drawable-hdpi/list_blue_down.9.png=D\:\\college4\\soft\\ghnb\\src\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_blue_down.9.png +net.micode.notes.app-main-5\:/drawable-hdpi/list_blue_middle.9.png=D\:\\college4\\soft\\ghnb\\src\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_blue_middle.9.png +net.micode.notes.app-main-5\:/drawable-hdpi/list_blue_single.9.png=D\:\\college4\\soft\\ghnb\\src\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_blue_single.9.png +net.micode.notes.app-main-5\:/drawable-hdpi/list_blue_up.9.png=D\:\\college4\\soft\\ghnb\\src\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_blue_up.9.png +net.micode.notes.app-main-5\:/drawable-hdpi/list_folder.9.png=D\:\\college4\\soft\\ghnb\\src\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_folder.9.png +net.micode.notes.app-main-5\:/drawable-hdpi/list_footer_bg.9.png=D\:\\college4\\soft\\ghnb\\src\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_footer_bg.9.png +net.micode.notes.app-main-5\:/drawable-hdpi/list_green_down.9.png=D\:\\college4\\soft\\ghnb\\src\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_green_down.9.png +net.micode.notes.app-main-5\:/drawable-hdpi/list_green_middle.9.png=D\:\\college4\\soft\\ghnb\\src\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_green_middle.9.png +net.micode.notes.app-main-5\:/drawable-hdpi/list_green_single.9.png=D\:\\college4\\soft\\ghnb\\src\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_green_single.9.png +net.micode.notes.app-main-5\:/drawable-hdpi/list_green_up.9.png=D\:\\college4\\soft\\ghnb\\src\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_green_up.9.png +net.micode.notes.app-main-5\:/drawable-hdpi/list_red_down.9.png=D\:\\college4\\soft\\ghnb\\src\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_red_down.9.png +net.micode.notes.app-main-5\:/drawable-hdpi/list_red_middle.9.png=D\:\\college4\\soft\\ghnb\\src\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_red_middle.9.png +net.micode.notes.app-main-5\:/drawable-hdpi/list_red_single.9.png=D\:\\college4\\soft\\ghnb\\src\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_red_single.9.png +net.micode.notes.app-main-5\:/drawable-hdpi/list_red_up.9.png=D\:\\college4\\soft\\ghnb\\src\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_red_up.9.png +net.micode.notes.app-main-5\:/drawable-hdpi/list_white_down.9.png=D\:\\college4\\soft\\ghnb\\src\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_white_down.9.png +net.micode.notes.app-main-5\:/drawable-hdpi/list_white_middle.9.png=D\:\\college4\\soft\\ghnb\\src\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_white_middle.9.png +net.micode.notes.app-main-5\:/drawable-hdpi/list_white_single.9.png=D\:\\college4\\soft\\ghnb\\src\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_white_single.9.png +net.micode.notes.app-main-5\:/drawable-hdpi/list_white_up.9.png=D\:\\college4\\soft\\ghnb\\src\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_white_up.9.png +net.micode.notes.app-main-5\:/drawable-hdpi/list_yellow_down.9.png=D\:\\college4\\soft\\ghnb\\src\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_yellow_down.9.png +net.micode.notes.app-main-5\:/drawable-hdpi/list_yellow_middle.9.png=D\:\\college4\\soft\\ghnb\\src\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_yellow_middle.9.png +net.micode.notes.app-main-5\:/drawable-hdpi/list_yellow_single.9.png=D\:\\college4\\soft\\ghnb\\src\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_yellow_single.9.png +net.micode.notes.app-main-5\:/drawable-hdpi/list_yellow_up.9.png=D\:\\college4\\soft\\ghnb\\src\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_yellow_up.9.png +net.micode.notes.app-main-5\:/drawable-hdpi/menu_delete.png=D\:\\college4\\soft\\ghnb\\src\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\menu_delete.png +net.micode.notes.app-main-5\:/drawable-hdpi/menu_move.png=D\:\\college4\\soft\\ghnb\\src\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\menu_move.png +net.micode.notes.app-main-5\:/drawable-hdpi/new_note_normal.png=D\:\\college4\\soft\\ghnb\\src\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\new_note_normal.png +net.micode.notes.app-main-5\:/drawable-hdpi/new_note_pressed.png=D\:\\college4\\soft\\ghnb\\src\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\new_note_pressed.png +net.micode.notes.app-main-5\:/drawable-hdpi/note_edit_color_selector_panel.png=D\:\\college4\\soft\\ghnb\\src\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\note_edit_color_selector_panel.png +net.micode.notes.app-main-5\:/drawable-hdpi/notification.png=D\:\\college4\\soft\\ghnb\\src\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\notification.png +net.micode.notes.app-main-5\:/drawable-hdpi/search_result.png=D\:\\college4\\soft\\ghnb\\src\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\search_result.png +net.micode.notes.app-main-5\:/drawable-hdpi/selected.png=D\:\\college4\\soft\\ghnb\\src\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\selected.png +net.micode.notes.app-main-5\:/drawable-hdpi/title_alert.png=D\:\\college4\\soft\\ghnb\\src\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\title_alert.png +net.micode.notes.app-main-5\:/drawable-hdpi/title_bar_bg.9.png=D\:\\college4\\soft\\ghnb\\src\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\title_bar_bg.9.png +net.micode.notes.app-main-5\:/drawable-hdpi/widget_2x_blue.png=D\:\\college4\\soft\\ghnb\\src\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\widget_2x_blue.png +net.micode.notes.app-main-5\:/drawable-hdpi/widget_2x_green.png=D\:\\college4\\soft\\ghnb\\src\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\widget_2x_green.png +net.micode.notes.app-main-5\:/drawable-hdpi/widget_2x_red.png=D\:\\college4\\soft\\ghnb\\src\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\widget_2x_red.png +net.micode.notes.app-main-5\:/drawable-hdpi/widget_2x_white.png=D\:\\college4\\soft\\ghnb\\src\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\widget_2x_white.png +net.micode.notes.app-main-5\:/drawable-hdpi/widget_2x_yellow.png=D\:\\college4\\soft\\ghnb\\src\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\widget_2x_yellow.png +net.micode.notes.app-main-5\:/drawable-hdpi/widget_4x_blue.png=D\:\\college4\\soft\\ghnb\\src\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\widget_4x_blue.png +net.micode.notes.app-main-5\:/drawable-hdpi/widget_4x_green.png=D\:\\college4\\soft\\ghnb\\src\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\widget_4x_green.png +net.micode.notes.app-main-5\:/drawable-hdpi/widget_4x_red.png=D\:\\college4\\soft\\ghnb\\src\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\widget_4x_red.png +net.micode.notes.app-main-5\:/drawable-hdpi/widget_4x_white.png=D\:\\college4\\soft\\ghnb\\src\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\widget_4x_white.png +net.micode.notes.app-main-5\:/drawable-hdpi/widget_4x_yellow.png=D\:\\college4\\soft\\ghnb\\src\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\widget_4x_yellow.png +net.micode.notes.app-main-5\:/drawable/new_note.xml=D\:\\college4\\soft\\ghnb\\src\\app\\build\\intermediates\\packaged_res\\debug\\drawable\\new_note.xml +net.micode.notes.app-main-5\:/layout/account_dialog_title.xml=D\:\\college4\\soft\\ghnb\\src\\app\\build\\intermediates\\packaged_res\\debug\\layout\\account_dialog_title.xml +net.micode.notes.app-main-5\:/layout/add_account_text.xml=D\:\\college4\\soft\\ghnb\\src\\app\\build\\intermediates\\packaged_res\\debug\\layout\\add_account_text.xml +net.micode.notes.app-main-5\:/layout/datetime_picker.xml=D\:\\college4\\soft\\ghnb\\src\\app\\build\\intermediates\\packaged_res\\debug\\layout\\datetime_picker.xml +net.micode.notes.app-main-5\:/layout/dialog_edit_text.xml=D\:\\college4\\soft\\ghnb\\src\\app\\build\\intermediates\\packaged_res\\debug\\layout\\dialog_edit_text.xml +net.micode.notes.app-main-5\:/layout/folder_list_item.xml=D\:\\college4\\soft\\ghnb\\src\\app\\build\\intermediates\\packaged_res\\debug\\layout\\folder_list_item.xml +net.micode.notes.app-main-5\:/layout/note_edit.xml=D\:\\college4\\soft\\ghnb\\src\\app\\build\\intermediates\\packaged_res\\debug\\layout\\note_edit.xml +net.micode.notes.app-main-5\:/layout/note_edit_list_item.xml=D\:\\college4\\soft\\ghnb\\src\\app\\build\\intermediates\\packaged_res\\debug\\layout\\note_edit_list_item.xml +net.micode.notes.app-main-5\:/layout/note_item.xml=D\:\\college4\\soft\\ghnb\\src\\app\\build\\intermediates\\packaged_res\\debug\\layout\\note_item.xml +net.micode.notes.app-main-5\:/layout/note_list.xml=D\:\\college4\\soft\\ghnb\\src\\app\\build\\intermediates\\packaged_res\\debug\\layout\\note_list.xml +net.micode.notes.app-main-5\:/layout/note_list_dropdown_menu.xml=D\:\\college4\\soft\\ghnb\\src\\app\\build\\intermediates\\packaged_res\\debug\\layout\\note_list_dropdown_menu.xml +net.micode.notes.app-main-5\:/layout/note_list_footer.xml=D\:\\college4\\soft\\ghnb\\src\\app\\build\\intermediates\\packaged_res\\debug\\layout\\note_list_footer.xml +net.micode.notes.app-main-5\:/layout/settings_header.xml=D\:\\college4\\soft\\ghnb\\src\\app\\build\\intermediates\\packaged_res\\debug\\layout\\settings_header.xml +net.micode.notes.app-main-5\:/layout/widget_2x.xml=D\:\\college4\\soft\\ghnb\\src\\app\\build\\intermediates\\packaged_res\\debug\\layout\\widget_2x.xml +net.micode.notes.app-main-5\:/layout/widget_4x.xml=D\:\\college4\\soft\\ghnb\\src\\app\\build\\intermediates\\packaged_res\\debug\\layout\\widget_4x.xml +net.micode.notes.app-main-5\:/menu/call_note_edit.xml=D\:\\college4\\soft\\ghnb\\src\\app\\build\\intermediates\\packaged_res\\debug\\menu\\call_note_edit.xml +net.micode.notes.app-main-5\:/menu/call_record_folder.xml=D\:\\college4\\soft\\ghnb\\src\\app\\build\\intermediates\\packaged_res\\debug\\menu\\call_record_folder.xml +net.micode.notes.app-main-5\:/menu/note_edit.xml=D\:\\college4\\soft\\ghnb\\src\\app\\build\\intermediates\\packaged_res\\debug\\menu\\note_edit.xml +net.micode.notes.app-main-5\:/menu/note_list.xml=D\:\\college4\\soft\\ghnb\\src\\app\\build\\intermediates\\packaged_res\\debug\\menu\\note_list.xml +net.micode.notes.app-main-5\:/menu/note_list_dropdown.xml=D\:\\college4\\soft\\ghnb\\src\\app\\build\\intermediates\\packaged_res\\debug\\menu\\note_list_dropdown.xml +net.micode.notes.app-main-5\:/menu/note_list_options.xml=D\:\\college4\\soft\\ghnb\\src\\app\\build\\intermediates\\packaged_res\\debug\\menu\\note_list_options.xml +net.micode.notes.app-main-5\:/menu/sub_folder.xml=D\:\\college4\\soft\\ghnb\\src\\app\\build\\intermediates\\packaged_res\\debug\\menu\\sub_folder.xml +net.micode.notes.app-main-5\:/raw-zh-rCN/introduction=D\:\\college4\\soft\\ghnb\\src\\app\\build\\intermediates\\packaged_res\\debug\\raw-zh-rCN\\introduction +net.micode.notes.app-main-5\:/raw/introduction=D\:\\college4\\soft\\ghnb\\src\\app\\build\\intermediates\\packaged_res\\debug\\raw\\introduction +net.micode.notes.app-main-5\:/xml/preferences.xml=D\:\\college4\\soft\\ghnb\\src\\app\\build\\intermediates\\packaged_res\\debug\\xml\\preferences.xml +net.micode.notes.app-main-5\:/xml/searchable.xml=D\:\\college4\\soft\\ghnb\\src\\app\\build\\intermediates\\packaged_res\\debug\\xml\\searchable.xml +net.micode.notes.app-main-5\:/xml/widget_2x_info.xml=D\:\\college4\\soft\\ghnb\\src\\app\\build\\intermediates\\packaged_res\\debug\\xml\\widget_2x_info.xml +net.micode.notes.app-main-5\:/xml/widget_4x_info.xml=D\:\\college4\\soft\\ghnb\\src\\app\\build\\intermediates\\packaged_res\\debug\\xml\\widget_4x_info.xml diff --git a/src/app/build/intermediates/incremental/debug/packageDebugResources/merger.xml b/src/app/build/intermediates/incremental/debug/packageDebugResources/merger.xml index 6445f66e..82c69992 100644 --- a/src/app/build/intermediates/incremental/debug/packageDebugResources/merger.xml +++ b/src/app/build/intermediates/incremental/debug/packageDebugResources/merger.xml @@ -1,5 +1,5 @@ - + -%s --%s --%s @@ -7,11 +7,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 syncingSettingsSearchDeleteMove to folder%d selectedNothing selected, the operation is invalidSelect allDeselect allFont sizeSmallMediumLargeSuperEnter check listLeave check listView folderDelete folderChange folder nameThe folder %1$s exist, please renameShareSend to homeRemind meDelete reminderSelect folderParent folderNote added to homeConfirm to delete folder and its notes?Delete selected notesConfirm to delete the selected %d notes?Confirm to delete this note?Have moved selected %1$d notes to %2$s folderSD card busy, not available nowExport failed, please check SD cardThe note is not existSorry, can not set clock on empty noteSorry, can not send and empty note to homeExport successfulExport failExport text file (%1$s) to SD (%2$s) directorySyncing notes...Sync is successfulSync is failedSync is canceledSync is successful with account %1$sSync failed, please check network and account settingsSync failed, internal error occursSync is canceledLogging into %1$s...Getting remote note list...Synchronize local notes with Google Task...SettingsSync accountSync notes with google taskLast sync time %1$syyyy-MM-dd hh:mm:ssAdd accountChange sync accountRemove sync accountCancelSync immediatelyCancel syncingCurrent account %1$sAll sync related information will be deleted, which may result in duplicated items sometimeSync notesPlease select a google account. Local notes will be synced with google task.Cannot change the account because sync is in progress%1$s has been set as the sync accountNew note background color randomDeleteCall notesInput nameSearching NotesSearch notesText in your notesNotessetcancel %1$s result for \"%2$s\" %1$s results for \"%2$s\" - + 短信 邮件 - 便签便签2x2便签4x4没有关联内容，点击新建便签。访客模式下，便签内容不可见...新建便签成功删除提醒创建提醒已过期yyyyMMddMM月dd日 kk:mm知道了查看呼叫电话发送邮件浏览网页打开地图新建文件夹导出文本同步取消同步设置搜索删除移动到文件夹选中了 %d 项没有选中项，操作无效全选取消全选文字大小小正常大超大进入清单模式退出清单模式查看文件夹刪除文件夹修改文件夹名称文件夹 %1$s 已存在，请重新命名分享发送到桌面提醒我删除提醒选择文件夹上一级文件夹已添加到桌面删除确认要删除所选的 %d 条便签吗?确认要删除该条便签吗?确认删除文件夹及所包含的便签吗？已将所选 %1$d 条便签移到 %2$s 文件夹SD卡被占用，不能操作导出文本时发生错误，请检查SD卡要查看的便签不存在不能为空便签设置闹钟提醒不能将空便签发送到桌面导出成功导出失败已将文本文件(%1$s)输出至SD卡(%2$s)目录同步便签...同步成功同步失败同步已取消与%1$s同步成功同步失败，请检查网络和帐号设置同步失败，发生内部错误同步已取消登录%1$s...正在获取服务器便签列表...正在同步本地便签...设置同步账号与google task同步便签记录上次同步于 %1$s添加账号更换账号删除账号取消立即同步取消同步当前帐号 %1$s如更换同步帐号，过去的帐号同步信息将被清空，再次切换的同时可能会造成数据重复同步便签请选择google帐号，便签将与该帐号的google task内容同步。正在同步中，不能修改同步帐号同步帐号已设置为%1$s新建便签背景颜色随机删除通话便签请输入名称正在搜索便签搜索便签便签中的文字便签设置取消 + 便签便签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新建便籤背景顏色隨機刪除通話便籤請輸入名稱正在搜索便籤搜索便籤便籤中的文字便籤設置取消 + 便簽便簽2x2便簽4x4沒有關聯內容，點擊新建便簽。訪客模式下，便籤內容不可見...新建便簽成功刪除提醒創建提醒已過期yyyyMMddMM月dd日 kk:mm知道了查看呼叫電話發送郵件浏覽網頁打開地圖已將所選 %1$d 便籤移到 %2$s 文件夾新建文件夾導出文本同步取消同步設置搜尋刪除移動到文件夾選中了 %d 項沒有選中項，操作無效全選取消全選文字大小小正常大超大進入清單模式退出清單模式查看文件夾刪除文件夾修改文件夾名稱文件夾 %1$s 已存在，請重新命名分享發送到桌面提醒我刪除提醒選擇文件夾上一級文件夾已添加到桌面刪除确认要刪除所選的 %d 條便籤嗎?确认要删除該條便籤嗎?確認刪除檔夾及所包含的便簽嗎？SD卡被佔用，不能操作導出TXT時發生錯誤，請檢查SD卡要查看的便籤不存在不能爲空便籤設置鬧鐘提醒不能將空便籤發送到桌面導出成功導出失敗已將文本文件(%1$s)導出至SD(%2$s)目錄同步便簽...同步成功同步失敗同步已取消與%1$s同步成功同步失敗，請檢查網絡和帳號設置同步失敗，發生內部錯誤同步已取消登陸%1$s...正在獲取服務器便籤列表...正在同步本地便籤...設置同步賬號与google task同步便簽記錄上次同步于 %1$s添加賬號更換賬號刪除賬號取消立即同步取消同步當前帳號 %1$s如更換同步帳號，過去的帳號同步信息將被清空，再次切換的同時可能會造成數據重復同步便簽請選擇google帳號，便簽將與該帳號的google task內容同步。正在同步中，不能修改同步帳號同步帳號已設置為%1$s新建便籤背景顏色隨機刪除通話便籤請輸入名稱正在搜索便籤搜索便籤便籤中的文字便籤設置取消 %1$s 條符合”%2$s“的搜尋結果 - \ No newline at end of file + \ No newline at end of file diff --git a/src/app/build/intermediates/incremental/debugAndroidTest/mergeDebugAndroidTestResources/compile-file-map.properties b/src/app/build/intermediates/incremental/debugAndroidTest/mergeDebugAndroidTestResources/compile-file-map.properties index 7191bab4..3275a51d 100644 --- a/src/app/build/intermediates/incremental/debugAndroidTest/mergeDebugAndroidTestResources/compile-file-map.properties +++ b/src/app/build/intermediates/incremental/debugAndroidTest/mergeDebugAndroidTestResources/compile-file-map.properties @@ -1 +1 @@ -#Sat Dec 09 00:14:07 CST 2023 +#Thu Dec 21 00:00:06 CST 2023 diff --git a/src/app/build/intermediates/incremental/debugAndroidTest/mergeDebugAndroidTestResources/merger.xml b/src/app/build/intermediates/incremental/debugAndroidTest/mergeDebugAndroidTestResources/merger.xml index 8e6b1e6d..0f4b63a2 100644 --- a/src/app/build/intermediates/incremental/debugAndroidTest/mergeDebugAndroidTestResources/merger.xml +++ b/src/app/build/intermediates/incremental/debugAndroidTest/mergeDebugAndroidTestResources/merger.xml @@ -1,2 +1,2 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/src/app/build/intermediates/incremental/mergeDebugAndroidTestAssets/merger.xml b/src/app/build/intermediates/incremental/mergeDebugAndroidTestAssets/merger.xml index 6179fb2c..70422630 100644 --- a/src/app/build/intermediates/incremental/mergeDebugAndroidTestAssets/merger.xml +++ b/src/app/build/intermediates/incremental/mergeDebugAndroidTestAssets/merger.xml @@ -1,2 +1,2 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/src/app/build/intermediates/incremental/mergeDebugAndroidTestJniLibFolders/merger.xml b/src/app/build/intermediates/incremental/mergeDebugAndroidTestJniLibFolders/merger.xml index f6931f87..d9ec9df9 100644 --- a/src/app/build/intermediates/incremental/mergeDebugAndroidTestJniLibFolders/merger.xml +++ b/src/app/build/intermediates/incremental/mergeDebugAndroidTestJniLibFolders/merger.xml @@ -1,2 +1,2 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/src/app/build/intermediates/incremental/mergeDebugAndroidTestShaders/merger.xml b/src/app/build/intermediates/incremental/mergeDebugAndroidTestShaders/merger.xml index defcd324..8a53c072 100644 --- a/src/app/build/intermediates/incremental/mergeDebugAndroidTestShaders/merger.xml +++ b/src/app/build/intermediates/incremental/mergeDebugAndroidTestShaders/merger.xml @@ -1,2 +1,2 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/src/app/build/intermediates/incremental/mergeDebugAssets/merger.xml b/src/app/build/intermediates/incremental/mergeDebugAssets/merger.xml index 1c454e33..f22439db 100644 --- a/src/app/build/intermediates/incremental/mergeDebugAssets/merger.xml +++ b/src/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/app/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml b/src/app/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml index 0fcbe8e9..1bda5249 100644 --- a/src/app/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml +++ b/src/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/app/build/intermediates/incremental/mergeDebugShaders/merger.xml b/src/app/build/intermediates/incremental/mergeDebugShaders/merger.xml index 2c78f8c9..e34698ff 100644 --- a/src/app/build/intermediates/incremental/mergeDebugShaders/merger.xml +++ b/src/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/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt b/src/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt index 5a5e78df..e5a77134 100644 --- a/src/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt +++ b/src/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt @@ -1,4 +1,4 @@ -#Sat Dec 09 23:27:08 CST 2023 -base.0=C\:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\build\\intermediates\\dex\\debug\\mergeDexDebug\\classes.dex +#Thu Dec 21 00:01:10 CST 2023 +base.0=D\:\\college4\\soft\\ghnb\\src\\app\\build\\intermediates\\dex\\debug\\mergeDexDebug\\classes.dex path.0=classes.dex renamed.0=classes.dex diff --git a/src/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/androidResources b/src/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/androidResources index 57db451c..013dee09 100644 Binary files a/src/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/androidResources and b/src/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/androidResources differ diff --git a/src/app/build/intermediates/incremental/packageDebugAndroidTest/tmp/debugAndroidTest/dex-renamer-state.txt b/src/app/build/intermediates/incremental/packageDebugAndroidTest/tmp/debugAndroidTest/dex-renamer-state.txt index 41788ea5..94d32394 100644 --- a/src/app/build/intermediates/incremental/packageDebugAndroidTest/tmp/debugAndroidTest/dex-renamer-state.txt +++ b/src/app/build/intermediates/incremental/packageDebugAndroidTest/tmp/debugAndroidTest/dex-renamer-state.txt @@ -1,4 +1,4 @@ -#Sat Dec 09 00:54:38 CST 2023 -base.0=C\:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\build\\intermediates\\dex\\debugAndroidTest\\mergeDexDebugAndroidTest\\classes.dex +#Thu Dec 21 00:00:13 CST 2023 +base.0=D\:\\college4\\soft\\ghnb\\src\\app\\build\\intermediates\\dex\\debugAndroidTest\\mergeDexDebugAndroidTest\\classes.dex path.0=classes.dex renamed.0=classes.dex diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskSyncService$1.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskSyncService$1.class index f246eb87..e3981f2a 100644 Binary files a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskSyncService$1.class and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskSyncService$1.class differ diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskSyncService.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskSyncService.class index 18da491b..046324a7 100644 Binary files a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskSyncService.class and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskSyncService.class differ diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/model/WorkingNote.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/model/WorkingNote.class index df71afc5..7a717d2d 100644 Binary files a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/model/WorkingNote.class and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/model/WorkingNote.class differ diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$2.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$2.class index bb9f7862..6efe55fe 100644 Binary files a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$2.class and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$2.class differ diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$3.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$3.class index 961f2f41..f8758f37 100644 Binary files a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$3.class and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$3.class differ diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity.class index 7d0a456f..c7af5e52 100644 Binary files a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity.class and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity.class differ diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$3.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$3.class index 0fd69770..ae5d23bc 100644 Binary files a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$3.class and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$3.class differ diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$4.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$4.class index 04686521..62b7e431 100644 Binary files a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$4.class and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$4.class differ diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$5.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$5.class index 54fa5723..0c3614ba 100644 Binary files a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$5.class and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$5.class differ diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$6.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$6.class index 062ecb51..708e26c4 100644 Binary files a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$6.class and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$6.class differ diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$7.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$7.class index c2178731..3adfefed 100644 Binary files a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$7.class and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$7.class differ diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$8.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$8.class index d3dbb603..003aae65 100644 Binary files a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$8.class and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$8.class differ diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$9.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$9.class index 8f0a21b4..e7be3591 100644 Binary files a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$9.class and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$9.class differ diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.class index 3d4e8b10..c8bc735d 100644 Binary files a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.class and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.class differ diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity.class index 83dc6c88..8dc90586 100644 Binary files a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity.class and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity.class differ diff --git a/src/app/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt b/src/app/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt index b0efa0ef..c4c1a665 100644 --- a/src/app/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt +++ b/src/app/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt @@ -20,252 +20,252 @@ 20 android:versionName="0.1" > 21 22 C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\src\main\AndroidManifest.xml:23:5-44 +22-->D:\college4\soft\ghnb\src\app\src\main\AndroidManifest.xml:23:5-44 23 android:minSdkVersion="1" -23-->C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\src\main\AndroidManifest.xml:23:15-41 +23-->D:\college4\soft\ghnb\src\app\src\main\AndroidManifest.xml:23:15-41 24 android:targetSdkVersion="14" /> -24-->C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\src\main\AndroidManifest.xml:23:5-44 +24-->D:\college4\soft\ghnb\src\app\src\main\AndroidManifest.xml:23:5-44 25 26 -26-->C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\src\main\AndroidManifest.xml:25:5-81 -26-->C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\src\main\AndroidManifest.xml:25:22-78 +26-->D:\college4\soft\ghnb\src\app\src\main\AndroidManifest.xml:25:5-81 +26-->D:\college4\soft\ghnb\src\app\src\main\AndroidManifest.xml:25:22-78 27 -27-->C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\src\main\AndroidManifest.xml:26:5-88 -27-->C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\src\main\AndroidManifest.xml:26:22-85 +27-->D:\college4\soft\ghnb\src\app\src\main\AndroidManifest.xml:26:5-88 +27-->D:\college4\soft\ghnb\src\app\src\main\AndroidManifest.xml:26:22-85 28 -28-->C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\src\main\AndroidManifest.xml:27:5-67 -28-->C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\src\main\AndroidManifest.xml:27:22-64 +28-->D:\college4\soft\ghnb\src\app\src\main\AndroidManifest.xml:27:5-67 +28-->D:\college4\soft\ghnb\src\app\src\main\AndroidManifest.xml:27:22-64 29 -29-->C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\src\main\AndroidManifest.xml:28:5-72 -29-->C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\src\main\AndroidManifest.xml:28:22-69 +29-->D:\college4\soft\ghnb\src\app\src\main\AndroidManifest.xml:28:5-72 +29-->D:\college4\soft\ghnb\src\app\src\main\AndroidManifest.xml:28:22-69 30 -30-->C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\src\main\AndroidManifest.xml:29:5-74 -30-->C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\src\main\AndroidManifest.xml:29:22-71 +30-->D:\college4\soft\ghnb\src\app\src\main\AndroidManifest.xml:29:5-74 +30-->D:\college4\soft\ghnb\src\app\src\main\AndroidManifest.xml:29:22-71 31 -31-->C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\src\main\AndroidManifest.xml:30:5-80 -31-->C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\src\main\AndroidManifest.xml:30:22-77 +31-->D:\college4\soft\ghnb\src\app\src\main\AndroidManifest.xml:30:5-80 +31-->D:\college4\soft\ghnb\src\app\src\main\AndroidManifest.xml:30:22-77 32 -32-->C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\src\main\AndroidManifest.xml:31:5-71 -32-->C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\src\main\AndroidManifest.xml:31:22-68 +32-->D:\college4\soft\ghnb\src\app\src\main\AndroidManifest.xml:31:5-71 +32-->D:\college4\soft\ghnb\src\app\src\main\AndroidManifest.xml:31:22-68 33 -33-->C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\src\main\AndroidManifest.xml:32:5-74 -33-->C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\src\main\AndroidManifest.xml:32:22-71 +33-->D:\college4\soft\ghnb\src\app\src\main\AndroidManifest.xml:32:5-74 +33-->D:\college4\soft\ghnb\src\app\src\main\AndroidManifest.xml:32:22-71 34 -34-->C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\src\main\AndroidManifest.xml:33:5-81 -34-->C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\src\main\AndroidManifest.xml:33:22-78 +34-->D:\college4\soft\ghnb\src\app\src\main\AndroidManifest.xml:33:5-81 +34-->D:\college4\soft\ghnb\src\app\src\main\AndroidManifest.xml:33:22-78 35 36 C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\src\main\AndroidManifest.xml:35:5-148:19 +36-->D:\college4\soft\ghnb\src\app\src\main\AndroidManifest.xml:35:5-148:19 37 android:debuggable="true" 38 android:icon="@drawable/icon_app" -38-->C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\src\main\AndroidManifest.xml:36:9-42 +38-->D:\college4\soft\ghnb\src\app\src\main\AndroidManifest.xml:36:9-42 39 android:label="@string/app_name" -39-->C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\src\main\AndroidManifest.xml:37:9-41 +39-->D:\college4\soft\ghnb\src\app\src\main\AndroidManifest.xml:37:9-41 40 android:testOnly="true" > 41 C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\src\main\AndroidManifest.xml:38:9-50:20 +41-->D:\college4\soft\ghnb\src\app\src\main\AndroidManifest.xml:38:9-50:20 42 android:name="net.micode.notes.ui.NotesListActivity" -42-->C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\src\main\AndroidManifest.xml:39:13-49 +42-->D:\college4\soft\ghnb\src\app\src\main\AndroidManifest.xml:39:13-49 43 android:configChanges="keyboardHidden|orientation|screenSize" -43-->C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\src\main\AndroidManifest.xml:40:13-74 +43-->D:\college4\soft\ghnb\src\app\src\main\AndroidManifest.xml:40:13-74 44 android:label="@string/app_name" -44-->C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\src\main\AndroidManifest.xml:41:13-45 +44-->D:\college4\soft\ghnb\src\app\src\main\AndroidManifest.xml:41:13-45 45 android:launchMode="singleTop" -45-->C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\src\main\AndroidManifest.xml:42:13-43 +45-->D:\college4\soft\ghnb\src\app\src\main\AndroidManifest.xml:42:13-43 46 android:theme="@style/NoteTheme" -46-->C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\src\main\AndroidManifest.xml:43:13-45 +46-->D:\college4\soft\ghnb\src\app\src\main\AndroidManifest.xml:43:13-45 47 android:windowSoftInputMode="adjustPan" > -47-->C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\src\main\AndroidManifest.xml:44:13-52 +47-->D:\college4\soft\ghnb\src\app\src\main\AndroidManifest.xml:44:13-52 48 -48-->C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\src\main\AndroidManifest.xml:46:13-49:29 +48-->D:\college4\soft\ghnb\src\app\src\main\AndroidManifest.xml:46:13-49:29 49 -49-->C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\src\main\AndroidManifest.xml:47:17-69 -49-->C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\src\main\AndroidManifest.xml:47:25-66 +49-->D:\college4\soft\ghnb\src\app\src\main\AndroidManifest.xml:47:17-69 +49-->D:\college4\soft\ghnb\src\app\src\main\AndroidManifest.xml:47:25-66 50 51 -51-->C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\src\main\AndroidManifest.xml:48:17-77 -51-->C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\src\main\AndroidManifest.xml:48:27-74 +51-->D:\college4\soft\ghnb\src\app\src\main\AndroidManifest.xml:48:17-77 +51-->D:\college4\soft\ghnb\src\app\src\main\AndroidManifest.xml:48:27-74 52 53 54 C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\src\main\AndroidManifest.xml:52:9-80:20 +54-->D:\college4\soft\ghnb\src\app\src\main\AndroidManifest.xml:52:9-80:20 55 android:name="net.micode.notes.ui.NoteEditActivity" -55-->C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\src\main\AndroidManifest.xml:53:13-48 +55-->D:\college4\soft\ghnb\src\app\src\main\AndroidManifest.xml:53:13-48 56 android:configChanges="keyboardHidden|orientation|screenSize" -56-->C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\src\main\AndroidManifest.xml:54:13-74 +56-->D:\college4\soft\ghnb\src\app\src\main\AndroidManifest.xml:54:13-74 57 android:launchMode="singleTop" -57-->C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\src\main\AndroidManifest.xml:55:13-43 +57-->D:\college4\soft\ghnb\src\app\src\main\AndroidManifest.xml:55:13-43 58 android:theme="@style/NoteTheme" > -58-->C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\src\main\AndroidManifest.xml:56:13-45 +58-->D:\college4\soft\ghnb\src\app\src\main\AndroidManifest.xml:56:13-45 59 -59-->C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\src\main\AndroidManifest.xml:58:13-63:29 +59-->D:\college4\soft\ghnb\src\app\src\main\AndroidManifest.xml:58:13-63:29 60 -60-->C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\src\main\AndroidManifest.xml:59:17-69 -60-->C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\src\main\AndroidManifest.xml:59:25-66 +60-->D:\college4\soft\ghnb\src\app\src\main\AndroidManifest.xml:59:17-69 +60-->D:\college4\soft\ghnb\src\app\src\main\AndroidManifest.xml:59:25-66 61 62 -62-->C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\src\main\AndroidManifest.xml:60:17-76 -62-->C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\src\main\AndroidManifest.xml:60:27-73 +62-->D:\college4\soft\ghnb\src\app\src\main\AndroidManifest.xml:60:17-76 +62-->D:\college4\soft\ghnb\src\app\src\main\AndroidManifest.xml:60:27-73 63 64 -64-->C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\src\main\AndroidManifest.xml:61:17-78 -64-->C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\src\main\AndroidManifest.xml:61:23-75 +64-->D:\college4\soft\ghnb\src\app\src\main\AndroidManifest.xml:61:17-78 +64-->D:\college4\soft\ghnb\src\app\src\main\AndroidManifest.xml:61:23-75 65 -65-->C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\src\main\AndroidManifest.xml:61:17-78 -65-->C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\src\main\AndroidManifest.xml:61:23-75 +65-->D:\college4\soft\ghnb\src\app\src\main\AndroidManifest.xml:61:17-78 +65-->D:\college4\soft\ghnb\src\app\src\main\AndroidManifest.xml:61:23-75 66 67 -67-->C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\src\main\AndroidManifest.xml:65:13-70:29 +67-->D:\college4\soft\ghnb\src\app\src\main\AndroidManifest.xml:65:13-70:29 68 -68-->C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\src\main\AndroidManifest.xml:66:17-79 -68-->C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\src\main\AndroidManifest.xml:66:25-76 +68-->D:\college4\soft\ghnb\src\app\src\main\AndroidManifest.xml:66:17-79 +68-->D:\college4\soft\ghnb\src\app\src\main\AndroidManifest.xml:66:25-76 69 70 -70-->C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\src\main\AndroidManifest.xml:60:17-76 -70-->C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\src\main\AndroidManifest.xml:60:27-73 +70-->D:\college4\soft\ghnb\src\app\src\main\AndroidManifest.xml:60:17-76 +70-->D:\college4\soft\ghnb\src\app\src\main\AndroidManifest.xml:60:27-73 71 72 -72-->C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\src\main\AndroidManifest.xml:61:17-78 -72-->C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\src\main\AndroidManifest.xml:61:23-75 +72-->D:\college4\soft\ghnb\src\app\src\main\AndroidManifest.xml:61:17-78 +72-->D:\college4\soft\ghnb\src\app\src\main\AndroidManifest.xml:61:23-75 73 -73-->C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\src\main\AndroidManifest.xml:61:17-78 -73-->C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\src\main\AndroidManifest.xml:61:23-75 +73-->D:\college4\soft\ghnb\src\app\src\main\AndroidManifest.xml:61:17-78 +73-->D:\college4\soft\ghnb\src\app\src\main\AndroidManifest.xml:61:23-75 74 75 -75-->C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\src\main\AndroidManifest.xml:72:13-75:29 +75-->D:\college4\soft\ghnb\src\app\src\main\AndroidManifest.xml:72:13-75:29 76 -76-->C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\src\main\AndroidManifest.xml:73:17-71 -76-->C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\src\main\AndroidManifest.xml:73:25-68 +76-->D:\college4\soft\ghnb\src\app\src\main\AndroidManifest.xml:73:17-71 +76-->D:\college4\soft\ghnb\src\app\src\main\AndroidManifest.xml:73:25-68 77 78 -78-->C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\src\main\AndroidManifest.xml:60:17-76 -78-->C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\src\main\AndroidManifest.xml:60:27-73 +78-->D:\college4\soft\ghnb\src\app\src\main\AndroidManifest.xml:60:17-76 +78-->D:\college4\soft\ghnb\src\app\src\main\AndroidManifest.xml:60:27-73 79 80 81 C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\src\main\AndroidManifest.xml:77:13-79:54 +81-->D:\college4\soft\ghnb\src\app\src\main\AndroidManifest.xml:77:13-79:54 82 android:name="android.app.searchable" -82-->C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\src\main\AndroidManifest.xml:78:17-54 +82-->D:\college4\soft\ghnb\src\app\src\main\AndroidManifest.xml:78:17-54 83 android:resource="@xml/searchable" /> -83-->C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\src\main\AndroidManifest.xml:79:17-51 +83-->D:\college4\soft\ghnb\src\app\src\main\AndroidManifest.xml:79:17-51 84 85 86 C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\src\main\AndroidManifest.xml:82:9-85:43 +86-->D:\college4\soft\ghnb\src\app\src\main\AndroidManifest.xml:82:9-85:43 87 android:name="net.micode.notes.data.NotesProvider" -87-->C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\src\main\AndroidManifest.xml:83:13-63 +87-->D:\college4\soft\ghnb\src\app\src\main\AndroidManifest.xml:83:13-63 88 android:authorities="micode_notes" -88-->C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\src\main\AndroidManifest.xml:84:13-47 +88-->D:\college4\soft\ghnb\src\app\src\main\AndroidManifest.xml:84:13-47 89 android:multiprocess="true" /> -89-->C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\src\main\AndroidManifest.xml:85:13-40 +89-->D:\college4\soft\ghnb\src\app\src\main\AndroidManifest.xml:85:13-40 90 91 C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\src\main\AndroidManifest.xml:87:9-99:20 +91-->D:\college4\soft\ghnb\src\app\src\main\AndroidManifest.xml:87:9-99:20 92 android:name="net.micode.notes.widget.NoteWidgetProvider_2x" -92-->C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\src\main\AndroidManifest.xml:88:13-57 +92-->D:\college4\soft\ghnb\src\app\src\main\AndroidManifest.xml:88:13-57 93 android:label="@string/app_widget2x2" > -93-->C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\src\main\AndroidManifest.xml:89:13-50 +93-->D:\college4\soft\ghnb\src\app\src\main\AndroidManifest.xml:89:13-50 94 -94-->C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\src\main\AndroidManifest.xml:90:13-94:29 +94-->D:\college4\soft\ghnb\src\app\src\main\AndroidManifest.xml:90:13-94:29 95 -95-->C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\src\main\AndroidManifest.xml:91:17-84 -95-->C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\src\main\AndroidManifest.xml:91:25-81 +95-->D:\college4\soft\ghnb\src\app\src\main\AndroidManifest.xml:91:17-84 +95-->D:\college4\soft\ghnb\src\app\src\main\AndroidManifest.xml:91:25-81 96 -96-->C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\src\main\AndroidManifest.xml:92:17-85 -96-->C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\src\main\AndroidManifest.xml:92:25-82 +96-->D:\college4\soft\ghnb\src\app\src\main\AndroidManifest.xml:92:17-85 +96-->D:\college4\soft\ghnb\src\app\src\main\AndroidManifest.xml:92:25-82 97 -97-->C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\src\main\AndroidManifest.xml:93:17-85 -97-->C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\src\main\AndroidManifest.xml:93:25-82 +97-->D:\college4\soft\ghnb\src\app\src\main\AndroidManifest.xml:93:17-85 +97-->D:\college4\soft\ghnb\src\app\src\main\AndroidManifest.xml:93:25-82 98 99 100 C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\src\main\AndroidManifest.xml:96:13-98:58 +100-->D:\college4\soft\ghnb\src\app\src\main\AndroidManifest.xml:96:13-98:58 101 android:name="android.appwidget.provider" -101-->C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\src\main\AndroidManifest.xml:97:17-58 +101-->D:\college4\soft\ghnb\src\app\src\main\AndroidManifest.xml:97:17-58 102 android:resource="@xml/widget_2x_info" /> -102-->C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\src\main\AndroidManifest.xml:98:17-55 +102-->D:\college4\soft\ghnb\src\app\src\main\AndroidManifest.xml:98:17-55 103 104 C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\src\main\AndroidManifest.xml:100:9-113:20 +104-->D:\college4\soft\ghnb\src\app\src\main\AndroidManifest.xml:100:9-113:20 105 android:name="net.micode.notes.widget.NoteWidgetProvider_4x" -105-->C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\src\main\AndroidManifest.xml:101:13-57 +105-->D:\college4\soft\ghnb\src\app\src\main\AndroidManifest.xml:101:13-57 106 android:label="@string/app_widget4x4" > -106-->C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\src\main\AndroidManifest.xml:102:13-50 +106-->D:\college4\soft\ghnb\src\app\src\main\AndroidManifest.xml:102:13-50 107 -107-->C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\src\main\AndroidManifest.xml:90:13-94:29 +107-->D:\college4\soft\ghnb\src\app\src\main\AndroidManifest.xml:90:13-94:29 108 -108-->C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\src\main\AndroidManifest.xml:91:17-84 -108-->C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\src\main\AndroidManifest.xml:91:25-81 +108-->D:\college4\soft\ghnb\src\app\src\main\AndroidManifest.xml:91:17-84 +108-->D:\college4\soft\ghnb\src\app\src\main\AndroidManifest.xml:91:25-81 109 -109-->C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\src\main\AndroidManifest.xml:92:17-85 -109-->C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\src\main\AndroidManifest.xml:92:25-82 +109-->D:\college4\soft\ghnb\src\app\src\main\AndroidManifest.xml:92:17-85 +109-->D:\college4\soft\ghnb\src\app\src\main\AndroidManifest.xml:92:25-82 110 -110-->C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\src\main\AndroidManifest.xml:93:17-85 -110-->C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\src\main\AndroidManifest.xml:93:25-82 +110-->D:\college4\soft\ghnb\src\app\src\main\AndroidManifest.xml:93:17-85 +110-->D:\college4\soft\ghnb\src\app\src\main\AndroidManifest.xml:93:25-82 111 112 113 C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\src\main\AndroidManifest.xml:96:13-98:58 +113-->D:\college4\soft\ghnb\src\app\src\main\AndroidManifest.xml:96:13-98:58 114 android:name="android.appwidget.provider" -114-->C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\src\main\AndroidManifest.xml:97:17-58 +114-->D:\college4\soft\ghnb\src\app\src\main\AndroidManifest.xml:97:17-58 115 android:resource="@xml/widget_4x_info" /> -115-->C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\src\main\AndroidManifest.xml:98:17-55 +115-->D:\college4\soft\ghnb\src\app\src\main\AndroidManifest.xml:98:17-55 116 117 -117-->C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\src\main\AndroidManifest.xml:115:9-119:20 -117-->C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\src\main\AndroidManifest.xml:115:19-55 +117-->D:\college4\soft\ghnb\src\app\src\main\AndroidManifest.xml:115:9-119:20 +117-->D:\college4\soft\ghnb\src\app\src\main\AndroidManifest.xml:115:19-55 118 -118-->C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\src\main\AndroidManifest.xml:116:13-118:29 +118-->D:\college4\soft\ghnb\src\app\src\main\AndroidManifest.xml:116:13-118:29 119 -119-->C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\src\main\AndroidManifest.xml:117:17-79 -119-->C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\src\main\AndroidManifest.xml:117:25-76 +119-->D:\college4\soft\ghnb\src\app\src\main\AndroidManifest.xml:117:17-79 +119-->D:\college4\soft\ghnb\src\app\src\main\AndroidManifest.xml:117:25-76 120 121 122 C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\src\main\AndroidManifest.xml:121:9-124:20 +122-->D:\college4\soft\ghnb\src\app\src\main\AndroidManifest.xml:121:9-124:20 123 android:name="net.micode.notes.ui.AlarmReceiver" -123-->C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\src\main\AndroidManifest.xml:122:13-61 +123-->D:\college4\soft\ghnb\src\app\src\main\AndroidManifest.xml:122:13-61 124 android:process=":remote" > -124-->C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\src\main\AndroidManifest.xml:123:13-38 +124-->D:\college4\soft\ghnb\src\app\src\main\AndroidManifest.xml:123:13-38 125 126 127 C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\src\main\AndroidManifest.xml:126:9-131:20 +127-->D:\college4\soft\ghnb\src\app\src\main\AndroidManifest.xml:126:9-131:20 128 android:name="net.micode.notes.ui.AlarmAlertActivity" -128-->C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\src\main\AndroidManifest.xml:127:13-50 +128-->D:\college4\soft\ghnb\src\app\src\main\AndroidManifest.xml:127:13-50 129 android:label="@string/app_name" -129-->C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\src\main\AndroidManifest.xml:128:13-45 +129-->D:\college4\soft\ghnb\src\app\src\main\AndroidManifest.xml:128:13-45 130 android:launchMode="singleInstance" -130-->C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\src\main\AndroidManifest.xml:129:13-48 +130-->D:\college4\soft\ghnb\src\app\src\main\AndroidManifest.xml:129:13-48 131 android:theme="@android:style/Theme.Holo.Wallpaper.NoTitleBar" > -131-->C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\src\main\AndroidManifest.xml:130:13-75 +131-->D:\college4\soft\ghnb\src\app\src\main\AndroidManifest.xml:130:13-75 132 133 C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\src\main\AndroidManifest.xml:133:9-138:20 +133-->D:\college4\soft\ghnb\src\app\src\main\AndroidManifest.xml:133:9-138:20 134 android:name="net.micode.notes.ui.NotesPreferenceActivity" -134-->C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\src\main\AndroidManifest.xml:134:13-71 +134-->D:\college4\soft\ghnb\src\app\src\main\AndroidManifest.xml:134:13-71 135 android:label="@string/preferences_title" -135-->C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\src\main\AndroidManifest.xml:135:13-54 +135-->D:\college4\soft\ghnb\src\app\src\main\AndroidManifest.xml:135:13-54 136 android:launchMode="singleTop" -136-->C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\src\main\AndroidManifest.xml:136:13-43 +136-->D:\college4\soft\ghnb\src\app\src\main\AndroidManifest.xml:136:13-43 137 android:theme="@android:style/Theme.Holo.Light" > -137-->C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\src\main\AndroidManifest.xml:137:13-60 +137-->D:\college4\soft\ghnb\src\app\src\main\AndroidManifest.xml:137:13-60 138 139 140 C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\src\main\AndroidManifest.xml:140:9-143:19 +140-->D:\college4\soft\ghnb\src\app\src\main\AndroidManifest.xml:140:9-143:19 141 android:name="net.micode.notes.gtask.remote.GTaskSyncService" -141-->C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\src\main\AndroidManifest.xml:141:13-74 +141-->D:\college4\soft\ghnb\src\app\src\main\AndroidManifest.xml:141:13-74 142 android:exported="false" > -142-->C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\src\main\AndroidManifest.xml:142:13-37 +142-->D:\college4\soft\ghnb\src\app\src\main\AndroidManifest.xml:142:13-37 143 144 145 C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\src\main\AndroidManifest.xml:145:9-147:52 +145-->D:\college4\soft\ghnb\src\app\src\main\AndroidManifest.xml:145:9-147:52 146 android:name="android.app.default_searchable" -146-->C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\src\main\AndroidManifest.xml:146:13-58 +146-->D:\college4\soft\ghnb\src\app\src\main\AndroidManifest.xml:146:13-58 147 android:value=".ui.NoteEditActivity" /> -147-->C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\src\main\AndroidManifest.xml:147:13-49 +147-->D:\college4\soft\ghnb\src\app\src\main\AndroidManifest.xml:147:13-49 148 149 150 diff --git a/src/app/build/intermediates/manifest_merge_blame_file/debugAndroidTest/manifest-merger-blame-debug-androidTest-report.txt b/src/app/build/intermediates/manifest_merge_blame_file/debugAndroidTest/manifest-merger-blame-debug-androidTest-report.txt index b91c5480..8b628843 100644 --- a/src/app/build/intermediates/manifest_merge_blame_file/debugAndroidTest/manifest-merger-blame-debug-androidTest-report.txt +++ b/src/app/build/intermediates/manifest_merge_blame_file/debugAndroidTest/manifest-merger-blame-debug-androidTest-report.txt @@ -3,30 +3,30 @@ 3 package="net.micode.notes.test" > 4 5 C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest502989645291940736.xml:5:5-73 +5-->D:\college4\soft\ghnb\src\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest13666416001784366444.xml:5:5-73 6 android:minSdkVersion="1" -6-->C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest502989645291940736.xml:5:15-40 +6-->D:\college4\soft\ghnb\src\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest13666416001784366444.xml:5:15-40 7 android:targetSdkVersion="14" /> -7-->C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest502989645291940736.xml:5:41-70 +7-->D:\college4\soft\ghnb\src\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest13666416001784366444.xml:5:41-70 8 9 C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest502989645291940736.xml:11:5-15:66 +9-->D:\college4\soft\ghnb\src\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest13666416001784366444.xml:11:5-15:66 10 android:name="android.test.InstrumentationTestRunner" -10-->C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest502989645291940736.xml:11:22-75 +10-->D:\college4\soft\ghnb\src\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest13666416001784366444.xml:11:22-75 11 android:functionalTest="false" -11-->C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest502989645291940736.xml:14:22-52 +11-->D:\college4\soft\ghnb\src\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest13666416001784366444.xml:14:22-52 12 android:handleProfiling="false" -12-->C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest502989645291940736.xml:13:22-53 +12-->D:\college4\soft\ghnb\src\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest13666416001784366444.xml:13:22-53 13 android:label="Tests for net.micode.notes" -13-->C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest502989645291940736.xml:15:22-64 +13-->D:\college4\soft\ghnb\src\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest13666416001784366444.xml:15:22-64 14 android:targetPackage="net.micode.notes" /> -14-->C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest502989645291940736.xml:12:22-62 +14-->D:\college4\soft\ghnb\src\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest13666416001784366444.xml:12:22-62 15 16 -16-->C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest502989645291940736.xml:7:5-9:19 +16-->D:\college4\soft\ghnb\src\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest13666416001784366444.xml:7:5-9:19 17 -17-->C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest502989645291940736.xml:8:9-60 -17-->C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest502989645291940736.xml:8:23-57 +17-->D:\college4\soft\ghnb\src\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest13666416001784366444.xml:8:9-60 +17-->D:\college4\soft\ghnb\src\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest13666416001784366444.xml:8:23-57 18 19 20 diff --git a/src/app/build/intermediates/merged_res/debug/raw-zh-rCN_introduction.flat b/src/app/build/intermediates/merged_res/debug/raw-zh-rCN_introduction.flat index 68b46ae3..00291c5c 100644 Binary files a/src/app/build/intermediates/merged_res/debug/raw-zh-rCN_introduction.flat and b/src/app/build/intermediates/merged_res/debug/raw-zh-rCN_introduction.flat differ diff --git a/src/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/debug.json b/src/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/debug.json index 9ab429c2..fa2e2486 100644 --- a/src/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/debug.json +++ b/src/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/debug.json @@ -1,17 +1,36 @@ { "logs": [ { - "outputFile": "C:\\Users\\huigenb\\.gradle\\daemon\\8.0\\net.micode.notes.app-merged_res-4:\\values-zh-rTW_values-zh-rTW.arsc.flat", + "outputFile": "net.micode.notes.app-merged_res-4:/values-zh-rCN_values-zh-rCN.arsc.flat", "map": [ { - "source": "C:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\src\\main\\res\\values-zh-rTW\\arrays.xml", + "source": "D:\\college4\\soft\\ghnb\\src\\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": "6653,3566,3499,3425,3374,846,887,936,6195,6241,6598,6547,1225,3938,4007,3878,3812,3748,4682,4621,4557,4141,2937,1398,1452,4196,3640,6299,3314,3097,1836,2123,2374,1890,2876,2822,2770,2571,2522,2426,2475,2618,2666,2167,3254,2717,3141,2079,2326,2269,2213,3041,2034,2998,1941,1983,3194,1346,1657,1755,1609,1707,1561,1515,1173,1119,5064,5004,5207,6120,5523,5453,5588,5667,5852,5778,5140,5397,5265,5331,4954,5957,6041,6508,6399,6350,6445,1288,4085,4497,4797,4738,4865,4448,4402,4353,4301,985,1052", + "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": "6827,3634,3560,3493,3419,881,930,979,6235,6293,6647,6592,1282,4001,4079,3932,3872,3806,4732,4676,4615,4190,2992,1446,1509,4276,3716,6344,3368,3135,1884,2161,2420,1935,2931,2870,2816,2612,2565,2469,2516,2660,2711,2207,3308,2764,3188,2117,2368,2320,2263,3091,2073,3035,1977,2028,3248,1392,1701,1799,1651,1749,1603,1555,1219,1167,5134,5058,5259,6189,5582,5517,5661,5772,5951,5846,5201,5447,5325,5391,4998,6035,6114,6541,6439,6393,6502,1340,4135,4551,4859,4791,4922,4491,4442,4396,4347,1046,1113" + }, + "to": { + "startLines": "6,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106", + "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", + "startOffsets": "215,384,457,523,596,646,686,734,782,827,884,938,988,1050,1118,1195,1254,1319,1382,1437,1497,1560,1614,1674,1727,1789,1874,1955,2005,2064,2107,2160,2203,2254,2304,2364,2417,2468,2514,2562,2610,2656,2703,2753,2798,2857,2909,2961,3004,3051,3107,3162,3217,3261,3303,3344,3394,3453,3504,3553,3602,3649,3696,3743,3788,3839,3892,3967,4026,4083,4157,4221,4290,4368,4478,4582,4655,4721,4776,4841,4906,4955,5038,5116,5154,5199,5247,5309,5366,5421,5480,5547,5605,5667,5715,5760,5808,5859,5925", + "endLines": "8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106", + "endColumns": "14,72,65,72,49,39,47,47,44,56,53,49,61,67,76,58,64,62,54,59,62,53,59,52,61,84,80,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65", + "endOffsets": "379,452,518,591,641,681,729,777,822,879,933,983,1045,1113,1190,1249,1314,1377,1432,1492,1555,1609,1669,1722,1784,1869,1950,2000,2059,2102,2155,2198,2249,2299,2359,2412,2463,2509,2557,2605,2651,2698,2748,2793,2852,2904,2956,2999,3046,3102,3157,3212,3256,3298,3339,3389,3448,3499,3548,3597,3644,3691,3738,3783,3834,3887,3962,4021,4078,4152,4216,4285,4363,4473,4577,4650,4716,4771,4836,4901,4950,5033,5111,5149,5194,5242,5304,5361,5416,5475,5542,5600,5662,5710,5755,5803,5854,5920,5986" + } + }, + { + "source": "D:\\college4\\soft\\ghnb\\src\\app\\src\\main\\res\\values-zh-rCN\\arrays.xml", "from": { "startLines": "18", "startColumns": "4", - "startOffsets": "712", + "startOffsets": "730", "endLines": "21", "endColumns": "19", - "endOffsets": "817" + "endOffsets": "838" }, "to": { "startLines": "2", @@ -21,25 +40,6 @@ "endColumns": "19", "endOffsets": "210" } - }, - { - "source": "C:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\src\\main\\res\\values-zh-rTW\\strings.xml", - "from": { - "startLines": "122,72,71,70,69,19,20,21,112,113,121,120,26,76,77,75,74,73,89,88,87,79,61,29,30,80,37,114,68,64,39,45,50,40,60,59,58,54,53,51,52,55,56,46,67,57,65,44,49,48,47,63,43,62,41,42,66,28,34,36,33,35,32,31,25,24,96,95,98,110,103,102,104,105,107,106,97,101,99,100,94,108,109,119,117,116,118,27,78,86,91,90,92,85,84,83,82,22,23", - "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "6507,3575,3509,3436,3386,827,867,915,6057,6102,6453,6403,1199,3835,3903,3776,3710,3647,4565,4505,4442,4035,2957,1369,1422,4089,1768,6159,3327,3114,1878,2159,2405,1931,2897,2844,2793,2598,2550,2456,2504,2644,2691,2202,3268,2741,3157,2116,2358,2302,2247,3059,2072,3017,1981,2022,3209,1318,1623,1719,1576,1672,1529,1484,1148,1095,4940,4881,5081,5982,5392,5323,5456,5534,5717,5644,5015,5268,5138,5203,4832,5821,5904,6365,6258,6210,6303,1261,3980,4383,4678,4620,4745,4335,4290,4242,4191,963,1029", - "endLines": "124,72,71,70,69,19,20,21,112,113,121,120,26,76,77,75,74,73,89,88,87,79,61,29,30,80,37,114,68,64,39,45,50,40,60,59,58,54,53,51,52,55,56,46,67,57,65,44,49,48,47,63,43,62,41,42,66,28,34,36,33,35,32,31,25,24,96,95,98,110,103,102,104,105,107,106,97,101,99,100,94,108,109,119,117,116,118,27,78,86,91,90,92,85,84,83,82,22,23", - "endColumns": "14,71,65,72,49,39,47,47,44,56,53,49,61,67,76,58,65,62,54,59,62,53,59,52,61,83,79,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65", - "endOffsets": "6679,3642,3570,3504,3431,862,910,958,6097,6154,6502,6448,1256,3898,3975,3830,3771,3705,4615,4560,4500,4084,3012,1417,1479,4168,1843,6204,3381,3152,1926,2197,2451,1976,2952,2892,2839,2639,2593,2499,2545,2686,2736,2242,3322,2788,3204,2154,2400,2353,2297,3109,2111,3054,2017,2067,3263,1364,1667,1763,1618,1714,1571,1524,1194,1143,5010,4935,5133,6051,5451,5387,5529,5639,5816,5712,5076,5318,5198,5263,4876,5899,5977,6398,6298,6253,6360,1313,4030,4437,4740,4673,4802,4378,4330,4285,4237,1024,1090" - }, - "to": { - "startLines": "6,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106", - "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "215,384,456,522,595,645,685,733,781,826,883,937,987,1049,1117,1194,1253,1319,1382,1437,1497,1560,1614,1674,1727,1789,1873,1953,2003,2062,2105,2158,2201,2252,2302,2362,2415,2466,2512,2560,2608,2654,2701,2751,2796,2855,2907,2959,3002,3049,3105,3160,3215,3259,3301,3342,3392,3451,3502,3551,3600,3647,3694,3741,3786,3837,3890,3965,4024,4081,4155,4219,4288,4366,4476,4580,4653,4719,4774,4839,4904,4953,5036,5114,5152,5197,5245,5307,5364,5419,5478,5545,5603,5665,5713,5758,5806,5857,5923", - "endLines": "8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106", - "endColumns": "14,71,65,72,49,39,47,47,44,56,53,49,61,67,76,58,65,62,54,59,62,53,59,52,61,83,79,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65", - "endOffsets": "379,451,517,590,640,680,728,776,821,878,932,982,1044,1112,1189,1248,1314,1377,1432,1492,1555,1609,1669,1722,1784,1868,1948,1998,2057,2100,2153,2196,2247,2297,2357,2410,2461,2507,2555,2603,2649,2696,2746,2791,2850,2902,2954,2997,3044,3100,3155,3210,3254,3296,3337,3387,3446,3497,3546,3595,3642,3689,3736,3781,3832,3885,3960,4019,4076,4150,4214,4283,4361,4471,4575,4648,4714,4769,4834,4899,4948,5031,5109,5147,5192,5240,5302,5359,5414,5473,5540,5598,5660,5708,5753,5801,5852,5918,5984" - } } ] }, @@ -47,41 +47,33 @@ "outputFile": "net.micode.notes.app-merged_res-4:/values_values.arsc.flat", "map": [ { - "source": "C:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\src\\main\\res\\values\\colors.xml", - "from": { - "startLines": "-1", - "startColumns": "-1", - "startOffsets": "-1" - }, - "to": { - "startLines": "12", - "startColumns": "4", - "startOffsets": "420", - "endColumns": "56", - "endOffsets": "472" - } - }, - { - "source": "C:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\src\\main\\res\\values\\dimens.xml", + "source": "D:\\college4\\soft\\ghnb\\src\\app\\src\\main\\res\\values\\styles.xml", "from": { - "startLines": "-1,-1,-1,-1,-1", - "startColumns": "-1,-1,-1,-1,-1", - "startOffsets": "-1,-1,-1,-1,-1" + "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": "2112,2322,2704,2539,917,1104,1293,1484,1693,730,1905", + "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": "2314,2531,2913,2696,1098,1287,1476,1685,1897,911,2104" }, "to": { - "startLines": "13,14,15,16,17", - "startColumns": "4,4,4,4,4", - "startOffsets": "477,529,582,635,687", - "endColumns": "51,52,52,51,51", - "endOffsets": "524,577,630,682,734" + "startLines": "125,129,133,137,140,144,148,152,156,160,164", + "startColumns": "4,4,4,4,4,4,4,4,4,4,4", + "startOffsets": "8124,8328,8539,8749,8909,9092,9277,9462,9665,9871,10054", + "endLines": "128,132,136,139,143,147,151,155,159,163,167", + "endColumns": "12,12,12,12,12,12,12,12,12,12,12", + "endOffsets": "8323,8534,8744,8904,9087,9272,9457,9660,9866,10049,10250" } }, { - "source": "C:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\src\\main\\res\\values\\arrays.xml", + "source": "D:\\college4\\soft\\ghnb\\src\\app\\src\\main\\res\\values\\arrays.xml", "from": { - "startLines": "-1,-1", - "startColumns": "-1,-1", - "startOffsets": "-1,-1" + "startLines": "19,26", + "startColumns": "4,4", + "startOffsets": "758,1073", + "endLines": "24,29", + "endColumns": "19,19", + "endOffsets": "1065,1191" }, "to": { "startLines": "2,8", @@ -93,53 +85,13 @@ } }, { - "source": "C:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\src\\main\\res\\values\\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,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-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", - "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" - }, - "to": { - "startLines": "18,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124", - "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "739,1092,1188,1271,1367,1436,1479,1531,1583,1632,1695,1753,1804,1888,1982,2090,2161,2245,2328,2394,2477,2579,2640,2702,2753,2831,2884,2944,3049,3108,3210,3265,3336,3385,3443,3490,3549,3606,3677,3738,3795,3845,3897,3950,4000,4050,4110,4163,4229,4291,4354,4401,4456,4544,4602,4664,4714,4759,4802,4862,4929,4984,5039,5092,5139,5192,5248,5296,5351,5404,5488,5555,5619,5715,5789,5870,5959,6122,6266,6345,6420,6502,6561,6641,6721,6776,6898,7001,7042,7095,7152,7226,7291,7359,7445,7525,7594,7688,7747,7802,7864,7924,8034", - "endLines": "22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124", - "endColumns": "14,95,82,95,68,42,51,51,48,62,57,50,83,93,107,70,83,82,65,82,101,60,61,50,77,52,59,104,58,101,54,70,48,57,46,58,56,70,60,56,49,51,52,49,49,59,52,65,61,62,46,54,87,57,61,49,44,42,59,66,54,54,52,46,52,55,47,54,52,83,66,63,95,73,80,88,162,143,78,74,81,58,79,79,54,121,102,40,52,56,73,64,67,85,79,68,93,58,54,61,59,109,89", - "endOffsets": "1087,1183,1266,1362,1431,1474,1526,1578,1627,1690,1748,1799,1883,1977,2085,2156,2240,2323,2389,2472,2574,2635,2697,2748,2826,2879,2939,3044,3103,3205,3260,3331,3380,3438,3485,3544,3601,3672,3733,3790,3840,3892,3945,3995,4045,4105,4158,4224,4286,4349,4396,4451,4539,4597,4659,4709,4754,4797,4857,4924,4979,5034,5087,5134,5187,5243,5291,5346,5399,5483,5550,5614,5710,5784,5865,5954,6117,6261,6340,6415,6497,6556,6636,6716,6771,6893,6996,7037,7090,7147,7221,7286,7354,7440,7520,7589,7683,7742,7797,7859,7919,8029,8119" - } - }, - { - "source": "C:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\src\\main\\res\\values\\styles.xml", - "from": { - "startLines": "-1,-1,64,-1,-1,-1,-1,-1,-1,-1,-1", - "startColumns": "-1,-1,4,-1,-1,-1,-1,-1,-1,-1,-1", - "startOffsets": "-1,-1,2640,-1,-1,-1,-1,-1,-1,-1,-1", - "endLines": "-1,-1,67,-1,-1,-1,-1,-1,-1,-1,-1", - "endColumns": "-1,-1,12,-1,-1,-1,-1,-1,-1,-1,-1", - "endOffsets": "-1,-1,2846,-1,-1,-1,-1,-1,-1,-1,-1" - }, - "to": { - "startLines": "125,129,133,137,140,144,148,152,156,160,164", - "startColumns": "4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "8124,8328,8539,8749,8909,9092,9277,9462,9665,9871,10054", - "endLines": "128,132,136,139,143,147,151,155,159,163,167", - "endColumns": "12,12,12,12,12,12,12,12,12,12,12", - "endOffsets": "8323,8534,8744,8904,9087,9272,9457,9660,9866,10049,10250" - } - } - ] - }, - { - "outputFile": "C:\\Users\\huigenb\\.gradle\\daemon\\8.0\\net.micode.notes.app-merged_res-4:\\values_values.arsc.flat", - "map": [ - { - "source": "C:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\src\\main\\res\\values\\colors.xml", + "source": "D:\\college4\\soft\\ghnb\\src\\app\\src\\main\\res\\values\\colors.xml", "from": { "startLines": "18", "startColumns": "4", - "startOffsets": "712", + "startOffsets": "730", "endColumns": "56", - "endOffsets": "764" + "endOffsets": "782" }, "to": { "startLines": "12", @@ -150,50 +102,14 @@ } }, { - "source": "C:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\src\\main\\res\\values\\dimens.xml", - "from": { - "startLines": "19,20,21,22,18", - "startColumns": "4,4,4,4,4", - "startOffsets": "764,816,869,922,712", - "endColumns": "51,52,52,51,51", - "endOffsets": "811,864,917,969,759" - }, - "to": { - "startLines": "13,14,15,16,17", - "startColumns": "4,4,4,4,4", - "startOffsets": "477,529,582,635,687", - "endColumns": "51,52,52,51,51", - "endOffsets": "524,577,630,682,734" - } - }, - { - "source": "C:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\src\\main\\res\\values\\arrays.xml", - "from": { - "startLines": "19,26", - "startColumns": "4,4", - "startOffsets": "739,1047", - "endLines": "24,29", - "endColumns": "19,19", - "endOffsets": "1041,1162" - }, - "to": { - "startLines": "2,8", - "startColumns": "4,4", - "startOffsets": "105,300", - "endLines": "7,11", - "endColumns": "19,19", - "endOffsets": "295,415" - } - }, - { - "source": "C:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\src\\main\\res\\values\\strings.xml", + "source": "D:\\college4\\soft\\ghnb\\src\\app\\src\\main\\res\\values\\strings.xml", "from": { "startLines": "128,72,75,74,73,19,20,21,118,119,127,126,26,81,82,80,79,78,94,93,92,84,39,38,64,29,30,85,41,76,120,71,67,42,48,53,43,63,62,61,57,56,54,55,58,59,49,70,60,68,47,52,51,50,66,46,65,44,45,69,28,34,36,33,35,32,31,25,24,101,100,104,116,109,108,110,111,113,112,102,103,107,105,106,99,114,115,125,123,122,124,27,83,91,96,95,97,90,89,88,87,22,23", "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "8008,3898,4159,4063,3994,827,870,922,7506,7555,7950,7899,1282,4613,4707,4542,4458,4375,5574,5491,5389,4883,2004,1953,3397,1486,1539,4944,2097,4242,7618,3827,3582,2156,2471,2772,2214,3326,3265,3208,2986,2934,2831,2884,3036,3086,2518,3761,3146,3631,2424,2717,2629,2571,3520,2374,3475,2271,2314,3694,1431,1750,1858,1703,1805,1647,1599,1227,1174,6030,5963,6271,7409,6635,6554,6709,6798,7040,6961,6114,6189,6495,6335,6415,5908,7184,7306,7858,7731,7674,7784,1366,4815,5303,5709,5640,5789,5244,5189,5127,5067,974,1084", + "startOffsets": "8136,3970,4234,4137,4067,846,890,943,7624,7674,8077,8025,1308,4694,4789,4622,4537,4453,5668,5584,5481,4967,2043,1991,3461,1515,1569,5029,2138,4318,7738,3898,3649,2198,2519,2825,2257,3389,3327,3269,3043,2990,2885,2939,3094,3145,2567,3831,3206,3699,2471,2769,2680,2621,3586,2420,3540,2315,2359,3763,1459,1784,1894,1736,1840,1679,1630,1252,1198,6131,6063,6375,7525,6744,6662,6819,6909,7153,7073,6216,6292,6602,6440,6521,6007,7298,7421,7983,7854,7796,7908,1393,4898,5394,5805,5735,5886,5334,5278,5215,5154,996,1107", "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" + "endOffsets": "8544,4061,4312,4228,4131,884,937,990,7668,7732,8130,8071,1387,4783,4892,4688,4616,4531,5729,5662,5578,5023,2100,2037,3534,1563,1624,5129,2192,4415,7788,3964,3693,2251,2561,2879,2309,3455,3383,3321,3088,3037,2933,2984,3139,3200,2615,3892,3263,3757,2513,2819,2763,2674,3643,2465,3580,2353,2414,3825,1509,1834,1942,1778,1888,1730,1673,1302,1246,6210,6125,6434,7616,6813,6738,6903,7067,7292,7147,6286,6369,6656,6515,6596,6057,7415,7519,8019,7902,7848,7977,1453,4961,5475,5880,5799,5975,5388,5328,5272,5209,1101,1192" }, "to": { "startLines": "18,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124", @@ -205,38 +121,36 @@ } }, { - "source": "C:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\src\\main\\res\\values\\styles.xml", + "source": "D:\\college4\\soft\\ghnb\\src\\app\\src\\main\\res\\values\\dimens.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": "19,20,21,22,18", + "startColumns": "4,4,4,4,4", + "startOffsets": "783,836,890,944,730", + "endColumns": "51,52,52,51,51", + "endOffsets": "830,884,938,991,777" }, "to": { - "startLines": "125,129,133,137,140,144,148,152,156,160,164", - "startColumns": "4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "8124,8328,8539,8746,8906,9089,9274,9459,9662,9868,10051", - "endLines": "128,132,136,139,143,147,151,155,159,163,167", - "endColumns": "12,12,12,12,12,12,12,12,12,12,12", - "endOffsets": "8323,8534,8741,8901,9084,9269,9454,9657,9863,10046,10247" + "startLines": "13,14,15,16,17", + "startColumns": "4,4,4,4,4", + "startOffsets": "477,529,582,635,687", + "endColumns": "51,52,52,51,51", + "endOffsets": "524,577,630,682,734" } } ] }, { - "outputFile": "C:\\Users\\huigenb\\.gradle\\daemon\\8.0\\net.micode.notes.app-merged_res-4:\\values-zh-rCN_values-zh-rCN.arsc.flat", + "outputFile": "net.micode.notes.app-merged_res-4:/values-zh-rTW_values-zh-rTW.arsc.flat", "map": [ { - "source": "C:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\src\\main\\res\\values-zh-rCN\\arrays.xml", + "source": "D:\\college4\\soft\\ghnb\\src\\app\\src\\main\\res\\values-zh-rTW\\arrays.xml", "from": { "startLines": "18", "startColumns": "4", - "startOffsets": "712", + "startOffsets": "730", "endLines": "21", "endColumns": "19", - "endOffsets": "817" + "endOffsets": "838" }, "to": { "startLines": "2", @@ -248,22 +162,22 @@ } }, { - "source": "C:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\src\\main\\res\\values-zh-rCN\\strings.xml", + "source": "D:\\college4\\soft\\ghnb\\src\\app\\src\\main\\res\\values-zh-rTW\\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", + "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": "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" + "startOffsets": "6629,3647,3580,3506,3455,846,887,936,6169,6215,6574,6523,1225,3911,3980,3851,3784,3720,4654,4593,4529,4114,3018,1398,1452,4169,1805,6273,3395,3178,1917,2204,2455,1971,2957,2903,2851,2652,2603,2507,2556,2699,2747,2248,3335,2798,3222,2160,2407,2350,2294,3122,2115,3079,2022,2064,3275,1346,1657,1755,1609,1707,1561,1515,1173,1119,5036,4976,5179,6092,5495,5425,5560,5639,5824,5750,5112,5369,5237,5303,4926,5929,6013,6484,6375,6326,6421,1288,4058,4469,4769,4710,4837,4420,4374,4325,4273,985,1052", + "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": "6803,3714,3641,3574,3500,881,930,979,6209,6267,6623,6568,1282,3974,4052,3905,3845,3778,4704,4648,4587,4163,3073,1446,1509,4248,1880,6318,3449,3216,1965,2242,2501,2016,3012,2951,2897,2693,2646,2550,2597,2741,2792,2288,3389,2845,3269,2198,2449,2401,2344,3172,2154,3116,2058,2109,3329,1392,1701,1799,1651,1749,1603,1555,1219,1167,5106,5030,5231,6161,5554,5489,5633,5744,5923,5818,5173,5419,5297,5363,4970,6007,6086,6517,6415,6369,6478,1340,4108,4523,4831,4763,4894,4463,4414,4368,4319,1046,1113" }, "to": { "startLines": "6,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106", "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "215,384,457,523,596,646,686,734,782,827,884,938,988,1050,1118,1195,1254,1319,1382,1437,1497,1560,1614,1674,1727,1789,1874,1955,2005,2064,2107,2160,2203,2254,2304,2364,2417,2468,2514,2562,2610,2656,2703,2753,2798,2857,2909,2961,3004,3051,3107,3162,3217,3261,3303,3344,3394,3453,3504,3553,3602,3649,3696,3743,3788,3839,3892,3967,4026,4083,4157,4221,4290,4368,4478,4582,4655,4721,4776,4841,4906,4955,5038,5116,5154,5199,5247,5309,5366,5421,5480,5547,5605,5667,5715,5760,5808,5859,5925", + "startOffsets": "215,384,456,522,595,645,685,733,781,826,883,937,987,1049,1117,1194,1253,1319,1382,1437,1497,1560,1614,1674,1727,1789,1873,1953,2003,2062,2105,2158,2201,2252,2302,2362,2415,2466,2512,2560,2608,2654,2701,2751,2796,2855,2907,2959,3002,3049,3105,3160,3215,3259,3301,3342,3392,3451,3502,3551,3600,3647,3694,3741,3786,3837,3890,3965,4024,4081,4155,4219,4288,4366,4476,4580,4653,4719,4774,4839,4904,4953,5036,5114,5152,5197,5245,5307,5364,5419,5478,5545,5603,5665,5713,5758,5806,5857,5923", "endLines": "8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106", - "endColumns": "14,72,65,72,49,39,47,47,44,56,53,49,61,67,76,58,64,62,54,59,62,53,59,52,61,84,80,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65", - "endOffsets": "379,452,518,591,641,681,729,777,822,879,933,983,1045,1113,1190,1249,1314,1377,1432,1492,1555,1609,1669,1722,1784,1869,1950,2000,2059,2102,2155,2198,2249,2299,2359,2412,2463,2509,2557,2605,2651,2698,2748,2793,2852,2904,2956,2999,3046,3102,3157,3212,3256,3298,3339,3389,3448,3499,3548,3597,3644,3691,3738,3783,3834,3887,3962,4021,4078,4152,4216,4285,4363,4473,4577,4650,4716,4771,4836,4901,4950,5033,5111,5149,5194,5242,5304,5361,5416,5475,5542,5600,5662,5710,5755,5803,5854,5920,5986" + "endColumns": "14,71,65,72,49,39,47,47,44,56,53,49,61,67,76,58,65,62,54,59,62,53,59,52,61,83,79,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65", + "endOffsets": "379,451,517,590,640,680,728,776,821,878,932,982,1044,1112,1189,1248,1314,1377,1432,1492,1555,1609,1669,1722,1784,1868,1948,1998,2057,2100,2153,2196,2247,2297,2357,2410,2461,2507,2555,2603,2649,2696,2746,2791,2850,2902,2954,2997,3044,3100,3155,3210,3254,3296,3337,3387,3446,3497,3546,3595,3642,3689,3736,3781,3832,3885,3960,4019,4076,4150,4214,4283,4361,4471,4575,4648,4714,4769,4834,4899,4948,5031,5109,5147,5192,5240,5302,5359,5414,5473,5540,5598,5660,5708,5753,5801,5852,5918,5984" } } ] diff --git a/src/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rCN.json b/src/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rCN.json index 48b880bd..a5bd9efa 100644 --- a/src/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rCN.json +++ b/src/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rCN.json @@ -4,33 +4,14 @@ "outputFile": "net.micode.notes.app-mergeDebugResources-2:/values-zh-rCN/values-zh-rCN.xml", "map": [ { - "source": "C:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\src\\main\\res\\values-zh-rCN\\arrays.xml", - "from": { - "startLines": "18", - "startColumns": "4", - "startOffsets": "712", - "endLines": "21", - "endColumns": "19", - "endOffsets": "817" - }, - "to": { - "startLines": "2", - "startColumns": "4", - "startOffsets": "105", - "endLines": "5", - "endColumns": "19", - "endOffsets": "210" - } - }, - { - "source": "C:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\src\\main\\res\\values-zh-rCN\\strings.xml", + "source": "D:\\college4\\soft\\ghnb\\src\\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", + "startOffsets": "6653,3566,3499,3425,3374,846,887,936,6195,6241,6598,6547,1225,3938,4007,3878,3812,3748,4682,4621,4557,4141,2937,1398,1452,4196,3640,6299,3314,3097,1836,2123,2374,1890,2876,2822,2770,2571,2522,2426,2475,2618,2666,2167,3254,2717,3141,2079,2326,2269,2213,3041,2034,2998,1941,1983,3194,1346,1657,1755,1609,1707,1561,1515,1173,1119,5064,5004,5207,6120,5523,5453,5588,5667,5852,5778,5140,5397,5265,5331,4954,5957,6041,6508,6399,6350,6445,1288,4085,4497,4797,4738,4865,4448,4402,4353,4301,985,1052", "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" + "endOffsets": "6827,3634,3560,3493,3419,881,930,979,6235,6293,6647,6592,1282,4001,4079,3932,3872,3806,4732,4676,4615,4190,2992,1446,1509,4276,3716,6344,3368,3135,1884,2161,2420,1935,2931,2870,2816,2612,2565,2469,2516,2660,2711,2207,3308,2764,3188,2117,2368,2320,2263,3091,2073,3035,1977,2028,3248,1392,1701,1799,1651,1749,1603,1555,1219,1167,5134,5058,5259,6189,5582,5517,5661,5772,5951,5846,5201,5447,5325,5391,4998,6035,6114,6541,6439,6393,6502,1340,4135,4551,4859,4791,4922,4491,4442,4396,4347,1046,1113" }, "to": { "startLines": "6,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106", @@ -40,6 +21,25 @@ "endColumns": "14,72,65,72,49,39,47,47,44,56,53,49,61,67,76,58,64,62,54,59,62,53,59,52,61,84,80,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65", "endOffsets": "379,452,518,591,641,681,729,777,822,879,933,983,1045,1113,1190,1249,1314,1377,1432,1492,1555,1609,1669,1722,1784,1869,1950,2000,2059,2102,2155,2198,2249,2299,2359,2412,2463,2509,2557,2605,2651,2698,2748,2793,2852,2904,2956,2999,3046,3102,3157,3212,3256,3298,3339,3389,3448,3499,3548,3597,3644,3691,3738,3783,3834,3887,3962,4021,4078,4152,4216,4285,4363,4473,4577,4650,4716,4771,4836,4901,4950,5033,5111,5149,5194,5242,5304,5361,5416,5475,5542,5600,5662,5710,5755,5803,5854,5920,5986" } + }, + { + "source": "D:\\college4\\soft\\ghnb\\src\\app\\src\\main\\res\\values-zh-rCN\\arrays.xml", + "from": { + "startLines": "18", + "startColumns": "4", + "startOffsets": "730", + "endLines": "21", + "endColumns": "19", + "endOffsets": "838" + }, + "to": { + "startLines": "2", + "startColumns": "4", + "startOffsets": "105", + "endLines": "5", + "endColumns": "19", + "endOffsets": "210" + } } ] } diff --git a/src/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rTW.json b/src/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rTW.json index 9b4828be..4fe9014b 100644 --- a/src/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rTW.json +++ b/src/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rTW.json @@ -4,14 +4,14 @@ "outputFile": "net.micode.notes.app-mergeDebugResources-2:/values-zh-rTW/values-zh-rTW.xml", "map": [ { - "source": "C:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\src\\main\\res\\values-zh-rTW\\arrays.xml", + "source": "D:\\college4\\soft\\ghnb\\src\\app\\src\\main\\res\\values-zh-rTW\\arrays.xml", "from": { "startLines": "18", "startColumns": "4", - "startOffsets": "712", + "startOffsets": "730", "endLines": "21", "endColumns": "19", - "endOffsets": "817" + "endOffsets": "838" }, "to": { "startLines": "2", @@ -23,14 +23,14 @@ } }, { - "source": "C:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\src\\main\\res\\values-zh-rTW\\strings.xml", + "source": "D:\\college4\\soft\\ghnb\\src\\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", + "startOffsets": "6629,3647,3580,3506,3455,846,887,936,6169,6215,6574,6523,1225,3911,3980,3851,3784,3720,4654,4593,4529,4114,3018,1398,1452,4169,1805,6273,3395,3178,1917,2204,2455,1971,2957,2903,2851,2652,2603,2507,2556,2699,2747,2248,3335,2798,3222,2160,2407,2350,2294,3122,2115,3079,2022,2064,3275,1346,1657,1755,1609,1707,1561,1515,1173,1119,5036,4976,5179,6092,5495,5425,5560,5639,5824,5750,5112,5369,5237,5303,4926,5929,6013,6484,6375,6326,6421,1288,4058,4469,4769,4710,4837,4420,4374,4325,4273,985,1052", "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" + "endOffsets": "6803,3714,3641,3574,3500,881,930,979,6209,6267,6623,6568,1282,3974,4052,3905,3845,3778,4704,4648,4587,4163,3073,1446,1509,4248,1880,6318,3449,3216,1965,2242,2501,2016,3012,2951,2897,2693,2646,2550,2597,2741,2792,2288,3389,2845,3269,2198,2449,2401,2344,3172,2154,3116,2058,2109,3329,1392,1701,1799,1651,1749,1603,1555,1219,1167,5106,5030,5231,6161,5554,5489,5633,5744,5923,5818,5173,5419,5297,5363,4970,6007,6086,6517,6415,6369,6478,1340,4108,4523,4831,4763,4894,4463,4414,4368,4319,1046,1113" }, "to": { "startLines": "6,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106", diff --git a/src/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values.json b/src/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values.json index 60d8a8e9..04e6a843 100644 --- a/src/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values.json +++ b/src/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values.json @@ -4,41 +4,33 @@ "outputFile": "net.micode.notes.app-mergeDebugResources-2:/values/values.xml", "map": [ { - "source": "C:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\src\\main\\res\\values\\colors.xml", + "source": "D:\\college4\\soft\\ghnb\\src\\app\\src\\main\\res\\values\\styles.xml", "from": { - "startLines": "-1", - "startColumns": "-1", - "startOffsets": "-1" - }, - "to": { - "startLines": "12", - "startColumns": "4", - "startOffsets": "420", - "endColumns": "56", - "endOffsets": "472" - } - }, - { - "source": "C:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\src\\main\\res\\values\\dimens.xml", - "from": { - "startLines": "-1,-1,-1,-1,-1", - "startColumns": "-1,-1,-1,-1,-1", - "startOffsets": "-1,-1,-1,-1,-1" + "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": "2112,2322,2704,2539,917,1104,1293,1484,1693,730,1905", + "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": "2314,2531,2913,2696,1098,1287,1476,1685,1897,911,2104" }, "to": { - "startLines": "13,14,15,16,17", - "startColumns": "4,4,4,4,4", - "startOffsets": "477,529,582,635,687", - "endColumns": "51,52,52,51,51", - "endOffsets": "524,577,630,682,734" + "startLines": "125,129,133,137,140,144,148,152,156,160,164", + "startColumns": "4,4,4,4,4,4,4,4,4,4,4", + "startOffsets": "8124,8328,8539,8749,8909,9092,9277,9462,9665,9871,10054", + "endLines": "128,132,136,139,143,147,151,155,159,163,167", + "endColumns": "12,12,12,12,12,12,12,12,12,12,12", + "endOffsets": "8323,8534,8744,8904,9087,9272,9457,9660,9866,10049,10250" } }, { - "source": "C:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\src\\main\\res\\values\\arrays.xml", + "source": "D:\\college4\\soft\\ghnb\\src\\app\\src\\main\\res\\values\\arrays.xml", "from": { - "startLines": "-1,-1", - "startColumns": "-1,-1", - "startOffsets": "-1,-1" + "startLines": "19,26", + "startColumns": "4,4", + "startOffsets": "758,1073", + "endLines": "24,29", + "endColumns": "19,19", + "endOffsets": "1065,1191" }, "to": { "startLines": "2,8", @@ -50,53 +42,13 @@ } }, { - "source": "C:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\src\\main\\res\\values\\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,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-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", - "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" - }, - "to": { - "startLines": "18,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124", - "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "739,1092,1188,1271,1367,1436,1479,1531,1583,1632,1695,1753,1804,1888,1982,2090,2161,2245,2328,2394,2477,2579,2640,2702,2753,2831,2884,2944,3049,3108,3210,3265,3336,3385,3443,3490,3549,3606,3677,3738,3795,3845,3897,3950,4000,4050,4110,4163,4229,4291,4354,4401,4456,4544,4602,4664,4714,4759,4802,4862,4929,4984,5039,5092,5139,5192,5248,5296,5351,5404,5488,5555,5619,5715,5789,5870,5959,6122,6266,6345,6420,6502,6561,6641,6721,6776,6898,7001,7042,7095,7152,7226,7291,7359,7445,7525,7594,7688,7747,7802,7864,7924,8034", - "endLines": "22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124", - "endColumns": "14,95,82,95,68,42,51,51,48,62,57,50,83,93,107,70,83,82,65,82,101,60,61,50,77,52,59,104,58,101,54,70,48,57,46,58,56,70,60,56,49,51,52,49,49,59,52,65,61,62,46,54,87,57,61,49,44,42,59,66,54,54,52,46,52,55,47,54,52,83,66,63,95,73,80,88,162,143,78,74,81,58,79,79,54,121,102,40,52,56,73,64,67,85,79,68,93,58,54,61,59,109,89", - "endOffsets": "1087,1183,1266,1362,1431,1474,1526,1578,1627,1690,1748,1799,1883,1977,2085,2156,2240,2323,2389,2472,2574,2635,2697,2748,2826,2879,2939,3044,3103,3205,3260,3331,3380,3438,3485,3544,3601,3672,3733,3790,3840,3892,3945,3995,4045,4105,4158,4224,4286,4349,4396,4451,4539,4597,4659,4709,4754,4797,4857,4924,4979,5034,5087,5134,5187,5243,5291,5346,5399,5483,5550,5614,5710,5784,5865,5954,6117,6261,6340,6415,6497,6556,6636,6716,6771,6893,6996,7037,7090,7147,7221,7286,7354,7440,7520,7589,7683,7742,7797,7859,7919,8029,8119" - } - }, - { - "source": "C:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\src\\main\\res\\values\\styles.xml", - "from": { - "startLines": "-1,-1,64,-1,-1,-1,-1,-1,-1,-1,-1", - "startColumns": "-1,-1,4,-1,-1,-1,-1,-1,-1,-1,-1", - "startOffsets": "-1,-1,2640,-1,-1,-1,-1,-1,-1,-1,-1", - "endLines": "-1,-1,67,-1,-1,-1,-1,-1,-1,-1,-1", - "endColumns": "-1,-1,12,-1,-1,-1,-1,-1,-1,-1,-1", - "endOffsets": "-1,-1,2846,-1,-1,-1,-1,-1,-1,-1,-1" - }, - "to": { - "startLines": "125,129,133,137,140,144,148,152,156,160,164", - "startColumns": "4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "8124,8328,8539,8749,8909,9092,9277,9462,9665,9871,10054", - "endLines": "128,132,136,139,143,147,151,155,159,163,167", - "endColumns": "12,12,12,12,12,12,12,12,12,12,12", - "endOffsets": "8323,8534,8744,8904,9087,9272,9457,9660,9866,10049,10250" - } - } - ] - }, - { - "outputFile": "C:\\Users\\huigenb\\.gradle\\daemon\\8.0\\net.micode.notes.app-mergeDebugResources-2:\\values\\values.xml", - "map": [ - { - "source": "C:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\src\\main\\res\\values\\colors.xml", + "source": "D:\\college4\\soft\\ghnb\\src\\app\\src\\main\\res\\values\\colors.xml", "from": { "startLines": "18", "startColumns": "4", - "startOffsets": "712", + "startOffsets": "730", "endColumns": "56", - "endOffsets": "764" + "endOffsets": "782" }, "to": { "startLines": "12", @@ -107,50 +59,14 @@ } }, { - "source": "C:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\src\\main\\res\\values\\dimens.xml", - "from": { - "startLines": "19,20,21,22,18", - "startColumns": "4,4,4,4,4", - "startOffsets": "764,816,869,922,712", - "endColumns": "51,52,52,51,51", - "endOffsets": "811,864,917,969,759" - }, - "to": { - "startLines": "13,14,15,16,17", - "startColumns": "4,4,4,4,4", - "startOffsets": "477,529,582,635,687", - "endColumns": "51,52,52,51,51", - "endOffsets": "524,577,630,682,734" - } - }, - { - "source": "C:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\src\\main\\res\\values\\arrays.xml", - "from": { - "startLines": "19,26", - "startColumns": "4,4", - "startOffsets": "739,1047", - "endLines": "24,29", - "endColumns": "19,19", - "endOffsets": "1041,1162" - }, - "to": { - "startLines": "2,8", - "startColumns": "4,4", - "startOffsets": "105,300", - "endLines": "7,11", - "endColumns": "19,19", - "endOffsets": "295,415" - } - }, - { - "source": "C:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\src\\main\\res\\values\\strings.xml", + "source": "D:\\college4\\soft\\ghnb\\src\\app\\src\\main\\res\\values\\strings.xml", "from": { "startLines": "128,72,75,74,73,19,20,21,118,119,127,126,26,81,82,80,79,78,94,93,92,84,39,38,64,29,30,85,41,76,120,71,67,42,48,53,43,63,62,61,57,56,54,55,58,59,49,70,60,68,47,52,51,50,66,46,65,44,45,69,28,34,36,33,35,32,31,25,24,101,100,104,116,109,108,110,111,113,112,102,103,107,105,106,99,114,115,125,123,122,124,27,83,91,96,95,97,90,89,88,87,22,23", "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "8008,3898,4159,4063,3994,827,870,922,7506,7555,7950,7899,1282,4613,4707,4542,4458,4375,5574,5491,5389,4883,2004,1953,3397,1486,1539,4944,2097,4242,7618,3827,3582,2156,2471,2772,2214,3326,3265,3208,2986,2934,2831,2884,3036,3086,2518,3761,3146,3631,2424,2717,2629,2571,3520,2374,3475,2271,2314,3694,1431,1750,1858,1703,1805,1647,1599,1227,1174,6030,5963,6271,7409,6635,6554,6709,6798,7040,6961,6114,6189,6495,6335,6415,5908,7184,7306,7858,7731,7674,7784,1366,4815,5303,5709,5640,5789,5244,5189,5127,5067,974,1084", + "startOffsets": "8136,3970,4234,4137,4067,846,890,943,7624,7674,8077,8025,1308,4694,4789,4622,4537,4453,5668,5584,5481,4967,2043,1991,3461,1515,1569,5029,2138,4318,7738,3898,3649,2198,2519,2825,2257,3389,3327,3269,3043,2990,2885,2939,3094,3145,2567,3831,3206,3699,2471,2769,2680,2621,3586,2420,3540,2315,2359,3763,1459,1784,1894,1736,1840,1679,1630,1252,1198,6131,6063,6375,7525,6744,6662,6819,6909,7153,7073,6216,6292,6602,6440,6521,6007,7298,7421,7983,7854,7796,7908,1393,4898,5394,5805,5735,5886,5334,5278,5215,5154,996,1107", "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" + "endOffsets": "8544,4061,4312,4228,4131,884,937,990,7668,7732,8130,8071,1387,4783,4892,4688,4616,4531,5729,5662,5578,5023,2100,2037,3534,1563,1624,5129,2192,4415,7788,3964,3693,2251,2561,2879,2309,3455,3383,3321,3088,3037,2933,2984,3139,3200,2615,3892,3263,3757,2513,2819,2763,2674,3643,2465,3580,2353,2414,3825,1509,1834,1942,1778,1888,1730,1673,1302,1246,6210,6125,6434,7616,6813,6738,6903,7067,7292,7147,6286,6369,6656,6515,6596,6057,7415,7519,8019,7902,7848,7977,1453,4961,5475,5880,5799,5975,5388,5328,5272,5209,1101,1192" }, "to": { "startLines": "18,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124", @@ -162,22 +78,20 @@ } }, { - "source": "C:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\src\\main\\res\\values\\styles.xml", + "source": "D:\\college4\\soft\\ghnb\\src\\app\\src\\main\\res\\values\\dimens.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": "19,20,21,22,18", + "startColumns": "4,4,4,4,4", + "startOffsets": "783,836,890,944,730", + "endColumns": "51,52,52,51,51", + "endOffsets": "830,884,938,991,777" }, "to": { - "startLines": "125,129,133,137,140,144,148,152,156,160,164", - "startColumns": "4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "8124,8328,8539,8746,8906,9089,9274,9459,9662,9868,10051", - "endLines": "128,132,136,139,143,147,151,155,159,163,167", - "endColumns": "12,12,12,12,12,12,12,12,12,12,12", - "endOffsets": "8323,8534,8741,8901,9084,9269,9454,9657,9863,10046,10247" + "startLines": "13,14,15,16,17", + "startColumns": "4,4,4,4,4", + "startOffsets": "477,529,582,635,687", + "endColumns": "51,52,52,51,51", + "endOffsets": "524,577,630,682,734" } } ] diff --git a/src/app/build/intermediates/processed_res/debug/out/resources-debug.ap_ b/src/app/build/intermediates/processed_res/debug/out/resources-debug.ap_ index 15063ff6..5b2dd3b8 100644 Binary files a/src/app/build/intermediates/processed_res/debug/out/resources-debug.ap_ and b/src/app/build/intermediates/processed_res/debug/out/resources-debug.ap_ differ diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/6fb608442905b936dce52f16a181c025151faf92e41d064ee3771f89d763e519_5.jar b/src/app/build/intermediates/project_dex_archive/debug/out/6fb608442905b936dce52f16a181c025151faf92e41d064ee3771f89d763e519_5.jar index 5aec7fce..9ff90d93 100644 Binary files a/src/app/build/intermediates/project_dex_archive/debug/out/6fb608442905b936dce52f16a181c025151faf92e41d064ee3771f89d763e519_5.jar and b/src/app/build/intermediates/project_dex_archive/debug/out/6fb608442905b936dce52f16a181c025151faf92e41d064ee3771f89d763e519_5.jar differ diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Contact.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Contact.dex index 32be5fc9..2f67bd07 100644 Binary files a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Contact.dex and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Contact.dex differ diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$CallNote.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$CallNote.dex index b845b4e2..485f34bb 100644 Binary files a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$CallNote.dex and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$CallNote.dex differ diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$DataColumns.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$DataColumns.dex index 1c0dee7a..2b0d946c 100644 Binary files a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$DataColumns.dex and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$DataColumns.dex differ diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$DataConstants.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$DataConstants.dex index 3ba5a357..a60f83d0 100644 Binary files a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$DataConstants.dex and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$DataConstants.dex differ diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$NoteColumns.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$NoteColumns.dex index 3e6ef4ea..81c3fc2a 100644 Binary files a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$NoteColumns.dex and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$NoteColumns.dex differ diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$TextNote.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$TextNote.dex index 9f409497..99781f54 100644 Binary files a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$TextNote.dex and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$TextNote.dex differ diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes.dex index e2144f07..55dfbd27 100644 Binary files a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes.dex and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes.dex differ diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/NotesDatabaseHelper$TABLE.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/NotesDatabaseHelper$TABLE.dex index 00400e42..6b4a4698 100644 Binary files a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/NotesDatabaseHelper$TABLE.dex and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/NotesDatabaseHelper$TABLE.dex differ diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/NotesDatabaseHelper.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/NotesDatabaseHelper.dex index 20e87a9e..0563670e 100644 Binary files a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/NotesDatabaseHelper.dex and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/NotesDatabaseHelper.dex differ diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/NotesProvider.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/NotesProvider.dex index 028d8ecc..33c0125b 100644 Binary files a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/NotesProvider.dex and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/NotesProvider.dex differ diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/MetaData.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/MetaData.dex index a55abb88..8f17e712 100644 Binary files a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/MetaData.dex and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/MetaData.dex differ diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/Node.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/Node.dex index e43108d5..e2055dc1 100644 Binary files a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/Node.dex and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/Node.dex differ diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/SqlData.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/SqlData.dex index a6268696..f51d63bd 100644 Binary files a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/SqlData.dex and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/SqlData.dex differ diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/SqlNote.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/SqlNote.dex index fa9fd36b..2aba33b3 100644 Binary files a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/SqlNote.dex and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/SqlNote.dex differ diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/Task.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/Task.dex index 137bd023..67e31de8 100644 Binary files a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/Task.dex and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/Task.dex differ diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/TaskList.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/TaskList.dex index 82a15e21..60b9e396 100644 Binary files a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/TaskList.dex and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/TaskList.dex differ diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/exception/ActionFailureException.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/exception/ActionFailureException.dex index ff466b5b..7009519c 100644 Binary files a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/exception/ActionFailureException.dex and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/exception/ActionFailureException.dex differ diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/exception/NetworkFailureException.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/exception/NetworkFailureException.dex index c3c8e6aa..e2dff47d 100644 Binary files a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/exception/NetworkFailureException.dex and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/exception/NetworkFailureException.dex differ diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskASyncTask$1.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskASyncTask$1.dex index b145141d..46602e0e 100644 Binary files a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskASyncTask$1.dex and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskASyncTask$1.dex differ diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskASyncTask$OnCompleteListener.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskASyncTask$OnCompleteListener.dex index 9db738af..64d96b3f 100644 Binary files a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskASyncTask$OnCompleteListener.dex and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskASyncTask$OnCompleteListener.dex differ diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskASyncTask.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskASyncTask.dex index 7882433f..10e31341 100644 Binary files a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskASyncTask.dex and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskASyncTask.dex differ diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskClient.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskClient.dex index 0e75b17f..29cbbbf8 100644 Binary files a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskClient.dex and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskClient.dex differ diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskManager.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskManager.dex index 2972d40a..989df850 100644 Binary files a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskManager.dex and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskManager.dex differ diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskSyncService$1.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskSyncService$1.dex index e65e5b68..212c30c1 100644 Binary files a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskSyncService$1.dex and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskSyncService$1.dex differ diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskSyncService.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskSyncService.dex index cc8addfa..84e3cec3 100644 Binary files a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskSyncService.dex and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskSyncService.dex differ diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/Note$NoteData.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/Note$NoteData.dex index 234fe748..b8db69cd 100644 Binary files a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/Note$NoteData.dex and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/Note$NoteData.dex differ diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/Note.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/Note.dex index 00800a07..ec0402c0 100644 Binary files a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/Note.dex and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/Note.dex differ diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/WorkingNote$NoteSettingChangedListener.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/WorkingNote$NoteSettingChangedListener.dex index 4cc87c9e..5fd517e1 100644 Binary files a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/WorkingNote$NoteSettingChangedListener.dex and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/WorkingNote$NoteSettingChangedListener.dex differ diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/WorkingNote.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/WorkingNote.dex index 2c8f09ce..da7b3ec3 100644 Binary files a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/WorkingNote.dex and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/WorkingNote.dex differ diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/BackupUtils$TextExport.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/BackupUtils$TextExport.dex index 4ec8e868..8f924659 100644 Binary files a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/BackupUtils$TextExport.dex and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/BackupUtils$TextExport.dex differ diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/BackupUtils.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/BackupUtils.dex index d474cc6e..a6a69426 100644 Binary files a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/BackupUtils.dex and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/BackupUtils.dex differ diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/DataUtils.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/DataUtils.dex index b6874340..91d53dfc 100644 Binary files a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/DataUtils.dex and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/DataUtils.dex differ diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/GTaskStringUtils.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/GTaskStringUtils.dex index fc4e9947..0215fa67 100644 Binary files a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/GTaskStringUtils.dex and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/GTaskStringUtils.dex differ diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser$NoteBgResources.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser$NoteBgResources.dex index 20fbb2d3..33322187 100644 Binary files a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser$NoteBgResources.dex and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser$NoteBgResources.dex differ diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser$NoteItemBgResources.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser$NoteItemBgResources.dex index fdbccf94..129d5d9e 100644 Binary files a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser$NoteItemBgResources.dex and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser$NoteItemBgResources.dex differ diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser$TextAppearanceResources.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser$TextAppearanceResources.dex index 8b937f64..d4438f60 100644 Binary files a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser$TextAppearanceResources.dex and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser$TextAppearanceResources.dex differ diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser$WidgetBgResources.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser$WidgetBgResources.dex index 6924a990..5d8cadbb 100644 Binary files a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser$WidgetBgResources.dex and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser$WidgetBgResources.dex differ diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser.dex index 61a84ce1..dfce0f18 100644 Binary files a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser.dex and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser.dex differ diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/AlarmAlertActivity.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/AlarmAlertActivity.dex index fe16853e..ffd80dd9 100644 Binary files a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/AlarmAlertActivity.dex and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/AlarmAlertActivity.dex differ diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/AlarmInitReceiver.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/AlarmInitReceiver.dex index 07ef22e8..04d5c912 100644 Binary files a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/AlarmInitReceiver.dex and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/AlarmInitReceiver.dex differ diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/AlarmReceiver.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/AlarmReceiver.dex index 9278ab02..64cbaabf 100644 Binary files a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/AlarmReceiver.dex and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/AlarmReceiver.dex differ diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$1.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$1.dex index eed33502..b1a976d9 100644 Binary files a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$1.dex and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$1.dex differ diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$2.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$2.dex index 88dead1f..97a7ce48 100644 Binary files a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$2.dex and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$2.dex differ diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$3.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$3.dex index afad0e00..5ff69b8d 100644 Binary files a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$3.dex and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$3.dex differ diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$4.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$4.dex index 01e1c188..08f79c9b 100644 Binary files a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$4.dex and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$4.dex differ diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$OnDateTimeChangedListener.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$OnDateTimeChangedListener.dex index 0df26556..e26f40f4 100644 Binary files a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$OnDateTimeChangedListener.dex and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$OnDateTimeChangedListener.dex differ diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker.dex index e1205dd8..e776717e 100644 Binary files a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker.dex and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker.dex differ diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePickerDialog$1.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePickerDialog$1.dex index 2c10036a..379d2539 100644 Binary files a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePickerDialog$1.dex and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePickerDialog$1.dex differ diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePickerDialog$OnDateTimeSetListener.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePickerDialog$OnDateTimeSetListener.dex index d9419a5d..b8ecb0a7 100644 Binary files a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePickerDialog$OnDateTimeSetListener.dex and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePickerDialog$OnDateTimeSetListener.dex differ diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePickerDialog.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePickerDialog.dex index 5bba515f..fc3abd9f 100644 Binary files a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePickerDialog.dex and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePickerDialog.dex differ diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DropdownMenu$1.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DropdownMenu$1.dex index 49a8b166..a3554460 100644 Binary files a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DropdownMenu$1.dex and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DropdownMenu$1.dex differ diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DropdownMenu.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DropdownMenu.dex index 92250f26..cfd9d917 100644 Binary files a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DropdownMenu.dex and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DropdownMenu.dex differ diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/FoldersListAdapter$FolderListItem.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/FoldersListAdapter$FolderListItem.dex index 1f9408f6..b8013060 100644 Binary files a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/FoldersListAdapter$FolderListItem.dex and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/FoldersListAdapter$FolderListItem.dex differ diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/FoldersListAdapter.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/FoldersListAdapter.dex index cce08c43..987c31f1 100644 Binary files a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/FoldersListAdapter.dex and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/FoldersListAdapter.dex differ diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$1.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$1.dex index 1edfd0a8..cbe131f7 100644 Binary files a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$1.dex and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$1.dex differ diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$2.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$2.dex index bc46bd9a..bee07ce0 100644 Binary files a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$2.dex and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$2.dex differ diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$3.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$3.dex index 6e546854..7dddbe88 100644 Binary files a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$3.dex and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$3.dex differ diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$HeadViewHolder.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$HeadViewHolder.dex index 3a9b0bf6..a2bbe0e4 100644 Binary files a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$HeadViewHolder.dex and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$HeadViewHolder.dex differ diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity.dex index 16b73733..22b954d6 100644 Binary files a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity.dex and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity.dex differ diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditText$1.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditText$1.dex index 59153307..1a6e15e4 100644 Binary files a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditText$1.dex and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditText$1.dex differ diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditText$OnTextViewChangeListener.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditText$OnTextViewChangeListener.dex index 1323e64f..ff32b286 100644 Binary files a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditText$OnTextViewChangeListener.dex and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditText$OnTextViewChangeListener.dex differ diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditText.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditText.dex index 70d2682f..ab9e4c58 100644 Binary files a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditText.dex and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditText.dex differ diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteItemData.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteItemData.dex index bc0b0bfb..8eba3468 100644 Binary files a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteItemData.dex and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteItemData.dex differ diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$1.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$1.dex index c95399db..d88e05c1 100644 Binary files a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$1.dex and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$1.dex differ diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$2.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$2.dex index 79c670f2..a6b00e70 100644 Binary files a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$2.dex and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$2.dex differ diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$3.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$3.dex index ad34861e..a6f4a8a6 100644 Binary files a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$3.dex and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$3.dex differ diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$4.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$4.dex index a0a58e1e..abc541d2 100644 Binary files a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$4.dex and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$4.dex differ diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$5.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$5.dex index b419ff20..09951350 100644 Binary files a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$5.dex and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$5.dex differ diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$6.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$6.dex index 8e51dd73..c6e2fe7f 100644 Binary files a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$6.dex and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$6.dex differ diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$7.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$7.dex index 1519f8d3..bdf64e1f 100644 Binary files a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$7.dex and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$7.dex differ diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$8.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$8.dex index 09676c5e..d9f96477 100644 Binary files a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$8.dex and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$8.dex differ diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$9.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$9.dex index 79b3edd0..5423fac6 100644 Binary files a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$9.dex and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$9.dex differ diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$BackgroundQueryHandler.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$BackgroundQueryHandler.dex index 2b33a923..7b2eb4fc 100644 Binary files a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$BackgroundQueryHandler.dex and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$BackgroundQueryHandler.dex differ diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ListEditState.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ListEditState.dex index 74086ad2..83194ec4 100644 Binary files a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ListEditState.dex and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ListEditState.dex differ diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback$1.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback$1.dex index 5be9167a..357ed7c8 100644 Binary files a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback$1.dex and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback$1.dex differ diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback$2.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback$2.dex index a062b8dd..a1a53913 100644 Binary files a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback$2.dex and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback$2.dex differ diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback.dex index 9463e101..5e799ad2 100644 Binary files a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback.dex and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback.dex differ diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$NewNoteOnTouchListener.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$NewNoteOnTouchListener.dex index dff3aea3..20777331 100644 Binary files a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$NewNoteOnTouchListener.dex and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$NewNoteOnTouchListener.dex differ diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.dex index 39389fda..b279e4b0 100644 Binary files a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.dex and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.dex differ diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity.dex index 0f4a76ca..28055022 100644 Binary files a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity.dex and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity.dex differ diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListAdapter$AppWidgetAttribute.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListAdapter$AppWidgetAttribute.dex index a0cf8e6e..b2e4069e 100644 Binary files a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListAdapter$AppWidgetAttribute.dex and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListAdapter$AppWidgetAttribute.dex differ diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListAdapter.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListAdapter.dex index 68f5579c..3456bf5a 100644 Binary files a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListAdapter.dex and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListAdapter.dex differ diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListItem.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListItem.dex index e5b839dc..990465b9 100644 Binary files a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListItem.dex and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListItem.dex differ diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$1.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$1.dex index 14d6a26b..7f8339b3 100644 Binary files a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$1.dex and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$1.dex differ diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$2.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$2.dex index 99e75dd6..c665855b 100644 Binary files a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$2.dex and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$2.dex differ diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$3.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$3.dex index 80233e5c..afc21678 100644 Binary files a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$3.dex and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$3.dex differ diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$4.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$4.dex index 5919360f..c75dcffa 100644 Binary files a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$4.dex and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$4.dex differ diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$5.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$5.dex index a5a02afb..5a37d5ac 100644 Binary files a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$5.dex and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$5.dex differ diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$6.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$6.dex index 194cc494..d79be5e6 100644 Binary files a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$6.dex and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$6.dex differ diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$7.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$7.dex index 48610141..92aba603 100644 Binary files a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$7.dex and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$7.dex differ diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$8.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$8.dex index 5e41302d..f42000d1 100644 Binary files a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$8.dex and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$8.dex differ diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$GTaskReceiver.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$GTaskReceiver.dex index 8f2b93dd..4303e64e 100644 Binary files a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$GTaskReceiver.dex and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$GTaskReceiver.dex differ diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity.dex index 4403885f..3fc49771 100644 Binary files a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity.dex and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity.dex differ diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/widget/NoteWidgetProvider.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/widget/NoteWidgetProvider.dex index 47fd474c..ea0e4da8 100644 Binary files a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/widget/NoteWidgetProvider.dex and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/widget/NoteWidgetProvider.dex differ diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/widget/NoteWidgetProvider_2x.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/widget/NoteWidgetProvider_2x.dex index a2738caf..8310109c 100644 Binary files a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/widget/NoteWidgetProvider_2x.dex and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/widget/NoteWidgetProvider_2x.dex differ diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/widget/NoteWidgetProvider_4x.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/widget/NoteWidgetProvider_4x.dex index 10f69481..d5d0f8db 100644 Binary files a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/widget/NoteWidgetProvider_4x.dex and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/widget/NoteWidgetProvider_4x.dex differ diff --git a/src/app/build/intermediates/signing_config_versions/debug/signing-config-versions.json b/src/app/build/intermediates/signing_config_versions/debug/signing-config-versions.json index 51f6368b..1920ca85 100644 --- a/src/app/build/intermediates/signing_config_versions/debug/signing-config-versions.json +++ b/src/app/build/intermediates/signing_config_versions/debug/signing-config-versions.json @@ -1 +1 @@ -{"enableV1Signing":false,"enableV2Signing":true,"enableV3Signing":false,"enableV4Signing":false} \ No newline at end of file +{"enableV1Signing":true,"enableV2Signing":false,"enableV3Signing":false,"enableV4Signing":false} \ No newline at end of file diff --git a/src/app/build/intermediates/source_set_path_map/debug/file-map.txt b/src/app/build/intermediates/source_set_path_map/debug/file-map.txt index 7ea00043..57b22956 100644 --- a/src/app/build/intermediates/source_set_path_map/debug/file-map.txt +++ b/src/app/build/intermediates/source_set_path_map/debug/file-map.txt @@ -1,7 +1,7 @@ -net.micode.notes.app-pngs-0 C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\build\generated\res\pngs\debug -net.micode.notes.app-resValues-1 C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\build\generated\res\resValues\debug -net.micode.notes.app-packageDebugResources-2 C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\build\intermediates\incremental\debug\packageDebugResources\merged.dir -net.micode.notes.app-packageDebugResources-3 C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\build\intermediates\incremental\debug\packageDebugResources\stripped.dir -net.micode.notes.app-merged_res-4 C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\build\intermediates\merged_res\debug -net.micode.notes.app-debug-5 C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\src\debug\res -net.micode.notes.app-main-6 C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\src\main\res +net.micode.notes.app-pngs-0 D:\college4\soft\ghnb\src\app\build\generated\res\pngs\debug +net.micode.notes.app-resValues-1 D:\college4\soft\ghnb\src\app\build\generated\res\resValues\debug +net.micode.notes.app-packageDebugResources-2 D:\college4\soft\ghnb\src\app\build\intermediates\incremental\debug\packageDebugResources\merged.dir +net.micode.notes.app-packageDebugResources-3 D:\college4\soft\ghnb\src\app\build\intermediates\incremental\debug\packageDebugResources\stripped.dir +net.micode.notes.app-merged_res-4 D:\college4\soft\ghnb\src\app\build\intermediates\merged_res\debug +net.micode.notes.app-debug-5 D:\college4\soft\ghnb\src\app\src\debug\res +net.micode.notes.app-main-6 D:\college4\soft\ghnb\src\app\src\main\res diff --git a/src/app/build/intermediates/source_set_path_map/debugAndroidTest/file-map.txt b/src/app/build/intermediates/source_set_path_map/debugAndroidTest/file-map.txt index 67a95d4f..d79d2308 100644 --- a/src/app/build/intermediates/source_set_path_map/debugAndroidTest/file-map.txt +++ b/src/app/build/intermediates/source_set_path_map/debugAndroidTest/file-map.txt @@ -1,4 +1,4 @@ -net.micode.notes.test.app-androidTest-0 C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\build\generated\res\resValues\androidTest\debug -net.micode.notes.test.app-mergeDebugAndroidTestResources-1 C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\build\intermediates\incremental\debugAndroidTest\mergeDebugAndroidTestResources\merged.dir -net.micode.notes.test.app-mergeDebugAndroidTestResources-2 C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\build\intermediates\incremental\debugAndroidTest\mergeDebugAndroidTestResources\stripped.dir -net.micode.notes.test.app-merged_res-3 C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\build\intermediates\merged_res\debugAndroidTest +net.micode.notes.test.app-androidTest-0 D:\college4\soft\ghnb\src\app\build\generated\res\resValues\androidTest\debug +net.micode.notes.test.app-mergeDebugAndroidTestResources-1 D:\college4\soft\ghnb\src\app\build\intermediates\incremental\debugAndroidTest\mergeDebugAndroidTestResources\merged.dir +net.micode.notes.test.app-mergeDebugAndroidTestResources-2 D:\college4\soft\ghnb\src\app\build\intermediates\incremental\debugAndroidTest\mergeDebugAndroidTestResources\stripped.dir +net.micode.notes.test.app-merged_res-3 D:\college4\soft\ghnb\src\app\build\intermediates\merged_res\debugAndroidTest diff --git a/src/app/build/outputs/apk/androidTest/debug/app-debug-androidTest.apk b/src/app/build/outputs/apk/androidTest/debug/app-debug-androidTest.apk index 401c3ffc..f0ec1d05 100644 Binary files a/src/app/build/outputs/apk/androidTest/debug/app-debug-androidTest.apk and b/src/app/build/outputs/apk/androidTest/debug/app-debug-androidTest.apk differ diff --git a/src/app/build/outputs/logs/manifest-merger-debug-report.txt b/src/app/build/outputs/logs/manifest-merger-debug-report.txt index 3ddc1a85..7cb8c6e5 100644 --- a/src/app/build/outputs/logs/manifest-merger-debug-report.txt +++ b/src/app/build/outputs/logs/manifest-merger-debug-report.txt @@ -1,233 +1,233 @@ -- Merging decision tree log --- manifest -ADDED from C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\src\main\AndroidManifest.xml:18:1-149:12 -INJECTED from C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\src\main\AndroidManifest.xml:18:1-149:12 -INJECTED from C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\src\main\AndroidManifest.xml:18:1-149:12 -INJECTED from C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\src\main\AndroidManifest.xml:18:1-149:12 -INJECTED from C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\src\main\AndroidManifest.xml:18:1-149:12 -INJECTED from C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\src\main\AndroidManifest.xml:18:1-149:12 -INJECTED from C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\src\main\AndroidManifest.xml:18:1-149:12 +ADDED from D:\college4\soft\ghnb\src\app\src\main\AndroidManifest.xml:18:1-149:12 +INJECTED from D:\college4\soft\ghnb\src\app\src\main\AndroidManifest.xml:18:1-149:12 +INJECTED from D:\college4\soft\ghnb\src\app\src\main\AndroidManifest.xml:18:1-149:12 +INJECTED from D:\college4\soft\ghnb\src\app\src\main\AndroidManifest.xml:18:1-149:12 +INJECTED from D:\college4\soft\ghnb\src\app\src\main\AndroidManifest.xml:18:1-149:12 +INJECTED from D:\college4\soft\ghnb\src\app\src\main\AndroidManifest.xml:18:1-149:12 +INJECTED from D:\college4\soft\ghnb\src\app\src\main\AndroidManifest.xml:18:1-149:12 package - ADDED from C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\src\main\AndroidManifest.xml:19:5-31 - INJECTED from C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\src\main\AndroidManifest.xml - INJECTED from C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\src\main\AndroidManifest.xml + ADDED from D:\college4\soft\ghnb\src\app\src\main\AndroidManifest.xml:19:5-31 + INJECTED from D:\college4\soft\ghnb\src\app\src\main\AndroidManifest.xml + INJECTED from D:\college4\soft\ghnb\src\app\src\main\AndroidManifest.xml android:versionName - ADDED from C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\src\main\AndroidManifest.xml:21:5-30 - INJECTED from C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\src\main\AndroidManifest.xml - INJECTED from C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\src\main\AndroidManifest.xml + ADDED from D:\college4\soft\ghnb\src\app\src\main\AndroidManifest.xml:21:5-30 + INJECTED from D:\college4\soft\ghnb\src\app\src\main\AndroidManifest.xml + INJECTED from D:\college4\soft\ghnb\src\app\src\main\AndroidManifest.xml xmlns:android - ADDED from C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\src\main\AndroidManifest.xml:18:11-69 + ADDED from D:\college4\soft\ghnb\src\app\src\main\AndroidManifest.xml:18:11-69 android:versionCode - ADDED from C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\src\main\AndroidManifest.xml:20:5-28 - INJECTED from C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\src\main\AndroidManifest.xml - INJECTED from C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\src\main\AndroidManifest.xml + ADDED from D:\college4\soft\ghnb\src\app\src\main\AndroidManifest.xml:20:5-28 + INJECTED from D:\college4\soft\ghnb\src\app\src\main\AndroidManifest.xml + INJECTED from D:\college4\soft\ghnb\src\app\src\main\AndroidManifest.xml uses-sdk -ADDED from C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\src\main\AndroidManifest.xml:23:5-44 -INJECTED from C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\src\main\AndroidManifest.xml:23:5-44 -INJECTED from C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\src\main\AndroidManifest.xml:23:5-44 -INJECTED from C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\src\main\AndroidManifest.xml:23:5-44 -INJECTED from C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\src\main\AndroidManifest.xml:23:5-44 +ADDED from D:\college4\soft\ghnb\src\app\src\main\AndroidManifest.xml:23:5-44 +INJECTED from D:\college4\soft\ghnb\src\app\src\main\AndroidManifest.xml:23:5-44 +INJECTED from D:\college4\soft\ghnb\src\app\src\main\AndroidManifest.xml:23:5-44 +INJECTED from D:\college4\soft\ghnb\src\app\src\main\AndroidManifest.xml:23:5-44 +INJECTED from D:\college4\soft\ghnb\src\app\src\main\AndroidManifest.xml:23:5-44 android:targetSdkVersion - INJECTED from C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\src\main\AndroidManifest.xml - ADDED from C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\src\main\AndroidManifest.xml:23:5-44 - INJECTED from C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\src\main\AndroidManifest.xml + INJECTED from D:\college4\soft\ghnb\src\app\src\main\AndroidManifest.xml + ADDED from D:\college4\soft\ghnb\src\app\src\main\AndroidManifest.xml:23:5-44 + INJECTED from D:\college4\soft\ghnb\src\app\src\main\AndroidManifest.xml android:minSdkVersion - ADDED from C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\src\main\AndroidManifest.xml:23:15-41 - INJECTED from C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\src\main\AndroidManifest.xml - INJECTED from C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\src\main\AndroidManifest.xml + ADDED from D:\college4\soft\ghnb\src\app\src\main\AndroidManifest.xml:23:15-41 + INJECTED from D:\college4\soft\ghnb\src\app\src\main\AndroidManifest.xml + INJECTED from D:\college4\soft\ghnb\src\app\src\main\AndroidManifest.xml uses-permission#android.permission.WRITE_EXTERNAL_STORAGE -ADDED from C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\src\main\AndroidManifest.xml:25:5-81 +ADDED from D:\college4\soft\ghnb\src\app\src\main\AndroidManifest.xml:25:5-81 android:name - ADDED from C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\src\main\AndroidManifest.xml:25:22-78 + ADDED from D:\college4\soft\ghnb\src\app\src\main\AndroidManifest.xml:25:22-78 uses-permission#com.android.launcher.permission.INSTALL_SHORTCUT -ADDED from C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\src\main\AndroidManifest.xml:26:5-88 +ADDED from D:\college4\soft\ghnb\src\app\src\main\AndroidManifest.xml:26:5-88 android:name - ADDED from C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\src\main\AndroidManifest.xml:26:22-85 + ADDED from D:\college4\soft\ghnb\src\app\src\main\AndroidManifest.xml:26:22-85 uses-permission#android.permission.INTERNET -ADDED from C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\src\main\AndroidManifest.xml:27:5-67 +ADDED from D:\college4\soft\ghnb\src\app\src\main\AndroidManifest.xml:27:5-67 android:name - ADDED from C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\src\main\AndroidManifest.xml:27:22-64 + ADDED from D:\college4\soft\ghnb\src\app\src\main\AndroidManifest.xml:27:22-64 uses-permission#android.permission.READ_CONTACTS -ADDED from C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\src\main\AndroidManifest.xml:28:5-72 +ADDED from D:\college4\soft\ghnb\src\app\src\main\AndroidManifest.xml:28:5-72 android:name - ADDED from C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\src\main\AndroidManifest.xml:28:22-69 + ADDED from D:\college4\soft\ghnb\src\app\src\main\AndroidManifest.xml:28:22-69 uses-permission#android.permission.MANAGE_ACCOUNTS -ADDED from C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\src\main\AndroidManifest.xml:29:5-74 +ADDED from D:\college4\soft\ghnb\src\app\src\main\AndroidManifest.xml:29:5-74 android:name - ADDED from C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\src\main\AndroidManifest.xml:29:22-71 + ADDED from D:\college4\soft\ghnb\src\app\src\main\AndroidManifest.xml:29:22-71 uses-permission#android.permission.AUTHENTICATE_ACCOUNTS -ADDED from C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\src\main\AndroidManifest.xml:30:5-80 +ADDED from D:\college4\soft\ghnb\src\app\src\main\AndroidManifest.xml:30:5-80 android:name - ADDED from C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\src\main\AndroidManifest.xml:30:22-77 + ADDED from D:\college4\soft\ghnb\src\app\src\main\AndroidManifest.xml:30:22-77 uses-permission#android.permission.GET_ACCOUNTS -ADDED from C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\src\main\AndroidManifest.xml:31:5-71 +ADDED from D:\college4\soft\ghnb\src\app\src\main\AndroidManifest.xml:31:5-71 android:name - ADDED from C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\src\main\AndroidManifest.xml:31:22-68 + ADDED from D:\college4\soft\ghnb\src\app\src\main\AndroidManifest.xml:31:22-68 uses-permission#android.permission.USE_CREDENTIALS -ADDED from C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\src\main\AndroidManifest.xml:32:5-74 +ADDED from D:\college4\soft\ghnb\src\app\src\main\AndroidManifest.xml:32:5-74 android:name - ADDED from C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\src\main\AndroidManifest.xml:32:22-71 + ADDED from D:\college4\soft\ghnb\src\app\src\main\AndroidManifest.xml:32:22-71 uses-permission#android.permission.RECEIVE_BOOT_COMPLETED -ADDED from C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\src\main\AndroidManifest.xml:33:5-81 +ADDED from D:\college4\soft\ghnb\src\app\src\main\AndroidManifest.xml:33:5-81 android:name - ADDED from C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\src\main\AndroidManifest.xml:33:22-78 + ADDED from D:\college4\soft\ghnb\src\app\src\main\AndroidManifest.xml:33:22-78 application -ADDED from C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\src\main\AndroidManifest.xml:35:5-148:19 +ADDED from D:\college4\soft\ghnb\src\app\src\main\AndroidManifest.xml:35:5-148:19 android:label - ADDED from C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\src\main\AndroidManifest.xml:37:9-41 + ADDED from D:\college4\soft\ghnb\src\app\src\main\AndroidManifest.xml:37:9-41 android:icon - ADDED from C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\src\main\AndroidManifest.xml:36:9-42 + ADDED from D:\college4\soft\ghnb\src\app\src\main\AndroidManifest.xml:36:9-42 activity#net.micode.notes.ui.NotesListActivity -ADDED from C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\src\main\AndroidManifest.xml:38:9-50:20 +ADDED from D:\college4\soft\ghnb\src\app\src\main\AndroidManifest.xml:38:9-50:20 android:label - ADDED from C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\src\main\AndroidManifest.xml:41:13-45 + ADDED from D:\college4\soft\ghnb\src\app\src\main\AndroidManifest.xml:41:13-45 android:launchMode - ADDED from C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\src\main\AndroidManifest.xml:42:13-43 + ADDED from D:\college4\soft\ghnb\src\app\src\main\AndroidManifest.xml:42:13-43 android:windowSoftInputMode - ADDED from C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\src\main\AndroidManifest.xml:44:13-52 + ADDED from D:\college4\soft\ghnb\src\app\src\main\AndroidManifest.xml:44:13-52 android:configChanges - ADDED from C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\src\main\AndroidManifest.xml:40:13-74 + ADDED from D:\college4\soft\ghnb\src\app\src\main\AndroidManifest.xml:40:13-74 android:theme - ADDED from C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\src\main\AndroidManifest.xml:43:13-45 + ADDED from D:\college4\soft\ghnb\src\app\src\main\AndroidManifest.xml:43:13-45 android:name - ADDED from C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\src\main\AndroidManifest.xml:39:13-49 + ADDED from D:\college4\soft\ghnb\src\app\src\main\AndroidManifest.xml:39:13-49 intent-filter#action:name:android.intent.action.MAIN+category:name:android.intent.category.LAUNCHER -ADDED from C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\src\main\AndroidManifest.xml:46:13-49:29 +ADDED from D:\college4\soft\ghnb\src\app\src\main\AndroidManifest.xml:46:13-49:29 action#android.intent.action.MAIN -ADDED from C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\src\main\AndroidManifest.xml:47:17-69 +ADDED from D:\college4\soft\ghnb\src\app\src\main\AndroidManifest.xml:47:17-69 android:name - ADDED from C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\src\main\AndroidManifest.xml:47:25-66 + ADDED from D:\college4\soft\ghnb\src\app\src\main\AndroidManifest.xml:47:25-66 category#android.intent.category.LAUNCHER -ADDED from C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\src\main\AndroidManifest.xml:48:17-77 +ADDED from D:\college4\soft\ghnb\src\app\src\main\AndroidManifest.xml:48:17-77 android:name - ADDED from C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\src\main\AndroidManifest.xml:48:27-74 + ADDED from D:\college4\soft\ghnb\src\app\src\main\AndroidManifest.xml:48:27-74 activity#net.micode.notes.ui.NoteEditActivity -ADDED from C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\src\main\AndroidManifest.xml:52:9-80:20 +ADDED from D:\college4\soft\ghnb\src\app\src\main\AndroidManifest.xml:52:9-80:20 android:launchMode - ADDED from C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\src\main\AndroidManifest.xml:55:13-43 + ADDED from D:\college4\soft\ghnb\src\app\src\main\AndroidManifest.xml:55:13-43 android:configChanges - ADDED from C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\src\main\AndroidManifest.xml:54:13-74 + ADDED from D:\college4\soft\ghnb\src\app\src\main\AndroidManifest.xml:54:13-74 android:theme - ADDED from C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\src\main\AndroidManifest.xml:56:13-45 + ADDED from D:\college4\soft\ghnb\src\app\src\main\AndroidManifest.xml:56:13-45 android:name - ADDED from C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\src\main\AndroidManifest.xml:53:13-48 + ADDED from D:\college4\soft\ghnb\src\app\src\main\AndroidManifest.xml:53:13-48 intent-filter#action:name:android.intent.action.VIEW+category:name:android.intent.category.DEFAULT+data:mimeType:vnd.android.cursor.item/call_note+data:mimeType:vnd.android.cursor.item/text_note -ADDED from C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\src\main\AndroidManifest.xml:58:13-63:29 +ADDED from D:\college4\soft\ghnb\src\app\src\main\AndroidManifest.xml:58:13-63:29 action#android.intent.action.VIEW -ADDED from C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\src\main\AndroidManifest.xml:59:17-69 +ADDED from D:\college4\soft\ghnb\src\app\src\main\AndroidManifest.xml:59:17-69 android:name - ADDED from C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\src\main\AndroidManifest.xml:59:25-66 + ADDED from D:\college4\soft\ghnb\src\app\src\main\AndroidManifest.xml:59:25-66 category#android.intent.category.DEFAULT -ADDED from C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\src\main\AndroidManifest.xml:60:17-76 +ADDED from D:\college4\soft\ghnb\src\app\src\main\AndroidManifest.xml:60:17-76 android:name - ADDED from C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\src\main\AndroidManifest.xml:60:27-73 + ADDED from D:\college4\soft\ghnb\src\app\src\main\AndroidManifest.xml:60:27-73 data -ADDED from C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\src\main\AndroidManifest.xml:61:17-78 +ADDED from D:\college4\soft\ghnb\src\app\src\main\AndroidManifest.xml:61:17-78 android:mimeType - ADDED from C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\src\main\AndroidManifest.xml:61:23-75 + ADDED from D:\college4\soft\ghnb\src\app\src\main\AndroidManifest.xml:61:23-75 intent-filter#action:name:android.intent.action.INSERT_OR_EDIT+category:name:android.intent.category.DEFAULT+data:mimeType:vnd.android.cursor.item/call_note+data:mimeType:vnd.android.cursor.item/text_note -ADDED from C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\src\main\AndroidManifest.xml:65:13-70:29 +ADDED from D:\college4\soft\ghnb\src\app\src\main\AndroidManifest.xml:65:13-70:29 action#android.intent.action.INSERT_OR_EDIT -ADDED from C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\src\main\AndroidManifest.xml:66:17-79 +ADDED from D:\college4\soft\ghnb\src\app\src\main\AndroidManifest.xml:66:17-79 android:name - ADDED from C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\src\main\AndroidManifest.xml:66:25-76 + ADDED from D:\college4\soft\ghnb\src\app\src\main\AndroidManifest.xml:66:25-76 intent-filter#action:name:android.intent.action.SEARCH+category:name:android.intent.category.DEFAULT -ADDED from C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\src\main\AndroidManifest.xml:72:13-75:29 +ADDED from D:\college4\soft\ghnb\src\app\src\main\AndroidManifest.xml:72:13-75:29 action#android.intent.action.SEARCH -ADDED from C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\src\main\AndroidManifest.xml:73:17-71 +ADDED from D:\college4\soft\ghnb\src\app\src\main\AndroidManifest.xml:73:17-71 android:name - ADDED from C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\src\main\AndroidManifest.xml:73:25-68 + ADDED from D:\college4\soft\ghnb\src\app\src\main\AndroidManifest.xml:73:25-68 meta-data#android.app.searchable -ADDED from C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\src\main\AndroidManifest.xml:77:13-79:54 +ADDED from D:\college4\soft\ghnb\src\app\src\main\AndroidManifest.xml:77:13-79:54 android:resource - ADDED from C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\src\main\AndroidManifest.xml:79:17-51 + ADDED from D:\college4\soft\ghnb\src\app\src\main\AndroidManifest.xml:79:17-51 android:name - ADDED from C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\src\main\AndroidManifest.xml:78:17-54 + ADDED from D:\college4\soft\ghnb\src\app\src\main\AndroidManifest.xml:78:17-54 provider#net.micode.notes.data.NotesProvider -ADDED from C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\src\main\AndroidManifest.xml:82:9-85:43 +ADDED from D:\college4\soft\ghnb\src\app\src\main\AndroidManifest.xml:82:9-85:43 android:authorities - ADDED from C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\src\main\AndroidManifest.xml:84:13-47 + ADDED from D:\college4\soft\ghnb\src\app\src\main\AndroidManifest.xml:84:13-47 android:multiprocess - ADDED from C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\src\main\AndroidManifest.xml:85:13-40 + ADDED from D:\college4\soft\ghnb\src\app\src\main\AndroidManifest.xml:85:13-40 android:name - ADDED from C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\src\main\AndroidManifest.xml:83:13-63 + ADDED from D:\college4\soft\ghnb\src\app\src\main\AndroidManifest.xml:83:13-63 receiver#net.micode.notes.widget.NoteWidgetProvider_2x -ADDED from C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\src\main\AndroidManifest.xml:87:9-99:20 +ADDED from D:\college4\soft\ghnb\src\app\src\main\AndroidManifest.xml:87:9-99:20 android:label - ADDED from C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\src\main\AndroidManifest.xml:89:13-50 + ADDED from D:\college4\soft\ghnb\src\app\src\main\AndroidManifest.xml:89:13-50 android:name - ADDED from C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\src\main\AndroidManifest.xml:88:13-57 + ADDED from D:\college4\soft\ghnb\src\app\src\main\AndroidManifest.xml:88:13-57 intent-filter#action:name:android.appwidget.action.APPWIDGET_DELETED+action:name:android.appwidget.action.APPWIDGET_UPDATE+action:name:android.intent.action.PRIVACY_MODE_CHANGED -ADDED from C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\src\main\AndroidManifest.xml:90:13-94:29 +ADDED from D:\college4\soft\ghnb\src\app\src\main\AndroidManifest.xml:90:13-94:29 action#android.appwidget.action.APPWIDGET_UPDATE -ADDED from C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\src\main\AndroidManifest.xml:91:17-84 +ADDED from D:\college4\soft\ghnb\src\app\src\main\AndroidManifest.xml:91:17-84 android:name - ADDED from C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\src\main\AndroidManifest.xml:91:25-81 + ADDED from D:\college4\soft\ghnb\src\app\src\main\AndroidManifest.xml:91:25-81 action#android.appwidget.action.APPWIDGET_DELETED -ADDED from C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\src\main\AndroidManifest.xml:92:17-85 +ADDED from D:\college4\soft\ghnb\src\app\src\main\AndroidManifest.xml:92:17-85 android:name - ADDED from C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\src\main\AndroidManifest.xml:92:25-82 + ADDED from D:\college4\soft\ghnb\src\app\src\main\AndroidManifest.xml:92:25-82 action#android.intent.action.PRIVACY_MODE_CHANGED -ADDED from C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\src\main\AndroidManifest.xml:93:17-85 +ADDED from D:\college4\soft\ghnb\src\app\src\main\AndroidManifest.xml:93:17-85 android:name - ADDED from C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\src\main\AndroidManifest.xml:93:25-82 + ADDED from D:\college4\soft\ghnb\src\app\src\main\AndroidManifest.xml:93:25-82 meta-data#android.appwidget.provider -ADDED from C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\src\main\AndroidManifest.xml:96:13-98:58 +ADDED from D:\college4\soft\ghnb\src\app\src\main\AndroidManifest.xml:96:13-98:58 android:resource - ADDED from C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\src\main\AndroidManifest.xml:98:17-55 + ADDED from D:\college4\soft\ghnb\src\app\src\main\AndroidManifest.xml:98:17-55 android:name - ADDED from C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\src\main\AndroidManifest.xml:97:17-58 + ADDED from D:\college4\soft\ghnb\src\app\src\main\AndroidManifest.xml:97:17-58 receiver#net.micode.notes.widget.NoteWidgetProvider_4x -ADDED from C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\src\main\AndroidManifest.xml:100:9-113:20 +ADDED from D:\college4\soft\ghnb\src\app\src\main\AndroidManifest.xml:100:9-113:20 android:label - ADDED from C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\src\main\AndroidManifest.xml:102:13-50 + ADDED from D:\college4\soft\ghnb\src\app\src\main\AndroidManifest.xml:102:13-50 android:name - ADDED from C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\src\main\AndroidManifest.xml:101:13-57 + ADDED from D:\college4\soft\ghnb\src\app\src\main\AndroidManifest.xml:101:13-57 receiver#net.micode.notes.ui.AlarmInitReceiver -ADDED from C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\src\main\AndroidManifest.xml:115:9-119:20 +ADDED from D:\college4\soft\ghnb\src\app\src\main\AndroidManifest.xml:115:9-119:20 android:name - ADDED from C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\src\main\AndroidManifest.xml:115:19-55 + ADDED from D:\college4\soft\ghnb\src\app\src\main\AndroidManifest.xml:115:19-55 intent-filter#action:name:android.intent.action.BOOT_COMPLETED -ADDED from C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\src\main\AndroidManifest.xml:116:13-118:29 +ADDED from D:\college4\soft\ghnb\src\app\src\main\AndroidManifest.xml:116:13-118:29 action#android.intent.action.BOOT_COMPLETED -ADDED from C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\src\main\AndroidManifest.xml:117:17-79 +ADDED from D:\college4\soft\ghnb\src\app\src\main\AndroidManifest.xml:117:17-79 android:name - ADDED from C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\src\main\AndroidManifest.xml:117:25-76 + ADDED from D:\college4\soft\ghnb\src\app\src\main\AndroidManifest.xml:117:25-76 receiver#net.micode.notes.ui.AlarmReceiver -ADDED from C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\src\main\AndroidManifest.xml:121:9-124:20 +ADDED from D:\college4\soft\ghnb\src\app\src\main\AndroidManifest.xml:121:9-124:20 android:process - ADDED from C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\src\main\AndroidManifest.xml:123:13-38 + ADDED from D:\college4\soft\ghnb\src\app\src\main\AndroidManifest.xml:123:13-38 android:name - ADDED from C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\src\main\AndroidManifest.xml:122:13-61 + ADDED from D:\college4\soft\ghnb\src\app\src\main\AndroidManifest.xml:122:13-61 activity#net.micode.notes.ui.AlarmAlertActivity -ADDED from C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\src\main\AndroidManifest.xml:126:9-131:20 +ADDED from D:\college4\soft\ghnb\src\app\src\main\AndroidManifest.xml:126:9-131:20 android:label - ADDED from C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\src\main\AndroidManifest.xml:128:13-45 + ADDED from D:\college4\soft\ghnb\src\app\src\main\AndroidManifest.xml:128:13-45 android:launchMode - ADDED from C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\src\main\AndroidManifest.xml:129:13-48 + ADDED from D:\college4\soft\ghnb\src\app\src\main\AndroidManifest.xml:129:13-48 android:theme - ADDED from C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\src\main\AndroidManifest.xml:130:13-75 + ADDED from D:\college4\soft\ghnb\src\app\src\main\AndroidManifest.xml:130:13-75 android:name - ADDED from C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\src\main\AndroidManifest.xml:127:13-50 + ADDED from D:\college4\soft\ghnb\src\app\src\main\AndroidManifest.xml:127:13-50 activity#net.micode.notes.ui.NotesPreferenceActivity -ADDED from C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\src\main\AndroidManifest.xml:133:9-138:20 +ADDED from D:\college4\soft\ghnb\src\app\src\main\AndroidManifest.xml:133:9-138:20 android:label - ADDED from C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\src\main\AndroidManifest.xml:135:13-54 + ADDED from D:\college4\soft\ghnb\src\app\src\main\AndroidManifest.xml:135:13-54 android:launchMode - ADDED from C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\src\main\AndroidManifest.xml:136:13-43 + ADDED from D:\college4\soft\ghnb\src\app\src\main\AndroidManifest.xml:136:13-43 android:theme - ADDED from C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\src\main\AndroidManifest.xml:137:13-60 + ADDED from D:\college4\soft\ghnb\src\app\src\main\AndroidManifest.xml:137:13-60 android:name - ADDED from C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\src\main\AndroidManifest.xml:134:13-71 + ADDED from D:\college4\soft\ghnb\src\app\src\main\AndroidManifest.xml:134:13-71 service#net.micode.notes.gtask.remote.GTaskSyncService -ADDED from C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\src\main\AndroidManifest.xml:140:9-143:19 +ADDED from D:\college4\soft\ghnb\src\app\src\main\AndroidManifest.xml:140:9-143:19 android:exported - ADDED from C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\src\main\AndroidManifest.xml:142:13-37 + ADDED from D:\college4\soft\ghnb\src\app\src\main\AndroidManifest.xml:142:13-37 android:name - ADDED from C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\src\main\AndroidManifest.xml:141:13-74 + ADDED from D:\college4\soft\ghnb\src\app\src\main\AndroidManifest.xml:141:13-74 meta-data#android.app.default_searchable -ADDED from C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\src\main\AndroidManifest.xml:145:9-147:52 +ADDED from D:\college4\soft\ghnb\src\app\src\main\AndroidManifest.xml:145:9-147:52 android:value - ADDED from C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\src\main\AndroidManifest.xml:147:13-49 + ADDED from D:\college4\soft\ghnb\src\app\src\main\AndroidManifest.xml:147:13-49 android:name - ADDED from C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\src\main\AndroidManifest.xml:146:13-58 + ADDED from D:\college4\soft\ghnb\src\app\src\main\AndroidManifest.xml:146:13-58 diff --git a/src/app/build/tmp/compileDebugJavaWithJavac/previous-compilation-data.bin b/src/app/build/tmp/compileDebugJavaWithJavac/previous-compilation-data.bin index 28c082b3..2a7272aa 100644 Binary files a/src/app/build/tmp/compileDebugJavaWithJavac/previous-compilation-data.bin and b/src/app/build/tmp/compileDebugJavaWithJavac/previous-compilation-data.bin differ diff --git a/src/local.properties b/src/local.properties index 9c401d2b..ac7d5770 100644 --- a/src/local.properties +++ b/src/local.properties @@ -1,8 +1,8 @@ -# This file must *NOT* be checked into Version Control Systems, +## This file must *NOT* be checked into Version Control Systems, # as it contains information specific to your local configuration. # # Location of the SDK. This is only used by Gradle. # For customization when using a Version Control System, please read the # header note. -#Mon Nov 06 19:57:38 CST 2023 -sdk.dir=C:\\Users\\huigenb\\AppData\\Local\\Android\\Sdk +#Mon Dec 18 18:38:27 CST 2023 +sdk.dir=C\:\\Users\\GH\\.androidSDK diff --git a/src/src/net/micode/notes/gtask/data/MetaData.java b/src/src/net/micode/notes/gtask/data/MetaData.java index 3a2050b0..cc0757b5 100644 --- a/src/src/net/micode/notes/gtask/data/MetaData.java +++ b/src/src/net/micode/notes/gtask/data/MetaData.java @@ -23,60 +23,57 @@ import net.micode.notes.tool.GTaskStringUtils; import org.json.JSONException; import org.json.JSONObject; +public class MetaData extends Task { // 定义名为MetaData的类，继承自Task类 + private final static String TAG = MetaData.class.getSimpleName(); // 定义静态字符串TAG，并初始化为MetaData类的简单名称 + private String mRelatedGid = null; // 声明私有字符串变量mRelatedGid，并初始化为null -public class MetaData extends Task { - private final static String TAG = MetaData.class.getSimpleName(); - - private String mRelatedGid = null; - - public void setMeta(String gid, JSONObject metaInfo) { - try { - metaInfo.put(GTaskStringUtils.META_HEAD_GTASK_ID, gid); - } catch (JSONException e) { - Log.e(TAG, "failed to put related gid"); + public void setMeta(String gid, JSONObject metaInfo) { // 定义一个名为setMeta的方法，接受gid和metaInfo两个参数 + try { // 尝试执行以下代码块 + metaInfo.put(GTaskStringUtils.META_HEAD_GTASK_ID, gid); // 向metaInfo中放入键为META_HEAD_GTASK_ID、值为gid的键值对 + } catch (JSONException e) { // 如果捕获到JSONException异常 + Log.e(TAG, "failed to put related gid"); // 记录错误日志："failed to put related gid" } - setNotes(metaInfo.toString()); - setName(GTaskStringUtils.META_NOTE_NAME); + setNotes(metaInfo.toString()); // 调用setNotes方法，将metaInfo转换为字符串后设置为备注信息 + setName(GTaskStringUtils.META_NOTE_NAME); // 调用setName方法，设置名称为META_NOTE_NAME } - public String getRelatedGid() { - return mRelatedGid; + public String getRelatedGid() { // 定义一个名为getRelatedGid的方法 + return mRelatedGid; // 返回mRelatedGid变量的值 } @Override - public boolean isWorthSaving() { - return getNotes() != null; + public boolean isWorthSaving() { // 覆盖父类的isWorthSaving方法 + return getNotes() != null; // 返回是否备注信息不为null } @Override - public void setContentByRemoteJSON(JSONObject js) { - super.setContentByRemoteJSON(js); - if (getNotes() != null) { - try { - JSONObject metaInfo = new JSONObject(getNotes().trim()); - mRelatedGid = metaInfo.getString(GTaskStringUtils.META_HEAD_GTASK_ID); - } catch (JSONException e) { - Log.w(TAG, "failed to get related gid"); - mRelatedGid = null; + public void setContentByRemoteJSON(JSONObject js) { // 覆盖父类的setContentByRemoteJSON方法，接受JSONObject类型的js参数 + super.setContentByRemoteJSON(js); // 调用父类的setContentByRemoteJSON方法 + if (getNotes() != null) { // 如果备注信息不为null + try { // 尝试执行以下代码块 + JSONObject metaInfo = new JSONObject(getNotes().trim()); // 创建新的JSONObject对象metaInfo，通过trim方法去除备注信息的空格 + mRelatedGid = metaInfo.getString(GTaskStringUtils.META_HEAD_GTASK_ID); // 从metaInfo中获取键为META_HEAD_GTASK_ID的值，并设置给mRelatedGid + } catch (JSONException e) { // 如果捕获到JSONException异常 + Log.w(TAG, "failed to get related gid"); // 记录警告日志："failed to get related gid" + mRelatedGid = null; // 将mRelatedGid设置为null } } } @Override - public void setContentByLocalJSON(JSONObject js) { - // this function should not be called - throw new IllegalAccessError("MetaData:setContentByLocalJSON should not be called"); + public void setContentByLocalJSON(JSONObject js) { // 覆盖父类的setContentByLocalJSON方法，接受JSONObject类型的js参数 + // this function should not be called // 注释：不应调用该函数 + throw new IllegalAccessError("MetaData:setContentByLocalJSON should not be called"); // 抛出IllegalAccessError异常，内容为"MetaData:setContentByLocalJSON should not be called" } @Override - public JSONObject getLocalJSONFromContent() { - throw new IllegalAccessError("MetaData:getLocalJSONFromContent should not be called"); + public JSONObject getLocalJSONFromContent() { // 覆盖父类的getLocalJSONFromContent方法 + throw new IllegalAccessError("MetaData:getLocalJSONFromContent should not be called"); // 抛出IllegalAccessError异常，内容为"MetaData:getLocalJSONFromContent should not be called" } @Override - public int getSyncAction(Cursor c) { - throw new IllegalAccessError("MetaData:getSyncAction should not be called"); + public int getSyncAction(Cursor c) { // 覆盖父类的getSyncAction方法，接受Cursor类型的c参数 + throw new IllegalAccessError("MetaData:getSyncAction should not be called"); // 抛出IllegalAccessError异常，内容为"MetaData:getSyncAction should not be called" } - } diff --git a/src/src/net/micode/notes/gtask/data/Node.java b/src/src/net/micode/notes/gtask/data/Node.java index 63950e0d..fb58040b 100644 --- a/src/src/net/micode/notes/gtask/data/Node.java +++ b/src/src/net/micode/notes/gtask/data/Node.java @@ -19,81 +19,118 @@ package net.micode.notes.gtask.data; import android.database.Cursor; import org.json.JSONObject; - +/** + * 抽象类Node，表示一个任务节点。 + */ public abstract class Node { + // 同步操作类型常量定义 public static final int SYNC_ACTION_NONE = 0; - public static final int SYNC_ACTION_ADD_REMOTE = 1; - public static final int SYNC_ACTION_ADD_LOCAL = 2; - public static final int SYNC_ACTION_DEL_REMOTE = 3; - public static final int SYNC_ACTION_DEL_LOCAL = 4; - public static final int SYNC_ACTION_UPDATE_REMOTE = 5; - public static final int SYNC_ACTION_UPDATE_LOCAL = 6; - public static final int SYNC_ACTION_UPDATE_CONFLICT = 7; - public static final int SYNC_ACTION_ERROR = 8; - private String mGid; - - private String mName; - - private long mLastModified; - - private boolean mDeleted; + private String mGid; // 任务节点的唯一标识 + private String mName; // 任务节点的名称 + private long mLastModified; // 任务节点的最后修改时间 + private boolean mDeleted; // 标识任务节点是否被删除 + /** + * 构造方法Node，初始化成员变量。 + */ public Node() { - mGid = null; - mName = ""; - mLastModified = 0; - mDeleted = false; + mGid = null; // 初始化为null + mName = ""; // 初始化为空字符串 + mLastModified = 0; // 初始化为0 + mDeleted = false; // 初始化为false } + /** + * 抽象方法getCreateAction，接受一个整型参数actionId，返回一个JSONObject对象，表示创建节点操作。 + */ public abstract JSONObject getCreateAction(int actionId); + /** + * 抽象方法getUpdateAction，接受一个整型参数actionId，返回一个JSONObject对象，表示更新节点操作。 + */ public abstract JSONObject getUpdateAction(int actionId); + /** + * 抽象方法setContentByRemoteJSON，接受一个JSONObject类型的参数js，根据远端传来的信息设置节点内容。 + */ public abstract void setContentByRemoteJSON(JSONObject js); + /** + * 抽象方法setContentByLocalJSON，接受一个JSONObject类型的参数js，根据本地传来的信息设置节点内容。 + */ public abstract void setContentByLocalJSON(JSONObject js); + /** + * 抽象方法getLocalJSONFromContent，返回一个JSONObject对象，表示本地节点的内容。 + */ public abstract JSONObject getLocalJSONFromContent(); + /** + * 抽象方法getSyncAction，接受一个Cursor类型的参数c，返回一个整型值，表示同步操作。 + */ public abstract int getSyncAction(Cursor c); + /** + * setGid方法，接受一个字符串参数gid，设置节点的Gid。 + */ public void setGid(String gid) { this.mGid = gid; } + /** + * setName方法，接受一个字符串参数name，设置节点的名称。 + */ public void setName(String name) { this.mName = name; } + /** + * setLastModified方法，接受一个长整型参数lastModified，设置节点的最后修改时间。 + */ public void setLastModified(long lastModified) { this.mLastModified = lastModified; } + /** + * setDeleted方法，接受一个布尔型参数deleted，设置节点是否被删除。 + */ public void setDeleted(boolean deleted) { this.mDeleted = deleted; } + /** + * getGid方法，返回节点的Gid。 + */ public String getGid() { return this.mGid; } + /** + * getName方法，返回节点的名称。 + */ public String getName() { return this.mName; } + /** + * getLastModified方法，返回节点的最后修改时间。 + */ public long getLastModified() { return this.mLastModified; } + /** + * getDeleted方法，返回节点是否被删除。 + */ public boolean getDeleted() { return this.mDeleted; } diff --git a/src/src/net/micode/notes/gtask/data/SqlData.java b/src/src/net/micode/notes/gtask/data/SqlData.java index 211eba2d..60506d3e 100644 --- a/src/src/net/micode/notes/gtask/data/SqlData.java +++ b/src/src/net/micode/notes/gtask/data/SqlData.java @@ -33,44 +33,61 @@ import net.micode.notes.gtask.exception.ActionFailureException; import org.json.JSONException; import org.json.JSONObject; - - public class SqlData { private static final String TAG = SqlData.class.getSimpleName(); + // 无效ID常量值 private static final int INVALID_ID = -99999; - public static final String[] PROJECTION_DATA = new String[]{ + // 要投射的数据列数组 + public static final String[] PROJECTION_DATA = new String[] { DataColumns.ID, DataColumns.MIME_TYPE, DataColumns.CONTENT, DataColumns.DATA1, DataColumns.DATA3 }; + // 数据ID列的索引 public static final int DATA_ID_COLUMN = 0; + // 数据MIME类型列的索引 public static final int DATA_MIME_TYPE_COLUMN = 1; + // 数据内容列的索引 public static final int DATA_CONTENT_COLUMN = 2; + // 数据内容数据1列的索引 public static final int DATA_CONTENT_DATA_1_COLUMN = 3; + // 数据内容数据3列的索引 public static final int DATA_CONTENT_DATA_3_COLUMN = 4; + // 用于访问内容提供者的ContentResolver对象 private ContentResolver mContentResolver; + // 表示数据是否为新创建的布尔值 private boolean mIsCreate; + // 数据ID private long mDataId; + // 数据MIME类型 private String mDataMimeType; + // 数据内容 private String mDataContent; + // 数据内容数据1 private long mDataContentData1; + // 数据内容数据3 private String mDataContentData3; + // 用于存储数据差异的ContentValues对象 private ContentValues mDiffDataValues; + /** + * 构造函数，通过上下文初始化SqlData对象 + * @param context 上下文对象 + */ public SqlData(Context context) { mContentResolver = context.getContentResolver(); mIsCreate = true; @@ -82,6 +99,11 @@ public class SqlData { mDiffDataValues = new ContentValues(); } + /** + * 构造函数，通过上下文和游标初始化SqlData对象，并从游标中加载数据 + * @param context 上下文对象 + * @param c 游标对象 + */ public SqlData(Context context, Cursor c) { mContentResolver = context.getContentResolver(); mIsCreate = false; @@ -89,6 +111,10 @@ public class SqlData { mDiffDataValues = new ContentValues(); } + /** + * 从游标中加载数据 + * @param c 游标对象 + */ private void loadFromCursor(Cursor c) { mDataId = c.getLong(DATA_ID_COLUMN); mDataMimeType = c.getString(DATA_MIME_TYPE_COLUMN); @@ -97,13 +123,20 @@ public class SqlData { mDataContentData3 = c.getString(DATA_CONTENT_DATA_3_COLUMN); } + /** + * 根据给定的JSON对象设置数据内容 + * @param js 数据内容的JSON对象 + * @throws JSONException JSON解析异常 + */ public void setContent(JSONObject js) throws JSONException { + // 获取数据ID long dataId = js.has(DataColumns.ID) ? js.getLong(DataColumns.ID) : INVALID_ID; if (mIsCreate || mDataId != dataId) { mDiffDataValues.put(DataColumns.ID, dataId); } mDataId = dataId; + // 获取数据MIME类型 String dataMimeType = js.has(DataColumns.MIME_TYPE) ? js.getString(DataColumns.MIME_TYPE) : DataConstants.NOTE; if (mIsCreate || !mDataMimeType.equals(dataMimeType)) { @@ -111,18 +144,21 @@ public class SqlData { } mDataMimeType = dataMimeType; + // 获取数据内容 String dataContent = js.has(DataColumns.CONTENT) ? js.getString(DataColumns.CONTENT) : ""; if (mIsCreate || !mDataContent.equals(dataContent)) { mDiffDataValues.put(DataColumns.CONTENT, dataContent); } mDataContent = dataContent; + // 获取数据内容数据1 long dataContentData1 = js.has(DataColumns.DATA1) ? js.getLong(DataColumns.DATA1) : 0; if (mIsCreate || mDataContentData1 != dataContentData1) { mDiffDataValues.put(DataColumns.DATA1, dataContentData1); } mDataContentData1 = dataContentData1; + // 获取数据内容数据3 String dataContentData3 = js.has(DataColumns.DATA3) ? js.getString(DataColumns.DATA3) : ""; if (mIsCreate || !mDataContentData3.equals(dataContentData3)) { mDiffDataValues.put(DataColumns.DATA3, dataContentData3); @@ -130,6 +166,11 @@ public class SqlData { mDataContentData3 = dataContentData3; } + /** + * 获取数据内容的JSON对象 + * @return 数据内容的JSON对象 + * @throws JSONException JSON解析异常 + */ public JSONObject getContent() throws JSONException { if (mIsCreate) { Log.e(TAG, "it seems that we haven't created this in database yet"); @@ -144,13 +185,20 @@ public class SqlData { return js; } + /** + * 提交数据更改 + * @param noteId 笔记ID + * @param validateVersion 是否验证版本号 + * @param version 版本号 + */ public void commit(long noteId, boolean validateVersion, long version) { - if (mIsCreate) { + // 如果数据ID无效，移除ID键值对 if (mDataId == INVALID_ID && mDiffDataValues.containsKey(DataColumns.ID)) { mDiffDataValues.remove(DataColumns.ID); } + // 插入新的数据 mDiffDataValues.put(DataColumns.NOTE_ID, noteId); Uri uri = mContentResolver.insert(Notes.CONTENT_DATA_URI, mDiffDataValues); try { @@ -163,9 +211,11 @@ public class SqlData { if (mDiffDataValues.size() > 0) { int result = 0; if (!validateVersion) { + // 不验证版本号，直接更新 result = mContentResolver.update(ContentUris.withAppendedId( Notes.CONTENT_DATA_URI, mDataId), mDiffDataValues, null, null); } else { + // 验证版本号，只有版本号匹配才更新 result = mContentResolver.update(ContentUris.withAppendedId( Notes.CONTENT_DATA_URI, mDataId), mDiffDataValues, " ? in (SELECT " + NoteColumns.ID + " FROM " + TABLE.NOTE @@ -179,10 +229,15 @@ public class SqlData { } } + // 清空差异数据，重置状态 mDiffDataValues.clear(); mIsCreate = false; } + /** + * 获取数据ID + * @return 数据ID + */ public long getId() { return mDataId; } diff --git a/src/src/net/micode/notes/gtask/data/SqlNote.java b/src/src/net/micode/notes/gtask/data/SqlNote.java index 3ff745ef..50fad182 100644 --- a/src/src/net/micode/notes/gtask/data/SqlNote.java +++ b/src/src/net/micode/notes/gtask/data/SqlNote.java @@ -37,92 +37,52 @@ import org.json.JSONObject; import java.util.ArrayList; +// SqlNote.java +/** + * 这个类用于操作笔记数据的 SQLite 数据库操作 + */ public class SqlNote { - private static final String TAG = SqlNote.class.getSimpleName(); + private static final String TAG = SqlNote.class.getSimpleName(); // 用于在日志中标识类名的常量 - private static final int INVALID_ID = -99999; + private static final int INVALID_ID = -99999; // 无效 ID，表示数据库中不存在的 ID + // 定义了笔记表的所有列名，用于查询数据库时使用 public static final String[] PROJECTION_NOTE = new String[]{ - NoteColumns.ID, NoteColumns.ALERTED_DATE, NoteColumns.BG_COLOR_ID, - NoteColumns.CREATED_DATE, NoteColumns.HAS_ATTACHMENT, NoteColumns.MODIFIED_DATE, - NoteColumns.NOTES_COUNT, NoteColumns.PARENT_ID, NoteColumns.SNIPPET, NoteColumns.TYPE, - NoteColumns.WIDGET_ID, NoteColumns.WIDGET_TYPE, NoteColumns.SYNC_ID, - NoteColumns.LOCAL_MODIFIED, NoteColumns.ORIGIN_PARENT_ID, NoteColumns.GTASK_ID, - NoteColumns.VERSION - }; - - public static final int ID_COLUMN = 0; - - public static final int ALERTED_DATE_COLUMN = 1; - - public static final int BG_COLOR_ID_COLUMN = 2; - - public static final int CREATED_DATE_COLUMN = 3; - - public static final int HAS_ATTACHMENT_COLUMN = 4; - - public static final int MODIFIED_DATE_COLUMN = 5; - - public static final int NOTES_COUNT_COLUMN = 6; - - public static final int PARENT_ID_COLUMN = 7; - - public static final int SNIPPET_COLUMN = 8; - - public static final int TYPE_COLUMN = 9; - - public static final int WIDGET_ID_COLUMN = 10; - - public static final int WIDGET_TYPE_COLUMN = 11; - - public static final int SYNC_ID_COLUMN = 12; - - public static final int LOCAL_MODIFIED_COLUMN = 13; - - public static final int ORIGIN_PARENT_ID_COLUMN = 14; - - public static final int GTASK_ID_COLUMN = 15; - - public static final int VERSION_COLUMN = 16; - - private Context mContext; - - private ContentResolver mContentResolver; - - private boolean mIsCreate; - - private long mId; - - private long mAlertDate; - - private int mBgColorId; - - private long mCreatedDate; - - private int mHasAttachment; - - private long mModifiedDate; - - private long mParentId; - - private String mSnippet; - - private int mType; - - private int mWidgetId; - - private int mWidgetType; - - private long mOriginParent; - - private long mVersion; - - private ContentValues mDiffNoteValues; - - private ArrayList mDataList; - - public SqlNote(Context context) { + NoteColumns.ID, NoteColumns.ALERTED_DATE, ... // 这里省略了一些列名 + NoteColumns.VERSION +}; + +// 定义了各列在查询结果中的索引位置 +public static final int ID_COLUMN = 0; +public static final int ALERTED_DATE_COLUMN = 1; +// ... 其他列的索引位置 + +// 下面是一系列私有成员变量，代表了一个笔记对象的各个属性 +// 这些变量用于在对象内部保存笔记的各种信息 +private Context mContext; +private ContentResolver mContentResolver; +private boolean mIsCreate; +private long mId; +private long mAlertDate; +private int mBgColorId; +private long mCreatedDate; +private int mHasAttachment; +private long mModifiedDate; +private long mParentId; +private String mSnippet; +private int mType; +private int mWidgetId; +private int mWidgetType; +private long mOriginParent; +private long mVersion; +private ContentValues mDiffNoteValues; +private ArrayList mDataList; + +/** + * 构造函数，初始化笔记对象的各个属性 + */ +public SqlNote(Context context) { mContext = context; mContentResolver = context.getContentResolver(); mIsCreate = true; @@ -141,365 +101,437 @@ public class SqlNote { mVersion = 0; mDiffNoteValues = new ContentValues(); mDataList = new ArrayList(); - } + } - public SqlNote(Context context, Cursor c) { +/** + * 从 Cursor 中加载笔记数据的构造函数 + */ +public SqlNote(Context context, Cursor c) { mContext = context; mContentResolver = context.getContentResolver(); mIsCreate = false; loadFromCursor(c); mDataList = new ArrayList(); if (mType == Notes.TYPE_NOTE) - loadDataContent(); + loadDataContent(); mDiffNoteValues = new ContentValues(); - } + } - public SqlNote(Context context, long id) { +/** + * 从数据库中加载指定 ID 的笔记数据的构造函数 + */ +public SqlNote(Context context, long id) { mContext = context; mContentResolver = context.getContentResolver(); mIsCreate = false; loadFromCursor(id); mDataList = new ArrayList(); if (mType == Notes.TYPE_NOTE) - loadDataContent(); + loadDataContent(); mDiffNoteValues = new ContentValues(); + } - } +/** + * 从 Cursor 中加载笔记数据 + */ +private void loadFromCursor(Cursor c) { + // 根据 Cursor 中的数据加载笔记对象的各个属性 + } - private void loadFromCursor(long id) { +/** + * 从数据库中加载指定 ID 的笔记数据 + */ +private void loadFromCursor(long id) { Cursor c = null; try { - c = mContentResolver.query(Notes.CONTENT_NOTE_URI, PROJECTION_NOTE, "(_id=?)", - new String[]{ - String.valueOf(id) - }, null); - if (c != null) { - c.moveToNext(); - loadFromCursor(c); - } else { - Log.w(TAG, "loadFromCursor: cursor = null"); - } + c = mContentResolver.query(Notes.CONTENT_NOTE_URI, PROJECTION_NOTE, "(_id=?)", + new String[]{String.valueOf(id)}, null); + if (c != null) { + c.moveToNext(); + loadFromCursor(c); + } else { + Log.w(TAG, "loadFromCursor: cursor = null"); + } } finally { - if (c != null) - c.close(); - } - } - - private void loadFromCursor(Cursor c) { - mId = c.getLong(ID_COLUMN); - mAlertDate = c.getLong(ALERTED_DATE_COLUMN); - mBgColorId = c.getInt(BG_COLOR_ID_COLUMN); - mCreatedDate = c.getLong(CREATED_DATE_COLUMN); - mHasAttachment = c.getInt(HAS_ATTACHMENT_COLUMN); - mModifiedDate = c.getLong(MODIFIED_DATE_COLUMN); - mParentId = c.getLong(PARENT_ID_COLUMN); - mSnippet = c.getString(SNIPPET_COLUMN); - mType = c.getInt(TYPE_COLUMN); - mWidgetId = c.getInt(WIDGET_ID_COLUMN); - mWidgetType = c.getInt(WIDGET_TYPE_COLUMN); - mVersion = c.getLong(VERSION_COLUMN); - } - - private void loadDataContent() { + if (c != null) + c.close(); + } + } + // ... 其他方法 + } +private void loadFromCursor(Cursor c) { + mId = c.getLong(ID_COLUMN); // 从 Cursor 中获取 ID 列的值，并存储到 mId 变量中 + mAlertDate = c.getLong(ALERTED_DATE_COLUMN); // 从 Cursor 中获取 ALERTED_DATE 列的值，并存储到 mAlertDate 变量中 + mBgColorId = c.getInt(BG_COLOR_ID_COLUMN); // 从 Cursor 中获取 BG_COLOR_ID 列的值，并存储到 mBgColorId 变量中 + mCreatedDate = c.getLong(CREATED_DATE_COLUMN); // 从 Cursor 中获取 CREATED_DATE 列的值，并存储到 mCreatedDate 变量中 + mHasAttachment = c.getInt(HAS_ATTACHMENT_COLUMN); // 从 Cursor 中获取 HAS_ATTACHMENT 列的值，并存储到 mHasAttachment 变量中 + mModifiedDate = c.getLong(MODIFIED_DATE_COLUMN); // 从 Cursor 中获取 MODIFIED_DATE 列的值，并存储到 mModifiedDate 变量中 + mParentId = c.getLong(PARENT_ID_COLUMN); // 从 Cursor 中获取 PARENT_ID 列的值，并存储到 mParentId 变量中 + mSnippet = c.getString(SNIPPET_COLUMN); // 从 Cursor 中获取 SNIPPET 列的值，并存储到 mSnippet 变量中 + mType = c.getInt(TYPE_COLUMN); // 从 Cursor 中获取 TYPE 列的值，并存储到 mType 变量中 + mWidgetId = c.getInt(WIDGET_ID_COLUMN); // 从 Cursor 中获取 WIDGET_ID 列的值，并存储到 mWidgetId 变量中 + mWidgetType = c.getInt(WIDGET_TYPE_COLUMN); // 从 Cursor 中获取 WIDGET_TYPE 列的值，并存储到 mWidgetType 变量中 + mVersion = c.getLong(VERSION_COLUMN); // 从 Cursor 中获取 VERSION 列的值，并存储到 mVersion 变量中 + } + +private void loadDataContent() { Cursor c = null; - mDataList.clear(); + mDataList.clear(); // 清空 mDataList 列表 try { - c = mContentResolver.query(Notes.CONTENT_DATA_URI, SqlData.PROJECTION_DATA, - "(note_id=?)", new String[]{ - String.valueOf(mId) - }, null); - if (c != null) { - if (c.getCount() == 0) { - Log.w(TAG, "it seems that the note has not data"); - return; - } - while (c.moveToNext()) { - SqlData data = new SqlData(mContext, c); - mDataList.add(data); - } - } else { - Log.w(TAG, "loadDataContent: cursor = null"); - } + c = mContentResolver.query(Notes.CONTENT_DATA_URI, SqlData.PROJECTION_DATA, + "(note_id=?)", new String[]{String.valueOf(mId)}, null); + if (c != null) { + if (c.getCount() == 0) { // 检查 Cursor 中是否有数据 + Log.w(TAG, "it seems that the note has not data"); // 如果没有数据，则打印警告日志并返回 + return; + } + while (c.moveToNext()) { + SqlData data = new SqlData(mContext, c); // 创建 SqlData 对象，并从 Cursor 中加载数据 + mDataList.add(data); // 将 SqlData 对象添加到 mDataList 列表中 + } + } else { + Log.w(TAG, "loadDataContent: cursor = null"); // 如果 Cursor 为 null，则打印警告日志 + } } finally { - if (c != null) - c.close(); + if (c != null) + c.close(); // 关闭 Cursor } - } - - public boolean setContent(JSONObject js) { + } +public boolean setContent(JSONObject js) { try { - JSONObject note = js.getJSONObject(GTaskStringUtils.META_HEAD_NOTE); - if (note.getInt(NoteColumns.TYPE) == Notes.TYPE_SYSTEM) { - Log.w(TAG, "cannot set system folder"); - } else if (note.getInt(NoteColumns.TYPE) == Notes.TYPE_FOLDER) { - // for folder we can only update the snnipet and type - String snippet = note.has(NoteColumns.SNIPPET) ? note - .getString(NoteColumns.SNIPPET) : ""; - if (mIsCreate || !mSnippet.equals(snippet)) { - mDiffNoteValues.put(NoteColumns.SNIPPET, snippet); - } - mSnippet = snippet; - - int type = note.has(NoteColumns.TYPE) ? note.getInt(NoteColumns.TYPE) - : Notes.TYPE_NOTE; - if (mIsCreate || mType != type) { - mDiffNoteValues.put(NoteColumns.TYPE, type); - } - mType = type; - } else if (note.getInt(NoteColumns.TYPE) == Notes.TYPE_NOTE) { - JSONArray dataArray = js.getJSONArray(GTaskStringUtils.META_HEAD_DATA); - long id = note.has(NoteColumns.ID) ? note.getLong(NoteColumns.ID) : INVALID_ID; - if (mIsCreate || mId != id) { - mDiffNoteValues.put(NoteColumns.ID, id); - } - mId = id; - - long alertDate = note.has(NoteColumns.ALERTED_DATE) ? note - .getLong(NoteColumns.ALERTED_DATE) : 0; - if (mIsCreate || mAlertDate != alertDate) { - mDiffNoteValues.put(NoteColumns.ALERTED_DATE, alertDate); - } - mAlertDate = alertDate; - - int bgColorId = note.has(NoteColumns.BG_COLOR_ID) ? note - .getInt(NoteColumns.BG_COLOR_ID) : ResourceParser.getDefaultBgId(mContext); - if (mIsCreate || mBgColorId != bgColorId) { - mDiffNoteValues.put(NoteColumns.BG_COLOR_ID, bgColorId); - } - mBgColorId = bgColorId; - - long createDate = note.has(NoteColumns.CREATED_DATE) ? note - .getLong(NoteColumns.CREATED_DATE) : System.currentTimeMillis(); - if (mIsCreate || mCreatedDate != createDate) { - mDiffNoteValues.put(NoteColumns.CREATED_DATE, createDate); - } - mCreatedDate = createDate; - - int hasAttachment = note.has(NoteColumns.HAS_ATTACHMENT) ? note - .getInt(NoteColumns.HAS_ATTACHMENT) : 0; - if (mIsCreate || mHasAttachment != hasAttachment) { - mDiffNoteValues.put(NoteColumns.HAS_ATTACHMENT, hasAttachment); - } - mHasAttachment = hasAttachment; - - long modifiedDate = note.has(NoteColumns.MODIFIED_DATE) ? note - .getLong(NoteColumns.MODIFIED_DATE) : System.currentTimeMillis(); - if (mIsCreate || mModifiedDate != modifiedDate) { - mDiffNoteValues.put(NoteColumns.MODIFIED_DATE, modifiedDate); - } - mModifiedDate = modifiedDate; - - long parentId = note.has(NoteColumns.PARENT_ID) ? note - .getLong(NoteColumns.PARENT_ID) : 0; - if (mIsCreate || mParentId != parentId) { - mDiffNoteValues.put(NoteColumns.PARENT_ID, parentId); - } - mParentId = parentId; - - String snippet = note.has(NoteColumns.SNIPPET) ? note - .getString(NoteColumns.SNIPPET) : ""; - if (mIsCreate || !mSnippet.equals(snippet)) { - mDiffNoteValues.put(NoteColumns.SNIPPET, snippet); - } - mSnippet = snippet; - - int type = note.has(NoteColumns.TYPE) ? note.getInt(NoteColumns.TYPE) - : Notes.TYPE_NOTE; - if (mIsCreate || mType != type) { - mDiffNoteValues.put(NoteColumns.TYPE, type); - } - mType = type; - - int widgetId = note.has(NoteColumns.WIDGET_ID) ? note.getInt(NoteColumns.WIDGET_ID) - : AppWidgetManager.INVALID_APPWIDGET_ID; - if (mIsCreate || mWidgetId != widgetId) { - mDiffNoteValues.put(NoteColumns.WIDGET_ID, widgetId); - } - mWidgetId = widgetId; - - int widgetType = note.has(NoteColumns.WIDGET_TYPE) ? note - .getInt(NoteColumns.WIDGET_TYPE) : Notes.TYPE_WIDGET_INVALIDE; - if (mIsCreate || mWidgetType != widgetType) { - mDiffNoteValues.put(NoteColumns.WIDGET_TYPE, widgetType); - } - mWidgetType = widgetType; - - long originParent = note.has(NoteColumns.ORIGIN_PARENT_ID) ? note - .getLong(NoteColumns.ORIGIN_PARENT_ID) : 0; - if (mIsCreate || mOriginParent != originParent) { - mDiffNoteValues.put(NoteColumns.ORIGIN_PARENT_ID, originParent); - } - mOriginParent = originParent; - - for (int i = 0; i < dataArray.length(); i++) { - JSONObject data = dataArray.getJSONObject(i); - SqlData sqlData = null; - if (data.has(DataColumns.ID)) { - long dataId = data.getLong(DataColumns.ID); - for (SqlData temp : mDataList) { - if (dataId == temp.getId()) { - sqlData = temp; - } - } - } - - if (sqlData == null) { - sqlData = new SqlData(mContext); - mDataList.add(sqlData); - } - - sqlData.setContent(data); - } - } + // 解析传入的 JSON 对象 + JSONObject note = js.getJSONObject(GTaskStringUtils.META_HEAD_NOTE); + + // 判断是否为系统文件夹，如果是则无法设置内容 + if (note.getInt(NoteColumns.TYPE) == Notes.TYPE_SYSTEM) { + Log.w(TAG, "cannot set system folder"); + } + // 判断是否为文件夹类型 + else if (note.getInt(NoteColumns.TYPE) == Notes.TYPE_FOLDER) { + // 更新文件夹的摘要和类型 + String snippet = note.has(NoteColumns.SNIPPET) ? note.getString(NoteColumns.SNIPPET) : ""; + if (mIsCreate || !mSnippet.equals(snippet)) { + mDiffNoteValues.put(NoteColumns.SNIPPET, snippet); + } + mSnippet = snippet; + + int type = note.has(NoteColumns.TYPE) ? note.getInt(NoteColumns.TYPE) : Notes.TYPE_NOTE; + if (mIsCreate || mType != type) { + mDiffNoteValues.put(NoteColumns.TYPE, type); + } + mType = type; + } + // 如果是笔记类型 + else if (note.getInt(NoteColumns.TYPE) == Notes.TYPE_NOTE) { + // 解析数据部分 + JSONArray dataArray = js.getJSONArray(GTaskStringUtils.META_HEAD_DATA); + + // 解析并更新笔记的各个属性 + long id = note.has(NoteColumns.ID) ? note.getLong(NoteColumns.ID) : INVALID_ID; + if (mIsCreate || mId != id) { + mDiffNoteValues.put(NoteColumns.ID, id); + } + mId = id; + +// 解析提醒时间，若不存在则默认为 0，更新到 mDiffNoteValues 和成员变量中 + long alertDate = note.has(NoteColumns.ALERTED_DATE) ? note.getLong(NoteColumns.ALERTED_DATE) : 0; + if (mIsCreate || mAlertDate != alertDate) { + mDiffNoteValues.put(NoteColumns.ALERTED_DATE, alertDate); + } + mAlertDate = alertDate; + +// 解析背景色 Id，若不存在则使用默认背景色 Id，更新到 mDiffNoteValues 和成员变量中 + int bgColorId = note.has(NoteColumns.BG_COLOR_ID) ? note.getInt(NoteColumns.BG_COLOR_ID) : ResourceParser.getDefaultBgId(mContext); + if (mIsCreate || mBgColorId != bgColorId) { + mDiffNoteValues.put(NoteColumns.BG_COLOR_ID, bgColorId); + } + mBgColorId = bgColorId; + +// 解析笔记创建时间，若不存在则使用当前系统时间，更新到 mDiffNoteValues 和成员变量中 + long createDate = note.has(NoteColumns.CREATED_DATE) ? note.getLong(NoteColumns.CREATED_DATE) : System.currentTimeMillis(); + if (mIsCreate || mCreatedDate != createDate) { + mDiffNoteValues.put(NoteColumns.CREATED_DATE, createDate); + } + mCreatedDate = createDate; + +// 解析是否有附件，若不存在则默认为 0，更新到 mDiffNoteValues 和成员变量中 + int hasAttachment = note.has(NoteColumns.HAS_ATTACHMENT) ? note.getInt(NoteColumns.HAS_ATTACHMENT) : 0; + if (mIsCreate || mHasAttachment != hasAttachment) { + mDiffNoteValues.put(NoteColumns.HAS_ATTACHMENT, hasAttachment); + } + mHasAttachment = hasAttachment; + +// 解析笔记最近修改时间，若不存在则使用当前系统时间，更新到 mDiffNoteValues 和成员变量中 + long modifiedDate = note.has(NoteColumns.MODIFIED_DATE) ? note.getLong(NoteColumns.MODIFIED_DATE) : System.currentTimeMillis(); + if (mIsCreate || mModifiedDate != modifiedDate) { + mDiffNoteValues.put(NoteColumns.MODIFIED_DATE, modifiedDate); + } + mModifiedDate = modifiedDate; + +// 解析笔记父文件夹 Id，若不存在则默认为 0，更新到 mDiffNoteValues 和成员变量中 + long parentId = note.has(NoteColumns.PARENT_ID) ? note.getLong(NoteColumns.PARENT_ID) : 0; + if (mIsCreate || mParentId != parentId) { + mDiffNoteValues.put(NoteColumns.PARENT_ID, parentId); + } + mParentId = parentId; + +// 解析笔记摘要，若不存在则默认为空字符串，更新到 mDiffNoteValues 和成员变量中 + String snippet = note.has(NoteColumns.SNIPPET) ? note.getString(NoteColumns.SNIPPET) : ""; + if (mIsCreate || !mSnippet.equals(snippet)) { + mDiffNoteValues.put(NoteColumns.SNIPPET, snippet); + } + mSnippet = snippet; + +// 解析笔记类型，若不存在则默认为 TYPE_NOTE，更新到 mDiffNoteValues 和成员变量中 + int type = note.has(NoteColumns.TYPE) ? note.getInt(NoteColumns.TYPE) : Notes.TYPE_NOTE; + if (mIsCreate || mType != type) { + mDiffNoteValues.put(NoteColumns.TYPE, type); + } + mType = type; + +// 解析 widgetId，若不存在则默认为 INVALID_APPWIDGET_ID，更新到 mDiffNoteValues 和成员变量中 + int widgetId = note.has(NoteColumns.WIDGET_ID) ? note.getInt(NoteColumns.WIDGET_ID) : AppWidgetManager.INVALID_APPWIDGET_ID; + if (mIsCreate || mWidgetId != widgetId) { + mDiffNoteValues.put(NoteColumns.WIDGET_ID, widgetId); + } + mWidgetId = widgetId; + +// 解析 widgetType，若不存在则默认为 TYPE_WIDGET_INVALIDE，更新到 mDiffNoteValues 和成员变量中 + int widgetType = note.has(NoteColumns.WIDGET_TYPE) ? note.getInt(NoteColumns.WIDGET_TYPE) : Notes.TYPE_WIDGET_INVALIDE; + if (mIsCreate || mWidgetType != widgetType) { + mDiffNoteValues.put(NoteColumns.WIDGET_TYPE, widgetType); + } + mWidgetType = widgetType; + +// 解析 originParent，若不存在则默认为 0，更新到 mDiffNoteValues 和成员变量中 + long originParent = note.has(NoteColumns.ORIGIN_PARENT_ID) ? note.getLong(NoteColumns.ORIGIN_PARENT_ID) : 0; + if (mIsCreate || mOriginParent != originParent) { + mDiffNoteValues.put(NoteColumns.ORIGIN_PARENT_ID, originParent); + } + mOriginParent = originParent; + // 处理数据部分 + for (int i = 0; i < dataArray.length(); i++) { + JSONObject data = dataArray.getJSONObject(i); + SqlData sqlData = null; + if (data.has(DataColumns.ID)) { + long dataId = data.getLong(DataColumns.ID); + // 查找是否已存在该数据，如果不存在则新建一个 + for (SqlData temp : mDataList) { + if (dataId == temp.getId()) { + sqlData = temp; + } + } + } + + if (sqlData == null) { + sqlData = new SqlData(mContext); + mDataList.add(sqlData); + } + + // 更新数据内容 + sqlData.setContent(data); + } + } } catch (JSONException e) { - Log.e(TAG, e.toString()); - e.printStackTrace(); - return false; + Log.e(TAG, e.toString()); + e.printStackTrace(); + return false; } return true; - } + } + - public JSONObject getContent() { +public JSONObject getContent() { try { - JSONObject js = new JSONObject(); - - if (mIsCreate) { - Log.e(TAG, "it seems that we haven't created this in database yet"); - return null; - } - - JSONObject note = new JSONObject(); - if (mType == Notes.TYPE_NOTE) { - note.put(NoteColumns.ID, mId); - note.put(NoteColumns.ALERTED_DATE, mAlertDate); - note.put(NoteColumns.BG_COLOR_ID, mBgColorId); - note.put(NoteColumns.CREATED_DATE, mCreatedDate); - note.put(NoteColumns.HAS_ATTACHMENT, mHasAttachment); - note.put(NoteColumns.MODIFIED_DATE, mModifiedDate); - note.put(NoteColumns.PARENT_ID, mParentId); - note.put(NoteColumns.SNIPPET, mSnippet); - note.put(NoteColumns.TYPE, mType); - note.put(NoteColumns.WIDGET_ID, mWidgetId); - note.put(NoteColumns.WIDGET_TYPE, mWidgetType); - note.put(NoteColumns.ORIGIN_PARENT_ID, mOriginParent); - js.put(GTaskStringUtils.META_HEAD_NOTE, note); - - JSONArray dataArray = new JSONArray(); - for (SqlData sqlData : mDataList) { - JSONObject data = sqlData.getContent(); - if (data != null) { - dataArray.put(data); - } - } - js.put(GTaskStringUtils.META_HEAD_DATA, dataArray); - } else if (mType == Notes.TYPE_FOLDER || mType == Notes.TYPE_SYSTEM) { - note.put(NoteColumns.ID, mId); - note.put(NoteColumns.TYPE, mType); - note.put(NoteColumns.SNIPPET, mSnippet); - js.put(GTaskStringUtils.META_HEAD_NOTE, note); - } - - return js; + JSONObject js = new JSONObject(); + + // 如果是新创建的笔记对象，则没有在数据库中创建过 + if (mIsCreate) { + Log.e(TAG, "it seems that we haven't created this in database yet"); + return null; + } + + JSONObject note = new JSONObject(); + if (mType == Notes.TYPE_NOTE) { + // 解析笔记对象的各个属性，并存入 note JSON 对象中 + note.put(NoteColumns.ID, mId); + note.put(NoteColumns.ALERTED_DATE, mAlertDate); + note.put(NoteColumns.BG_COLOR_ID, mBgColorId); + note.put(NoteColumns.CREATED_DATE, mCreatedDate); + note.put(NoteColumns.HAS_ATTACHMENT, mHasAttachment); + note.put(NoteColumns.MODIFIED_DATE, mModifiedDate); + note.put(NoteColumns.PARENT_ID, mParentId); + note.put(NoteColumns.SNIPPET, mSnippet); + note.put(NoteColumns.TYPE, mType); + note.put(NoteColumns.WIDGET_ID, mWidgetId); + note.put(NoteColumns.WIDGET_TYPE, mWidgetType); + note.put(NoteColumns.ORIGIN_PARENT_ID, mOriginParent); + js.put(GTaskStringUtils.META_HEAD_NOTE, note); + + JSONArray dataArray = new JSONArray(); + for (SqlData sqlData : mDataList) { + // 解析笔记的数据内容，添加到 dataArray 中 + JSONObject data = sqlData.getContent(); + if (data != null) { + dataArray.put(data); + } + } + js.put(GTaskStringUtils.META_HEAD_DATA, dataArray); + } else if (mType == Notes.TYPE_FOLDER || mType == Notes.TYPE_SYSTEM) { + // 如果是文件夹或系统类型的笔记，则只解析对应的属性 + note.put(NoteColumns.ID, mId); + note.put(NoteColumns.TYPE, mType); + note.put(NoteColumns.SNIPPET, mSnippet); + js.put(GTaskStringUtils.META_HEAD_NOTE, note); + } + + return js; } catch (JSONException e) { - Log.e(TAG, e.toString()); - e.printStackTrace(); + Log.e(TAG, e.toString()); + e.printStackTrace(); } return null; - } - - public void setParentId(long id) { + } +/** + * 设置笔记的父级 ID + * @param id 父级 ID + */ +public void setParentId(long id) { mParentId = id; mDiffNoteValues.put(NoteColumns.PARENT_ID, id); - } + } - public void setGtaskId(String gid) { +/** + * 设置笔记在 GTask 中的 ID + * @param gid GTask 中的 ID + */ +public void setGtaskId(String gid) { mDiffNoteValues.put(NoteColumns.GTASK_ID, gid); - } + } - public void setSyncId(long syncId) { +/** + * 设置笔记在服务器上同步时对应的 ID + * @param syncId 同步 ID + */ +public void setSyncId(long syncId) { mDiffNoteValues.put(NoteColumns.SYNC_ID, syncId); - } + } - public void resetLocalModified() { +/** + * 重置笔记的本地修改状态 + */ +public void resetLocalModified() { mDiffNoteValues.put(NoteColumns.LOCAL_MODIFIED, 0); - } + } - public long getId() { +/** + * 获取笔记的 ID + * @return 笔记的 ID + */ +public long getId() { return mId; - } + } - public long getParentId() { +/** + * 获取笔记的父级 ID + * @return 笔记的父级 ID + */ +public long getParentId() { return mParentId; - } + } - public String getSnippet() { +/** + * 获取笔记的摘要 + * @return 笔记的摘要 + */ +public String getSnippet() { return mSnippet; - } + } - public boolean isNoteType() { +/** + * 判断笔记是否为笔记类型 + * @return 是否为笔记类型 + */ +/** + * 判断笔记是否为笔记类型 + * @return 是否为笔记类型 + */ +public boolean isNoteType() { return mType == Notes.TYPE_NOTE; - } + } - public void commit(boolean validateVersion) { +/** + * 提交笔记变更 + * @param validateVersion 是否验证版本号 + * @throws ActionFailureException 执行操作失败时抛出该异常 + */ +public void commit(boolean validateVersion) throws ActionFailureException { + // 如果是新建笔记 if (mIsCreate) { - if (mId == INVALID_ID && mDiffNoteValues.containsKey(NoteColumns.ID)) { - mDiffNoteValues.remove(NoteColumns.ID); - } - - Uri uri = mContentResolver.insert(Notes.CONTENT_NOTE_URI, mDiffNoteValues); - try { - mId = Long.valueOf(uri.getPathSegments().get(1)); - } catch (NumberFormatException e) { - Log.e(TAG, "Get note id error :" + e.toString()); - throw new ActionFailureException("create note failed"); - } - if (mId == 0) { - throw new IllegalStateException("Create thread id failed"); - } - - if (mType == Notes.TYPE_NOTE) { - for (SqlData sqlData : mDataList) { - sqlData.commit(mId, false, -1); - } - } + // 如果 ID 无效且 DiffNoteValues 中包含 ID，则删除 ID + if (mId == INVALID_ID && mDiffNoteValues.containsKey(NoteColumns.ID)) { + mDiffNoteValues.remove(NoteColumns.ID); + } + // 插入新的笔记数据 + Uri uri = mContentResolver.insert(Notes.CONTENT_NOTE_URI, mDiffNoteValues); + try { + mId = Long.valueOf(uri.getPathSegments().get(1)); + } catch (NumberFormatException e) { + Log.e(TAG, "Get note id error :" + e.toString()); + throw new ActionFailureException("create note failed"); + } + if (mId == 0) { + throw new IllegalStateException("Create thread id failed"); + } + // 如果是笔记类型，则提交其它相关数据 + if (mType == Notes.TYPE_NOTE) { + for (SqlData sqlData : mDataList) { + sqlData.commit(mId, false, -1); + } + } + } + // 如果是更新笔记 + else { + // 如果 ID 无效或为根文件夹或通话记录文件夹 + if (mId <= 0 && mId != Notes.ID_ROOT_FOLDER && mId != Notes.ID_CALL_RECORD_FOLDER) { + Log.e(TAG, "No such note"); + throw new IllegalStateException("Try to update note with invalid id"); + } + // 如果 DiffNoteValues 中有变更，则更新笔记 + if (mDiffNoteValues.size() > 0) { + mVersion++; + int result = 0; + if (!validateVersion) { + // 如果不验证版本号，则直接更新笔记 + result = mContentResolver.update(Notes.CONTENT_NOTE_URI, mDiffNoteValues, "(" + + NoteColumns.ID + "=?)", new String[]{ + String.valueOf(mId) + }); } else { - if (mId <= 0 && mId != Notes.ID_ROOT_FOLDER && mId != Notes.ID_CALL_RECORD_FOLDER) { - Log.e(TAG, "No such note"); - throw new IllegalStateException("Try to update note with invalid id"); - } - if (mDiffNoteValues.size() > 0) { - mVersion++; - int result = 0; - if (!validateVersion) { - result = mContentResolver.update(Notes.CONTENT_NOTE_URI, mDiffNoteValues, "(" - + NoteColumns.ID + "=?)", new String[]{ - String.valueOf(mId) - }); - } else { - result = mContentResolver.update(Notes.CONTENT_NOTE_URI, mDiffNoteValues, "(" - + NoteColumns.ID + "=?) AND (" + NoteColumns.VERSION + "<=?)", - new String[]{ - String.valueOf(mId), String.valueOf(mVersion) - }); - } - if (result == 0) { - Log.w(TAG, "there is no update. maybe user updates note when syncing"); - } - } - - if (mType == Notes.TYPE_NOTE) { - for (SqlData sqlData : mDataList) { - sqlData.commit(mId, validateVersion, mVersion); - } - } - } - - // refresh local info + // 如果验证版本号，则只在版本号匹配时更新笔记 + result = mContentResolver.update(Notes.CONTENT_NOTE_URI, mDiffNoteValues, "(" + + NoteColumns.ID + "=?) AND (" + NoteColumns.VERSION + "<=?)", + new String[]{ + String.valueOf(mId), String.valueOf(mVersion) + }); + } + if (result == 0) { + Log.w(TAG, "there is no update. maybe user updates note when syncing"); + } + } + // 如果是笔记类型，则提交其它相关数据 + if (mType == Notes.TYPE_NOTE) { + for (SqlData sqlData : mDataList) { + sqlData.commit(mId, validateVersion, mVersion); + } + } + } + + // 刷新本地信息 loadFromCursor(mId); if (mType == Notes.TYPE_NOTE) - loadDataContent(); + loadDataContent(); mDiffNoteValues.clear(); mIsCreate = false; - } -} + } diff --git a/src/src/net/micode/notes/gtask/data/Task.java b/src/src/net/micode/notes/gtask/data/Task.java index 6a19454d..e1a4b135 100644 --- a/src/src/net/micode/notes/gtask/data/Task.java +++ b/src/src/net/micode/notes/gtask/data/Task.java @@ -31,19 +31,18 @@ import org.json.JSONArray; import org.json.JSONException; import org.json.JSONObject; - public class Task extends Node { private static final String TAG = Task.class.getSimpleName(); - private boolean mCompleted; + private boolean mCompleted; // 任务是否已完成 - private String mNotes; + private String mNotes; // 任务的备注信息 - private JSONObject mMetaInfo; + private JSONObject mMetaInfo; // 任务的元信息 - private Task mPriorSibling; + private Task mPriorSibling; // 前一个兄弟任务 - private TaskList mParent; + private TaskList mParent; // 任务所属的任务列表 public Task() { super(); @@ -54,6 +53,11 @@ public class Task extends Node { mMetaInfo = null; } + /** + * 获取创建任务的操作JSONObject + * @param actionId 操作ID + * @return 创建任务的操作JSONObject + */ public JSONObject getCreateAction(int actionId) { JSONObject js = new JSONObject(); @@ -102,115 +106,128 @@ public class Task extends Node { return js; } - +} public JSONObject getUpdateAction(int actionId) { + // 创建一个新的JSONObject对象 JSONObject js = new JSONObject(); try { - // action_type + // 设置操作类型为更新 js.put(GTaskStringUtils.GTASK_JSON_ACTION_TYPE, GTaskStringUtils.GTASK_JSON_ACTION_TYPE_UPDATE); - // action_id + // 设置操作ID js.put(GTaskStringUtils.GTASK_JSON_ACTION_ID, actionId); - // id + // 设置任务的ID js.put(GTaskStringUtils.GTASK_JSON_ID, getGid()); - // entity_delta + // 设置任务的变更信息 JSONObject entity = new JSONObject(); entity.put(GTaskStringUtils.GTASK_JSON_NAME, getName()); if (getNotes() != null) { + // 如果有备注信息，设置备注信息 entity.put(GTaskStringUtils.GTASK_JSON_NOTES, getNotes()); } + // 设置任务是否被删除 entity.put(GTaskStringUtils.GTASK_JSON_DELETED, getDeleted()); js.put(GTaskStringUtils.GTASK_JSON_ENTITY_DELTA, entity); } catch (JSONException e) { + // 捕获JSON异常并打印日志 Log.e(TAG, e.toString()); e.printStackTrace(); + // 抛出自定义的操作失败异常 throw new ActionFailureException("fail to generate task-update jsonobject"); } - return js; + return js; // 返回创建好的JSONObject对象 } - + /** + * 根据远程服务器返回的 JSON 数据设置任务对象的内容 + * @param js 从远程服务器返回的 JSON 对象 + */ public void setContentByRemoteJSON(JSONObject js) { - if (js != null) { + if (js != null) { // 判断 JSON 对象不为空 try { // id if (js.has(GTaskStringUtils.GTASK_JSON_ID)) { - setGid(js.getString(GTaskStringUtils.GTASK_JSON_ID)); + setGid(js.getString(GTaskStringUtils.GTASK_JSON_ID)); // 设置任务ID } // last_modified if (js.has(GTaskStringUtils.GTASK_JSON_LAST_MODIFIED)) { - setLastModified(js.getLong(GTaskStringUtils.GTASK_JSON_LAST_MODIFIED)); + setLastModified(js.getLong(GTaskStringUtils.GTASK_JSON_LAST_MODIFIED)); // 设置最后修改时间 } // name if (js.has(GTaskStringUtils.GTASK_JSON_NAME)) { - setName(js.getString(GTaskStringUtils.GTASK_JSON_NAME)); + setName(js.getString(GTaskStringUtils.GTASK_JSON_NAME)); // 设置任务名称 } // notes if (js.has(GTaskStringUtils.GTASK_JSON_NOTES)) { - setNotes(js.getString(GTaskStringUtils.GTASK_JSON_NOTES)); + setNotes(js.getString(GTaskStringUtils.GTASK_JSON_NOTES)); // 设置任务备注 } // deleted if (js.has(GTaskStringUtils.GTASK_JSON_DELETED)) { - setDeleted(js.getBoolean(GTaskStringUtils.GTASK_JSON_DELETED)); + setDeleted(js.getBoolean(GTaskStringUtils.GTASK_JSON_DELETED)); // 设置任务是否被删除 } // completed if (js.has(GTaskStringUtils.GTASK_JSON_COMPLETED)) { - setCompleted(js.getBoolean(GTaskStringUtils.GTASK_JSON_COMPLETED)); + setCompleted(js.getBoolean(GTaskStringUtils.GTASK_JSON_COMPLETED)); // 设置任务是否完成 } } catch (JSONException e) { - Log.e(TAG, e.toString()); - e.printStackTrace(); - throw new ActionFailureException("fail to get task content from jsonobject"); + Log.e(TAG, e.toString()); // 打印异常信息 + e.printStackTrace(); // 打印堆栈信息 + throw new ActionFailureException("fail to get task content from jsonobject"); // 抛出自定义操作失败异常 } } } - + /** + * 根据本地存储的 JSON 数据设置任务对象的内容 + * @param js 从本地存储获取的 JSON 对象 + */ public void setContentByLocalJSON(JSONObject js) { if (js == null || !js.has(GTaskStringUtils.META_HEAD_NOTE) || !js.has(GTaskStringUtils.META_HEAD_DATA)) { - Log.w(TAG, "setContentByLocalJSON: nothing is avaiable"); + Log.w(TAG, "setContentByLocalJSON: nothing is avaiable"); // 如果 JSON 对象为空或者缺少必要的字段，则记录一条警告日志并退出方法 } try { - JSONObject note = js.getJSONObject(GTaskStringUtils.META_HEAD_NOTE); - JSONArray dataArray = js.getJSONArray(GTaskStringUtils.META_HEAD_DATA); + JSONObject note = js.getJSONObject(GTaskStringUtils.META_HEAD_NOTE); // 获取元数据中的 note 对象 + JSONArray dataArray = js.getJSONArray(GTaskStringUtils.META_HEAD_DATA); // 获取元数据中的 data 数组 if (note.getInt(NoteColumns.TYPE) != Notes.TYPE_NOTE) { - Log.e(TAG, "invalid type"); + Log.e(TAG, "invalid type"); // 如果 note 类型不是 Note 类型，则记录一条错误日志并返回 return; } - for (int i = 0; i < dataArray.length(); i++) { + for (int i = 0; i < dataArray.length(); i++) { // 遍历 data 数组 JSONObject data = dataArray.getJSONObject(i); - if (TextUtils.equals(data.getString(DataColumns.MIME_TYPE), DataConstants.NOTE)) { - setName(data.getString(DataColumns.CONTENT)); + if (TextUtils.equals(data.getString(DataColumns.MIME_TYPE), DataConstants.NOTE)) { // 如果 MIME_TYPE 等于 "vnd.android.cursor.item/note" + setName(data.getString(DataColumns.CONTENT)); // 设置任务名称为 data 中的 CONTENT 字段 break; } } } catch (JSONException e) { - Log.e(TAG, e.toString()); - e.printStackTrace(); + Log.e(TAG, e.toString()); // 打印异常信息 + e.printStackTrace(); // 打印堆栈信息 } } - + /** + * 从任务对象的内容中生成本地存储的 JSON 数据 + * @return 生成的 JSON 数据对象 + */ public JSONObject getLocalJSONFromContent() { - String name = getName(); + String name = getName(); // 获取任务名称 try { - if (mMetaInfo == null) { - // new task created from web + if (mMetaInfo == null) { // 如果元数据信息为空，则表示任务是从网络创建的新任务 if (name == null) { - Log.w(TAG, "the note seems to be an empty one"); + Log.w(TAG, "the note seems to be an empty one"); // 如果任务名称为空，则记录一条警告日志并返回空 return null; } @@ -218,39 +235,47 @@ public class Task extends Node { JSONObject note = new JSONObject(); JSONArray dataArray = new JSONArray(); JSONObject data = new JSONObject(); - data.put(DataColumns.CONTENT, name); - dataArray.put(data); - js.put(GTaskStringUtils.META_HEAD_DATA, dataArray); - note.put(NoteColumns.TYPE, Notes.TYPE_NOTE); - js.put(GTaskStringUtils.META_HEAD_NOTE, note); - return js; - } else { - // synced task - JSONObject note = mMetaInfo.getJSONObject(GTaskStringUtils.META_HEAD_NOTE); - JSONArray dataArray = mMetaInfo.getJSONArray(GTaskStringUtils.META_HEAD_DATA); - - for (int i = 0; i < dataArray.length(); i++) { + data.put(DataColumns.CONTENT, name); // 将任务名称作为 data 对象的 CONTENT 字段的值 + dataArray.put(data); // 将 data 对象添加到 dataArray 数组中 + js.put(GTaskStringUtils.META_HEAD_DATA, dataArray); // 将 dataArray 数组添加到 JSON 对象 js 中的 META_HEAD_DATA 字段 + note.put(NoteColumns.TYPE, Notes.TYPE_NOTE); // 设置 note 对象的 TYPE 字段为 Note 类型 + js.put(GTaskStringUtils.META_HEAD_NOTE, note); // 将 note 对象添加到 JSON 对象 js 中的 META_HEAD_NOTE 字段 + return js; // 返回生成的 JSON 对象 + + } else { // 如果元数据信息不为空，则表示任务是同步过来的任务 + JSONObject note = mMetaInfo.getJSONObject(GTaskStringUtils.META_HEAD_NOTE); // 获取元数据中的 note 对象 + JSONArray dataArray = mMetaInfo.getJSONArray(GTaskStringUtils.META_HEAD_DATA); // 获取元数据中的 data 数组 + + for (int i = 0; i < dataArray.length(); i++) { // 遍历 data 数组 JSONObject data = dataArray.getJSONObject(i); - if (TextUtils.equals(data.getString(DataColumns.MIME_TYPE), DataConstants.NOTE)) { - data.put(DataColumns.CONTENT, getName()); + if (TextUtils.equals(data.getString(DataColumns.MIME_TYPE), DataConstants.NOTE)) { // 如果 MIME_TYPE 等于 "vnd.android.cursor.item/note" + data.put(DataColumns.CONTENT, getName()); // 将任务名称作为 data 对象的 CONTENT 字段的值 break; } } - note.put(NoteColumns.TYPE, Notes.TYPE_NOTE); - return mMetaInfo; + note.put(NoteColumns.TYPE, Notes.TYPE_NOTE); // 设置 note 对象的 TYPE 字段为 Note 类型 + return mMetaInfo; // 返回原始的元数据信息对象 + } } catch (JSONException e) { - Log.e(TAG, e.toString()); - e.printStackTrace(); - return null; + Log.e(TAG, e.toString()); // 打印异常信息 + e.printStackTrace(); // 打印堆栈信息 + return null; // 返回空 } } - +public class Task { + private JSONObject mMetaInfo; // 任务的元数据信息 + private boolean mCompleted; // 任务是否已完成 + private String mNotes; // 任务的备注信息 + private Task mPriorSibling; // 前一个兄弟任务 + private TaskList mParent; // 任务所属的任务列表 + + // 设置任务的元数据信息 public void setMetaInfo(MetaData metaData) { if (metaData != null && metaData.getNotes() != null) { try { - mMetaInfo = new JSONObject(metaData.getNotes()); + mMetaInfo = new JSONObject(metaData.getNotes()); // 将元数据的备注信息转换为 JSON 对象并赋值给 mMetaInfo } catch (JSONException e) { Log.w(TAG, e.toString()); mMetaInfo = null; @@ -258,49 +283,50 @@ public class Task extends Node { } } + // 获取同步操作的动作类型 public int getSyncAction(Cursor c) { try { JSONObject noteInfo = null; if (mMetaInfo != null && mMetaInfo.has(GTaskStringUtils.META_HEAD_NOTE)) { - noteInfo = mMetaInfo.getJSONObject(GTaskStringUtils.META_HEAD_NOTE); + noteInfo = mMetaInfo.getJSONObject(GTaskStringUtils.META_HEAD_NOTE); // 获取元数据中的 note 对象 } if (noteInfo == null) { Log.w(TAG, "it seems that note meta has been deleted"); - return SYNC_ACTION_UPDATE_REMOTE; + return SYNC_ACTION_UPDATE_REMOTE; // 元数据中的 note 对象为空，表示远程任务已被删除，执行更新远程操作 } if (!noteInfo.has(NoteColumns.ID)) { Log.w(TAG, "remote note id seems to be deleted"); - return SYNC_ACTION_UPDATE_LOCAL; + return SYNC_ACTION_UPDATE_LOCAL; // 元数据中的 note 对象没有 ID 字段，表示远程任务的 ID 已被删除，执行更新本地操作 } - // validate the note id now + // 验证任务的 ID 是否匹配 if (c.getLong(SqlNote.ID_COLUMN) != noteInfo.getLong(NoteColumns.ID)) { Log.w(TAG, "note id doesn't match"); - return SYNC_ACTION_UPDATE_LOCAL; + return SYNC_ACTION_UPDATE_LOCAL; // 任务的 ID 不匹配，执行更新本地操作 } if (c.getInt(SqlNote.LOCAL_MODIFIED_COLUMN) == 0) { - // there is no local update + // 没有本地更新 if (c.getLong(SqlNote.SYNC_ID_COLUMN) == getLastModified()) { - // no update both side - return SYNC_ACTION_NONE; + // 双方都没有更新 + return SYNC_ACTION_NONE; // 无需执行同步操作 } else { - // apply remote to local - return SYNC_ACTION_UPDATE_LOCAL; + // 应用远程更新到本地 + return SYNC_ACTION_UPDATE_LOCAL; // 执行更新本地操作 } } else { - // validate gtask id + // 验证 GTask ID if (!c.getString(SqlNote.GTASK_ID_COLUMN).equals(getGid())) { Log.e(TAG, "gtask id doesn't match"); - return SYNC_ACTION_ERROR; + return SYNC_ACTION_ERROR; // GTask ID 不匹配，返回错误类型 } if (c.getLong(SqlNote.SYNC_ID_COLUMN) == getLastModified()) { - // local modification only - return SYNC_ACTION_UPDATE_REMOTE; + // 只有本地修改 + return SYNC_ACTION_UPDATE_REMOTE; // 执行更新远程操作 } else { - return SYNC_ACTION_UPDATE_CONFLICT; + return SYNC_ACTION_UPDATE_CONFLICT; // 执行冲突处理操作 } } } catch (Exception e) { @@ -308,44 +334,52 @@ public class Task extends Node { e.printStackTrace(); } - return SYNC_ACTION_ERROR; + return SYNC_ACTION_ERROR; // 返回错误类型 } + // 判断任务是否值得保存 public boolean isWorthSaving() { return mMetaInfo != null || (getName() != null && getName().trim().length() > 0) || (getNotes() != null && getNotes().trim().length() > 0); } + // 设置任务是否已完成 public void setCompleted(boolean completed) { this.mCompleted = completed; } + // 设置任务的备注信息 public void setNotes(String notes) { this.mNotes = notes; } + // 设置前一个兄弟任务 public void setPriorSibling(Task priorSibling) { this.mPriorSibling = priorSibling; } + // 设置任务所属的任务列表 public void setParent(TaskList parent) { this.mParent = parent; } + // 获取任务是否已完成 public boolean getCompleted() { return this.mCompleted; } + // 获取任务的备注信息 public String getNotes() { return this.mNotes; } + // 获取前一个兄弟任务 public Task getPriorSibling() { return this.mPriorSibling; } + // 获取任务所属的任务列表 public TaskList getParent() { return this.mParent; } - } diff --git a/src/src/net/micode/notes/gtask/data/TaskList.java b/src/src/net/micode/notes/gtask/data/TaskList.java index 4ea21c5b..af63f291 100644 --- a/src/src/net/micode/notes/gtask/data/TaskList.java +++ b/src/src/net/micode/notes/gtask/data/TaskList.java @@ -29,106 +29,101 @@ import org.json.JSONObject; import java.util.ArrayList; - public class TaskList extends Node { private static final String TAG = TaskList.class.getSimpleName(); - private int mIndex; - - private ArrayList mChildren; + private int mIndex; // 任务列表的索引 + private ArrayList mChildren; // 子任务列表 + // 构造函数 public TaskList() { - super(); - mChildren = new ArrayList(); - mIndex = 1; + super(); // 调用父类的构造函数 + mChildren = new ArrayList(); // 初始化子任务列表 + mIndex = 1; // 设置任务列表的索引为1 } + // 获取创建操作的JSON对象 public JSONObject getCreateAction(int actionId) { JSONObject js = new JSONObject(); try { // action_type - js.put(GTaskStringUtils.GTASK_JSON_ACTION_TYPE, - GTaskStringUtils.GTASK_JSON_ACTION_TYPE_CREATE); + js.put(GTaskStringUtils.GTASK_JSON_ACTION_TYPE, GTaskStringUtils.GTASK_JSON_ACTION_TYPE_CREATE); // 设置操作类型为创建 // action_id - js.put(GTaskStringUtils.GTASK_JSON_ACTION_ID, actionId); + js.put(GTaskStringUtils.GTASK_JSON_ACTION_ID, actionId); // 设置操作ID // index - js.put(GTaskStringUtils.GTASK_JSON_INDEX, mIndex); + js.put(GTaskStringUtils.GTASK_JSON_INDEX, mIndex); // 设置索引 // entity_delta JSONObject entity = new JSONObject(); - entity.put(GTaskStringUtils.GTASK_JSON_NAME, getName()); - entity.put(GTaskStringUtils.GTASK_JSON_CREATOR_ID, "null"); - entity.put(GTaskStringUtils.GTASK_JSON_ENTITY_TYPE, - GTaskStringUtils.GTASK_JSON_TYPE_GROUP); - js.put(GTaskStringUtils.GTASK_JSON_ENTITY_DELTA, entity); + entity.put(GTaskStringUtils.GTASK_JSON_NAME, getName()); // 设置任务列表的名称 + entity.put(GTaskStringUtils.GTASK_JSON_CREATOR_ID, "null"); // 创建者ID设置为"null" + entity.put(GTaskStringUtils.GTASK_JSON_ENTITY_TYPE, GTaskStringUtils.GTASK_JSON_TYPE_GROUP); // 设置实体类型为组类型 + js.put(GTaskStringUtils.GTASK_JSON_ENTITY_DELTA, entity); // 将实体信息加入到JSON对象中 } catch (JSONException e) { Log.e(TAG, e.toString()); e.printStackTrace(); - throw new ActionFailureException("fail to generate tasklist-create jsonobject"); + throw new ActionFailureException("fail to generate tasklist-create jsonobject"); // 抛出操作失败异常 } - return js; + return js; // 返回JSON对象 } - +} public JSONObject getUpdateAction(int actionId) { JSONObject js = new JSONObject(); try { // action_type - js.put(GTaskStringUtils.GTASK_JSON_ACTION_TYPE, - GTaskStringUtils.GTASK_JSON_ACTION_TYPE_UPDATE); + js.put(GTaskStringUtils.GTASK_JSON_ACTION_TYPE, GTaskStringUtils.GTASK_JSON_ACTION_TYPE_UPDATE); // 设置操作类型为更新 // action_id - js.put(GTaskStringUtils.GTASK_JSON_ACTION_ID, actionId); + js.put(GTaskStringUtils.GTASK_JSON_ACTION_ID, actionId); // 设置操作ID // id - js.put(GTaskStringUtils.GTASK_JSON_ID, getGid()); + js.put(GTaskStringUtils.GTASK_JSON_ID, getGid()); // 设置任务列表的唯一标识符 // entity_delta JSONObject entity = new JSONObject(); - entity.put(GTaskStringUtils.GTASK_JSON_NAME, getName()); - entity.put(GTaskStringUtils.GTASK_JSON_DELETED, getDeleted()); - js.put(GTaskStringUtils.GTASK_JSON_ENTITY_DELTA, entity); + entity.put(GTaskStringUtils.GTASK_JSON_NAME, getName()); // 设置任务列表的名称 + entity.put(GTaskStringUtils.GTASK_JSON_DELETED, getDeleted()); // 设置任务列表的删除状态 + js.put(GTaskStringUtils.GTASK_JSON_ENTITY_DELTA, entity); // 将实体信息加入到JSON对象中 } catch (JSONException e) { Log.e(TAG, e.toString()); e.printStackTrace(); - throw new ActionFailureException("fail to generate tasklist-update jsonobject"); + throw new ActionFailureException("fail to generate tasklist-update jsonobject"); // 抛出操作失败异常 } - return js; + return js; // 返回JSON对象 } - public void setContentByRemoteJSON(JSONObject js) { if (js != null) { try { // id if (js.has(GTaskStringUtils.GTASK_JSON_ID)) { - setGid(js.getString(GTaskStringUtils.GTASK_JSON_ID)); + setGid(js.getString(GTaskStringUtils.GTASK_JSON_ID)); // 从远程的JSON对象中获取任务列表的唯一标识符，并设置给当前对象的gid属性 } // last_modified if (js.has(GTaskStringUtils.GTASK_JSON_LAST_MODIFIED)) { - setLastModified(js.getLong(GTaskStringUtils.GTASK_JSON_LAST_MODIFIED)); + setLastModified(js.getLong(GTaskStringUtils.GTASK_JSON_LAST_MODIFIED)); // 从远程的JSON对象中获取任务列表的最后修改时间，并设置给当前对象的lastModified属性 } // name if (js.has(GTaskStringUtils.GTASK_JSON_NAME)) { - setName(js.getString(GTaskStringUtils.GTASK_JSON_NAME)); + setName(js.getString(GTaskStringUtils.GTASK_JSON_NAME)); // 从远程的JSON对象中获取任务列表的名称，并设置给当前对象的name属性 } } catch (JSONException e) { Log.e(TAG, e.toString()); e.printStackTrace(); - throw new ActionFailureException("fail to get tasklist content from jsonobject"); + throw new ActionFailureException("fail to get tasklist content from jsonobject"); // 抛出操作失败异常 } } } - public void setContentByLocalJSON(JSONObject js) { if (js == null || !js.has(GTaskStringUtils.META_HEAD_NOTE)) { Log.w(TAG, "setContentByLocalJSON: nothing is avaiable"); @@ -139,13 +134,12 @@ public class TaskList extends Node { if (folder.getInt(NoteColumns.TYPE) == Notes.TYPE_FOLDER) { String name = folder.getString(NoteColumns.SNIPPET); - setName(GTaskStringUtils.MIUI_FOLDER_PREFFIX + name); + setName(GTaskStringUtils.MIUI_FOLDER_PREFFIX + name); // 从本地的JSON对象中获取文件夹类型的任务列表的名称，并在前面添加一定的前缀后，设置给当前对象的name属性 } else if (folder.getInt(NoteColumns.TYPE) == Notes.TYPE_SYSTEM) { if (folder.getLong(NoteColumns.ID) == Notes.ID_ROOT_FOLDER) - setName(GTaskStringUtils.MIUI_FOLDER_PREFFIX + GTaskStringUtils.FOLDER_DEFAULT); + setName(GTaskStringUtils.MIUI_FOLDER_PREFFIX + GTaskStringUtils.FOLDER_DEFAULT); // 如果是系统文件夹类型的任务列表，则根据其ID设置对应的名称 else if (folder.getLong(NoteColumns.ID) == Notes.ID_CALL_RECORD_FOLDER) - setName(GTaskStringUtils.MIUI_FOLDER_PREFFIX - + GTaskStringUtils.FOLDER_CALL_NOTE); + setName(GTaskStringUtils.MIUI_FOLDER_PREFFIX + GTaskStringUtils.FOLDER_CALL_NOTE); else Log.e(TAG, "invalid system folder"); } else { @@ -156,7 +150,6 @@ public class TaskList extends Node { e.printStackTrace(); } } - public JSONObject getLocalJSONFromContent() { try { JSONObject js = new JSONObject(); @@ -166,16 +159,16 @@ public class TaskList extends Node { if (getName().startsWith(GTaskStringUtils.MIUI_FOLDER_PREFFIX)) folderName = folderName.substring(GTaskStringUtils.MIUI_FOLDER_PREFFIX.length(), folderName.length()); - folder.put(NoteColumns.SNIPPET, folderName); + folder.put(NoteColumns.SNIPPET, folderName); // 将任务列表对象的名称设置为文件夹的摘要，并添加到folder对象中 if (folderName.equals(GTaskStringUtils.FOLDER_DEFAULT) || folderName.equals(GTaskStringUtils.FOLDER_CALL_NOTE)) - folder.put(NoteColumns.TYPE, Notes.TYPE_SYSTEM); + folder.put(NoteColumns.TYPE, Notes.TYPE_SYSTEM); // 如果文件夹名称是默认或通话记录类型，则将文件夹类型设置为系统类型 else - folder.put(NoteColumns.TYPE, Notes.TYPE_FOLDER); + folder.put(NoteColumns.TYPE, Notes.TYPE_FOLDER); // 否则，将文件夹类型设置为普通文件夹类型 - js.put(GTaskStringUtils.META_HEAD_NOTE, folder); + js.put(GTaskStringUtils.META_HEAD_NOTE, folder); // 将folder对象添加到最终的JSON对象js中 - return js; + return js; // 返回构建好的JSON对象 } catch (JSONException e) { Log.e(TAG, e.toString()); e.printStackTrace(); @@ -186,26 +179,27 @@ public class TaskList extends Node { public int getSyncAction(Cursor c) { try { if (c.getInt(SqlNote.LOCAL_MODIFIED_COLUMN) == 0) { - // there is no local update + // 如果本地修改标志位为0，表示没有本地更新 if (c.getLong(SqlNote.SYNC_ID_COLUMN) == getLastModified()) { - // no update both side - return SYNC_ACTION_NONE; + // 如果同步ID与最后修改时间相等，表示双方都没有更新 + return SYNC_ACTION_NONE; // 返回不需要进行同步操作 } else { - // apply remote to local - return SYNC_ACTION_UPDATE_LOCAL; + // 如果同步ID与最后修改时间不相等，表示远程有更新，需要将远程更新应用到本地 + return SYNC_ACTION_UPDATE_LOCAL; // 返回更新本地的同步操作 } } else { - // validate gtask id + // 如果本地修改标志位为1，表示有本地更新 + // 验证gtask id是否匹配 if (!c.getString(SqlNote.GTASK_ID_COLUMN).equals(getGid())) { Log.e(TAG, "gtask id doesn't match"); - return SYNC_ACTION_ERROR; + return SYNC_ACTION_ERROR; // 返回同步操作错误 } if (c.getLong(SqlNote.SYNC_ID_COLUMN) == getLastModified()) { - // local modification only - return SYNC_ACTION_UPDATE_REMOTE; + // 如果同步ID与最后修改时间相等，表示只有本地修改 + return SYNC_ACTION_UPDATE_REMOTE; // 返回更新远程的同步操作 } else { - // for folder conflicts, just apply local modification - return SYNC_ACTION_UPDATE_REMOTE; + // 对于文件夹冲突，仅应用本地修改 + return SYNC_ACTION_UPDATE_REMOTE; // 返回更新远程的同步操作 } } } catch (Exception e) { @@ -213,27 +207,36 @@ public class TaskList extends Node { e.printStackTrace(); } - return SYNC_ACTION_ERROR; + return SYNC_ACTION_ERROR; // 返回同步操作错误 } +import java.util.ArrayList; + import android.util.Log; + +public class Task { + private static final String TAG = "Task"; + private ArrayList mChildren; // 子任务列表 + private int mIndex; // 索引 + // 获取子任务数量 public int getChildTaskCount() { return mChildren.size(); } + // 添加子任务 public boolean addChildTask(Task task) { boolean ret = false; if (task != null && !mChildren.contains(task)) { ret = mChildren.add(task); if (ret) { - // need to set prior sibling and parent - task.setPriorSibling(mChildren.isEmpty() ? null : mChildren - .get(mChildren.size() - 1)); + // 设置前一个兄弟节点和父节点 + task.setPriorSibling(mChildren.isEmpty() ? null : mChildren.get(mChildren.size() - 1)); task.setParent(this); } } return ret; } + // 在指定位置添加子任务 public boolean addChildTask(Task task, int index) { if (index < 0 || index > mChildren.size()) { Log.e(TAG, "add child task: invalid index"); @@ -244,7 +247,7 @@ public class TaskList extends Node { if (task != null && pos == -1) { mChildren.add(index, task); - // update the task list + // 更新任务列表 Task preTask = null; Task afterTask = null; if (index != 0) @@ -260,6 +263,7 @@ public class TaskList extends Node { return true; } + // 移除子任务 public boolean removeChildTask(Task task) { boolean ret = false; int index = mChildren.indexOf(task); @@ -267,11 +271,11 @@ public class TaskList extends Node { ret = mChildren.remove(task); if (ret) { - // reset prior sibling and parent + // 重置前一个兄弟节点和父节点 task.setPriorSibling(null); task.setParent(null); - // update the task list + // 更新任务列表 if (index != mChildren.size()) { mChildren.get(index).setPriorSibling( index == 0 ? null : mChildren.get(index - 1)); @@ -281,8 +285,8 @@ public class TaskList extends Node { return ret; } + // 移动子任务到指定位置 public boolean moveChildTask(Task task, int index) { - if (index < 0 || index >= mChildren.size()) { Log.e(TAG, "move child task: invalid index"); return false; @@ -299,6 +303,7 @@ public class TaskList extends Node { return (removeChildTask(task) && addChildTask(task, index)); } + // 根据任务ID查找子任务 public Task findChildTaskByGid(String gid) { for (int i = 0; i < mChildren.size(); i++) { Task t = mChildren.get(i); @@ -309,10 +314,12 @@ public class TaskList extends Node { return null; } + // 获取子任务在列表中的索引 public int getChildTaskIndex(Task task) { return mChildren.indexOf(task); } + // 根据索引获取子任务 public Task getChildTaskByIndex(int index) { if (index < 0 || index >= mChildren.size()) { Log.e(TAG, "getTaskByIndex: invalid index"); @@ -321,6 +328,7 @@ public class TaskList extends Node { return mChildren.get(index); } + // 根据任务ID获取子任务 public Task getChilTaskByGid(String gid) { for (Task task : mChildren) { if (task.getGid().equals(gid)) @@ -329,15 +337,20 @@ public class TaskList extends Node { return null; } + // 获取子任务列表 public ArrayList getChildTaskList() { return this.mChildren; } + // 设置索引 public void setIndex(int index) { this.mIndex = index; } + // 获取索引 public int getIndex() { return this.mIndex; } + + // 其他属性和方法的定义 } diff --git a/src/src/net/micode/notes/gtask/exception/ActionFailureException.java b/src/src/net/micode/notes/gtask/exception/ActionFailureException.java index 15504be9..76a3a440 100644 --- a/src/src/net/micode/notes/gtask/exception/ActionFailureException.java +++ b/src/src/net/micode/notes/gtask/exception/ActionFailureException.java @@ -13,20 +13,36 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package net.micode.notes.gtask.exception; +/** + * ActionFailureException 表示操作失败的异常。 + */ public class ActionFailureException extends RuntimeException { private static final long serialVersionUID = 4425249765923293627L; + /** + * 创建一个无消息的 ActionFailureException 异常对象。 + */ public ActionFailureException() { super(); } + /** + * 创建一个带有指定消息的 ActionFailureException 异常对象。 + * + * @param paramString 异常消息 + */ public ActionFailureException(String paramString) { super(paramString); } + /** + * 创建一个带有指定消息和原因的 ActionFailureException 异常对象。 + * + * @param paramString 异常消息 + * @param paramThrowable 异常原因 + */ public ActionFailureException(String paramString, Throwable paramThrowable) { super(paramString, paramThrowable); } diff --git a/src/src/net/micode/notes/gtask/exception/NetworkFailureException.java b/src/src/net/micode/notes/gtask/exception/NetworkFailureException.java index b08cfb1d..bd09328a 100644 --- a/src/src/net/micode/notes/gtask/exception/NetworkFailureException.java +++ b/src/src/net/micode/notes/gtask/exception/NetworkFailureException.java @@ -16,17 +16,34 @@ package net.micode.notes.gtask.exception; +/** + * NetworkFailureException 表示网络操作失败的异常。 + */ public class NetworkFailureException extends Exception { private static final long serialVersionUID = 2107610287180234136L; + /** + * 创建一个无消息的 NetworkFailureException 异常对象。 + */ public NetworkFailureException() { super(); } + /** + * 创建一个带有指定消息的 NetworkFailureException 异常对象。 + * + * @param paramString 异常消息 + */ public NetworkFailureException(String paramString) { super(paramString); } + /** + * 创建一个带有指定消息和原因的 NetworkFailureException 异常对象。 + * + * @param paramString 异常消息 + * @param paramThrowable 异常原因 + */ public NetworkFailureException(String paramString, Throwable paramThrowable) { super(paramString, paramThrowable); } diff --git a/src/src/net/micode/notes/gtask/remote/GTaskASyncTask.java b/src/src/net/micode/notes/gtask/remote/GTaskASyncTask.java index b8fe5179..6566c1c2 100644 --- a/src/src/net/micode/notes/gtask/remote/GTaskASyncTask.java +++ b/src/src/net/micode/notes/gtask/remote/GTaskASyncTask.java @@ -28,96 +28,115 @@ import net.micode.notes.R; import net.micode.notes.ui.NotesListActivity; import net.micode.notes.ui.NotesPreferenceActivity; - +/** + * GTaskASyncTask 是一个异步任务类，用于在后台执行 GTasks 同步操作。 + */ public class GTaskASyncTask extends AsyncTask { + /** + * GTASK_SYNC_NOTIFICATION_ID 是通知的 ID。 + */ private static int GTASK_SYNC_NOTIFICATION_ID = 5234235; + /** + * OnCompleteListener 是异步任务完成时的回调接口。 + */ public interface OnCompleteListener { void onComplete(); } - private Context mContext; + private Context mContext; // 上下文 - private NotificationManager mNotifiManager; + private NotificationManager mNotifiManager; // 通知管理器 - private GTaskManager mTaskManager; + private GTaskManager mTaskManager; // GTasks 管理器 - private OnCompleteListener mOnCompleteListener; + private OnCompleteListener mOnCompleteListener; // 异步任务完成时的回调接口 + /** + * 创建一个 GTaskASyncTask 对象。 + * + * @param context 上下文 + * @param listener 异步任务完成时的回调接口 + */ public GTaskASyncTask(Context context, OnCompleteListener listener) { mContext = context; mOnCompleteListener = listener; - mNotifiManager = (NotificationManager) mContext - .getSystemService(Context.NOTIFICATION_SERVICE); + mNotifiManager = (NotificationManager) mContext.getSystemService(Context.NOTIFICATION_SERVICE); mTaskManager = GTaskManager.getInstance(); } - +} + /** + * 取消同步操作。 + */ public void cancelSync() { - mTaskManager.cancelSync(); + mTaskManager.cancelSync(); // 调用TaskManager的cancelSync方法取消同步操作 } + /** + * 发布进度更新。 + * + * @param message 进度消息 + */ public void publishProgess(String message) { publishProgress(new String[]{ message - }); + }); // 调用AsyncTask的publishProgress方法发布进度更新 } + /** + * 显示通知。 + * + * @param tickerId 通知 ID + * @param content 通知内容 + */ private void showNotification(int tickerId, String content) { - Notification notification = new Notification(R.drawable.notification, mContext - .getString(tickerId), System.currentTimeMillis()); - notification.defaults = Notification.DEFAULT_LIGHTS; - notification.flags = Notification.FLAG_AUTO_CANCEL; + Notification notification = new Notification(R.drawable.notification, mContext.getString(tickerId), System.currentTimeMillis()); // 创建一个通知对象 + notification.defaults = Notification.DEFAULT_LIGHTS; // 设置通知的默认灯光 + notification.flags = Notification.FLAG_AUTO_CANCEL; // 设置通知的自动取消标志 PendingIntent pendingIntent; - if (tickerId != R.string.ticker_success) { - pendingIntent = PendingIntent.getActivity(mContext, 0, new Intent(mContext, - NotesPreferenceActivity.class), 0); - + if (tickerId != R.string.ticker_success) { // 如果通知ID不是成功通知的ID + pendingIntent = PendingIntent.getActivity(mContext, 0, new Intent(mContext, NotesPreferenceActivity.class), 0); // 创建一个启动PreferencesActivity的PendingIntent } else { - pendingIntent = PendingIntent.getActivity(mContext, 0, new Intent(mContext, - NotesListActivity.class), 0); + pendingIntent = PendingIntent.getActivity(mContext, 0, new Intent(mContext, NotesListActivity.class), 0); // 创建一个启动NotesListActivity的PendingIntent } - notification.setLatestEventInfo(mContext, mContext.getString(R.string.app_name), content, - pendingIntent); - mNotifiManager.notify(GTASK_SYNC_NOTIFICATION_ID, notification); + notification.setLatestEventInfo(mContext, mContext.getString(R.string.app_name), content, pendingIntent); // 设置通知的最新事件信息 + mNotifiManager.notify(GTASK_SYNC_NOTIFICATION_ID, notification); // 发送通知 } @Override protected Integer doInBackground(Void... unused) { - publishProgess(mContext.getString(R.string.sync_progress_login, NotesPreferenceActivity - .getSyncAccountName(mContext))); - return mTaskManager.sync(mContext, this); + publishProgess(mContext.getString(R.string.sync_progress_login, NotesPreferenceActivity.getSyncAccountName(mContext))); // 发布进度更新，显示登录进度 + return mTaskManager.sync(mContext, this); // 调用TaskManager的sync方法进行同步操作 } @Override protected void onProgressUpdate(String... progress) { - showNotification(R.string.ticker_syncing, progress[0]); + showNotification(R.string.ticker_syncing, progress[0]); // 显示同步中的通知 if (mContext instanceof GTaskSyncService) { - ((GTaskSyncService) mContext).sendBroadcast(progress[0]); + ((GTaskSyncService) mContext).sendBroadcast(progress[0]); // 向GTaskSyncService发送广播 } } - @Override protected void onPostExecute(Integer result) { - if (result == GTaskManager.STATE_SUCCESS) { + if (result == GTaskManager.STATE_SUCCESS) { // 如果同步成功 showNotification(R.string.ticker_success, mContext.getString( - R.string.success_sync_account, mTaskManager.getSyncAccount())); - NotesPreferenceActivity.setLastSyncTime(mContext, System.currentTimeMillis()); - } else if (result == GTaskManager.STATE_NETWORK_ERROR) { - showNotification(R.string.ticker_fail, mContext.getString(R.string.error_sync_network)); - } else if (result == GTaskManager.STATE_INTERNAL_ERROR) { - showNotification(R.string.ticker_fail, mContext.getString(R.string.error_sync_internal)); - } else if (result == GTaskManager.STATE_SYNC_CANCELLED) { + R.string.success_sync_account, mTaskManager.getSyncAccount())); // 显示成功通知，包括账户信息 + NotesPreferenceActivity.setLastSyncTime(mContext, System.currentTimeMillis()); // 更新上次同步时间 + } else if (result == GTaskManager.STATE_NETWORK_ERROR) { // 如果网络错误 + showNotification(R.string.ticker_fail, mContext.getString(R.string.error_sync_network)); // 显示网络错误通知 + } else if (result == GTaskManager.STATE_INTERNAL_ERROR) { // 如果内部错误 + showNotification(R.string.ticker_fail, mContext.getString(R.string.error_sync_internal)); // 显示内部错误通知 + } else if (result == GTaskManager.STATE_SYNC_CANCELLED) { // 如果同步被取消 showNotification(R.string.ticker_cancel, mContext - .getString(R.string.error_sync_cancelled)); + .getString(R.string.error_sync_cancelled)); // 显示同步取消通知 } - if (mOnCompleteListener != null) { - new Thread(new Runnable() { + if (mOnCompleteListener != null) { // 如果存在完成监听器 + new Thread(new Runnable() { public void run() { - mOnCompleteListener.onComplete(); + mOnCompleteListener.onComplete(); // 在新线程中调用完成监听器的onComplete方法 } }).start(); } } -} diff --git a/src/src/net/micode/notes/gtask/remote/GTaskClient.java b/src/src/net/micode/notes/gtask/remote/GTaskClient.java index 7b94ce41..0e360c4e 100644 --- a/src/src/net/micode/notes/gtask/remote/GTaskClient.java +++ b/src/src/net/micode/notes/gtask/remote/GTaskClient.java @@ -60,47 +60,47 @@ import java.util.zip.GZIPInputStream; import java.util.zip.Inflater; import java.util.zip.InflaterInputStream; - public class GTaskClient { - private static final String TAG = GTaskClient.class.getSimpleName(); + private static final String TAG = GTaskClient.class.getSimpleName(); // 定义标签常量，用于日志输出 - private static final String GTASK_URL = "https://mail.google.com/tasks/"; + private static final String GTASK_URL = "https://mail.google.com/tasks/"; // 定义任务管理器的 URL 地址 - private static final String GTASK_GET_URL = "https://mail.google.com/tasks/ig"; + private static final String GTASK_GET_URL = "https://mail.google.com/tasks/ig"; // 定义获取任务数据的 URL 地址 - private static final String GTASK_POST_URL = "https://mail.google.com/tasks/r/ig"; + private static final String GTASK_POST_URL = "https://mail.google.com/tasks/r/ig"; // 定义发布任务数据的 URL 地址 - private static GTaskClient mInstance = null; + private static GTaskClient mInstance = null; // 单例模式中的唯一实例 - private DefaultHttpClient mHttpClient; + private DefaultHttpClient mHttpClient; // HTTP 客户端对象 - private String mGetUrl; + private String mGetUrl; // 获取任务数据的 URL 地址 - private String mPostUrl; + private String mPostUrl; // 发布任务数据的 URL 地址 - private long mClientVersion; + private long mClientVersion; // 客户端版本号 - private boolean mLoggedin; + private boolean mLoggedin; // 用户登录状态 - private long mLastLoginTime; + private long mLastLoginTime; // 上次登录时间 - private int mActionId; + private int mActionId; // 操作 ID - private Account mAccount; + private Account mAccount; // 用户账户信息 - private JSONArray mUpdateArray; + private JSONArray mUpdateArray; // 待更新的任务数据 JSON 数组 - private GTaskClient() { - mHttpClient = null; - mGetUrl = GTASK_GET_URL; - mPostUrl = GTASK_POST_URL; - mClientVersion = -1; - mLoggedin = false; - mLastLoginTime = 0; - mActionId = 1; - mAccount = null; - mUpdateArray = null; + private GTaskClient() { // 构造函数 + mHttpClient = null; // 初始化 HTTP 客户端对象为 null + mGetUrl = GTASK_GET_URL; // 设置获取任务数据的 URL 地址 + mPostUrl = GTASK_POST_URL; // 设置发布任务数据的 URL 地址 + mClientVersion = -1; // 初始化客户端版本号为 -1 + mLoggedin = false; // 初始化登录状态为 false + mLastLoginTime = 0; // 初始化上次登录时间为 0 + mActionId = 1; // 初始化操作 ID 为 1 + mAccount = null; // 初始化用户账户信息为 null + mUpdateArray = null; // 初始化待更新的任务数据 JSON 数组为 null } +} public static synchronized GTaskClient getInstance() { if (mInstance == null) { @@ -109,18 +109,20 @@ public class GTaskClient { return mInstance; } + /** + * 用户登录操作 + * @param activity 当前活动的 Activity + * @return 登录成功返回 true，登录失败返回 false + */ public boolean login(Activity activity) { - // we suppose that the cookie would expire after 5 minutes - // then we need to re-login + // 假设 cookie 在 5 分钟后过期，需要重新登录 final long interval = 1000 * 60 * 5; if (mLastLoginTime + interval < System.currentTimeMillis()) { mLoggedin = false; } - // need to re-login after account switch - if (mLoggedin - && !TextUtils.equals(getSyncAccount().name, NotesPreferenceActivity - .getSyncAccountName(activity))) { + // 切换账户后需要重新登录 + if (mLoggedin && !TextUtils.equals(getSyncAccount().name, NotesPreferenceActivity.getSyncAccountName(activity))) { mLoggedin = false; } @@ -136,9 +138,8 @@ public class GTaskClient { return false; } - // login with custom domain if necessary - if (!(mAccount.name.toLowerCase().endsWith("gmail.com") || mAccount.name.toLowerCase() - .endsWith("googlemail.com"))) { + // 如果账户不是以 "gmail.com" 或 "googlemail.com" 结尾，则使用自定义域登录 + if (!(mAccount.name.toLowerCase().endsWith("gmail.com") || mAccount.name.toLowerCase().endsWith("googlemail.com"))) { StringBuilder url = new StringBuilder(GTASK_URL).append("a/"); int index = mAccount.name.indexOf('@') + 1; String suffix = mAccount.name.substring(index); @@ -151,7 +152,7 @@ public class GTaskClient { } } - // try to login with google official url + // 尝试使用 Google 官方的 URL 登录 if (!mLoggedin) { mGetUrl = GTASK_GET_URL; mPostUrl = GTASK_POST_URL; @@ -163,7 +164,12 @@ public class GTaskClient { mLoggedin = true; return true; } - + /** + * 登录 Google 账户获取授权令牌 + * @param activity 当前活动的 Activity + * @param invalidateToken 是否使授权令牌无效 + * @return 成功返回授权令牌，失败返回 null + */ private String loginGoogleAccount(Activity activity, boolean invalidateToken) { String authToken; AccountManager accountManager = AccountManager.get(activity); @@ -189,7 +195,7 @@ public class GTaskClient { return null; } - // get the token now + // 获取授权令牌 AccountManagerFuture accountManagerFuture = accountManager.getAuthToken(account, "goanna_mobile", null, activity, null, null); try { @@ -206,11 +212,15 @@ public class GTaskClient { return authToken; } - + /** + * 尝试登录 Gtask + * @param activity 当前活动的 Activity + * @param authToken 授权令牌 + * @return 登录成功返回 true，失败返回 false + */ private boolean tryToLoginGtask(Activity activity, String authToken) { if (!loginGtask(authToken)) { - // maybe the auth token is out of date, now let's invalidate the - // token and try again + // 可能授权令牌已过期，使其失效后重试 authToken = loginGoogleAccount(activity, true); if (authToken == null) { Log.e(TAG, "login google account failed"); @@ -224,26 +234,40 @@ public class GTaskClient { } return true; } - + /** + * 登录 Gtask + * @param authToken 授权令牌 + * @return 登录成功返回 true，失败返回 false + */ private boolean loginGtask(String authToken) { int timeoutConnection = 10000; int timeoutSocket = 15000; + + // 设置 HttpParams 参数 HttpParams httpParameters = new BasicHttpParams(); HttpConnectionParams.setConnectionTimeout(httpParameters, timeoutConnection); HttpConnectionParams.setSoTimeout(httpParameters, timeoutSocket); + + // 创建 DefaultHttpClient 实例 mHttpClient = new DefaultHttpClient(httpParameters); + + // 创建 BasicCookieStore 实例，并设置到 HttpClient 中 BasicCookieStore localBasicCookieStore = new BasicCookieStore(); mHttpClient.setCookieStore(localBasicCookieStore); + + // 设置 HttpParams 参数 HttpProtocolParams.setUseExpectContinue(mHttpClient.getParams(), false); - // login gtask + // 尝试登录 Gtask try { String loginUrl = mGetUrl + "?auth=" + authToken; HttpGet httpGet = new HttpGet(loginUrl); + + // 执行 HttpGet 请求 HttpResponse response = null; response = mHttpClient.execute(httpGet); - // get the cookie now + // 获取 Cookie List cookies = mHttpClient.getCookieStore().getCookies(); boolean hasAuthCookie = false; for (Cookie cookie : cookies) { @@ -255,7 +279,7 @@ public class GTaskClient { Log.w(TAG, "it seems that there is no auth cookie"); } - // get the client version + // 获取客户端版本号 String resString = getResponseContent(response.getEntity()); String jsBegin = "_setup("; String jsEnd = ")}"; @@ -272,18 +296,25 @@ public class GTaskClient { e.printStackTrace(); return false; } catch (Exception e) { - // simply catch all exceptions + // 简单地捕获所有异常 Log.e(TAG, "httpget gtask_url failed"); return false; } return true; } - + /** + * 获取动作 ID + * @return 动作 ID + */ private int getActionId() { return mActionId++; } + /** + * 创建 HttpPost 请求 + * @return HttpPost 实例 + */ private HttpPost createHttpPost() { HttpPost httpPost = new HttpPost(mPostUrl); httpPost.setHeader("Content-Type", "application/x-www-form-urlencoded;charset=utf-8"); @@ -291,6 +322,12 @@ public class GTaskClient { return httpPost; } + /** + * 获取响应内容 + * @param entity 响应实体 + * @return 响应内容字符串 + * @throws IOException 输入输出异常 + */ private String getResponseContent(HttpEntity entity) throws IOException { String contentEncoding = null; if (entity.getContentEncoding() != null) { @@ -322,21 +359,30 @@ public class GTaskClient { input.close(); } } - + /** + * 发送 POST 请求 + * @param js 请求参数 + * @return 服务器响应 + * @throws NetworkFailureException 网络异常 + */ private JSONObject postRequest(JSONObject js) throws NetworkFailureException { + // 如果没有登录，则无法发送请求 if (!mLoggedin) { Log.e(TAG, "please login first"); throw new ActionFailureException("not logged in"); } + // 创建 HttpPost 请求 HttpPost httpPost = createHttpPost(); + try { LinkedList list = new LinkedList(); + // 将请求参数转换为 BasicNameValuePair 并添加到列表中 list.add(new BasicNameValuePair("r", js.toString())); UrlEncodedFormEntity entity = new UrlEncodedFormEntity(list, "UTF-8"); httpPost.setEntity(entity); - // execute the post + // 执行 POST 请求 HttpResponse response = mHttpClient.execute(httpPost); String jsString = getResponseContent(response.getEntity()); return new JSONObject(jsString); @@ -359,24 +405,34 @@ public class GTaskClient { throw new ActionFailureException("error occurs when posting request"); } } - + /** + * 创建新任务 + * @param task 待创建的任务 + * @throws NetworkFailureException 网络异常 + */ public void createTask(Task task) throws NetworkFailureException { + // 提交所有未提交的更新 commitUpdate(); + try { JSONObject jsPost = new JSONObject(); JSONArray actionList = new JSONArray(); // action_list + // 将任务创建操作封装成 Action 并添加到列表中 actionList.put(task.getCreateAction(getActionId())); jsPost.put(GTaskStringUtils.GTASK_JSON_ACTION_LIST, actionList); // client_version + // 添加客户端版本号 jsPost.put(GTaskStringUtils.GTASK_JSON_CLIENT_VERSION, mClientVersion); // post + // 发送 POST 请求 JSONObject jsResponse = postRequest(jsPost); JSONObject jsResult = (JSONObject) jsResponse.getJSONArray( GTaskStringUtils.GTASK_JSON_RESULTS).get(0); + // 解析服务器响应，更新任务 ID task.setGid(jsResult.getString(GTaskStringUtils.GTASK_JSON_NEW_ID)); } catch (JSONException e) { @@ -386,23 +442,34 @@ public class GTaskClient { } } + /** + * 创建新任务列表 + * @param tasklist 待创建的任务列表 + * @throws NetworkFailureException 网络异常 + */ public void createTaskList(TaskList tasklist) throws NetworkFailureException { + // 提交所有未提交的更新 commitUpdate(); + try { JSONObject jsPost = new JSONObject(); JSONArray actionList = new JSONArray(); // action_list + // 将任务列表创建操作封装成 Action 并添加到列表中 actionList.put(tasklist.getCreateAction(getActionId())); jsPost.put(GTaskStringUtils.GTASK_JSON_ACTION_LIST, actionList); // client version + // 添加客户端版本号 jsPost.put(GTaskStringUtils.GTASK_JSON_CLIENT_VERSION, mClientVersion); // post + // 发送 POST 请求 JSONObject jsResponse = postRequest(jsPost); JSONObject jsResult = (JSONObject) jsResponse.getJSONArray( GTaskStringUtils.GTASK_JSON_RESULTS).get(0); + // 解析服务器响应，更新任务列表 ID tasklist.setGid(jsResult.getString(GTaskStringUtils.GTASK_JSON_NEW_ID)); } catch (JSONException e) { @@ -411,19 +478,27 @@ public class GTaskClient { throw new ActionFailureException("create tasklist: handing jsonobject failed"); } } - + /** + * 提交所有未提交的更新 + * @throws NetworkFailureException 网络异常 + */ public void commitUpdate() throws NetworkFailureException { if (mUpdateArray != null) { try { JSONObject jsPost = new JSONObject(); // action_list + // 将待提交的更新列表作为参数添加到请求中 jsPost.put(GTaskStringUtils.GTASK_JSON_ACTION_LIST, mUpdateArray); // client_version + // 添加客户端版本号 jsPost.put(GTaskStringUtils.GTASK_JSON_CLIENT_VERSION, mClientVersion); + // post + // 发送 POST 请求 postRequest(jsPost); + // 清空更新列表 mUpdateArray = null; } catch (JSONException e) { Log.e(TAG, e.toString()); @@ -433,16 +508,25 @@ public class GTaskClient { } } + /** + * 添加更新节点 + * @param node 待添加的节点 + * @throws NetworkFailureException 网络异常 + */ public void addUpdateNode(Node node) throws NetworkFailureException { if (node != null) { - // too many update items may result in an error - // set max to 10 items + // 太多的更新项可能导致错误，设置最大为10个 if (mUpdateArray != null && mUpdateArray.length() > 10) { + // 提交当前的更新列表 commitUpdate(); } - if (mUpdateArray == null) + if (mUpdateArray == null) { + // 创建新的更新列表 mUpdateArray = new JSONArray(); + } + + // 将节点的更新操作封装成 Action 并添加到列表中 mUpdateArray.put(node.getUpdateAction(getActionId())); } }