diff --git a/src/Notes-master/.gradle/8.0.2/checksums/checksums.lock b/src/.gradle/8.0.2/checksums/checksums.lock similarity index 100% rename from src/Notes-master/.gradle/8.0.2/checksums/checksums.lock rename to src/.gradle/8.0.2/checksums/checksums.lock diff --git a/src/Notes-master/.gradle/8.0.2/checksums/md5-checksums.bin b/src/.gradle/8.0.2/checksums/md5-checksums.bin similarity index 100% rename from src/Notes-master/.gradle/8.0.2/checksums/md5-checksums.bin rename to src/.gradle/8.0.2/checksums/md5-checksums.bin diff --git a/src/Notes-master/.gradle/8.0.2/checksums/sha1-checksums.bin b/src/.gradle/8.0.2/checksums/sha1-checksums.bin similarity index 100% rename from src/Notes-master/.gradle/8.0.2/checksums/sha1-checksums.bin rename to src/.gradle/8.0.2/checksums/sha1-checksums.bin diff --git a/src/Notes-master/.gradle/8.0.2/dependencies-accessors/dependencies-accessors.lock b/src/.gradle/8.0.2/dependencies-accessors/dependencies-accessors.lock similarity index 100% rename from src/Notes-master/.gradle/8.0.2/dependencies-accessors/dependencies-accessors.lock rename to src/.gradle/8.0.2/dependencies-accessors/dependencies-accessors.lock diff --git a/src/Notes-master/.gradle/8.0.2/dependencies-accessors/gc.properties b/src/.gradle/8.0.2/dependencies-accessors/gc.properties similarity index 100% rename from src/Notes-master/.gradle/8.0.2/dependencies-accessors/gc.properties rename to src/.gradle/8.0.2/dependencies-accessors/gc.properties diff --git a/src/.gradle/8.0.2/executionHistory/executionHistory.bin b/src/.gradle/8.0.2/executionHistory/executionHistory.bin new file mode 100644 index 0000000..b002101 Binary files /dev/null and b/src/.gradle/8.0.2/executionHistory/executionHistory.bin differ diff --git a/src/.gradle/8.0.2/executionHistory/executionHistory.lock b/src/.gradle/8.0.2/executionHistory/executionHistory.lock new file mode 100644 index 0000000..ea225d5 Binary files /dev/null and b/src/.gradle/8.0.2/executionHistory/executionHistory.lock differ diff --git a/src/Notes-master/.gradle/8.0.2/fileChanges/last-build.bin b/src/.gradle/8.0.2/fileChanges/last-build.bin similarity index 100% rename from src/Notes-master/.gradle/8.0.2/fileChanges/last-build.bin rename to src/.gradle/8.0.2/fileChanges/last-build.bin diff --git a/src/Notes-master/.gradle/8.0.2/fileHashes/fileHashes.bin b/src/.gradle/8.0.2/fileHashes/fileHashes.bin similarity index 50% rename from src/Notes-master/.gradle/8.0.2/fileHashes/fileHashes.bin rename to src/.gradle/8.0.2/fileHashes/fileHashes.bin index 9ae633a..53ffc04 100644 Binary files a/src/Notes-master/.gradle/8.0.2/fileHashes/fileHashes.bin and b/src/.gradle/8.0.2/fileHashes/fileHashes.bin differ diff --git a/src/.gradle/8.0.2/fileHashes/fileHashes.lock b/src/.gradle/8.0.2/fileHashes/fileHashes.lock new file mode 100644 index 0000000..e6ca08d Binary files /dev/null and b/src/.gradle/8.0.2/fileHashes/fileHashes.lock differ diff --git a/src/Notes-master/.gradle/8.0.2/fileHashes/resourceHashesCache.bin b/src/.gradle/8.0.2/fileHashes/resourceHashesCache.bin similarity index 84% rename from src/Notes-master/.gradle/8.0.2/fileHashes/resourceHashesCache.bin rename to src/.gradle/8.0.2/fileHashes/resourceHashesCache.bin index d1e5d23..0eba6fa 100644 Binary files a/src/Notes-master/.gradle/8.0.2/fileHashes/resourceHashesCache.bin and b/src/.gradle/8.0.2/fileHashes/resourceHashesCache.bin differ diff --git a/src/Notes-master/.gradle/8.0.2/gc.properties b/src/.gradle/8.0.2/gc.properties similarity index 100% rename from src/Notes-master/.gradle/8.0.2/gc.properties rename to src/.gradle/8.0.2/gc.properties diff --git a/src/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/src/.gradle/buildOutputCleanup/buildOutputCleanup.lock new file mode 100644 index 0000000..9356a87 Binary files /dev/null and b/src/.gradle/buildOutputCleanup/buildOutputCleanup.lock differ diff --git a/src/Notes-master/.gradle/buildOutputCleanup/cache.properties b/src/.gradle/buildOutputCleanup/cache.properties similarity index 100% rename from src/Notes-master/.gradle/buildOutputCleanup/cache.properties rename to src/.gradle/buildOutputCleanup/cache.properties diff --git a/src/.gradle/buildOutputCleanup/outputFiles.bin b/src/.gradle/buildOutputCleanup/outputFiles.bin new file mode 100644 index 0000000..e88d24f Binary files /dev/null and b/src/.gradle/buildOutputCleanup/outputFiles.bin differ diff --git a/src/.gradle/file-system.probe b/src/.gradle/file-system.probe new file mode 100644 index 0000000..1088f80 Binary files /dev/null and b/src/.gradle/file-system.probe differ diff --git a/src/Notes-master/.gradle/vcs-1/gc.properties b/src/.gradle/vcs-1/gc.properties similarity index 100% rename from src/Notes-master/.gradle/vcs-1/gc.properties rename to src/.gradle/vcs-1/gc.properties diff --git a/src/Notes-master/.idea/.gitignore b/src/.idea/.gitignore similarity index 100% rename from src/Notes-master/.idea/.gitignore rename to src/.idea/.gitignore diff --git a/src/Notes-master/.idea/compiler.xml b/src/.idea/compiler.xml similarity index 100% rename from src/Notes-master/.idea/compiler.xml rename to src/.idea/compiler.xml diff --git a/src/.idea/deploymentTargetDropDown.xml b/src/.idea/deploymentTargetDropDown.xml deleted file mode 100644 index a2e5c0b..0000000 --- a/src/.idea/deploymentTargetDropDown.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/Notes-master/.idea/gradle.xml b/src/.idea/gradle.xml similarity index 100% rename from src/Notes-master/.idea/gradle.xml rename to src/.idea/gradle.xml diff --git a/src/Notes-master/.idea/jarRepositories.xml b/src/.idea/jarRepositories.xml similarity index 100% rename from src/Notes-master/.idea/jarRepositories.xml rename to src/.idea/jarRepositories.xml diff --git a/src/Notes-master/.idea/misc.xml b/src/.idea/misc.xml similarity index 100% rename from src/Notes-master/.idea/misc.xml rename to src/.idea/misc.xml diff --git a/src/Notes-master/.idea/vcs.xml b/src/.idea/vcs.xml similarity index 100% rename from src/Notes-master/.idea/vcs.xml rename to src/.idea/vcs.xml diff --git a/src/Notes-master/.gradle/8.0.2/executionHistory/executionHistory.bin b/src/Notes-master/.gradle/8.0.2/executionHistory/executionHistory.bin deleted file mode 100644 index a4050a1..0000000 Binary files a/src/Notes-master/.gradle/8.0.2/executionHistory/executionHistory.bin and /dev/null differ diff --git a/src/Notes-master/.gradle/8.0.2/executionHistory/executionHistory.lock b/src/Notes-master/.gradle/8.0.2/executionHistory/executionHistory.lock deleted file mode 100644 index 877d71b..0000000 Binary files a/src/Notes-master/.gradle/8.0.2/executionHistory/executionHistory.lock and /dev/null differ diff --git a/src/Notes-master/.gradle/8.0.2/fileHashes/fileHashes.lock b/src/Notes-master/.gradle/8.0.2/fileHashes/fileHashes.lock deleted file mode 100644 index 8431ebb..0000000 Binary files a/src/Notes-master/.gradle/8.0.2/fileHashes/fileHashes.lock and /dev/null differ diff --git a/src/Notes-master/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/src/Notes-master/.gradle/buildOutputCleanup/buildOutputCleanup.lock deleted file mode 100644 index dfd8515..0000000 Binary files a/src/Notes-master/.gradle/buildOutputCleanup/buildOutputCleanup.lock and /dev/null differ diff --git a/src/Notes-master/.gradle/buildOutputCleanup/outputFiles.bin b/src/Notes-master/.gradle/buildOutputCleanup/outputFiles.bin deleted file mode 100644 index 9e48b53..0000000 Binary files a/src/Notes-master/.gradle/buildOutputCleanup/outputFiles.bin and /dev/null differ diff --git a/src/Notes-master/.gradle/file-system.probe b/src/Notes-master/.gradle/file-system.probe deleted file mode 100644 index 8952541..0000000 Binary files a/src/Notes-master/.gradle/file-system.probe and /dev/null differ diff --git a/src/Notes-master/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_0/graph.bin b/src/Notes-master/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_0/graph.bin deleted file mode 100644 index 925e5cb..0000000 Binary files a/src/Notes-master/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_0/graph.bin and /dev/null differ diff --git a/src/Notes-master/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_1/graph.bin b/src/Notes-master/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_1/graph.bin deleted file mode 100644 index c600316..0000000 Binary files a/src/Notes-master/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_1/graph.bin and /dev/null differ diff --git a/src/Notes-master/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_4/graph.bin b/src/Notes-master/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_4/graph.bin deleted file mode 100644 index c115c17..0000000 Binary files a/src/Notes-master/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_4/graph.bin and /dev/null differ diff --git a/src/Notes-master/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_5/graph.bin b/src/Notes-master/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_5/graph.bin deleted file mode 100644 index 17483fc..0000000 Binary files a/src/Notes-master/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_5/graph.bin and /dev/null differ diff --git a/src/Notes-master/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_6/graph.bin b/src/Notes-master/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_6/graph.bin deleted file mode 100644 index 5d56e01..0000000 Binary files a/src/Notes-master/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_6/graph.bin and /dev/null differ diff --git a/src/Notes-master/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_7/graph.bin b/src/Notes-master/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_7/graph.bin deleted file mode 100644 index 1db3e80..0000000 Binary files a/src/Notes-master/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_7/graph.bin and /dev/null differ diff --git a/src/Notes-master/app/build/intermediates/dex_archive_input_jar_hashes/debug/out b/src/Notes-master/app/build/intermediates/dex_archive_input_jar_hashes/debug/out deleted file mode 100644 index 0b64d2b..0000000 Binary files a/src/Notes-master/app/build/intermediates/dex_archive_input_jar_hashes/debug/out and /dev/null differ diff --git a/src/Notes-master/app/build/intermediates/incremental/debug/mergeDebugResources/compile-file-map.properties b/src/Notes-master/app/build/intermediates/incremental/debug/mergeDebugResources/compile-file-map.properties deleted file mode 100644 index ef0ab77..0000000 --- a/src/Notes-master/app/build/intermediates/incremental/debug/mergeDebugResources/compile-file-map.properties +++ /dev/null @@ -1,96 +0,0 @@ -#Fri Apr 21 16:04:56 GMT+08:00 2023 -net.micode.notes.app-main-7\:/drawable-hdpi/font_super.png=D\:\\git\\TeamProject\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_super.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/call_record.png=D\:\\git\\TeamProject\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_call_record.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/new_note_normal.png=D\:\\git\\TeamProject\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_new_note_normal.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/edit_yellow.9.png=D\:\\git\\TeamProject\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_yellow.9.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/edit_title_green.9.png=D\:\\git\\TeamProject\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_green.9.png.flat -net.micode.notes.app-main-7\:/menu/sub_folder.xml=D\:\\git\\TeamProject\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\menu_sub_folder.xml.flat -net.micode.notes.app-main-7\:/drawable-hdpi/edit_title_yellow.9.png=D\:\\git\\TeamProject\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_yellow.9.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/font_small.png=D\:\\git\\TeamProject\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_small.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/widget_2x_white.png=D\:\\git\\TeamProject\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_white.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/edit_white.9.png=D\:\\git\\TeamProject\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_white.9.png.flat -net.micode.notes.app-main-7\:/layout/account_dialog_title.xml=D\:\\git\\TeamProject\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\layout_account_dialog_title.xml.flat -net.micode.notes.app-main-7\:/drawable-hdpi/widget_4x_green.png=D\:\\git\\TeamProject\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_green.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/list_blue_down.9.png=D\:\\git\\TeamProject\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_blue_down.9.png.flat -net.micode.notes.app-main-7\:/color/secondary_text_dark.xml=D\:\\git\\TeamProject\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\color_secondary_text_dark.xml.flat -net.micode.notes.app-main-7\:/layout/dialog_edit_text.xml=D\:\\git\\TeamProject\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\layout_dialog_edit_text.xml.flat -net.micode.notes.app-main-7\:/layout/widget_4x.xml=D\:\\git\\TeamProject\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\layout_widget_4x.xml.flat -net.micode.notes.app-main-7\:/drawable-hdpi/list_yellow_middle.9.png=D\:\\git\\TeamProject\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_middle.9.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/menu_delete.png=D\:\\git\\TeamProject\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_menu_delete.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/clock.png=D\:\\git\\TeamProject\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_clock.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/font_normal.png=D\:\\git\\TeamProject\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_normal.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/dropdown_icon.9.png=D\:\\git\\TeamProject\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_dropdown_icon.9.png.flat -net.micode.notes.app-main-7\:/layout/note_edit.xml=D\:\\git\\TeamProject\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\layout_note_edit.xml.flat -net.micode.notes.app-main-7\:/drawable-hdpi/edit_green.9.png=D\:\\git\\TeamProject\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_green.9.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/list_green_single.9.png=D\:\\git\\TeamProject\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_green_single.9.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/list_white_single.9.png=D\:\\git\\TeamProject\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_single.9.png.flat -net.micode.notes.app-main-7\:/raw-zh-rCN/introduction=D\:\\git\\TeamProject\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\raw-zh-rCN_introduction.flat -net.micode.notes.app-main-7\:/drawable-hdpi/widget_2x_green.png=D\:\\git\\TeamProject\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_green.png.flat -net.micode.notes.app-main-7\:/xml/preferences.xml=D\:\\git\\TeamProject\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\xml_preferences.xml.flat -net.micode.notes.app-main-7\:/drawable-hdpi/list_red_single.9.png=D\:\\git\\TeamProject\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_single.9.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/delete.png=D\:\\git\\TeamProject\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_delete.png.flat -net.micode.notes.app-main-7\:/menu/call_record_folder.xml=D\:\\git\\TeamProject\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\menu_call_record_folder.xml.flat -net.micode.notes.app-main-7\:/drawable-hdpi/widget_2x_red.png=D\:\\git\\TeamProject\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_red.png.flat -net.micode.notes.app-main-7\:/layout/widget_2x.xml=D\:\\git\\TeamProject\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\layout_widget_2x.xml.flat -net.micode.notes.app-main-7\:/drawable-hdpi/menu_move.png=D\:\\git\\TeamProject\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_menu_move.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/list_green_down.9.png=D\:\\git\\TeamProject\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_green_down.9.png.flat -net.micode.notes.app-main-7\:/layout/note_edit_list_item.xml=D\:\\git\\TeamProject\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\layout_note_edit_list_item.xml.flat -net.micode.notes.app-main-7\:/drawable-hdpi/widget_2x_blue.png=D\:\\git\\TeamProject\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_blue.png.flat -net.micode.notes.app-main-7\:/layout/add_account_text.xml=D\:\\git\\TeamProject\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\layout_add_account_text.xml.flat -net.micode.notes.app-main-7\:/xml/widget_4x_info.xml=D\:\\git\\TeamProject\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\xml_widget_4x_info.xml.flat -net.micode.notes.app-main-7\:/drawable-hdpi/font_size_selector_bg.9.png=D\:\\git\\TeamProject\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_size_selector_bg.9.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/selected.png=D\:\\git\\TeamProject\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_selected.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/search_result.png=D\:\\git\\TeamProject\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_search_result.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/widget_4x_white.png=D\:\\git\\TeamProject\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_white.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/list_blue_middle.9.png=D\:\\git\\TeamProject\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_blue_middle.9.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/list_green_middle.9.png=D\:\\git\\TeamProject\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_green_middle.9.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/list_white_down.9.png=D\:\\git\\TeamProject\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_down.9.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/list_blue_single.9.png=D\:\\git\\TeamProject\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_blue_single.9.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/font_large.png=D\:\\git\\TeamProject\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_large.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/list_yellow_up.9.png=D\:\\git\\TeamProject\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_up.9.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/list_red_middle.9.png=D\:\\git\\TeamProject\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_middle.9.png.flat -net.micode.notes.app-main-7\:/layout/settings_header.xml=D\:\\git\\TeamProject\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\layout_settings_header.xml.flat -net.micode.notes.app-main-7\:/menu/note_list.xml=D\:\\git\\TeamProject\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\menu_note_list.xml.flat -net.micode.notes.app-main-7\:/menu/call_note_edit.xml=D\:\\git\\TeamProject\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\menu_call_note_edit.xml.flat -net.micode.notes.app-main-7\:/drawable/new_note.xml=D\:\\git\\TeamProject\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable_new_note.xml.flat -net.micode.notes.app-main-7\:/drawable-hdpi/edit_red.9.png=D\:\\git\\TeamProject\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_red.9.png.flat -net.micode.notes.app-main-7\:/layout/note_list.xml=D\:\\git\\TeamProject\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\layout_note_list.xml.flat -net.micode.notes.app-main-7\:/color/primary_text_dark.xml=D\:\\git\\TeamProject\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\color_primary_text_dark.xml.flat -net.micode.notes.app-main-7\:/layout/datetime_picker.xml=D\:\\git\\TeamProject\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\layout_datetime_picker.xml.flat -net.micode.notes.app-main-7\:/raw/introduction=D\:\\git\\TeamProject\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\raw_introduction.flat -net.micode.notes.app-main-7\:/drawable-hdpi/list_yellow_single.9.png=D\:\\git\\TeamProject\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_single.9.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/widget_4x_yellow.png=D\:\\git\\TeamProject\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_yellow.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/widget_4x_red.png=D\:\\git\\TeamProject\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_red.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/title_alert.png=D\:\\git\\TeamProject\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_title_alert.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/list_red_down.9.png=D\:\\git\\TeamProject\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_down.9.png.flat -net.micode.notes.app-main-7\:/menu/note_list_options.xml=D\:\\git\\TeamProject\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\menu_note_list_options.xml.flat -net.micode.notes.app-main-7\:/drawable-hdpi/widget_2x_yellow.png=D\:\\git\\TeamProject\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_yellow.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/icon_app.png=D\:\\git\\TeamProject\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_icon_app.png.flat -net.micode.notes.app-main-7\:/layout/note_item.xml=D\:\\git\\TeamProject\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\layout_note_item.xml.flat -net.micode.notes.app-main-7\:/drawable-hdpi/list_background.png=D\:\\git\\TeamProject\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_background.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/edit_title_red.9.png=D\:\\git\\TeamProject\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_red.9.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/title_bar_bg.9.png=D\:\\git\\TeamProject\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_title_bar_bg.9.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/list_footer_bg.9.png=D\:\\git\\TeamProject\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_footer_bg.9.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/new_note_pressed.png=D\:\\git\\TeamProject\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_new_note_pressed.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/list_green_up.9.png=D\:\\git\\TeamProject\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_green_up.9.png.flat -net.micode.notes.app-main-7\:/layout/note_list_dropdown_menu.xml=D\:\\git\\TeamProject\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\layout_note_list_dropdown_menu.xml.flat -net.micode.notes.app-main-7\:/layout/note_list_footer.xml=D\:\\git\\TeamProject\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\layout_note_list_footer.xml.flat -net.micode.notes.app-main-7\:/drawable-hdpi/list_red_up.9.png=D\:\\git\\TeamProject\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_up.9.png.flat -net.micode.notes.app-main-7\:/menu/note_list_dropdown.xml=D\:\\git\\TeamProject\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\menu_note_list_dropdown.xml.flat -net.micode.notes.app-main-7\:/drawable-hdpi/list_white_up.9.png=D\:\\git\\TeamProject\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_up.9.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/edit_title_blue.9.png=D\:\\git\\TeamProject\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_blue.9.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/bg_color_btn_mask.png=D\:\\git\\TeamProject\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_bg_color_btn_mask.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/edit_blue.9.png=D\:\\git\\TeamProject\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_blue.9.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/bg_btn_set_color.png=D\:\\git\\TeamProject\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_bg_btn_set_color.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/edit_title_white.9.png=D\:\\git\\TeamProject\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_white.9.png.flat -net.micode.notes.app-main-7\:/xml/searchable.xml=D\:\\git\\TeamProject\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\xml_searchable.xml.flat -net.micode.notes.app-main-7\:/drawable-hdpi/notification.png=D\:\\git\\TeamProject\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_notification.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/list_blue_up.9.png=D\:\\git\\TeamProject\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_blue_up.9.png.flat -net.micode.notes.app-main-7\:/xml/widget_2x_info.xml=D\:\\git\\TeamProject\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\xml_widget_2x_info.xml.flat -net.micode.notes.app-main-7\:/drawable-hdpi/note_edit_color_selector_panel.png=D\:\\git\\TeamProject\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_note_edit_color_selector_panel.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/list_white_middle.9.png=D\:\\git\\TeamProject\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_middle.9.png.flat -net.micode.notes.app-main-7\:/layout/folder_list_item.xml=D\:\\git\\TeamProject\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\layout_folder_list_item.xml.flat -net.micode.notes.app-main-7\:/drawable-hdpi/list_folder.9.png=D\:\\git\\TeamProject\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_folder.9.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/widget_4x_blue.png=D\:\\git\\TeamProject\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_blue.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/list_yellow_down.9.png=D\:\\git\\TeamProject\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_down.9.png.flat -net.micode.notes.app-main-7\:/menu/note_edit.xml=D\:\\git\\TeamProject\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\menu_note_edit.xml.flat diff --git a/src/Notes-master/app/build/intermediates/incremental/debug/mergeDebugResources/merger.xml b/src/Notes-master/app/build/intermediates/incremental/debug/mergeDebugResources/merger.xml deleted file mode 100644 index 13662dc..0000000 --- a/src/Notes-master/app/build/intermediates/incremental/debug/mergeDebugResources/merger.xml +++ /dev/null @@ -1,56 +0,0 @@ - - - -%s - --%s - --%s - --%s - - Messaging - Email - #335b5b5b33sp26sp20sp17sp14spNotesNotes 2x2Notes 4x4No associated note found, click to create associated note.Privacy mode，can not see note content...Add noteDelete reminder successfullySet reminderExpiredyyyyMMddMMMd kk:mmGot itTake a lookCallSend emailBrowse webOpen map/MIUI/notes/notes_%s.txt(%d)New FolderExport textSyncCancel syncingSettingsSearchDeleteMove to folder%d selectedNothing selected, the operation is invalidSelect allDeselect allFont sizeSmallMediumLargeSuperEnter check listLeave check listView folderDelete folderChange folder nameThe folder %1$s exist, please renameShareSend to homeRemind meDelete reminderSelect folderParent folderNote added to homeConfirm to delete folder and its notes?Delete selected notesConfirm to delete the selected %d notes?Confirm to delete this note?Have moved selected %1$d notes to %2$s folderSD card busy, not available nowExport failed, please check SD cardThe note is not existSorry, can not set clock on empty noteSorry, can not send and empty note to homeExport successfulExport failExport text file (%1$s) to SD (%2$s) directorySyncing notes...Sync is successfulSync is failedSync is canceledSync is successful with account %1$sSync failed, please check network and account settingsSync failed, internal error occursSync is canceledLogging into %1$s...Getting remote note list...Synchronize local notes with Google Task...SettingsSync accountSync notes with google taskLast sync time %1$syyyy-MM-dd hh:mm:ssAdd accountChange sync accountRemove sync accountCancelSync immediatelyCancel syncingCurrent account %1$sAll sync related information will be deleted, which may result in duplicated items sometimeSync notesPlease select a google account. Local notes will be synced with google task.Cannot change the account because sync is in progress%1$s has been set as the sync accountNew note background color randomDeleteCall notesInput nameSearching NotesSearch notesText in your notesNotessetcancel - %1$s result for \"%2$s\" - - %1$s results for \"%2$s\" - - 短信 - 邮件 - 便签便签2x2便签4x4没有关联内容，点击新建便签。访客模式下，便签内容不可见...新建便签成功删除提醒创建提醒已过期yyyyMMddMM月dd日 kk:mm知道了查看呼叫电话发送邮件浏览网页打开地图新建文件夹导出文本同步取消同步设置搜索删除移动到文件夹选中了 %d 项没有选中项，操作无效全选取消全选文字大小小正常大超大进入清单模式退出清单模式查看文件夹刪除文件夹修改文件夹名称文件夹 %1$s 已存在，请重新命名分享发送到桌面提醒我删除提醒选择文件夹上一级文件夹已添加到桌面删除确认要删除所选的 %d 条便签吗?确认要删除该条便签吗?确认删除文件夹及所包含的便签吗？已将所选 %1$d 条便签移到 %2$s 文件夹SD卡被占用，不能操作导出文本时发生错误，请检查SD卡要查看的便签不存在不能为空便签设置闹钟提醒不能将空便签发送到桌面导出成功导出失败已将文本文件(%1$s)输出至SD卡(%2$s)目录同步便签...同步成功同步失败同步已取消与%1$s同步成功同步失败，请检查网络和帐号设置同步失败，发生内部错误同步已取消登录%1$s...正在获取服务器便签列表...正在同步本地便签...设置同步账号与google task同步便签记录上次同步于 %1$s添加账号更换账号删除账号取消立即同步取消同步当前帐号 %1$s如更换同步帐号，过去的帐号同步信息将被清空，再次切换的同时可能会造成数据重复同步便签请选择google帐号，便签将与该帐号的google task内容同步。正在同步中，不能修改同步帐号同步帐号已设置为%1$s新建便签背景颜色随机删除通话便签请输入名称正在搜索便签搜索便签便签中的文字便签设置取消 - %1$s 条符合“%2$s”的搜索结果 - - 短信 - 郵件 - 便簽便簽2x2便簽4x4沒有關聯內容，點擊新建便簽。訪客模式下，便籤內容不可見...新建便簽成功刪除提醒創建提醒已過期yyyyMMddMM月dd日 kk:mm知道了查看呼叫電話發送郵件浏覽網頁打開地圖已將所選 %1$d 便籤移到 %2$s 文件夾新建文件夾導出文本同步取消同步設置搜尋刪除移動到文件夾選中了 %d 項沒有選中項，操作無效全選取消全選文字大小小正常大超大進入清單模式退出清單模式查看文件夾刪除文件夾修改文件夾名稱文件夾 %1$s 已存在，請重新命名分享發送到桌面提醒我刪除提醒選擇文件夾上一級文件夾已添加到桌面刪除确认要刪除所選的 %d 條便籤嗎?确认要删除該條便籤嗎?確認刪除檔夾及所包含的便簽嗎？SD卡被佔用，不能操作導出TXT時發生錯誤，請檢查SD卡要查看的便籤不存在不能爲空便籤設置鬧鐘提醒不能將空便籤發送到桌面導出成功導出失敗已將文本文件(%1$s)導出至SD(%2$s)目錄同步便簽...同步成功同步失敗同步已取消與%1$s同步成功同步失敗，請檢查網絡和帳號設置同步失敗，發生內部錯誤同步已取消登陸%1$s...正在獲取服務器便籤列表...正在同步本地便籤...設置同步賬號与google task同步便簽記錄上次同步于 %1$s添加賬號更換賬號刪除賬號取消立即同步取消同步當前帳號 %1$s如更換同步帳號，過去的帳號同步信息將被清空，再次切換的同時可能會造成數據重復同步便簽請選擇google帳號，便簽將與該帳號的google task內容同步。正在同步中，不能修改同步帳號同步帳號已設置為%1$s新建便籤背景顏色隨機刪除通話便籤請輸入名稱正在搜索便籤搜索便籤便籤中的文字便籤設置取消 - %1$s 條符合”%2$s“的搜尋結果 - \ No newline at end of file diff --git a/src/Notes-master/app/build/intermediates/incremental/mergeDebugAssets/merger.xml b/src/Notes-master/app/build/intermediates/incremental/mergeDebugAssets/merger.xml deleted file mode 100644 index d59ecbd..0000000 --- a/src/Notes-master/app/build/intermediates/incremental/mergeDebugAssets/merger.xml +++ /dev/null @@ -1,2 +0,0 @@ - - \ No newline at end of file diff --git a/src/Notes-master/app/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml b/src/Notes-master/app/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml deleted file mode 100644 index f3a0615..0000000 --- a/src/Notes-master/app/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml +++ /dev/null @@ -1,2 +0,0 @@ - - \ No newline at end of file diff --git a/src/Notes-master/app/build/intermediates/incremental/mergeDebugShaders/merger.xml b/src/Notes-master/app/build/intermediates/incremental/mergeDebugShaders/merger.xml deleted file mode 100644 index 0c65c1b..0000000 --- a/src/Notes-master/app/build/intermediates/incremental/mergeDebugShaders/merger.xml +++ /dev/null @@ -1,2 +0,0 @@ - - \ No newline at end of file diff --git a/src/Notes-master/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt b/src/Notes-master/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt deleted file mode 100644 index aeb412c..0000000 --- a/src/Notes-master/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt +++ /dev/null @@ -1,4 +0,0 @@ -#Fri Apr 21 16:05:10 GMT+08:00 2023 -base.0=D\:\\git\\TeamProject\\src\\Notes-master\\app\\build\\intermediates\\dex\\debug\\mergeDexDebug\\classes.dex -renamed.0=classes.dex -path.0=classes.dex diff --git a/src/Notes-master/app/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt b/src/Notes-master/app/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt deleted file mode 100644 index 16721d4..0000000 --- a/src/Notes-master/app/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt +++ /dev/null @@ -1,273 +0,0 @@ -1 -2 -17 -21 -22 D:\git\TeamProject\src\Notes-master\app\src\main\AndroidManifest.xml:23:5-44 -23 android:minSdkVersion="14" -23-->D:\git\TeamProject\src\Notes-master\app\src\main\AndroidManifest.xml:23:15-41 -24 android:targetSdkVersion="14" /> -24-->D:\git\TeamProject\src\Notes-master\app\src\main\AndroidManifest.xml:23:5-44 -25 -26 -26-->D:\git\TeamProject\src\Notes-master\app\src\main\AndroidManifest.xml:25:5-81 -26-->D:\git\TeamProject\src\Notes-master\app\src\main\AndroidManifest.xml:25:22-78 -27 -27-->D:\git\TeamProject\src\Notes-master\app\src\main\AndroidManifest.xml:26:5-88 -27-->D:\git\TeamProject\src\Notes-master\app\src\main\AndroidManifest.xml:26:22-85 -28 -28-->D:\git\TeamProject\src\Notes-master\app\src\main\AndroidManifest.xml:27:5-67 -28-->D:\git\TeamProject\src\Notes-master\app\src\main\AndroidManifest.xml:27:22-64 -29 -29-->D:\git\TeamProject\src\Notes-master\app\src\main\AndroidManifest.xml:28:5-72 -29-->D:\git\TeamProject\src\Notes-master\app\src\main\AndroidManifest.xml:28:22-69 -30 -30-->D:\git\TeamProject\src\Notes-master\app\src\main\AndroidManifest.xml:29:5-74 -30-->D:\git\TeamProject\src\Notes-master\app\src\main\AndroidManifest.xml:29:22-71 -31 -31-->D:\git\TeamProject\src\Notes-master\app\src\main\AndroidManifest.xml:30:5-80 -31-->D:\git\TeamProject\src\Notes-master\app\src\main\AndroidManifest.xml:30:22-77 -32 -32-->D:\git\TeamProject\src\Notes-master\app\src\main\AndroidManifest.xml:31:5-71 -32-->D:\git\TeamProject\src\Notes-master\app\src\main\AndroidManifest.xml:31:22-68 -33 -33-->D:\git\TeamProject\src\Notes-master\app\src\main\AndroidManifest.xml:32:5-74 -33-->D:\git\TeamProject\src\Notes-master\app\src\main\AndroidManifest.xml:32:22-71 -34 -34-->D:\git\TeamProject\src\Notes-master\app\src\main\AndroidManifest.xml:33:5-81 -34-->D:\git\TeamProject\src\Notes-master\app\src\main\AndroidManifest.xml:33:22-78 -35 -36 D:\git\TeamProject\src\Notes-master\app\src\main\AndroidManifest.xml:35:5-149:19 -37 android:debuggable="true" -38 android:icon="@drawable/icon_app" -38-->D:\git\TeamProject\src\Notes-master\app\src\main\AndroidManifest.xml:36:9-42 -39 android:label="@string/app_name" -39-->D:\git\TeamProject\src\Notes-master\app\src\main\AndroidManifest.xml:37:9-41 -40 android:testOnly="true" > -41 D:\git\TeamProject\src\Notes-master\app\src\main\AndroidManifest.xml:38:9-51:20 -42 android:name="net.micode.notes.ui.NotesListActivity" -42-->D:\git\TeamProject\src\Notes-master\app\src\main\AndroidManifest.xml:39:13-49 -43 android:configChanges="keyboardHidden|orientation|screenSize" -43-->D:\git\TeamProject\src\Notes-master\app\src\main\AndroidManifest.xml:40:13-74 -44 android:label="@string/app_name" -44-->D:\git\TeamProject\src\Notes-master\app\src\main\AndroidManifest.xml:41:13-45 -45 android:launchMode="singleTop" -45-->D:\git\TeamProject\src\Notes-master\app\src\main\AndroidManifest.xml:42:13-43 -46 android:theme="@style/NoteTheme" -46-->D:\git\TeamProject\src\Notes-master\app\src\main\AndroidManifest.xml:43:13-45 -47 android:uiOptions="splitActionBarWhenNarrow" -47-->D:\git\TeamProject\src\Notes-master\app\src\main\AndroidManifest.xml:44:13-57 -48 android:windowSoftInputMode="adjustPan" > -48-->D:\git\TeamProject\src\Notes-master\app\src\main\AndroidManifest.xml:45:13-52 -49 -49-->D:\git\TeamProject\src\Notes-master\app\src\main\AndroidManifest.xml:47:13-50:29 -50 -50-->D:\git\TeamProject\src\Notes-master\app\src\main\AndroidManifest.xml:48:17-69 -50-->D:\git\TeamProject\src\Notes-master\app\src\main\AndroidManifest.xml:48:25-66 -51 -52 -52-->D:\git\TeamProject\src\Notes-master\app\src\main\AndroidManifest.xml:49:17-77 -52-->D:\git\TeamProject\src\Notes-master\app\src\main\AndroidManifest.xml:49:27-74 -53 -54 -55 D:\git\TeamProject\src\Notes-master\app\src\main\AndroidManifest.xml:53:9-81:20 -56 android:name="net.micode.notes.ui.NoteEditActivity" -56-->D:\git\TeamProject\src\Notes-master\app\src\main\AndroidManifest.xml:54:13-48 -57 android:configChanges="keyboardHidden|orientation|screenSize" -57-->D:\git\TeamProject\src\Notes-master\app\src\main\AndroidManifest.xml:55:13-74 -58 android:launchMode="singleTop" -58-->D:\git\TeamProject\src\Notes-master\app\src\main\AndroidManifest.xml:56:13-43 -59 android:theme="@style/NoteTheme" > -59-->D:\git\TeamProject\src\Notes-master\app\src\main\AndroidManifest.xml:57:13-45 -60 -60-->D:\git\TeamProject\src\Notes-master\app\src\main\AndroidManifest.xml:59:13-64:29 -61 -61-->D:\git\TeamProject\src\Notes-master\app\src\main\AndroidManifest.xml:60:17-69 -61-->D:\git\TeamProject\src\Notes-master\app\src\main\AndroidManifest.xml:60:25-66 -62 -63 -63-->D:\git\TeamProject\src\Notes-master\app\src\main\AndroidManifest.xml:61:17-76 -63-->D:\git\TeamProject\src\Notes-master\app\src\main\AndroidManifest.xml:61:27-73 -64 -65 -65-->D:\git\TeamProject\src\Notes-master\app\src\main\AndroidManifest.xml:62:17-78 -65-->D:\git\TeamProject\src\Notes-master\app\src\main\AndroidManifest.xml:62:23-75 -66 -66-->D:\git\TeamProject\src\Notes-master\app\src\main\AndroidManifest.xml:62:17-78 -66-->D:\git\TeamProject\src\Notes-master\app\src\main\AndroidManifest.xml:62:23-75 -67 -68 -68-->D:\git\TeamProject\src\Notes-master\app\src\main\AndroidManifest.xml:66:13-71:29 -69 -69-->D:\git\TeamProject\src\Notes-master\app\src\main\AndroidManifest.xml:67:17-79 -69-->D:\git\TeamProject\src\Notes-master\app\src\main\AndroidManifest.xml:67:25-76 -70 -71 -71-->D:\git\TeamProject\src\Notes-master\app\src\main\AndroidManifest.xml:61:17-76 -71-->D:\git\TeamProject\src\Notes-master\app\src\main\AndroidManifest.xml:61:27-73 -72 -73 -73-->D:\git\TeamProject\src\Notes-master\app\src\main\AndroidManifest.xml:62:17-78 -73-->D:\git\TeamProject\src\Notes-master\app\src\main\AndroidManifest.xml:62:23-75 -74 -74-->D:\git\TeamProject\src\Notes-master\app\src\main\AndroidManifest.xml:62:17-78 -74-->D:\git\TeamProject\src\Notes-master\app\src\main\AndroidManifest.xml:62:23-75 -75 -76 -76-->D:\git\TeamProject\src\Notes-master\app\src\main\AndroidManifest.xml:73:13-76:29 -77 -77-->D:\git\TeamProject\src\Notes-master\app\src\main\AndroidManifest.xml:74:17-71 -77-->D:\git\TeamProject\src\Notes-master\app\src\main\AndroidManifest.xml:74:25-68 -78 -79 -79-->D:\git\TeamProject\src\Notes-master\app\src\main\AndroidManifest.xml:61:17-76 -79-->D:\git\TeamProject\src\Notes-master\app\src\main\AndroidManifest.xml:61:27-73 -80 -81 -82 D:\git\TeamProject\src\Notes-master\app\src\main\AndroidManifest.xml:78:13-80:54 -83 android:name="android.app.searchable" -83-->D:\git\TeamProject\src\Notes-master\app\src\main\AndroidManifest.xml:79:17-54 -84 android:resource="@xml/searchable" /> -84-->D:\git\TeamProject\src\Notes-master\app\src\main\AndroidManifest.xml:80:17-51 -85 -86 -87 D:\git\TeamProject\src\Notes-master\app\src\main\AndroidManifest.xml:83:9-86:43 -88 android:name="net.micode.notes.data.NotesProvider" -88-->D:\git\TeamProject\src\Notes-master\app\src\main\AndroidManifest.xml:84:13-63 -89 android:authorities="micode_notes" -89-->D:\git\TeamProject\src\Notes-master\app\src\main\AndroidManifest.xml:85:13-47 -90 android:multiprocess="true" /> -90-->D:\git\TeamProject\src\Notes-master\app\src\main\AndroidManifest.xml:86:13-40 -91 -92 D:\git\TeamProject\src\Notes-master\app\src\main\AndroidManifest.xml:88:9-100:20 -93 android:name="net.micode.notes.widget.NoteWidgetProvider_2x" -93-->D:\git\TeamProject\src\Notes-master\app\src\main\AndroidManifest.xml:89:13-57 -94 android:label="@string/app_widget2x2" > -94-->D:\git\TeamProject\src\Notes-master\app\src\main\AndroidManifest.xml:90:13-50 -95 -95-->D:\git\TeamProject\src\Notes-master\app\src\main\AndroidManifest.xml:91:13-95:29 -96 -96-->D:\git\TeamProject\src\Notes-master\app\src\main\AndroidManifest.xml:92:17-84 -96-->D:\git\TeamProject\src\Notes-master\app\src\main\AndroidManifest.xml:92:25-81 -97 -97-->D:\git\TeamProject\src\Notes-master\app\src\main\AndroidManifest.xml:93:17-85 -97-->D:\git\TeamProject\src\Notes-master\app\src\main\AndroidManifest.xml:93:25-82 -98 -98-->D:\git\TeamProject\src\Notes-master\app\src\main\AndroidManifest.xml:94:17-85 -98-->D:\git\TeamProject\src\Notes-master\app\src\main\AndroidManifest.xml:94:25-82 -99 -100 -101 D:\git\TeamProject\src\Notes-master\app\src\main\AndroidManifest.xml:97:13-99:58 -102 android:name="android.appwidget.provider" -102-->D:\git\TeamProject\src\Notes-master\app\src\main\AndroidManifest.xml:98:17-58 -103 android:resource="@xml/widget_2x_info" /> -103-->D:\git\TeamProject\src\Notes-master\app\src\main\AndroidManifest.xml:99:17-55 -104 -105 D:\git\TeamProject\src\Notes-master\app\src\main\AndroidManifest.xml:101:9-114:20 -106 android:name="net.micode.notes.widget.NoteWidgetProvider_4x" -106-->D:\git\TeamProject\src\Notes-master\app\src\main\AndroidManifest.xml:102:13-57 -107 android:label="@string/app_widget4x4" > -107-->D:\git\TeamProject\src\Notes-master\app\src\main\AndroidManifest.xml:103:13-50 -108 -108-->D:\git\TeamProject\src\Notes-master\app\src\main\AndroidManifest.xml:91:13-95:29 -109 -109-->D:\git\TeamProject\src\Notes-master\app\src\main\AndroidManifest.xml:92:17-84 -109-->D:\git\TeamProject\src\Notes-master\app\src\main\AndroidManifest.xml:92:25-81 -110 -110-->D:\git\TeamProject\src\Notes-master\app\src\main\AndroidManifest.xml:93:17-85 -110-->D:\git\TeamProject\src\Notes-master\app\src\main\AndroidManifest.xml:93:25-82 -111 -111-->D:\git\TeamProject\src\Notes-master\app\src\main\AndroidManifest.xml:94:17-85 -111-->D:\git\TeamProject\src\Notes-master\app\src\main\AndroidManifest.xml:94:25-82 -112 -113 -114 D:\git\TeamProject\src\Notes-master\app\src\main\AndroidManifest.xml:97:13-99:58 -115 android:name="android.appwidget.provider" -115-->D:\git\TeamProject\src\Notes-master\app\src\main\AndroidManifest.xml:98:17-58 -116 android:resource="@xml/widget_4x_info" /> -116-->D:\git\TeamProject\src\Notes-master\app\src\main\AndroidManifest.xml:99:17-55 -117 -118 -118-->D:\git\TeamProject\src\Notes-master\app\src\main\AndroidManifest.xml:116:9-120:20 -118-->D:\git\TeamProject\src\Notes-master\app\src\main\AndroidManifest.xml:116:19-55 -119 -119-->D:\git\TeamProject\src\Notes-master\app\src\main\AndroidManifest.xml:117:13-119:29 -120 -120-->D:\git\TeamProject\src\Notes-master\app\src\main\AndroidManifest.xml:118:17-79 -120-->D:\git\TeamProject\src\Notes-master\app\src\main\AndroidManifest.xml:118:25-76 -121 -122 -123 D:\git\TeamProject\src\Notes-master\app\src\main\AndroidManifest.xml:122:9-125:20 -124 android:name="net.micode.notes.ui.AlarmReceiver" -124-->D:\git\TeamProject\src\Notes-master\app\src\main\AndroidManifest.xml:123:13-61 -125 android:process=":remote" > -125-->D:\git\TeamProject\src\Notes-master\app\src\main\AndroidManifest.xml:124:13-38 -126 -127 -128 D:\git\TeamProject\src\Notes-master\app\src\main\AndroidManifest.xml:127:9-132:20 -129 android:name="net.micode.notes.ui.AlarmAlertActivity" -129-->D:\git\TeamProject\src\Notes-master\app\src\main\AndroidManifest.xml:128:13-50 -130 android:label="@string/app_name" -130-->D:\git\TeamProject\src\Notes-master\app\src\main\AndroidManifest.xml:129:13-45 -131 android:launchMode="singleInstance" -131-->D:\git\TeamProject\src\Notes-master\app\src\main\AndroidManifest.xml:130:13-48 -132 android:theme="@android:style/Theme.Holo.Wallpaper.NoTitleBar" > -132-->D:\git\TeamProject\src\Notes-master\app\src\main\AndroidManifest.xml:131:13-75 -133 -134 D:\git\TeamProject\src\Notes-master\app\src\main\AndroidManifest.xml:134:9-139:20 -135 android:name="net.micode.notes.ui.NotesPreferenceActivity" -135-->D:\git\TeamProject\src\Notes-master\app\src\main\AndroidManifest.xml:135:13-71 -136 android:label="@string/preferences_title" -136-->D:\git\TeamProject\src\Notes-master\app\src\main\AndroidManifest.xml:136:13-54 -137 android:launchMode="singleTop" -137-->D:\git\TeamProject\src\Notes-master\app\src\main\AndroidManifest.xml:137:13-43 -138 android:theme="@android:style/Theme.Holo.Light" > -138-->D:\git\TeamProject\src\Notes-master\app\src\main\AndroidManifest.xml:138:13-60 -139 -140 -141 D:\git\TeamProject\src\Notes-master\app\src\main\AndroidManifest.xml:141:9-144:19 -142 android:name="net.micode.notes.gtask.remote.GTaskSyncService" -142-->D:\git\TeamProject\src\Notes-master\app\src\main\AndroidManifest.xml:142:13-74 -143 android:exported="false" > -143-->D:\git\TeamProject\src\Notes-master\app\src\main\AndroidManifest.xml:143:13-37 -144 -145 -146 D:\git\TeamProject\src\Notes-master\app\src\main\AndroidManifest.xml:146:9-148:52 -147 android:name="android.app.default_searchable" -147-->D:\git\TeamProject\src\Notes-master\app\src\main\AndroidManifest.xml:147:13-58 -148 android:value=".ui.NoteEditActivity" /> -148-->D:\git\TeamProject\src\Notes-master\app\src\main\AndroidManifest.xml:148:13-49 -149 -150 -151 diff --git a/src/Notes-master/app/build/intermediates/source_set_path_map/debug/file-map.txt b/src/Notes-master/app/build/intermediates/source_set_path_map/debug/file-map.txt deleted file mode 100644 index ce4415c..0000000 --- a/src/Notes-master/app/build/intermediates/source_set_path_map/debug/file-map.txt +++ /dev/null @@ -1,8 +0,0 @@ -net.micode.notes.app-pngs-0 D:\git\TeamProject\src\Notes-master\app\build\generated\res\pngs\debug -net.micode.notes.app-resValues-1 D:\git\TeamProject\src\Notes-master\app\build\generated\res\resValues\debug -net.micode.notes.app-rs-2 D:\git\TeamProject\src\Notes-master\app\build\generated\res\rs\debug -net.micode.notes.app-mergeDebugResources-3 D:\git\TeamProject\src\Notes-master\app\build\intermediates\incremental\debug\mergeDebugResources\merged.dir -net.micode.notes.app-mergeDebugResources-4 D:\git\TeamProject\src\Notes-master\app\build\intermediates\incremental\debug\mergeDebugResources\stripped.dir -net.micode.notes.app-merged_res-5 D:\git\TeamProject\src\Notes-master\app\build\intermediates\merged_res\debug -net.micode.notes.app-debug-6 D:\git\TeamProject\src\Notes-master\app\src\debug\res -net.micode.notes.app-main-7 D:\git\TeamProject\src\Notes-master\app\src\main\res diff --git a/src/Notes-master/app/build/outputs/logs/manifest-merger-debug-report.txt b/src/Notes-master/app/build/outputs/logs/manifest-merger-debug-report.txt deleted file mode 100644 index 605c133..0000000 --- a/src/Notes-master/app/build/outputs/logs/manifest-merger-debug-report.txt +++ /dev/null @@ -1,235 +0,0 @@ --- Merging decision tree log --- -manifest -ADDED from D:\git\TeamProject\src\Notes-master\app\src\main\AndroidManifest.xml:18:1-150:12 -INJECTED from D:\git\TeamProject\src\Notes-master\app\src\main\AndroidManifest.xml:18:1-150:12 -INJECTED from D:\git\TeamProject\src\Notes-master\app\src\main\AndroidManifest.xml:18:1-150:12 -INJECTED from D:\git\TeamProject\src\Notes-master\app\src\main\AndroidManifest.xml:18:1-150:12 -INJECTED from D:\git\TeamProject\src\Notes-master\app\src\main\AndroidManifest.xml:18:1-150:12 -INJECTED from D:\git\TeamProject\src\Notes-master\app\src\main\AndroidManifest.xml:18:1-150:12 -INJECTED from D:\git\TeamProject\src\Notes-master\app\src\main\AndroidManifest.xml:18:1-150:12 - package - ADDED from D:\git\TeamProject\src\Notes-master\app\src\main\AndroidManifest.xml:19:5-31 - INJECTED from D:\git\TeamProject\src\Notes-master\app\src\main\AndroidManifest.xml - INJECTED from D:\git\TeamProject\src\Notes-master\app\src\main\AndroidManifest.xml - android:versionName - ADDED from D:\git\TeamProject\src\Notes-master\app\src\main\AndroidManifest.xml:21:5-30 - INJECTED from D:\git\TeamProject\src\Notes-master\app\src\main\AndroidManifest.xml - INJECTED from D:\git\TeamProject\src\Notes-master\app\src\main\AndroidManifest.xml - xmlns:android - ADDED from D:\git\TeamProject\src\Notes-master\app\src\main\AndroidManifest.xml:18:11-69 - android:versionCode - ADDED from D:\git\TeamProject\src\Notes-master\app\src\main\AndroidManifest.xml:20:5-28 - INJECTED from D:\git\TeamProject\src\Notes-master\app\src\main\AndroidManifest.xml - INJECTED from D:\git\TeamProject\src\Notes-master\app\src\main\AndroidManifest.xml -uses-sdk -ADDED from D:\git\TeamProject\src\Notes-master\app\src\main\AndroidManifest.xml:23:5-44 -INJECTED from D:\git\TeamProject\src\Notes-master\app\src\main\AndroidManifest.xml:23:5-44 -INJECTED from D:\git\TeamProject\src\Notes-master\app\src\main\AndroidManifest.xml:23:5-44 -INJECTED from D:\git\TeamProject\src\Notes-master\app\src\main\AndroidManifest.xml:23:5-44 -INJECTED from D:\git\TeamProject\src\Notes-master\app\src\main\AndroidManifest.xml:23:5-44 - android:targetSdkVersion - INJECTED from D:\git\TeamProject\src\Notes-master\app\src\main\AndroidManifest.xml - ADDED from D:\git\TeamProject\src\Notes-master\app\src\main\AndroidManifest.xml:23:5-44 - INJECTED from D:\git\TeamProject\src\Notes-master\app\src\main\AndroidManifest.xml - android:minSdkVersion - ADDED from D:\git\TeamProject\src\Notes-master\app\src\main\AndroidManifest.xml:23:15-41 - INJECTED from D:\git\TeamProject\src\Notes-master\app\src\main\AndroidManifest.xml - INJECTED from D:\git\TeamProject\src\Notes-master\app\src\main\AndroidManifest.xml -uses-permission#android.permission.WRITE_EXTERNAL_STORAGE -ADDED from D:\git\TeamProject\src\Notes-master\app\src\main\AndroidManifest.xml:25:5-81 - android:name - ADDED from D:\git\TeamProject\src\Notes-master\app\src\main\AndroidManifest.xml:25:22-78 -uses-permission#com.android.launcher.permission.INSTALL_SHORTCUT -ADDED from D:\git\TeamProject\src\Notes-master\app\src\main\AndroidManifest.xml:26:5-88 - android:name - ADDED from D:\git\TeamProject\src\Notes-master\app\src\main\AndroidManifest.xml:26:22-85 -uses-permission#android.permission.INTERNET -ADDED from D:\git\TeamProject\src\Notes-master\app\src\main\AndroidManifest.xml:27:5-67 - android:name - ADDED from D:\git\TeamProject\src\Notes-master\app\src\main\AndroidManifest.xml:27:22-64 -uses-permission#android.permission.READ_CONTACTS -ADDED from D:\git\TeamProject\src\Notes-master\app\src\main\AndroidManifest.xml:28:5-72 - android:name - ADDED from D:\git\TeamProject\src\Notes-master\app\src\main\AndroidManifest.xml:28:22-69 -uses-permission#android.permission.MANAGE_ACCOUNTS -ADDED from D:\git\TeamProject\src\Notes-master\app\src\main\AndroidManifest.xml:29:5-74 - android:name - ADDED from D:\git\TeamProject\src\Notes-master\app\src\main\AndroidManifest.xml:29:22-71 -uses-permission#android.permission.AUTHENTICATE_ACCOUNTS -ADDED from D:\git\TeamProject\src\Notes-master\app\src\main\AndroidManifest.xml:30:5-80 - android:name - ADDED from D:\git\TeamProject\src\Notes-master\app\src\main\AndroidManifest.xml:30:22-77 -uses-permission#android.permission.GET_ACCOUNTS -ADDED from D:\git\TeamProject\src\Notes-master\app\src\main\AndroidManifest.xml:31:5-71 - android:name - ADDED from D:\git\TeamProject\src\Notes-master\app\src\main\AndroidManifest.xml:31:22-68 -uses-permission#android.permission.USE_CREDENTIALS -ADDED from D:\git\TeamProject\src\Notes-master\app\src\main\AndroidManifest.xml:32:5-74 - android:name - ADDED from D:\git\TeamProject\src\Notes-master\app\src\main\AndroidManifest.xml:32:22-71 -uses-permission#android.permission.RECEIVE_BOOT_COMPLETED -ADDED from D:\git\TeamProject\src\Notes-master\app\src\main\AndroidManifest.xml:33:5-81 - android:name - ADDED from D:\git\TeamProject\src\Notes-master\app\src\main\AndroidManifest.xml:33:22-78 -application -ADDED from D:\git\TeamProject\src\Notes-master\app\src\main\AndroidManifest.xml:35:5-149:19 - android:label - ADDED from D:\git\TeamProject\src\Notes-master\app\src\main\AndroidManifest.xml:37:9-41 - android:icon - ADDED from D:\git\TeamProject\src\Notes-master\app\src\main\AndroidManifest.xml:36:9-42 -activity#net.micode.notes.ui.NotesListActivity -ADDED from D:\git\TeamProject\src\Notes-master\app\src\main\AndroidManifest.xml:38:9-51:20 - android:label - ADDED from D:\git\TeamProject\src\Notes-master\app\src\main\AndroidManifest.xml:41:13-45 - android:launchMode - ADDED from D:\git\TeamProject\src\Notes-master\app\src\main\AndroidManifest.xml:42:13-43 - android:windowSoftInputMode - ADDED from D:\git\TeamProject\src\Notes-master\app\src\main\AndroidManifest.xml:45:13-52 - android:uiOptions - ADDED from D:\git\TeamProject\src\Notes-master\app\src\main\AndroidManifest.xml:44:13-57 - android:configChanges - ADDED from D:\git\TeamProject\src\Notes-master\app\src\main\AndroidManifest.xml:40:13-74 - android:theme - ADDED from D:\git\TeamProject\src\Notes-master\app\src\main\AndroidManifest.xml:43:13-45 - android:name - ADDED from D:\git\TeamProject\src\Notes-master\app\src\main\AndroidManifest.xml:39:13-49 -intent-filter#action:name:android.intent.action.MAIN+category:name:android.intent.category.LAUNCHER -ADDED from D:\git\TeamProject\src\Notes-master\app\src\main\AndroidManifest.xml:47:13-50:29 -action#android.intent.action.MAIN -ADDED from D:\git\TeamProject\src\Notes-master\app\src\main\AndroidManifest.xml:48:17-69 - android:name - ADDED from D:\git\TeamProject\src\Notes-master\app\src\main\AndroidManifest.xml:48:25-66 -category#android.intent.category.LAUNCHER -ADDED from D:\git\TeamProject\src\Notes-master\app\src\main\AndroidManifest.xml:49:17-77 - android:name - ADDED from D:\git\TeamProject\src\Notes-master\app\src\main\AndroidManifest.xml:49:27-74 -activity#net.micode.notes.ui.NoteEditActivity -ADDED from D:\git\TeamProject\src\Notes-master\app\src\main\AndroidManifest.xml:53:9-81:20 - android:launchMode - ADDED from D:\git\TeamProject\src\Notes-master\app\src\main\AndroidManifest.xml:56:13-43 - android:configChanges - ADDED from D:\git\TeamProject\src\Notes-master\app\src\main\AndroidManifest.xml:55:13-74 - android:theme - ADDED from D:\git\TeamProject\src\Notes-master\app\src\main\AndroidManifest.xml:57:13-45 - android:name - ADDED from D:\git\TeamProject\src\Notes-master\app\src\main\AndroidManifest.xml:54:13-48 -intent-filter#action:name:android.intent.action.VIEW+category:name:android.intent.category.DEFAULT+data:mimeType:vnd.android.cursor.item/call_note+data:mimeType:vnd.android.cursor.item/text_note -ADDED from D:\git\TeamProject\src\Notes-master\app\src\main\AndroidManifest.xml:59:13-64:29 -action#android.intent.action.VIEW -ADDED from D:\git\TeamProject\src\Notes-master\app\src\main\AndroidManifest.xml:60:17-69 - android:name - ADDED from D:\git\TeamProject\src\Notes-master\app\src\main\AndroidManifest.xml:60:25-66 -category#android.intent.category.DEFAULT -ADDED from D:\git\TeamProject\src\Notes-master\app\src\main\AndroidManifest.xml:61:17-76 - android:name - ADDED from D:\git\TeamProject\src\Notes-master\app\src\main\AndroidManifest.xml:61:27-73 -data -ADDED from D:\git\TeamProject\src\Notes-master\app\src\main\AndroidManifest.xml:62:17-78 - android:mimeType - ADDED from D:\git\TeamProject\src\Notes-master\app\src\main\AndroidManifest.xml:62:23-75 -intent-filter#action:name:android.intent.action.INSERT_OR_EDIT+category:name:android.intent.category.DEFAULT+data:mimeType:vnd.android.cursor.item/call_note+data:mimeType:vnd.android.cursor.item/text_note -ADDED from D:\git\TeamProject\src\Notes-master\app\src\main\AndroidManifest.xml:66:13-71:29 -action#android.intent.action.INSERT_OR_EDIT -ADDED from D:\git\TeamProject\src\Notes-master\app\src\main\AndroidManifest.xml:67:17-79 - android:name - ADDED from D:\git\TeamProject\src\Notes-master\app\src\main\AndroidManifest.xml:67:25-76 -intent-filter#action:name:android.intent.action.SEARCH+category:name:android.intent.category.DEFAULT -ADDED from D:\git\TeamProject\src\Notes-master\app\src\main\AndroidManifest.xml:73:13-76:29 -action#android.intent.action.SEARCH -ADDED from D:\git\TeamProject\src\Notes-master\app\src\main\AndroidManifest.xml:74:17-71 - android:name - ADDED from D:\git\TeamProject\src\Notes-master\app\src\main\AndroidManifest.xml:74:25-68 -meta-data#android.app.searchable -ADDED from D:\git\TeamProject\src\Notes-master\app\src\main\AndroidManifest.xml:78:13-80:54 - android:resource - ADDED from D:\git\TeamProject\src\Notes-master\app\src\main\AndroidManifest.xml:80:17-51 - android:name - ADDED from D:\git\TeamProject\src\Notes-master\app\src\main\AndroidManifest.xml:79:17-54 -provider#net.micode.notes.data.NotesProvider -ADDED from D:\git\TeamProject\src\Notes-master\app\src\main\AndroidManifest.xml:83:9-86:43 - android:authorities - ADDED from D:\git\TeamProject\src\Notes-master\app\src\main\AndroidManifest.xml:85:13-47 - android:multiprocess - ADDED from D:\git\TeamProject\src\Notes-master\app\src\main\AndroidManifest.xml:86:13-40 - android:name - ADDED from D:\git\TeamProject\src\Notes-master\app\src\main\AndroidManifest.xml:84:13-63 -receiver#net.micode.notes.widget.NoteWidgetProvider_2x -ADDED from D:\git\TeamProject\src\Notes-master\app\src\main\AndroidManifest.xml:88:9-100:20 - android:label - ADDED from D:\git\TeamProject\src\Notes-master\app\src\main\AndroidManifest.xml:90:13-50 - android:name - ADDED from D:\git\TeamProject\src\Notes-master\app\src\main\AndroidManifest.xml:89:13-57 -intent-filter#action:name:android.appwidget.action.APPWIDGET_DELETED+action:name:android.appwidget.action.APPWIDGET_UPDATE+action:name:android.intent.action.PRIVACY_MODE_CHANGED -ADDED from D:\git\TeamProject\src\Notes-master\app\src\main\AndroidManifest.xml:91:13-95:29 -action#android.appwidget.action.APPWIDGET_UPDATE -ADDED from D:\git\TeamProject\src\Notes-master\app\src\main\AndroidManifest.xml:92:17-84 - android:name - ADDED from D:\git\TeamProject\src\Notes-master\app\src\main\AndroidManifest.xml:92:25-81 -action#android.appwidget.action.APPWIDGET_DELETED -ADDED from D:\git\TeamProject\src\Notes-master\app\src\main\AndroidManifest.xml:93:17-85 - android:name - ADDED from D:\git\TeamProject\src\Notes-master\app\src\main\AndroidManifest.xml:93:25-82 -action#android.intent.action.PRIVACY_MODE_CHANGED -ADDED from D:\git\TeamProject\src\Notes-master\app\src\main\AndroidManifest.xml:94:17-85 - android:name - ADDED from D:\git\TeamProject\src\Notes-master\app\src\main\AndroidManifest.xml:94:25-82 -meta-data#android.appwidget.provider -ADDED from D:\git\TeamProject\src\Notes-master\app\src\main\AndroidManifest.xml:97:13-99:58 - android:resource - ADDED from D:\git\TeamProject\src\Notes-master\app\src\main\AndroidManifest.xml:99:17-55 - android:name - ADDED from D:\git\TeamProject\src\Notes-master\app\src\main\AndroidManifest.xml:98:17-58 -receiver#net.micode.notes.widget.NoteWidgetProvider_4x -ADDED from D:\git\TeamProject\src\Notes-master\app\src\main\AndroidManifest.xml:101:9-114:20 - android:label - ADDED from D:\git\TeamProject\src\Notes-master\app\src\main\AndroidManifest.xml:103:13-50 - android:name - ADDED from D:\git\TeamProject\src\Notes-master\app\src\main\AndroidManifest.xml:102:13-57 -receiver#net.micode.notes.ui.AlarmInitReceiver -ADDED from D:\git\TeamProject\src\Notes-master\app\src\main\AndroidManifest.xml:116:9-120:20 - android:name - ADDED from D:\git\TeamProject\src\Notes-master\app\src\main\AndroidManifest.xml:116:19-55 -intent-filter#action:name:android.intent.action.BOOT_COMPLETED -ADDED from D:\git\TeamProject\src\Notes-master\app\src\main\AndroidManifest.xml:117:13-119:29 -action#android.intent.action.BOOT_COMPLETED -ADDED from D:\git\TeamProject\src\Notes-master\app\src\main\AndroidManifest.xml:118:17-79 - android:name - ADDED from D:\git\TeamProject\src\Notes-master\app\src\main\AndroidManifest.xml:118:25-76 -receiver#net.micode.notes.ui.AlarmReceiver -ADDED from D:\git\TeamProject\src\Notes-master\app\src\main\AndroidManifest.xml:122:9-125:20 - android:process - ADDED from D:\git\TeamProject\src\Notes-master\app\src\main\AndroidManifest.xml:124:13-38 - android:name - ADDED from D:\git\TeamProject\src\Notes-master\app\src\main\AndroidManifest.xml:123:13-61 -activity#net.micode.notes.ui.AlarmAlertActivity -ADDED from D:\git\TeamProject\src\Notes-master\app\src\main\AndroidManifest.xml:127:9-132:20 - android:label - ADDED from D:\git\TeamProject\src\Notes-master\app\src\main\AndroidManifest.xml:129:13-45 - android:launchMode - ADDED from D:\git\TeamProject\src\Notes-master\app\src\main\AndroidManifest.xml:130:13-48 - android:theme - ADDED from D:\git\TeamProject\src\Notes-master\app\src\main\AndroidManifest.xml:131:13-75 - android:name - ADDED from D:\git\TeamProject\src\Notes-master\app\src\main\AndroidManifest.xml:128:13-50 -activity#net.micode.notes.ui.NotesPreferenceActivity -ADDED from D:\git\TeamProject\src\Notes-master\app\src\main\AndroidManifest.xml:134:9-139:20 - android:label - ADDED from D:\git\TeamProject\src\Notes-master\app\src\main\AndroidManifest.xml:136:13-54 - android:launchMode - ADDED from D:\git\TeamProject\src\Notes-master\app\src\main\AndroidManifest.xml:137:13-43 - android:theme - ADDED from D:\git\TeamProject\src\Notes-master\app\src\main\AndroidManifest.xml:138:13-60 - android:name - ADDED from D:\git\TeamProject\src\Notes-master\app\src\main\AndroidManifest.xml:135:13-71 -service#net.micode.notes.gtask.remote.GTaskSyncService -ADDED from D:\git\TeamProject\src\Notes-master\app\src\main\AndroidManifest.xml:141:9-144:19 - android:exported - ADDED from D:\git\TeamProject\src\Notes-master\app\src\main\AndroidManifest.xml:143:13-37 - android:name - ADDED from D:\git\TeamProject\src\Notes-master\app\src\main\AndroidManifest.xml:142:13-74 -meta-data#android.app.default_searchable -ADDED from D:\git\TeamProject\src\Notes-master\app\src\main\AndroidManifest.xml:146:9-148:52 - android:value - ADDED from D:\git\TeamProject\src\Notes-master\app\src\main\AndroidManifest.xml:148:13-49 - android:name - ADDED from D:\git\TeamProject\src\Notes-master\app\src\main\AndroidManifest.xml:147:13-58 diff --git a/src/Notes-master/app/build.gradle b/src/app/build.gradle similarity index 99% rename from src/Notes-master/app/build.gradle rename to src/app/build.gradle index b15a29f..ada50d9 100644 --- a/src/Notes-master/app/build.gradle +++ b/src/app/build.gradle @@ -19,4 +19,3 @@ android { } } } - diff --git a/src/Notes-master/app/build/generated/source/buildConfig/debug/net/micode/notes/BuildConfig.java b/src/app/build/generated/source/buildConfig/debug/net/micode/notes/BuildConfig.java similarity index 100% rename from src/Notes-master/app/build/generated/source/buildConfig/debug/net/micode/notes/BuildConfig.java rename to src/app/build/generated/source/buildConfig/debug/net/micode/notes/BuildConfig.java diff --git a/src/Notes-master/app/build/intermediates/annotation_processor_list/debug/annotationProcessors.json b/src/app/build/intermediates/annotation_processor_list/debug/annotationProcessors.json similarity index 100% rename from src/Notes-master/app/build/intermediates/annotation_processor_list/debug/annotationProcessors.json rename to src/app/build/intermediates/annotation_processor_list/debug/annotationProcessors.json diff --git a/src/Notes-master/app/build/intermediates/apk/debug/app-debug.apk b/src/app/build/intermediates/apk/debug/app-debug.apk similarity index 90% rename from src/Notes-master/app/build/intermediates/apk/debug/app-debug.apk rename to src/app/build/intermediates/apk/debug/app-debug.apk index 08a09c2..f104e85 100644 Binary files a/src/Notes-master/app/build/intermediates/apk/debug/app-debug.apk and b/src/app/build/intermediates/apk/debug/app-debug.apk differ diff --git a/src/Notes-master/app/build/intermediates/apk/debug/output-metadata.json b/src/app/build/intermediates/apk/debug/output-metadata.json similarity index 100% rename from src/Notes-master/app/build/intermediates/apk/debug/output-metadata.json rename to src/app/build/intermediates/apk/debug/output-metadata.json diff --git a/src/Notes-master/app/build/intermediates/apk_ide_redirect_file/debug/redirect.txt b/src/app/build/intermediates/apk_ide_redirect_file/debug/redirect.txt similarity index 100% rename from src/Notes-master/app/build/intermediates/apk_ide_redirect_file/debug/redirect.txt rename to src/app/build/intermediates/apk_ide_redirect_file/debug/redirect.txt diff --git a/src/Notes-master/app/build/intermediates/app_metadata/debug/app-metadata.properties b/src/app/build/intermediates/app_metadata/debug/app-metadata.properties similarity index 100% rename from src/Notes-master/app/build/intermediates/app_metadata/debug/app-metadata.properties rename to src/app/build/intermediates/app_metadata/debug/app-metadata.properties diff --git a/src/Notes-master/app/build/intermediates/compatible_screen_manifest/debug/output-metadata.json b/src/app/build/intermediates/compatible_screen_manifest/debug/output-metadata.json similarity index 100% rename from src/Notes-master/app/build/intermediates/compatible_screen_manifest/debug/output-metadata.json rename to src/app/build/intermediates/compatible_screen_manifest/debug/output-metadata.json diff --git a/src/Notes-master/app/build/intermediates/compile_and_runtime_not_namespaced_r_class_jar/debug/R.jar b/src/app/build/intermediates/compile_and_runtime_not_namespaced_r_class_jar/debug/R.jar similarity index 100% rename from src/Notes-master/app/build/intermediates/compile_and_runtime_not_namespaced_r_class_jar/debug/R.jar rename to src/app/build/intermediates/compile_and_runtime_not_namespaced_r_class_jar/debug/R.jar 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 new file mode 100644 index 0000000..4d30c7b Binary files /dev/null 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 new file mode 100644 index 0000000..b9925ef Binary files /dev/null and b/src/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_1/graph.bin differ diff --git a/src/Notes-master/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_2/graph.bin b/src/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_2/graph.bin similarity index 100% rename from src/Notes-master/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_2/graph.bin rename to src/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_2/graph.bin diff --git a/src/Notes-master/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_3/graph.bin b/src/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_3/graph.bin similarity index 100% rename from src/Notes-master/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_3/graph.bin rename to src/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_3/graph.bin 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 new file mode 100644 index 0000000..fdc14db Binary files /dev/null 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 new file mode 100644 index 0000000..772924b Binary files /dev/null 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 new file mode 100644 index 0000000..eeb4b12 Binary files /dev/null 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 new file mode 100644 index 0000000..abdbf75 Binary files /dev/null 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_6d0ab88516da0327d26fa9577517adff11f6527d4d72cadc3c35ea0cb5a99197_bucket_0/graph.bin b/src/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_6d0ab88516da0327d26fa9577517adff11f6527d4d72cadc3c35ea0cb5a99197_bucket_0/graph.bin new file mode 100644 index 0000000..601f245 Binary files /dev/null and b/src/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_6d0ab88516da0327d26fa9577517adff11f6527d4d72cadc3c35ea0cb5a99197_bucket_0/graph.bin differ diff --git a/src/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_6d0ab88516da0327d26fa9577517adff11f6527d4d72cadc3c35ea0cb5a99197_bucket_1/graph.bin b/src/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_6d0ab88516da0327d26fa9577517adff11f6527d4d72cadc3c35ea0cb5a99197_bucket_1/graph.bin new file mode 100644 index 0000000..601f245 Binary files /dev/null and b/src/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_6d0ab88516da0327d26fa9577517adff11f6527d4d72cadc3c35ea0cb5a99197_bucket_1/graph.bin differ diff --git a/src/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_6d0ab88516da0327d26fa9577517adff11f6527d4d72cadc3c35ea0cb5a99197_bucket_2/graph.bin b/src/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_6d0ab88516da0327d26fa9577517adff11f6527d4d72cadc3c35ea0cb5a99197_bucket_2/graph.bin new file mode 100644 index 0000000..601f245 Binary files /dev/null and b/src/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_6d0ab88516da0327d26fa9577517adff11f6527d4d72cadc3c35ea0cb5a99197_bucket_2/graph.bin differ diff --git a/src/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_6d0ab88516da0327d26fa9577517adff11f6527d4d72cadc3c35ea0cb5a99197_bucket_3/graph.bin b/src/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_6d0ab88516da0327d26fa9577517adff11f6527d4d72cadc3c35ea0cb5a99197_bucket_3/graph.bin new file mode 100644 index 0000000..601f245 Binary files /dev/null and b/src/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_6d0ab88516da0327d26fa9577517adff11f6527d4d72cadc3c35ea0cb5a99197_bucket_3/graph.bin differ diff --git a/src/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_6d0ab88516da0327d26fa9577517adff11f6527d4d72cadc3c35ea0cb5a99197_bucket_4/graph.bin b/src/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_6d0ab88516da0327d26fa9577517adff11f6527d4d72cadc3c35ea0cb5a99197_bucket_4/graph.bin new file mode 100644 index 0000000..601f245 Binary files /dev/null and b/src/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_6d0ab88516da0327d26fa9577517adff11f6527d4d72cadc3c35ea0cb5a99197_bucket_4/graph.bin differ diff --git a/src/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_6d0ab88516da0327d26fa9577517adff11f6527d4d72cadc3c35ea0cb5a99197_bucket_5/graph.bin b/src/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_6d0ab88516da0327d26fa9577517adff11f6527d4d72cadc3c35ea0cb5a99197_bucket_5/graph.bin new file mode 100644 index 0000000..601f245 Binary files /dev/null and b/src/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_6d0ab88516da0327d26fa9577517adff11f6527d4d72cadc3c35ea0cb5a99197_bucket_5/graph.bin differ diff --git a/src/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_6d0ab88516da0327d26fa9577517adff11f6527d4d72cadc3c35ea0cb5a99197_bucket_6/graph.bin b/src/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_6d0ab88516da0327d26fa9577517adff11f6527d4d72cadc3c35ea0cb5a99197_bucket_6/graph.bin new file mode 100644 index 0000000..601f245 Binary files /dev/null and b/src/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_6d0ab88516da0327d26fa9577517adff11f6527d4d72cadc3c35ea0cb5a99197_bucket_6/graph.bin differ diff --git a/src/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_6d0ab88516da0327d26fa9577517adff11f6527d4d72cadc3c35ea0cb5a99197_bucket_7/graph.bin b/src/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_6d0ab88516da0327d26fa9577517adff11f6527d4d72cadc3c35ea0cb5a99197_bucket_7/graph.bin new file mode 100644 index 0000000..601f245 Binary files /dev/null and b/src/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_6d0ab88516da0327d26fa9577517adff11f6527d4d72cadc3c35ea0cb5a99197_bucket_7/graph.bin differ diff --git a/src/Notes-master/app/build/intermediates/dex/debug/mergeDexDebug/classes.dex b/src/app/build/intermediates/dex/debug/mergeDexDebug/classes.dex similarity index 77% rename from src/Notes-master/app/build/intermediates/dex/debug/mergeDexDebug/classes.dex rename to src/app/build/intermediates/dex/debug/mergeDexDebug/classes.dex index baf6061..29ad11a 100644 Binary files a/src/Notes-master/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 new file mode 100644 index 0000000..1c2a78a Binary files /dev/null and b/src/app/build/intermediates/dex_archive_input_jar_hashes/debug/out differ diff --git a/src/Notes-master/app/build/intermediates/dex_number_of_buckets_file/debug/out b/src/app/build/intermediates/dex_number_of_buckets_file/debug/out similarity index 100% rename from src/Notes-master/app/build/intermediates/dex_number_of_buckets_file/debug/out rename to src/app/build/intermediates/dex_number_of_buckets_file/debug/out diff --git a/src/Notes-master/app/build/intermediates/incremental/debug-mergeJavaRes/merge-state b/src/app/build/intermediates/incremental/debug-mergeJavaRes/merge-state similarity index 100% rename from src/Notes-master/app/build/intermediates/incremental/debug-mergeJavaRes/merge-state rename to src/app/build/intermediates/incremental/debug-mergeJavaRes/merge-state 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 new file mode 100644 index 0000000..2df8078 --- /dev/null +++ b/src/app/build/intermediates/incremental/debug/mergeDebugResources/compile-file-map.properties @@ -0,0 +1,96 @@ +#Fri Mar 24 23:48:39 GMT+08:00 2023 +net.micode.notes.app-main-7\:/drawable-hdpi/font_super.png=D\:\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_super.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/call_record.png=D\:\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_call_record.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/new_note_normal.png=D\:\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_new_note_normal.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/edit_yellow.9.png=D\:\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_yellow.9.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/edit_title_green.9.png=D\:\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_green.9.png.flat +net.micode.notes.app-main-7\:/menu/sub_folder.xml=D\:\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\menu_sub_folder.xml.flat +net.micode.notes.app-main-7\:/drawable-hdpi/edit_title_yellow.9.png=D\:\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_yellow.9.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/font_small.png=D\:\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_small.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/widget_2x_white.png=D\:\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_white.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/edit_white.9.png=D\:\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_white.9.png.flat +net.micode.notes.app-main-7\:/layout/account_dialog_title.xml=D\:\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\layout_account_dialog_title.xml.flat +net.micode.notes.app-main-7\:/drawable-hdpi/widget_4x_green.png=D\:\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_green.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/list_blue_down.9.png=D\:\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_blue_down.9.png.flat +net.micode.notes.app-main-7\:/color/secondary_text_dark.xml=D\:\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\color_secondary_text_dark.xml.flat +net.micode.notes.app-main-7\:/layout/dialog_edit_text.xml=D\:\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\layout_dialog_edit_text.xml.flat +net.micode.notes.app-main-7\:/layout/widget_4x.xml=D\:\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\layout_widget_4x.xml.flat +net.micode.notes.app-main-7\:/drawable-hdpi/list_yellow_middle.9.png=D\:\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_middle.9.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/menu_delete.png=D\:\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_menu_delete.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/clock.png=D\:\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_clock.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/font_normal.png=D\:\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_normal.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/dropdown_icon.9.png=D\:\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_dropdown_icon.9.png.flat +net.micode.notes.app-main-7\:/layout/note_edit.xml=D\:\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\layout_note_edit.xml.flat +net.micode.notes.app-main-7\:/drawable-hdpi/edit_green.9.png=D\:\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_green.9.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/list_green_single.9.png=D\:\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_green_single.9.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/list_white_single.9.png=D\:\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_single.9.png.flat +net.micode.notes.app-main-7\:/raw-zh-rCN/introduction=D\:\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\raw-zh-rCN_introduction.flat +net.micode.notes.app-main-7\:/drawable-hdpi/widget_2x_green.png=D\:\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_green.png.flat +net.micode.notes.app-main-7\:/xml/preferences.xml=D\:\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\xml_preferences.xml.flat +net.micode.notes.app-main-7\:/drawable-hdpi/list_red_single.9.png=D\:\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_single.9.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/delete.png=D\:\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_delete.png.flat +net.micode.notes.app-main-7\:/menu/call_record_folder.xml=D\:\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\menu_call_record_folder.xml.flat +net.micode.notes.app-main-7\:/drawable-hdpi/widget_2x_red.png=D\:\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_red.png.flat +net.micode.notes.app-main-7\:/layout/widget_2x.xml=D\:\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\layout_widget_2x.xml.flat +net.micode.notes.app-main-7\:/drawable-hdpi/menu_move.png=D\:\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_menu_move.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/list_green_down.9.png=D\:\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_green_down.9.png.flat +net.micode.notes.app-main-7\:/layout/note_edit_list_item.xml=D\:\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\layout_note_edit_list_item.xml.flat +net.micode.notes.app-main-7\:/drawable-hdpi/widget_2x_blue.png=D\:\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_blue.png.flat +net.micode.notes.app-main-7\:/layout/add_account_text.xml=D\:\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\layout_add_account_text.xml.flat +net.micode.notes.app-main-7\:/xml/widget_4x_info.xml=D\:\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\xml_widget_4x_info.xml.flat +net.micode.notes.app-main-7\:/drawable-hdpi/font_size_selector_bg.9.png=D\:\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_size_selector_bg.9.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/selected.png=D\:\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_selected.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/search_result.png=D\:\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_search_result.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/widget_4x_white.png=D\:\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_white.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/list_blue_middle.9.png=D\:\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_blue_middle.9.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/list_green_middle.9.png=D\:\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_green_middle.9.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/list_white_down.9.png=D\:\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_down.9.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/list_blue_single.9.png=D\:\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_blue_single.9.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/font_large.png=D\:\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_large.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/list_yellow_up.9.png=D\:\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_up.9.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/list_red_middle.9.png=D\:\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_middle.9.png.flat +net.micode.notes.app-main-7\:/layout/settings_header.xml=D\:\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\layout_settings_header.xml.flat +net.micode.notes.app-main-7\:/menu/note_list.xml=D\:\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\menu_note_list.xml.flat +net.micode.notes.app-main-7\:/menu/call_note_edit.xml=D\:\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\menu_call_note_edit.xml.flat +net.micode.notes.app-main-7\:/drawable/new_note.xml=D\:\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable_new_note.xml.flat +net.micode.notes.app-main-7\:/drawable-hdpi/edit_red.9.png=D\:\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_red.9.png.flat +net.micode.notes.app-main-7\:/layout/note_list.xml=D\:\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\layout_note_list.xml.flat +net.micode.notes.app-main-7\:/color/primary_text_dark.xml=D\:\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\color_primary_text_dark.xml.flat +net.micode.notes.app-main-7\:/layout/datetime_picker.xml=D\:\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\layout_datetime_picker.xml.flat +net.micode.notes.app-main-7\:/raw/introduction=D\:\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\raw_introduction.flat +net.micode.notes.app-main-7\:/drawable-hdpi/list_yellow_single.9.png=D\:\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_single.9.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/widget_4x_yellow.png=D\:\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_yellow.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/widget_4x_red.png=D\:\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_red.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/title_alert.png=D\:\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_title_alert.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/list_red_down.9.png=D\:\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_down.9.png.flat +net.micode.notes.app-main-7\:/menu/note_list_options.xml=D\:\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\menu_note_list_options.xml.flat +net.micode.notes.app-main-7\:/drawable-hdpi/widget_2x_yellow.png=D\:\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_yellow.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/icon_app.png=D\:\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_icon_app.png.flat +net.micode.notes.app-main-7\:/layout/note_item.xml=D\:\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\layout_note_item.xml.flat +net.micode.notes.app-main-7\:/drawable-hdpi/list_background.png=D\:\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_background.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/edit_title_red.9.png=D\:\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_red.9.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/title_bar_bg.9.png=D\:\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_title_bar_bg.9.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/list_footer_bg.9.png=D\:\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_footer_bg.9.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/new_note_pressed.png=D\:\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_new_note_pressed.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/list_green_up.9.png=D\:\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_green_up.9.png.flat +net.micode.notes.app-main-7\:/layout/note_list_dropdown_menu.xml=D\:\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\layout_note_list_dropdown_menu.xml.flat +net.micode.notes.app-main-7\:/layout/note_list_footer.xml=D\:\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\layout_note_list_footer.xml.flat +net.micode.notes.app-main-7\:/drawable-hdpi/list_red_up.9.png=D\:\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_up.9.png.flat +net.micode.notes.app-main-7\:/menu/note_list_dropdown.xml=D\:\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\menu_note_list_dropdown.xml.flat +net.micode.notes.app-main-7\:/drawable-hdpi/list_white_up.9.png=D\:\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_up.9.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/edit_title_blue.9.png=D\:\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_blue.9.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/bg_color_btn_mask.png=D\:\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_bg_color_btn_mask.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/edit_blue.9.png=D\:\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_blue.9.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/bg_btn_set_color.png=D\:\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_bg_btn_set_color.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/edit_title_white.9.png=D\:\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_white.9.png.flat +net.micode.notes.app-main-7\:/xml/searchable.xml=D\:\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\xml_searchable.xml.flat +net.micode.notes.app-main-7\:/drawable-hdpi/notification.png=D\:\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_notification.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/list_blue_up.9.png=D\:\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_blue_up.9.png.flat +net.micode.notes.app-main-7\:/xml/widget_2x_info.xml=D\:\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\xml_widget_2x_info.xml.flat +net.micode.notes.app-main-7\:/drawable-hdpi/note_edit_color_selector_panel.png=D\:\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_note_edit_color_selector_panel.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/list_white_middle.9.png=D\:\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_middle.9.png.flat +net.micode.notes.app-main-7\:/layout/folder_list_item.xml=D\:\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\layout_folder_list_item.xml.flat +net.micode.notes.app-main-7\:/drawable-hdpi/list_folder.9.png=D\:\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_folder.9.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/widget_4x_blue.png=D\:\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_blue.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/list_yellow_down.9.png=D\:\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_down.9.png.flat +net.micode.notes.app-main-7\:/menu/note_edit.xml=D\:\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\menu_note_edit.xml.flat diff --git a/src/Notes-master/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values-zh-rCN/values-zh-rCN.xml b/src/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values-zh-rCN/values-zh-rCN.xml similarity index 100% rename from src/Notes-master/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values-zh-rCN/values-zh-rCN.xml rename to src/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values-zh-rCN/values-zh-rCN.xml diff --git a/src/Notes-master/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values-zh-rTW/values-zh-rTW.xml b/src/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values-zh-rTW/values-zh-rTW.xml similarity index 100% rename from src/Notes-master/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values-zh-rTW/values-zh-rTW.xml rename to src/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values-zh-rTW/values-zh-rTW.xml diff --git a/src/Notes-master/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values/values.xml b/src/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values/values.xml similarity index 100% rename from src/Notes-master/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values/values.xml rename to src/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values/values.xml diff --git a/src/app/build/intermediates/incremental/debug/mergeDebugResources/merger.xml b/src/app/build/intermediates/incremental/debug/mergeDebugResources/merger.xml new file mode 100644 index 0000000..fb47cbf --- /dev/null +++ b/src/app/build/intermediates/incremental/debug/mergeDebugResources/merger.xml @@ -0,0 +1,56 @@ + + + -%s + --%s + --%s + --%s + + Messaging + Email + #335b5b5b33sp26sp20sp17sp14spNotesNotes 2x2Notes 4x4No associated note found, click to create associated note.Privacy mode，can not see note content...Add noteDelete reminder successfullySet reminderExpiredyyyyMMddMMMd kk:mmGot itTake a lookCallSend emailBrowse webOpen map/MIUI/notes/notes_%s.txt(%d)New FolderExport textSyncCancel syncingSettingsSearchDeleteMove to folder%d selectedNothing selected, the operation is invalidSelect allDeselect allFont sizeSmallMediumLargeSuperEnter check listLeave check listView folderDelete folderChange folder nameThe folder %1$s exist, please renameShareSend to homeRemind meDelete reminderSelect folderParent folderNote added to homeConfirm to delete folder and its notes?Delete selected notesConfirm to delete the selected %d notes?Confirm to delete this note?Have moved selected %1$d notes to %2$s folderSD card busy, not available nowExport failed, please check SD cardThe note is not existSorry, can not set clock on empty noteSorry, can not send and empty note to homeExport successfulExport failExport text file (%1$s) to SD (%2$s) directorySyncing notes...Sync is successfulSync is failedSync is canceledSync is successful with account %1$sSync failed, please check network and account settingsSync failed, internal error occursSync is canceledLogging into %1$s...Getting remote note list...Synchronize local notes with Google Task...SettingsSync accountSync notes with google taskLast sync time %1$syyyy-MM-dd hh:mm:ssAdd accountChange sync accountRemove sync accountCancelSync immediatelyCancel syncingCurrent account %1$sAll sync related information will be deleted, which may result in duplicated items sometimeSync notesPlease select a google account. Local notes will be synced with google task.Cannot change the account because sync is in progress%1$s has been set as the sync accountNew note background color randomDeleteCall notesInput nameSearching NotesSearch notesText in your notesNotessetcancel + %1$s result for \"%2$s\" + + %1$s results for \"%2$s\" + + 短信 + 邮件 + 便签便签2x2便签4x4没有关联内容，点击新建便签。访客模式下，便签内容不可见...新建便签成功删除提醒创建提醒已过期yyyyMMddMM月dd日 kk:mm知道了查看呼叫电话发送邮件浏览网页打开地图新建文件夹导出文本同步取消同步设置搜索删除移动到文件夹选中了 %d 项没有选中项，操作无效全选取消全选文字大小小正常大超大进入清单模式退出清单模式查看文件夹刪除文件夹修改文件夹名称文件夹 %1$s 已存在，请重新命名分享发送到桌面提醒我删除提醒选择文件夹上一级文件夹已添加到桌面删除确认要删除所选的 %d 条便签吗?确认要删除该条便签吗?确认删除文件夹及所包含的便签吗？已将所选 %1$d 条便签移到 %2$s 文件夹SD卡被占用，不能操作导出文本时发生错误，请检查SD卡要查看的便签不存在不能为空便签设置闹钟提醒不能将空便签发送到桌面导出成功导出失败已将文本文件(%1$s)输出至SD卡(%2$s)目录同步便签...同步成功同步失败同步已取消与%1$s同步成功同步失败，请检查网络和帐号设置同步失败，发生内部错误同步已取消登录%1$s...正在获取服务器便签列表...正在同步本地便签...设置同步账号与google task同步便签记录上次同步于 %1$s添加账号更换账号删除账号取消立即同步取消同步当前帐号 %1$s如更换同步帐号，过去的帐号同步信息将被清空，再次切换的同时可能会造成数据重复同步便签请选择google帐号，便签将与该帐号的google task内容同步。正在同步中，不能修改同步帐号同步帐号已设置为%1$s新建便签背景颜色随机删除通话便签请输入名称正在搜索便签搜索便签便签中的文字便签设置取消 + %1$s 条符合“%2$s”的搜索结果 + + 短信 + 郵件 + 便簽便簽2x2便簽4x4沒有關聯內容，點擊新建便簽。訪客模式下，便籤內容不可見...新建便簽成功刪除提醒創建提醒已過期yyyyMMddMM月dd日 kk:mm知道了查看呼叫電話發送郵件浏覽網頁打開地圖已將所選 %1$d 便籤移到 %2$s 文件夾新建文件夾導出文本同步取消同步設置搜尋刪除移動到文件夾選中了 %d 項沒有選中項，操作無效全選取消全選文字大小小正常大超大進入清單模式退出清單模式查看文件夾刪除文件夾修改文件夾名稱文件夾 %1$s 已存在，請重新命名分享發送到桌面提醒我刪除提醒選擇文件夾上一級文件夾已添加到桌面刪除确认要刪除所選的 %d 條便籤嗎?确认要删除該條便籤嗎?確認刪除檔夾及所包含的便簽嗎？SD卡被佔用，不能操作導出TXT時發生錯誤，請檢查SD卡要查看的便籤不存在不能爲空便籤設置鬧鐘提醒不能將空便籤發送到桌面導出成功導出失敗已將文本文件(%1$s)導出至SD(%2$s)目錄同步便簽...同步成功同步失敗同步已取消與%1$s同步成功同步失敗，請檢查網絡和帳號設置同步失敗，發生內部錯誤同步已取消登陸%1$s...正在獲取服務器便籤列表...正在同步本地便籤...設置同步賬號与google task同步便簽記錄上次同步于 %1$s添加賬號更換賬號刪除賬號取消立即同步取消同步當前帳號 %1$s如更換同步帳號，過去的帳號同步信息將被清空，再次切換的同時可能會造成數據重復同步便簽請選擇google帳號，便簽將與該帳號的google task內容同步。正在同步中，不能修改同步帳號同步帳號已設置為%1$s新建便籤背景顏色隨機刪除通話便籤請輸入名稱正在搜索便籤搜索便籤便籤中的文字便籤設置取消 + %1$s 條符合”%2$s“的搜尋結果 + \ No newline at end of file diff --git a/src/app/build/intermediates/incremental/mergeDebugAssets/merger.xml b/src/app/build/intermediates/incremental/mergeDebugAssets/merger.xml new file mode 100644 index 0000000..691e379 --- /dev/null +++ b/src/app/build/intermediates/incremental/mergeDebugAssets/merger.xml @@ -0,0 +1,2 @@ + + \ 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 new file mode 100644 index 0000000..44d215b --- /dev/null +++ b/src/app/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml @@ -0,0 +1,2 @@ + + \ 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 new file mode 100644 index 0000000..f86983c --- /dev/null +++ b/src/app/build/intermediates/incremental/mergeDebugShaders/merger.xml @@ -0,0 +1,2 @@ + + \ 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 new file mode 100644 index 0000000..8a9daed --- /dev/null +++ b/src/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt @@ -0,0 +1,4 @@ +#Fri Mar 24 23:49:04 GMT+08:00 2023 +base.0=D\:\\Notes-master\\app\\build\\intermediates\\dex\\debug\\mergeDexDebug\\classes.dex +renamed.0=classes.dex +path.0=classes.dex diff --git a/src/Notes-master/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/androidResources b/src/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/androidResources similarity index 100% rename from src/Notes-master/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/androidResources rename to src/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/androidResources diff --git a/src/Notes-master/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/javaResources0 b/src/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/javaResources0 similarity index 100% rename from src/Notes-master/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/javaResources0 rename to src/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/javaResources0 diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/BuildConfig.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/BuildConfig.class similarity index 100% rename from src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/BuildConfig.class rename to src/app/build/intermediates/javac/debug/classes/net/micode/notes/BuildConfig.class diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Contact.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Contact.class similarity index 100% rename from src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Contact.class rename to src/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Contact.class diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$CallNote.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$CallNote.class similarity index 100% rename from src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$CallNote.class rename to src/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$CallNote.class diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$DataColumns.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$DataColumns.class similarity index 100% rename from src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$DataColumns.class rename to src/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$DataColumns.class diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$DataConstants.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$DataConstants.class similarity index 100% rename from src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$DataConstants.class rename to src/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$DataConstants.class diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$NoteColumns.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$NoteColumns.class similarity index 100% rename from src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$NoteColumns.class rename to src/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$NoteColumns.class diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$TextNote.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$TextNote.class similarity index 100% rename from src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$TextNote.class rename to src/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$TextNote.class diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes.class similarity index 100% rename from src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes.class rename to src/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes.class diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/data/NotesDatabaseHelper$TABLE.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/data/NotesDatabaseHelper$TABLE.class similarity index 100% rename from src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/data/NotesDatabaseHelper$TABLE.class rename to src/app/build/intermediates/javac/debug/classes/net/micode/notes/data/NotesDatabaseHelper$TABLE.class diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/data/NotesDatabaseHelper.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/data/NotesDatabaseHelper.class similarity index 100% rename from src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/data/NotesDatabaseHelper.class rename to src/app/build/intermediates/javac/debug/classes/net/micode/notes/data/NotesDatabaseHelper.class diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/data/NotesProvider.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/data/NotesProvider.class similarity index 100% rename from src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/data/NotesProvider.class rename to src/app/build/intermediates/javac/debug/classes/net/micode/notes/data/NotesProvider.class diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/MetaData.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/MetaData.class similarity index 100% rename from src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/MetaData.class rename to src/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/MetaData.class diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/Node.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/Node.class similarity index 100% rename from src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/Node.class rename to src/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/Node.class diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/SqlData.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/SqlData.class similarity index 100% rename from src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/SqlData.class rename to src/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/SqlData.class diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/SqlNote.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/SqlNote.class similarity index 100% rename from src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/SqlNote.class rename to src/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/SqlNote.class diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/Task.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/Task.class similarity index 100% rename from src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/Task.class rename to src/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/Task.class diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/TaskList.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/TaskList.class similarity index 100% rename from src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/TaskList.class rename to src/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/TaskList.class diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/exception/ActionFailureException.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/exception/ActionFailureException.class similarity index 100% rename from src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/exception/ActionFailureException.class rename to src/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/exception/ActionFailureException.class diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/exception/NetworkFailureException.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/exception/NetworkFailureException.class similarity index 100% rename from src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/exception/NetworkFailureException.class rename to src/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/exception/NetworkFailureException.class diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskASyncTask$1.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskASyncTask$1.class similarity index 100% rename from src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskASyncTask$1.class rename to src/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskASyncTask$1.class diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskASyncTask$OnCompleteListener.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskASyncTask$OnCompleteListener.class similarity index 100% rename from src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskASyncTask$OnCompleteListener.class rename to src/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskASyncTask$OnCompleteListener.class diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskASyncTask.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskASyncTask.class similarity index 100% rename from src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskASyncTask.class rename to src/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskASyncTask.class diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskClient.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskClient.class similarity index 100% rename from src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskClient.class rename to src/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskClient.class diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskManager.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskManager.class similarity index 100% rename from src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskManager.class rename to src/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskManager.class diff --git a/src/Notes-master/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 similarity index 100% rename from src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskSyncService$1.class rename to src/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskSyncService$1.class diff --git a/src/Notes-master/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 similarity index 100% rename from src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskSyncService.class rename to src/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskSyncService.class diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/model/Note$NoteData.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/model/Note$NoteData.class similarity index 100% rename from src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/model/Note$NoteData.class rename to src/app/build/intermediates/javac/debug/classes/net/micode/notes/model/Note$NoteData.class diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/model/Note.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/model/Note.class similarity index 100% rename from src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/model/Note.class rename to src/app/build/intermediates/javac/debug/classes/net/micode/notes/model/Note.class diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/model/WorkingNote$NoteSettingChangedListener.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/model/WorkingNote$NoteSettingChangedListener.class similarity index 100% rename from src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/model/WorkingNote$NoteSettingChangedListener.class rename to src/app/build/intermediates/javac/debug/classes/net/micode/notes/model/WorkingNote$NoteSettingChangedListener.class diff --git a/src/Notes-master/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 similarity index 100% rename from src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/model/WorkingNote.class rename to src/app/build/intermediates/javac/debug/classes/net/micode/notes/model/WorkingNote.class diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/BackupUtils$TextExport.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/BackupUtils$TextExport.class similarity index 100% rename from src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/BackupUtils$TextExport.class rename to src/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/BackupUtils$TextExport.class diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/BackupUtils.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/BackupUtils.class similarity index 100% rename from src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/BackupUtils.class rename to src/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/BackupUtils.class diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/DataUtils.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/DataUtils.class similarity index 100% rename from src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/DataUtils.class rename to src/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/DataUtils.class diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/GTaskStringUtils.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/GTaskStringUtils.class similarity index 100% rename from src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/GTaskStringUtils.class rename to src/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/GTaskStringUtils.class diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$NoteBgResources.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$NoteBgResources.class similarity index 100% rename from src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$NoteBgResources.class rename to src/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$NoteBgResources.class diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$NoteItemBgResources.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$NoteItemBgResources.class similarity index 100% rename from src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$NoteItemBgResources.class rename to src/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$NoteItemBgResources.class diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$TextAppearanceResources.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$TextAppearanceResources.class similarity index 100% rename from src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$TextAppearanceResources.class rename to src/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$TextAppearanceResources.class diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$WidgetBgResources.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$WidgetBgResources.class similarity index 100% rename from src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$WidgetBgResources.class rename to src/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$WidgetBgResources.class diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser.class similarity index 100% rename from src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser.class rename to src/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser.class diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/AlarmAlertActivity.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/AlarmAlertActivity.class similarity index 89% rename from src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/AlarmAlertActivity.class rename to src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/AlarmAlertActivity.class index a984d5b..51317a3 100644 Binary files a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/AlarmAlertActivity.class and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/AlarmAlertActivity.class differ diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/AlarmInitReceiver.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/AlarmInitReceiver.class similarity index 100% rename from src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/AlarmInitReceiver.class rename to src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/AlarmInitReceiver.class diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/AlarmReceiver.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/AlarmReceiver.class similarity index 89% rename from src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/AlarmReceiver.class rename to src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/AlarmReceiver.class index 7aa5322..a41b775 100644 Binary files a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/AlarmReceiver.class and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/AlarmReceiver.class differ diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$1.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$1.class similarity index 100% rename from src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$1.class rename to src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$1.class diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$2.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$2.class similarity index 100% rename from src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$2.class rename to src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$2.class diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$3.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$3.class similarity index 92% rename from src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$3.class rename to src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$3.class index d4087b3..de51bad 100644 Binary files a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$3.class and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$3.class differ diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$4.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$4.class similarity index 86% rename from src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$4.class rename to src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$4.class index 62776e0..d04cbe7 100644 Binary files a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$4.class and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$4.class differ diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$OnDateTimeChangedListener.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$OnDateTimeChangedListener.class similarity index 100% rename from src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$OnDateTimeChangedListener.class rename to src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$OnDateTimeChangedListener.class diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker.class similarity index 78% rename from src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker.class rename to src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker.class index fd993e7..505c291 100644 Binary files a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker.class and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker.class differ diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePickerDialog$1.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePickerDialog$1.class similarity index 86% rename from src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePickerDialog$1.class rename to src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePickerDialog$1.class index 9830ee9..415e755 100644 Binary files a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePickerDialog$1.class and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePickerDialog$1.class differ diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePickerDialog$OnDateTimeSetListener.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePickerDialog$OnDateTimeSetListener.class similarity index 100% rename from src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePickerDialog$OnDateTimeSetListener.class rename to src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePickerDialog$OnDateTimeSetListener.class diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePickerDialog.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePickerDialog.class similarity index 88% rename from src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePickerDialog.class rename to src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePickerDialog.class index 84f7a6a..7f6cc71 100644 Binary files a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePickerDialog.class and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePickerDialog.class differ diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DropdownMenu$1.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DropdownMenu$1.class similarity index 87% rename from src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DropdownMenu$1.class rename to src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DropdownMenu$1.class index e4ce4a7..ddd74fd 100644 Binary files a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DropdownMenu$1.class and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DropdownMenu$1.class differ diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DropdownMenu.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DropdownMenu.class similarity index 87% rename from src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DropdownMenu.class rename to src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DropdownMenu.class index 1a9d966..d805d20 100644 Binary files a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DropdownMenu.class and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DropdownMenu.class differ diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/FoldersListAdapter$FolderListItem.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/FoldersListAdapter$FolderListItem.class similarity index 83% rename from src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/FoldersListAdapter$FolderListItem.class rename to src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/FoldersListAdapter$FolderListItem.class index a1dde4d..45d174e 100644 Binary files a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/FoldersListAdapter$FolderListItem.class and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/FoldersListAdapter$FolderListItem.class differ diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/FoldersListAdapter.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/FoldersListAdapter.class similarity index 88% rename from src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/FoldersListAdapter.class rename to src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/FoldersListAdapter.class index 589495c..383f2f5 100644 Binary files a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/FoldersListAdapter.class and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/FoldersListAdapter.class differ diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$1.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$1.class similarity index 80% rename from src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$1.class rename to src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$1.class index 9d36124..f7afcae 100644 Binary files a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$1.class and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$1.class differ diff --git a/src/Notes-master/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 similarity index 87% rename from src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$2.class rename to src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$2.class index 74ee6d2..24c7362 100644 Binary files a/src/Notes-master/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/Notes-master/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 similarity index 83% rename from src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$3.class rename to src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$3.class index e629cb2..1725d92 100644 Binary files a/src/Notes-master/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/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$HeadViewHolder.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$HeadViewHolder.class similarity index 100% rename from src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$HeadViewHolder.class rename to src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$HeadViewHolder.class diff --git a/src/Notes-master/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 similarity index 85% rename from src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity.class rename to src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity.class index 8e74b9d..26e0ea0 100644 Binary files a/src/Notes-master/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/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditText$1.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditText$1.class similarity index 100% rename from src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditText$1.class rename to src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditText$1.class diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditText$OnTextViewChangeListener.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditText$OnTextViewChangeListener.class similarity index 100% rename from src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditText$OnTextViewChangeListener.class rename to src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditText$OnTextViewChangeListener.class diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditText.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditText.class similarity index 100% rename from src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditText.class rename to src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditText.class diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteItemData.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteItemData.class similarity index 100% rename from src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteItemData.class rename to src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteItemData.class diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$1.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$1.class similarity index 100% rename from src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$1.class rename to src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$1.class diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$2.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$2.class similarity index 100% rename from src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$2.class rename to src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$2.class diff --git a/src/Notes-master/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 similarity index 100% rename from src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$3.class rename to src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$3.class diff --git a/src/Notes-master/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 similarity index 100% rename from src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$4.class rename to src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$4.class diff --git a/src/Notes-master/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 similarity index 100% rename from src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$5.class rename to src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$5.class diff --git a/src/Notes-master/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 similarity index 100% rename from src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$6.class rename to src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$6.class diff --git a/src/Notes-master/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 similarity index 100% rename from src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$7.class rename to src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$7.class diff --git a/src/Notes-master/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 similarity index 100% rename from src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$8.class rename to src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$8.class diff --git a/src/Notes-master/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 similarity index 100% rename from src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$9.class rename to src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$9.class diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$BackgroundQueryHandler.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$BackgroundQueryHandler.class similarity index 100% rename from src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$BackgroundQueryHandler.class rename to src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$BackgroundQueryHandler.class diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ListEditState.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ListEditState.class similarity index 100% rename from src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ListEditState.class rename to src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ListEditState.class diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback$1.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback$1.class similarity index 100% rename from src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback$1.class rename to src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback$1.class diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback$2.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback$2.class similarity index 100% rename from src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback$2.class rename to src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback$2.class diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback.class similarity index 100% rename from src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback.class rename to src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback.class diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$NewNoteOnTouchListener.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$NewNoteOnTouchListener.class similarity index 100% rename from src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$NewNoteOnTouchListener.class rename to src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$NewNoteOnTouchListener.class diff --git a/src/Notes-master/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 similarity index 100% rename from src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.class rename to src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.class diff --git a/src/Notes-master/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 similarity index 100% rename from src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity.class rename to src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity.class diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListAdapter$AppWidgetAttribute.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListAdapter$AppWidgetAttribute.class similarity index 100% rename from src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListAdapter$AppWidgetAttribute.class rename to src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListAdapter$AppWidgetAttribute.class diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListAdapter.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListAdapter.class similarity index 100% rename from src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListAdapter.class rename to src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListAdapter.class diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListItem.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListItem.class similarity index 100% rename from src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListItem.class rename to src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListItem.class diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$1.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$1.class similarity index 100% rename from src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$1.class rename to src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$1.class diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$2.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$2.class similarity index 100% rename from src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$2.class rename to src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$2.class diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$3.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$3.class similarity index 100% rename from src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$3.class rename to src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$3.class diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$4.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$4.class similarity index 100% rename from src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$4.class rename to src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$4.class diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$5.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$5.class similarity index 100% rename from src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$5.class rename to src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$5.class diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$6.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$6.class similarity index 100% rename from src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$6.class rename to src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$6.class diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$7.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$7.class similarity index 100% rename from src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$7.class rename to src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$7.class diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$8.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$8.class similarity index 100% rename from src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$8.class rename to src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$8.class diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$GTaskReceiver.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$GTaskReceiver.class similarity index 100% rename from src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$GTaskReceiver.class rename to src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$GTaskReceiver.class diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity.class similarity index 100% rename from src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity.class rename to src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity.class diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider.class similarity index 92% rename from src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider.class rename to src/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider.class index b18ce0d..b06613f 100644 Binary files a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider.class and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider.class differ diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider_2x.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider_2x.class similarity index 82% rename from src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider_2x.class rename to src/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider_2x.class index efc7fc3..b11cc4f 100644 Binary files a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider_2x.class and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider_2x.class differ diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider_4x.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider_4x.class similarity index 100% rename from src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider_4x.class rename to src/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider_4x.class 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 new file mode 100644 index 0000000..8af6076 --- /dev/null +++ b/src/app/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt @@ -0,0 +1,273 @@ +1 +2 +17 +21 +22 D:\Notes-master\app\src\main\AndroidManifest.xml:23:5-44 +23 android:minSdkVersion="14" +23-->D:\Notes-master\app\src\main\AndroidManifest.xml:23:15-41 +24 android:targetSdkVersion="14" /> +24-->D:\Notes-master\app\src\main\AndroidManifest.xml:23:5-44 +25 +26 +26-->D:\Notes-master\app\src\main\AndroidManifest.xml:25:5-81 +26-->D:\Notes-master\app\src\main\AndroidManifest.xml:25:22-78 +27 +27-->D:\Notes-master\app\src\main\AndroidManifest.xml:26:5-88 +27-->D:\Notes-master\app\src\main\AndroidManifest.xml:26:22-85 +28 +28-->D:\Notes-master\app\src\main\AndroidManifest.xml:27:5-67 +28-->D:\Notes-master\app\src\main\AndroidManifest.xml:27:22-64 +29 +29-->D:\Notes-master\app\src\main\AndroidManifest.xml:28:5-72 +29-->D:\Notes-master\app\src\main\AndroidManifest.xml:28:22-69 +30 +30-->D:\Notes-master\app\src\main\AndroidManifest.xml:29:5-74 +30-->D:\Notes-master\app\src\main\AndroidManifest.xml:29:22-71 +31 +31-->D:\Notes-master\app\src\main\AndroidManifest.xml:30:5-80 +31-->D:\Notes-master\app\src\main\AndroidManifest.xml:30:22-77 +32 +32-->D:\Notes-master\app\src\main\AndroidManifest.xml:31:5-71 +32-->D:\Notes-master\app\src\main\AndroidManifest.xml:31:22-68 +33 +33-->D:\Notes-master\app\src\main\AndroidManifest.xml:32:5-74 +33-->D:\Notes-master\app\src\main\AndroidManifest.xml:32:22-71 +34 +34-->D:\Notes-master\app\src\main\AndroidManifest.xml:33:5-81 +34-->D:\Notes-master\app\src\main\AndroidManifest.xml:33:22-78 +35 +36 D:\Notes-master\app\src\main\AndroidManifest.xml:35:5-149:19 +37 android:debuggable="true" +38 android:icon="@drawable/icon_app" +38-->D:\Notes-master\app\src\main\AndroidManifest.xml:36:9-42 +39 android:label="@string/app_name" +39-->D:\Notes-master\app\src\main\AndroidManifest.xml:37:9-41 +40 android:testOnly="true" > +41 D:\Notes-master\app\src\main\AndroidManifest.xml:38:9-51:20 +42 android:name="net.micode.notes.ui.NotesListActivity" +42-->D:\Notes-master\app\src\main\AndroidManifest.xml:39:13-49 +43 android:configChanges="keyboardHidden|orientation|screenSize" +43-->D:\Notes-master\app\src\main\AndroidManifest.xml:40:13-74 +44 android:label="@string/app_name" +44-->D:\Notes-master\app\src\main\AndroidManifest.xml:41:13-45 +45 android:launchMode="singleTop" +45-->D:\Notes-master\app\src\main\AndroidManifest.xml:42:13-43 +46 android:theme="@style/NoteTheme" +46-->D:\Notes-master\app\src\main\AndroidManifest.xml:43:13-45 +47 android:uiOptions="splitActionBarWhenNarrow" +47-->D:\Notes-master\app\src\main\AndroidManifest.xml:44:13-57 +48 android:windowSoftInputMode="adjustPan" > +48-->D:\Notes-master\app\src\main\AndroidManifest.xml:45:13-52 +49 +49-->D:\Notes-master\app\src\main\AndroidManifest.xml:47:13-50:29 +50 +50-->D:\Notes-master\app\src\main\AndroidManifest.xml:48:17-69 +50-->D:\Notes-master\app\src\main\AndroidManifest.xml:48:25-66 +51 +52 +52-->D:\Notes-master\app\src\main\AndroidManifest.xml:49:17-77 +52-->D:\Notes-master\app\src\main\AndroidManifest.xml:49:27-74 +53 +54 +55 D:\Notes-master\app\src\main\AndroidManifest.xml:53:9-81:20 +56 android:name="net.micode.notes.ui.NoteEditActivity" +56-->D:\Notes-master\app\src\main\AndroidManifest.xml:54:13-48 +57 android:configChanges="keyboardHidden|orientation|screenSize" +57-->D:\Notes-master\app\src\main\AndroidManifest.xml:55:13-74 +58 android:launchMode="singleTop" +58-->D:\Notes-master\app\src\main\AndroidManifest.xml:56:13-43 +59 android:theme="@style/NoteTheme" > +59-->D:\Notes-master\app\src\main\AndroidManifest.xml:57:13-45 +60 +60-->D:\Notes-master\app\src\main\AndroidManifest.xml:59:13-64:29 +61 +61-->D:\Notes-master\app\src\main\AndroidManifest.xml:60:17-69 +61-->D:\Notes-master\app\src\main\AndroidManifest.xml:60:25-66 +62 +63 +63-->D:\Notes-master\app\src\main\AndroidManifest.xml:61:17-76 +63-->D:\Notes-master\app\src\main\AndroidManifest.xml:61:27-73 +64 +65 +65-->D:\Notes-master\app\src\main\AndroidManifest.xml:62:17-78 +65-->D:\Notes-master\app\src\main\AndroidManifest.xml:62:23-75 +66 +66-->D:\Notes-master\app\src\main\AndroidManifest.xml:62:17-78 +66-->D:\Notes-master\app\src\main\AndroidManifest.xml:62:23-75 +67 +68 +68-->D:\Notes-master\app\src\main\AndroidManifest.xml:66:13-71:29 +69 +69-->D:\Notes-master\app\src\main\AndroidManifest.xml:67:17-79 +69-->D:\Notes-master\app\src\main\AndroidManifest.xml:67:25-76 +70 +71 +71-->D:\Notes-master\app\src\main\AndroidManifest.xml:61:17-76 +71-->D:\Notes-master\app\src\main\AndroidManifest.xml:61:27-73 +72 +73 +73-->D:\Notes-master\app\src\main\AndroidManifest.xml:62:17-78 +73-->D:\Notes-master\app\src\main\AndroidManifest.xml:62:23-75 +74 +74-->D:\Notes-master\app\src\main\AndroidManifest.xml:62:17-78 +74-->D:\Notes-master\app\src\main\AndroidManifest.xml:62:23-75 +75 +76 +76-->D:\Notes-master\app\src\main\AndroidManifest.xml:73:13-76:29 +77 +77-->D:\Notes-master\app\src\main\AndroidManifest.xml:74:17-71 +77-->D:\Notes-master\app\src\main\AndroidManifest.xml:74:25-68 +78 +79 +79-->D:\Notes-master\app\src\main\AndroidManifest.xml:61:17-76 +79-->D:\Notes-master\app\src\main\AndroidManifest.xml:61:27-73 +80 +81 +82 D:\Notes-master\app\src\main\AndroidManifest.xml:78:13-80:54 +83 android:name="android.app.searchable" +83-->D:\Notes-master\app\src\main\AndroidManifest.xml:79:17-54 +84 android:resource="@xml/searchable" /> +84-->D:\Notes-master\app\src\main\AndroidManifest.xml:80:17-51 +85 +86 +87 D:\Notes-master\app\src\main\AndroidManifest.xml:83:9-86:43 +88 android:name="net.micode.notes.data.NotesProvider" +88-->D:\Notes-master\app\src\main\AndroidManifest.xml:84:13-63 +89 android:authorities="micode_notes" +89-->D:\Notes-master\app\src\main\AndroidManifest.xml:85:13-47 +90 android:multiprocess="true" /> +90-->D:\Notes-master\app\src\main\AndroidManifest.xml:86:13-40 +91 +92 D:\Notes-master\app\src\main\AndroidManifest.xml:88:9-100:20 +93 android:name="net.micode.notes.widget.NoteWidgetProvider_2x" +93-->D:\Notes-master\app\src\main\AndroidManifest.xml:89:13-57 +94 android:label="@string/app_widget2x2" > +94-->D:\Notes-master\app\src\main\AndroidManifest.xml:90:13-50 +95 +95-->D:\Notes-master\app\src\main\AndroidManifest.xml:91:13-95:29 +96 +96-->D:\Notes-master\app\src\main\AndroidManifest.xml:92:17-84 +96-->D:\Notes-master\app\src\main\AndroidManifest.xml:92:25-81 +97 +97-->D:\Notes-master\app\src\main\AndroidManifest.xml:93:17-85 +97-->D:\Notes-master\app\src\main\AndroidManifest.xml:93:25-82 +98 +98-->D:\Notes-master\app\src\main\AndroidManifest.xml:94:17-85 +98-->D:\Notes-master\app\src\main\AndroidManifest.xml:94:25-82 +99 +100 +101 D:\Notes-master\app\src\main\AndroidManifest.xml:97:13-99:58 +102 android:name="android.appwidget.provider" +102-->D:\Notes-master\app\src\main\AndroidManifest.xml:98:17-58 +103 android:resource="@xml/widget_2x_info" /> +103-->D:\Notes-master\app\src\main\AndroidManifest.xml:99:17-55 +104 +105 D:\Notes-master\app\src\main\AndroidManifest.xml:101:9-114:20 +106 android:name="net.micode.notes.widget.NoteWidgetProvider_4x" +106-->D:\Notes-master\app\src\main\AndroidManifest.xml:102:13-57 +107 android:label="@string/app_widget4x4" > +107-->D:\Notes-master\app\src\main\AndroidManifest.xml:103:13-50 +108 +108-->D:\Notes-master\app\src\main\AndroidManifest.xml:91:13-95:29 +109 +109-->D:\Notes-master\app\src\main\AndroidManifest.xml:92:17-84 +109-->D:\Notes-master\app\src\main\AndroidManifest.xml:92:25-81 +110 +110-->D:\Notes-master\app\src\main\AndroidManifest.xml:93:17-85 +110-->D:\Notes-master\app\src\main\AndroidManifest.xml:93:25-82 +111 +111-->D:\Notes-master\app\src\main\AndroidManifest.xml:94:17-85 +111-->D:\Notes-master\app\src\main\AndroidManifest.xml:94:25-82 +112 +113 +114 D:\Notes-master\app\src\main\AndroidManifest.xml:97:13-99:58 +115 android:name="android.appwidget.provider" +115-->D:\Notes-master\app\src\main\AndroidManifest.xml:98:17-58 +116 android:resource="@xml/widget_4x_info" /> +116-->D:\Notes-master\app\src\main\AndroidManifest.xml:99:17-55 +117 +118 +118-->D:\Notes-master\app\src\main\AndroidManifest.xml:116:9-120:20 +118-->D:\Notes-master\app\src\main\AndroidManifest.xml:116:19-55 +119 +119-->D:\Notes-master\app\src\main\AndroidManifest.xml:117:13-119:29 +120 +120-->D:\Notes-master\app\src\main\AndroidManifest.xml:118:17-79 +120-->D:\Notes-master\app\src\main\AndroidManifest.xml:118:25-76 +121 +122 +123 D:\Notes-master\app\src\main\AndroidManifest.xml:122:9-125:20 +124 android:name="net.micode.notes.ui.AlarmReceiver" +124-->D:\Notes-master\app\src\main\AndroidManifest.xml:123:13-61 +125 android:process=":remote" > +125-->D:\Notes-master\app\src\main\AndroidManifest.xml:124:13-38 +126 +127 +128 D:\Notes-master\app\src\main\AndroidManifest.xml:127:9-132:20 +129 android:name="net.micode.notes.ui.AlarmAlertActivity" +129-->D:\Notes-master\app\src\main\AndroidManifest.xml:128:13-50 +130 android:label="@string/app_name" +130-->D:\Notes-master\app\src\main\AndroidManifest.xml:129:13-45 +131 android:launchMode="singleInstance" +131-->D:\Notes-master\app\src\main\AndroidManifest.xml:130:13-48 +132 android:theme="@android:style/Theme.Holo.Wallpaper.NoTitleBar" > +132-->D:\Notes-master\app\src\main\AndroidManifest.xml:131:13-75 +133 +134 D:\Notes-master\app\src\main\AndroidManifest.xml:134:9-139:20 +135 android:name="net.micode.notes.ui.NotesPreferenceActivity" +135-->D:\Notes-master\app\src\main\AndroidManifest.xml:135:13-71 +136 android:label="@string/preferences_title" +136-->D:\Notes-master\app\src\main\AndroidManifest.xml:136:13-54 +137 android:launchMode="singleTop" +137-->D:\Notes-master\app\src\main\AndroidManifest.xml:137:13-43 +138 android:theme="@android:style/Theme.Holo.Light" > +138-->D:\Notes-master\app\src\main\AndroidManifest.xml:138:13-60 +139 +140 +141 D:\Notes-master\app\src\main\AndroidManifest.xml:141:9-144:19 +142 android:name="net.micode.notes.gtask.remote.GTaskSyncService" +142-->D:\Notes-master\app\src\main\AndroidManifest.xml:142:13-74 +143 android:exported="false" > +143-->D:\Notes-master\app\src\main\AndroidManifest.xml:143:13-37 +144 +145 +146 D:\Notes-master\app\src\main\AndroidManifest.xml:146:9-148:52 +147 android:name="android.app.default_searchable" +147-->D:\Notes-master\app\src\main\AndroidManifest.xml:147:13-58 +148 android:value=".ui.NoteEditActivity" /> +148-->D:\Notes-master\app\src\main\AndroidManifest.xml:148:13-49 +149 +150 +151 diff --git a/src/Notes-master/app/build/intermediates/merged_java_res/debug/base.jar b/src/app/build/intermediates/merged_java_res/debug/base.jar similarity index 100% rename from src/Notes-master/app/build/intermediates/merged_java_res/debug/base.jar rename to src/app/build/intermediates/merged_java_res/debug/base.jar diff --git a/src/Notes-master/app/build/intermediates/merged_manifest/debug/AndroidManifest.xml b/src/app/build/intermediates/merged_manifest/debug/AndroidManifest.xml similarity index 100% rename from src/Notes-master/app/build/intermediates/merged_manifest/debug/AndroidManifest.xml rename to src/app/build/intermediates/merged_manifest/debug/AndroidManifest.xml diff --git a/src/Notes-master/app/build/intermediates/merged_manifests/debug/AndroidManifest.xml b/src/app/build/intermediates/merged_manifests/debug/AndroidManifest.xml similarity index 100% rename from src/Notes-master/app/build/intermediates/merged_manifests/debug/AndroidManifest.xml rename to src/app/build/intermediates/merged_manifests/debug/AndroidManifest.xml diff --git a/src/Notes-master/app/build/intermediates/merged_manifests/debug/output-metadata.json b/src/app/build/intermediates/merged_manifests/debug/output-metadata.json similarity index 100% rename from src/Notes-master/app/build/intermediates/merged_manifests/debug/output-metadata.json rename to src/app/build/intermediates/merged_manifests/debug/output-metadata.json diff --git a/src/Notes-master/app/build/intermediates/merged_res/debug/color_primary_text_dark.xml.flat b/src/app/build/intermediates/merged_res/debug/color_primary_text_dark.xml.flat similarity index 100% rename from src/Notes-master/app/build/intermediates/merged_res/debug/color_primary_text_dark.xml.flat rename to src/app/build/intermediates/merged_res/debug/color_primary_text_dark.xml.flat diff --git a/src/Notes-master/app/build/intermediates/merged_res/debug/color_secondary_text_dark.xml.flat b/src/app/build/intermediates/merged_res/debug/color_secondary_text_dark.xml.flat similarity index 100% rename from src/Notes-master/app/build/intermediates/merged_res/debug/color_secondary_text_dark.xml.flat rename to src/app/build/intermediates/merged_res/debug/color_secondary_text_dark.xml.flat diff --git a/src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_bg_btn_set_color.png.flat b/src/app/build/intermediates/merged_res/debug/drawable-hdpi_bg_btn_set_color.png.flat similarity index 100% rename from src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_bg_btn_set_color.png.flat rename to src/app/build/intermediates/merged_res/debug/drawable-hdpi_bg_btn_set_color.png.flat diff --git a/src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_bg_color_btn_mask.png.flat b/src/app/build/intermediates/merged_res/debug/drawable-hdpi_bg_color_btn_mask.png.flat similarity index 100% rename from src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_bg_color_btn_mask.png.flat rename to src/app/build/intermediates/merged_res/debug/drawable-hdpi_bg_color_btn_mask.png.flat diff --git a/src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_call_record.png.flat b/src/app/build/intermediates/merged_res/debug/drawable-hdpi_call_record.png.flat similarity index 100% rename from src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_call_record.png.flat rename to src/app/build/intermediates/merged_res/debug/drawable-hdpi_call_record.png.flat diff --git a/src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_clock.png.flat b/src/app/build/intermediates/merged_res/debug/drawable-hdpi_clock.png.flat similarity index 100% rename from src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_clock.png.flat rename to src/app/build/intermediates/merged_res/debug/drawable-hdpi_clock.png.flat diff --git a/src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_delete.png.flat b/src/app/build/intermediates/merged_res/debug/drawable-hdpi_delete.png.flat similarity index 100% rename from src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_delete.png.flat rename to src/app/build/intermediates/merged_res/debug/drawable-hdpi_delete.png.flat diff --git a/src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_dropdown_icon.9.png.flat b/src/app/build/intermediates/merged_res/debug/drawable-hdpi_dropdown_icon.9.png.flat similarity index 100% rename from src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_dropdown_icon.9.png.flat rename to src/app/build/intermediates/merged_res/debug/drawable-hdpi_dropdown_icon.9.png.flat diff --git a/src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_blue.9.png.flat b/src/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_blue.9.png.flat similarity index 100% rename from src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_blue.9.png.flat rename to src/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_blue.9.png.flat diff --git a/src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_green.9.png.flat b/src/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_green.9.png.flat similarity index 100% rename from src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_green.9.png.flat rename to src/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_green.9.png.flat diff --git a/src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_red.9.png.flat b/src/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_red.9.png.flat similarity index 100% rename from src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_red.9.png.flat rename to src/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_red.9.png.flat diff --git a/src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_title_blue.9.png.flat b/src/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_title_blue.9.png.flat similarity index 100% rename from src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_title_blue.9.png.flat rename to src/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_title_blue.9.png.flat diff --git a/src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_title_green.9.png.flat b/src/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_title_green.9.png.flat similarity index 100% rename from src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_title_green.9.png.flat rename to src/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_title_green.9.png.flat diff --git a/src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_title_red.9.png.flat b/src/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_title_red.9.png.flat similarity index 100% rename from src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_title_red.9.png.flat rename to src/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_title_red.9.png.flat diff --git a/src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_title_white.9.png.flat b/src/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_title_white.9.png.flat similarity index 100% rename from src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_title_white.9.png.flat rename to src/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_title_white.9.png.flat diff --git a/src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_title_yellow.9.png.flat b/src/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_title_yellow.9.png.flat similarity index 100% rename from src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_title_yellow.9.png.flat rename to src/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_title_yellow.9.png.flat diff --git a/src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_white.9.png.flat b/src/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_white.9.png.flat similarity index 100% rename from src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_white.9.png.flat rename to src/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_white.9.png.flat diff --git a/src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_yellow.9.png.flat b/src/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_yellow.9.png.flat similarity index 100% rename from src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_yellow.9.png.flat rename to src/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_yellow.9.png.flat diff --git a/src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_font_large.png.flat b/src/app/build/intermediates/merged_res/debug/drawable-hdpi_font_large.png.flat similarity index 100% rename from src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_font_large.png.flat rename to src/app/build/intermediates/merged_res/debug/drawable-hdpi_font_large.png.flat diff --git a/src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_font_normal.png.flat b/src/app/build/intermediates/merged_res/debug/drawable-hdpi_font_normal.png.flat similarity index 100% rename from src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_font_normal.png.flat rename to src/app/build/intermediates/merged_res/debug/drawable-hdpi_font_normal.png.flat diff --git a/src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_font_size_selector_bg.9.png.flat b/src/app/build/intermediates/merged_res/debug/drawable-hdpi_font_size_selector_bg.9.png.flat similarity index 100% rename from src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_font_size_selector_bg.9.png.flat rename to src/app/build/intermediates/merged_res/debug/drawable-hdpi_font_size_selector_bg.9.png.flat diff --git a/src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_font_small.png.flat b/src/app/build/intermediates/merged_res/debug/drawable-hdpi_font_small.png.flat similarity index 100% rename from src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_font_small.png.flat rename to src/app/build/intermediates/merged_res/debug/drawable-hdpi_font_small.png.flat diff --git a/src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_font_super.png.flat b/src/app/build/intermediates/merged_res/debug/drawable-hdpi_font_super.png.flat similarity index 100% rename from src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_font_super.png.flat rename to src/app/build/intermediates/merged_res/debug/drawable-hdpi_font_super.png.flat diff --git a/src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_icon_app.png.flat b/src/app/build/intermediates/merged_res/debug/drawable-hdpi_icon_app.png.flat similarity index 100% rename from src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_icon_app.png.flat rename to src/app/build/intermediates/merged_res/debug/drawable-hdpi_icon_app.png.flat diff --git a/src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_list_background.png.flat b/src/app/build/intermediates/merged_res/debug/drawable-hdpi_list_background.png.flat similarity index 100% rename from src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_list_background.png.flat rename to src/app/build/intermediates/merged_res/debug/drawable-hdpi_list_background.png.flat diff --git a/src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_list_blue_down.9.png.flat b/src/app/build/intermediates/merged_res/debug/drawable-hdpi_list_blue_down.9.png.flat similarity index 100% rename from src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_list_blue_down.9.png.flat rename to src/app/build/intermediates/merged_res/debug/drawable-hdpi_list_blue_down.9.png.flat diff --git a/src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_list_blue_middle.9.png.flat b/src/app/build/intermediates/merged_res/debug/drawable-hdpi_list_blue_middle.9.png.flat similarity index 100% rename from src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_list_blue_middle.9.png.flat rename to src/app/build/intermediates/merged_res/debug/drawable-hdpi_list_blue_middle.9.png.flat diff --git a/src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_list_blue_single.9.png.flat b/src/app/build/intermediates/merged_res/debug/drawable-hdpi_list_blue_single.9.png.flat similarity index 100% rename from src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_list_blue_single.9.png.flat rename to src/app/build/intermediates/merged_res/debug/drawable-hdpi_list_blue_single.9.png.flat diff --git a/src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_list_blue_up.9.png.flat b/src/app/build/intermediates/merged_res/debug/drawable-hdpi_list_blue_up.9.png.flat similarity index 100% rename from src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_list_blue_up.9.png.flat rename to src/app/build/intermediates/merged_res/debug/drawable-hdpi_list_blue_up.9.png.flat diff --git a/src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_list_folder.9.png.flat b/src/app/build/intermediates/merged_res/debug/drawable-hdpi_list_folder.9.png.flat similarity index 100% rename from src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_list_folder.9.png.flat rename to src/app/build/intermediates/merged_res/debug/drawable-hdpi_list_folder.9.png.flat diff --git a/src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_list_footer_bg.9.png.flat b/src/app/build/intermediates/merged_res/debug/drawable-hdpi_list_footer_bg.9.png.flat similarity index 100% rename from src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_list_footer_bg.9.png.flat rename to src/app/build/intermediates/merged_res/debug/drawable-hdpi_list_footer_bg.9.png.flat diff --git a/src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_list_green_down.9.png.flat b/src/app/build/intermediates/merged_res/debug/drawable-hdpi_list_green_down.9.png.flat similarity index 100% rename from src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_list_green_down.9.png.flat rename to src/app/build/intermediates/merged_res/debug/drawable-hdpi_list_green_down.9.png.flat diff --git a/src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_list_green_middle.9.png.flat b/src/app/build/intermediates/merged_res/debug/drawable-hdpi_list_green_middle.9.png.flat similarity index 100% rename from src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_list_green_middle.9.png.flat rename to src/app/build/intermediates/merged_res/debug/drawable-hdpi_list_green_middle.9.png.flat diff --git a/src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_list_green_single.9.png.flat b/src/app/build/intermediates/merged_res/debug/drawable-hdpi_list_green_single.9.png.flat similarity index 100% rename from src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_list_green_single.9.png.flat rename to src/app/build/intermediates/merged_res/debug/drawable-hdpi_list_green_single.9.png.flat diff --git a/src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_list_green_up.9.png.flat b/src/app/build/intermediates/merged_res/debug/drawable-hdpi_list_green_up.9.png.flat similarity index 100% rename from src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_list_green_up.9.png.flat rename to src/app/build/intermediates/merged_res/debug/drawable-hdpi_list_green_up.9.png.flat diff --git a/src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_list_red_down.9.png.flat b/src/app/build/intermediates/merged_res/debug/drawable-hdpi_list_red_down.9.png.flat similarity index 100% rename from src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_list_red_down.9.png.flat rename to src/app/build/intermediates/merged_res/debug/drawable-hdpi_list_red_down.9.png.flat diff --git a/src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_list_red_middle.9.png.flat b/src/app/build/intermediates/merged_res/debug/drawable-hdpi_list_red_middle.9.png.flat similarity index 100% rename from src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_list_red_middle.9.png.flat rename to src/app/build/intermediates/merged_res/debug/drawable-hdpi_list_red_middle.9.png.flat diff --git a/src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_list_red_single.9.png.flat b/src/app/build/intermediates/merged_res/debug/drawable-hdpi_list_red_single.9.png.flat similarity index 100% rename from src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_list_red_single.9.png.flat rename to src/app/build/intermediates/merged_res/debug/drawable-hdpi_list_red_single.9.png.flat diff --git a/src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_list_red_up.9.png.flat b/src/app/build/intermediates/merged_res/debug/drawable-hdpi_list_red_up.9.png.flat similarity index 100% rename from src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_list_red_up.9.png.flat rename to src/app/build/intermediates/merged_res/debug/drawable-hdpi_list_red_up.9.png.flat diff --git a/src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_list_white_down.9.png.flat b/src/app/build/intermediates/merged_res/debug/drawable-hdpi_list_white_down.9.png.flat similarity index 100% rename from src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_list_white_down.9.png.flat rename to src/app/build/intermediates/merged_res/debug/drawable-hdpi_list_white_down.9.png.flat diff --git a/src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_list_white_middle.9.png.flat b/src/app/build/intermediates/merged_res/debug/drawable-hdpi_list_white_middle.9.png.flat similarity index 100% rename from src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_list_white_middle.9.png.flat rename to src/app/build/intermediates/merged_res/debug/drawable-hdpi_list_white_middle.9.png.flat diff --git a/src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_list_white_single.9.png.flat b/src/app/build/intermediates/merged_res/debug/drawable-hdpi_list_white_single.9.png.flat similarity index 100% rename from src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_list_white_single.9.png.flat rename to src/app/build/intermediates/merged_res/debug/drawable-hdpi_list_white_single.9.png.flat diff --git a/src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_list_white_up.9.png.flat b/src/app/build/intermediates/merged_res/debug/drawable-hdpi_list_white_up.9.png.flat similarity index 100% rename from src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_list_white_up.9.png.flat rename to src/app/build/intermediates/merged_res/debug/drawable-hdpi_list_white_up.9.png.flat diff --git a/src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_list_yellow_down.9.png.flat b/src/app/build/intermediates/merged_res/debug/drawable-hdpi_list_yellow_down.9.png.flat similarity index 100% rename from src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_list_yellow_down.9.png.flat rename to src/app/build/intermediates/merged_res/debug/drawable-hdpi_list_yellow_down.9.png.flat diff --git a/src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_list_yellow_middle.9.png.flat b/src/app/build/intermediates/merged_res/debug/drawable-hdpi_list_yellow_middle.9.png.flat similarity index 100% rename from src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_list_yellow_middle.9.png.flat rename to src/app/build/intermediates/merged_res/debug/drawable-hdpi_list_yellow_middle.9.png.flat diff --git a/src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_list_yellow_single.9.png.flat b/src/app/build/intermediates/merged_res/debug/drawable-hdpi_list_yellow_single.9.png.flat similarity index 100% rename from src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_list_yellow_single.9.png.flat rename to src/app/build/intermediates/merged_res/debug/drawable-hdpi_list_yellow_single.9.png.flat diff --git a/src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_list_yellow_up.9.png.flat b/src/app/build/intermediates/merged_res/debug/drawable-hdpi_list_yellow_up.9.png.flat similarity index 100% rename from src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_list_yellow_up.9.png.flat rename to src/app/build/intermediates/merged_res/debug/drawable-hdpi_list_yellow_up.9.png.flat diff --git a/src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_menu_delete.png.flat b/src/app/build/intermediates/merged_res/debug/drawable-hdpi_menu_delete.png.flat similarity index 100% rename from src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_menu_delete.png.flat rename to src/app/build/intermediates/merged_res/debug/drawable-hdpi_menu_delete.png.flat diff --git a/src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_menu_move.png.flat b/src/app/build/intermediates/merged_res/debug/drawable-hdpi_menu_move.png.flat similarity index 100% rename from src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_menu_move.png.flat rename to src/app/build/intermediates/merged_res/debug/drawable-hdpi_menu_move.png.flat diff --git a/src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_new_note_normal.png.flat b/src/app/build/intermediates/merged_res/debug/drawable-hdpi_new_note_normal.png.flat similarity index 100% rename from src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_new_note_normal.png.flat rename to src/app/build/intermediates/merged_res/debug/drawable-hdpi_new_note_normal.png.flat diff --git a/src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_new_note_pressed.png.flat b/src/app/build/intermediates/merged_res/debug/drawable-hdpi_new_note_pressed.png.flat similarity index 100% rename from src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_new_note_pressed.png.flat rename to src/app/build/intermediates/merged_res/debug/drawable-hdpi_new_note_pressed.png.flat diff --git a/src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_note_edit_color_selector_panel.png.flat b/src/app/build/intermediates/merged_res/debug/drawable-hdpi_note_edit_color_selector_panel.png.flat similarity index 100% rename from src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_note_edit_color_selector_panel.png.flat rename to src/app/build/intermediates/merged_res/debug/drawable-hdpi_note_edit_color_selector_panel.png.flat diff --git a/src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_notification.png.flat b/src/app/build/intermediates/merged_res/debug/drawable-hdpi_notification.png.flat similarity index 100% rename from src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_notification.png.flat rename to src/app/build/intermediates/merged_res/debug/drawable-hdpi_notification.png.flat diff --git a/src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_search_result.png.flat b/src/app/build/intermediates/merged_res/debug/drawable-hdpi_search_result.png.flat similarity index 100% rename from src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_search_result.png.flat rename to src/app/build/intermediates/merged_res/debug/drawable-hdpi_search_result.png.flat diff --git a/src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_selected.png.flat b/src/app/build/intermediates/merged_res/debug/drawable-hdpi_selected.png.flat similarity index 100% rename from src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_selected.png.flat rename to src/app/build/intermediates/merged_res/debug/drawable-hdpi_selected.png.flat diff --git a/src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_title_alert.png.flat b/src/app/build/intermediates/merged_res/debug/drawable-hdpi_title_alert.png.flat similarity index 100% rename from src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_title_alert.png.flat rename to src/app/build/intermediates/merged_res/debug/drawable-hdpi_title_alert.png.flat diff --git a/src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_title_bar_bg.9.png.flat b/src/app/build/intermediates/merged_res/debug/drawable-hdpi_title_bar_bg.9.png.flat similarity index 100% rename from src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_title_bar_bg.9.png.flat rename to src/app/build/intermediates/merged_res/debug/drawable-hdpi_title_bar_bg.9.png.flat diff --git a/src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_2x_blue.png.flat b/src/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_2x_blue.png.flat similarity index 100% rename from src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_2x_blue.png.flat rename to src/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_2x_blue.png.flat diff --git a/src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_2x_green.png.flat b/src/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_2x_green.png.flat similarity index 100% rename from src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_2x_green.png.flat rename to src/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_2x_green.png.flat diff --git a/src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_2x_red.png.flat b/src/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_2x_red.png.flat similarity index 100% rename from src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_2x_red.png.flat rename to src/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_2x_red.png.flat diff --git a/src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_2x_white.png.flat b/src/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_2x_white.png.flat similarity index 100% rename from src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_2x_white.png.flat rename to src/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_2x_white.png.flat diff --git a/src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_2x_yellow.png.flat b/src/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_2x_yellow.png.flat similarity index 100% rename from src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_2x_yellow.png.flat rename to src/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_2x_yellow.png.flat diff --git a/src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_4x_blue.png.flat b/src/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_4x_blue.png.flat similarity index 100% rename from src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_4x_blue.png.flat rename to src/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_4x_blue.png.flat diff --git a/src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_4x_green.png.flat b/src/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_4x_green.png.flat similarity index 100% rename from src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_4x_green.png.flat rename to src/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_4x_green.png.flat diff --git a/src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_4x_red.png.flat b/src/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_4x_red.png.flat similarity index 100% rename from src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_4x_red.png.flat rename to src/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_4x_red.png.flat diff --git a/src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_4x_white.png.flat b/src/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_4x_white.png.flat similarity index 100% rename from src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_4x_white.png.flat rename to src/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_4x_white.png.flat diff --git a/src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_4x_yellow.png.flat b/src/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_4x_yellow.png.flat similarity index 100% rename from src/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_4x_yellow.png.flat rename to src/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_4x_yellow.png.flat diff --git a/src/Notes-master/app/build/intermediates/merged_res/debug/drawable_new_note.xml.flat b/src/app/build/intermediates/merged_res/debug/drawable_new_note.xml.flat similarity index 100% rename from src/Notes-master/app/build/intermediates/merged_res/debug/drawable_new_note.xml.flat rename to src/app/build/intermediates/merged_res/debug/drawable_new_note.xml.flat diff --git a/src/Notes-master/app/build/intermediates/merged_res/debug/layout_account_dialog_title.xml.flat b/src/app/build/intermediates/merged_res/debug/layout_account_dialog_title.xml.flat similarity index 100% rename from src/Notes-master/app/build/intermediates/merged_res/debug/layout_account_dialog_title.xml.flat rename to src/app/build/intermediates/merged_res/debug/layout_account_dialog_title.xml.flat diff --git a/src/Notes-master/app/build/intermediates/merged_res/debug/layout_add_account_text.xml.flat b/src/app/build/intermediates/merged_res/debug/layout_add_account_text.xml.flat similarity index 100% rename from src/Notes-master/app/build/intermediates/merged_res/debug/layout_add_account_text.xml.flat rename to src/app/build/intermediates/merged_res/debug/layout_add_account_text.xml.flat diff --git a/src/Notes-master/app/build/intermediates/merged_res/debug/layout_datetime_picker.xml.flat b/src/app/build/intermediates/merged_res/debug/layout_datetime_picker.xml.flat similarity index 100% rename from src/Notes-master/app/build/intermediates/merged_res/debug/layout_datetime_picker.xml.flat rename to src/app/build/intermediates/merged_res/debug/layout_datetime_picker.xml.flat diff --git a/src/Notes-master/app/build/intermediates/merged_res/debug/layout_dialog_edit_text.xml.flat b/src/app/build/intermediates/merged_res/debug/layout_dialog_edit_text.xml.flat similarity index 100% rename from src/Notes-master/app/build/intermediates/merged_res/debug/layout_dialog_edit_text.xml.flat rename to src/app/build/intermediates/merged_res/debug/layout_dialog_edit_text.xml.flat diff --git a/src/Notes-master/app/build/intermediates/merged_res/debug/layout_folder_list_item.xml.flat b/src/app/build/intermediates/merged_res/debug/layout_folder_list_item.xml.flat similarity index 100% rename from src/Notes-master/app/build/intermediates/merged_res/debug/layout_folder_list_item.xml.flat rename to src/app/build/intermediates/merged_res/debug/layout_folder_list_item.xml.flat diff --git a/src/Notes-master/app/build/intermediates/merged_res/debug/layout_note_edit.xml.flat b/src/app/build/intermediates/merged_res/debug/layout_note_edit.xml.flat similarity index 100% rename from src/Notes-master/app/build/intermediates/merged_res/debug/layout_note_edit.xml.flat rename to src/app/build/intermediates/merged_res/debug/layout_note_edit.xml.flat diff --git a/src/Notes-master/app/build/intermediates/merged_res/debug/layout_note_edit_list_item.xml.flat b/src/app/build/intermediates/merged_res/debug/layout_note_edit_list_item.xml.flat similarity index 100% rename from src/Notes-master/app/build/intermediates/merged_res/debug/layout_note_edit_list_item.xml.flat rename to src/app/build/intermediates/merged_res/debug/layout_note_edit_list_item.xml.flat diff --git a/src/Notes-master/app/build/intermediates/merged_res/debug/layout_note_item.xml.flat b/src/app/build/intermediates/merged_res/debug/layout_note_item.xml.flat similarity index 100% rename from src/Notes-master/app/build/intermediates/merged_res/debug/layout_note_item.xml.flat rename to src/app/build/intermediates/merged_res/debug/layout_note_item.xml.flat diff --git a/src/Notes-master/app/build/intermediates/merged_res/debug/layout_note_list.xml.flat b/src/app/build/intermediates/merged_res/debug/layout_note_list.xml.flat similarity index 100% rename from src/Notes-master/app/build/intermediates/merged_res/debug/layout_note_list.xml.flat rename to src/app/build/intermediates/merged_res/debug/layout_note_list.xml.flat diff --git a/src/Notes-master/app/build/intermediates/merged_res/debug/layout_note_list_dropdown_menu.xml.flat b/src/app/build/intermediates/merged_res/debug/layout_note_list_dropdown_menu.xml.flat similarity index 100% rename from src/Notes-master/app/build/intermediates/merged_res/debug/layout_note_list_dropdown_menu.xml.flat rename to src/app/build/intermediates/merged_res/debug/layout_note_list_dropdown_menu.xml.flat diff --git a/src/Notes-master/app/build/intermediates/merged_res/debug/layout_note_list_footer.xml.flat b/src/app/build/intermediates/merged_res/debug/layout_note_list_footer.xml.flat similarity index 100% rename from src/Notes-master/app/build/intermediates/merged_res/debug/layout_note_list_footer.xml.flat rename to src/app/build/intermediates/merged_res/debug/layout_note_list_footer.xml.flat diff --git a/src/Notes-master/app/build/intermediates/merged_res/debug/layout_settings_header.xml.flat b/src/app/build/intermediates/merged_res/debug/layout_settings_header.xml.flat similarity index 100% rename from src/Notes-master/app/build/intermediates/merged_res/debug/layout_settings_header.xml.flat rename to src/app/build/intermediates/merged_res/debug/layout_settings_header.xml.flat diff --git a/src/Notes-master/app/build/intermediates/merged_res/debug/layout_widget_2x.xml.flat b/src/app/build/intermediates/merged_res/debug/layout_widget_2x.xml.flat similarity index 100% rename from src/Notes-master/app/build/intermediates/merged_res/debug/layout_widget_2x.xml.flat rename to src/app/build/intermediates/merged_res/debug/layout_widget_2x.xml.flat diff --git a/src/Notes-master/app/build/intermediates/merged_res/debug/layout_widget_4x.xml.flat b/src/app/build/intermediates/merged_res/debug/layout_widget_4x.xml.flat similarity index 100% rename from src/Notes-master/app/build/intermediates/merged_res/debug/layout_widget_4x.xml.flat rename to src/app/build/intermediates/merged_res/debug/layout_widget_4x.xml.flat diff --git a/src/Notes-master/app/build/intermediates/merged_res/debug/menu_call_note_edit.xml.flat b/src/app/build/intermediates/merged_res/debug/menu_call_note_edit.xml.flat similarity index 100% rename from src/Notes-master/app/build/intermediates/merged_res/debug/menu_call_note_edit.xml.flat rename to src/app/build/intermediates/merged_res/debug/menu_call_note_edit.xml.flat diff --git a/src/Notes-master/app/build/intermediates/merged_res/debug/menu_call_record_folder.xml.flat b/src/app/build/intermediates/merged_res/debug/menu_call_record_folder.xml.flat similarity index 100% rename from src/Notes-master/app/build/intermediates/merged_res/debug/menu_call_record_folder.xml.flat rename to src/app/build/intermediates/merged_res/debug/menu_call_record_folder.xml.flat diff --git a/src/Notes-master/app/build/intermediates/merged_res/debug/menu_note_edit.xml.flat b/src/app/build/intermediates/merged_res/debug/menu_note_edit.xml.flat similarity index 100% rename from src/Notes-master/app/build/intermediates/merged_res/debug/menu_note_edit.xml.flat rename to src/app/build/intermediates/merged_res/debug/menu_note_edit.xml.flat diff --git a/src/Notes-master/app/build/intermediates/merged_res/debug/menu_note_list.xml.flat b/src/app/build/intermediates/merged_res/debug/menu_note_list.xml.flat similarity index 100% rename from src/Notes-master/app/build/intermediates/merged_res/debug/menu_note_list.xml.flat rename to src/app/build/intermediates/merged_res/debug/menu_note_list.xml.flat diff --git a/src/Notes-master/app/build/intermediates/merged_res/debug/menu_note_list_dropdown.xml.flat b/src/app/build/intermediates/merged_res/debug/menu_note_list_dropdown.xml.flat similarity index 100% rename from src/Notes-master/app/build/intermediates/merged_res/debug/menu_note_list_dropdown.xml.flat rename to src/app/build/intermediates/merged_res/debug/menu_note_list_dropdown.xml.flat diff --git a/src/Notes-master/app/build/intermediates/merged_res/debug/menu_note_list_options.xml.flat b/src/app/build/intermediates/merged_res/debug/menu_note_list_options.xml.flat similarity index 100% rename from src/Notes-master/app/build/intermediates/merged_res/debug/menu_note_list_options.xml.flat rename to src/app/build/intermediates/merged_res/debug/menu_note_list_options.xml.flat diff --git a/src/Notes-master/app/build/intermediates/merged_res/debug/menu_sub_folder.xml.flat b/src/app/build/intermediates/merged_res/debug/menu_sub_folder.xml.flat similarity index 100% rename from src/Notes-master/app/build/intermediates/merged_res/debug/menu_sub_folder.xml.flat rename to src/app/build/intermediates/merged_res/debug/menu_sub_folder.xml.flat diff --git a/src/Notes-master/app/build/intermediates/merged_res/debug/raw-zh-rCN_introduction.flat b/src/app/build/intermediates/merged_res/debug/raw-zh-rCN_introduction.flat similarity index 100% rename from src/Notes-master/app/build/intermediates/merged_res/debug/raw-zh-rCN_introduction.flat rename to src/app/build/intermediates/merged_res/debug/raw-zh-rCN_introduction.flat diff --git a/src/Notes-master/app/build/intermediates/merged_res/debug/raw_introduction.flat b/src/app/build/intermediates/merged_res/debug/raw_introduction.flat similarity index 100% rename from src/Notes-master/app/build/intermediates/merged_res/debug/raw_introduction.flat rename to src/app/build/intermediates/merged_res/debug/raw_introduction.flat diff --git a/src/Notes-master/app/build/intermediates/merged_res/debug/values-zh-rCN_values-zh-rCN.arsc.flat b/src/app/build/intermediates/merged_res/debug/values-zh-rCN_values-zh-rCN.arsc.flat similarity index 100% rename from src/Notes-master/app/build/intermediates/merged_res/debug/values-zh-rCN_values-zh-rCN.arsc.flat rename to src/app/build/intermediates/merged_res/debug/values-zh-rCN_values-zh-rCN.arsc.flat diff --git a/src/Notes-master/app/build/intermediates/merged_res/debug/values-zh-rTW_values-zh-rTW.arsc.flat b/src/app/build/intermediates/merged_res/debug/values-zh-rTW_values-zh-rTW.arsc.flat similarity index 100% rename from src/Notes-master/app/build/intermediates/merged_res/debug/values-zh-rTW_values-zh-rTW.arsc.flat rename to src/app/build/intermediates/merged_res/debug/values-zh-rTW_values-zh-rTW.arsc.flat diff --git a/src/Notes-master/app/build/intermediates/merged_res/debug/values_values.arsc.flat b/src/app/build/intermediates/merged_res/debug/values_values.arsc.flat similarity index 100% rename from src/Notes-master/app/build/intermediates/merged_res/debug/values_values.arsc.flat rename to src/app/build/intermediates/merged_res/debug/values_values.arsc.flat diff --git a/src/Notes-master/app/build/intermediates/merged_res/debug/xml_preferences.xml.flat b/src/app/build/intermediates/merged_res/debug/xml_preferences.xml.flat similarity index 100% rename from src/Notes-master/app/build/intermediates/merged_res/debug/xml_preferences.xml.flat rename to src/app/build/intermediates/merged_res/debug/xml_preferences.xml.flat diff --git a/src/Notes-master/app/build/intermediates/merged_res/debug/xml_searchable.xml.flat b/src/app/build/intermediates/merged_res/debug/xml_searchable.xml.flat similarity index 100% rename from src/Notes-master/app/build/intermediates/merged_res/debug/xml_searchable.xml.flat rename to src/app/build/intermediates/merged_res/debug/xml_searchable.xml.flat diff --git a/src/Notes-master/app/build/intermediates/merged_res/debug/xml_widget_2x_info.xml.flat b/src/app/build/intermediates/merged_res/debug/xml_widget_2x_info.xml.flat similarity index 100% rename from src/Notes-master/app/build/intermediates/merged_res/debug/xml_widget_2x_info.xml.flat rename to src/app/build/intermediates/merged_res/debug/xml_widget_2x_info.xml.flat diff --git a/src/Notes-master/app/build/intermediates/merged_res/debug/xml_widget_4x_info.xml.flat b/src/app/build/intermediates/merged_res/debug/xml_widget_4x_info.xml.flat similarity index 100% rename from src/Notes-master/app/build/intermediates/merged_res/debug/xml_widget_4x_info.xml.flat rename to src/app/build/intermediates/merged_res/debug/xml_widget_4x_info.xml.flat diff --git a/src/Notes-master/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 similarity index 94% rename from src/Notes-master/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/debug.json rename to src/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/debug.json index 350834a..8df0fc9 100644 --- a/src/Notes-master/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 @@ -4,7 +4,7 @@ "outputFile": "net.micode.notes.app-merged_res-5:/values-zh-rCN_values-zh-rCN.arsc.flat", "map": [ { - "source": "D:\\git\\TeamProject\\src\\Notes-master\\app\\src\\main\\res\\values-zh-rCN\\arrays.xml", + "source": "D:\\Notes-master\\app\\src\\main\\res\\values-zh-rCN\\arrays.xml", "from": { "startLines": "18", "startColumns": "4", @@ -23,7 +23,7 @@ } }, { - "source": "D:\\git\\TeamProject\\src\\Notes-master\\app\\src\\main\\res\\values-zh-rCN\\strings.xml", + "source": "D:\\Notes-master\\app\\src\\main\\res\\values-zh-rCN\\strings.xml", "from": { "startLines": "121,71,70,69,68,19,20,21,112,113,120,119,26,77,78,76,75,74,90,89,88,80,60,29,30,81,72,114,67,63,38,44,49,39,59,58,57,53,52,50,51,54,55,45,66,56,64,43,48,47,46,62,42,61,40,41,65,28,34,36,33,35,32,31,25,24,97,96,99,111,104,103,105,106,108,107,98,102,100,101,95,109,110,118,116,115,117,27,79,87,92,91,93,86,85,84,83,22,23", "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", @@ -47,26 +47,24 @@ "outputFile": "net.micode.notes.app-merged_res-5:/values_values.arsc.flat", "map": [ { - "source": "D:\\git\\TeamProject\\src\\Notes-master\\app\\src\\main\\res\\values\\strings.xml", + "source": "D:\\Notes-master\\app\\src\\main\\res\\values\\dimens.xml", "from": { - "startLines": "128,72,75,74,73,19,20,21,118,119,127,126,26,81,82,80,79,78,94,93,92,84,39,38,64,29,30,85,41,76,120,71,67,42,48,53,43,63,62,61,57,56,54,55,58,59,49,70,60,68,47,52,51,50,66,46,65,44,45,69,28,34,36,33,35,32,31,25,24,101,100,104,116,109,108,110,111,113,112,102,103,107,105,106,99,114,115,125,123,122,124,27,83,91,96,95,97,90,89,88,87,22,23", - "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "8008,3898,4159,4063,3994,827,870,922,7506,7555,7950,7899,1282,4613,4707,4542,4458,4375,5574,5491,5389,4883,2004,1953,3397,1486,1539,4944,2097,4242,7618,3827,3582,2156,2471,2772,2214,3326,3265,3208,2986,2934,2831,2884,3036,3086,2518,3761,3146,3631,2424,2717,2629,2571,3520,2374,3475,2271,2314,3694,1431,1750,1858,1703,1805,1647,1599,1227,1174,6030,5963,6271,7409,6635,6554,6709,6798,7040,6961,6114,6189,6495,6335,6415,5908,7184,7306,7858,7731,7674,7784,1366,4815,5303,5709,5640,5789,5244,5189,5127,5067,974,1084", - "endLines": "132,72,75,74,73,19,20,21,118,119,127,126,26,81,82,80,79,78,94,93,92,84,39,38,64,29,30,85,41,76,120,71,67,42,48,53,43,63,62,61,57,56,54,55,58,59,49,70,60,68,47,52,51,50,66,46,65,44,45,69,28,34,36,33,35,32,31,25,24,101,100,104,116,109,108,110,111,113,112,102,103,107,105,106,99,114,115,125,123,122,124,27,83,91,96,95,97,90,89,88,87,22,23", - "endColumns": "14,95,82,95,68,42,51,51,48,62,57,50,83,93,107,70,83,82,65,82,101,60,61,50,77,52,59,104,58,101,54,70,48,57,46,58,56,70,60,56,49,51,52,49,49,59,52,65,61,62,46,54,87,57,61,49,44,42,59,66,54,54,52,46,52,55,47,54,52,83,66,63,95,73,80,88,162,143,78,74,81,58,79,79,54,121,102,40,52,56,73,64,67,85,79,68,93,58,54,61,59,109,89", - "endOffsets": "8412,3989,4237,4154,4058,865,917,969,7550,7613,8003,7945,1361,4702,4810,4608,4537,4453,5635,5569,5486,4939,2061,1999,3470,1534,1594,5044,2151,4339,7668,3893,3626,2209,2513,2826,2266,3392,3321,3260,3031,2981,2879,2929,3081,3141,2566,3822,3203,3689,2466,2767,2712,2624,3577,2419,3515,2309,2369,3756,1481,1800,1906,1745,1853,1698,1642,1277,1222,6109,6025,6330,7500,6704,6630,6793,6956,7179,7035,6184,6266,6549,6410,6490,5958,7301,7404,7894,7779,7726,7853,1426,4878,5384,5784,5704,5878,5298,5239,5184,5122,1079,1169" + "startLines": "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": "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" + "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": "D:\\git\\TeamProject\\src\\Notes-master\\app\\src\\main\\res\\values\\colors.xml", + "source": "D:\\Notes-master\\app\\src\\main\\res\\values\\colors.xml", "from": { "startLines": "18", "startColumns": "4", @@ -83,43 +81,26 @@ } }, { - "source": "D:\\git\\TeamProject\\src\\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": "D:\\git\\TeamProject\\src\\Notes-master\\app\\src\\main\\res\\values\\arrays.xml", + "source": "D:\\Notes-master\\app\\src\\main\\res\\values\\strings.xml", "from": { - "startLines": "19,26", - "startColumns": "4,4", - "startOffsets": "739,1047", - "endLines": "24,29", - "endColumns": "19,19", - "endOffsets": "1041,1162" + "startLines": "128,72,75,74,73,19,20,21,118,119,127,126,26,81,82,80,79,78,94,93,92,84,39,38,64,29,30,85,41,76,120,71,67,42,48,53,43,63,62,61,57,56,54,55,58,59,49,70,60,68,47,52,51,50,66,46,65,44,45,69,28,34,36,33,35,32,31,25,24,101,100,104,116,109,108,110,111,113,112,102,103,107,105,106,99,114,115,125,123,122,124,27,83,91,96,95,97,90,89,88,87,22,23", + "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", + "startOffsets": "8008,3898,4159,4063,3994,827,870,922,7506,7555,7950,7899,1282,4613,4707,4542,4458,4375,5574,5491,5389,4883,2004,1953,3397,1486,1539,4944,2097,4242,7618,3827,3582,2156,2471,2772,2214,3326,3265,3208,2986,2934,2831,2884,3036,3086,2518,3761,3146,3631,2424,2717,2629,2571,3520,2374,3475,2271,2314,3694,1431,1750,1858,1703,1805,1647,1599,1227,1174,6030,5963,6271,7409,6635,6554,6709,6798,7040,6961,6114,6189,6495,6335,6415,5908,7184,7306,7858,7731,7674,7784,1366,4815,5303,5709,5640,5789,5244,5189,5127,5067,974,1084", + "endLines": "132,72,75,74,73,19,20,21,118,119,127,126,26,81,82,80,79,78,94,93,92,84,39,38,64,29,30,85,41,76,120,71,67,42,48,53,43,63,62,61,57,56,54,55,58,59,49,70,60,68,47,52,51,50,66,46,65,44,45,69,28,34,36,33,35,32,31,25,24,101,100,104,116,109,108,110,111,113,112,102,103,107,105,106,99,114,115,125,123,122,124,27,83,91,96,95,97,90,89,88,87,22,23", + "endColumns": "14,95,82,95,68,42,51,51,48,62,57,50,83,93,107,70,83,82,65,82,101,60,61,50,77,52,59,104,58,101,54,70,48,57,46,58,56,70,60,56,49,51,52,49,49,59,52,65,61,62,46,54,87,57,61,49,44,42,59,66,54,54,52,46,52,55,47,54,52,83,66,63,95,73,80,88,162,143,78,74,81,58,79,79,54,121,102,40,52,56,73,64,67,85,79,68,93,58,54,61,59,109,89", + "endOffsets": "8412,3989,4237,4154,4058,865,917,969,7550,7613,8003,7945,1361,4702,4810,4608,4537,4453,5635,5569,5486,4939,2061,1999,3470,1534,1594,5044,2151,4339,7668,3893,3626,2209,2513,2826,2266,3392,3321,3260,3031,2981,2879,2929,3081,3141,2566,3822,3203,3689,2466,2767,2712,2624,3577,2419,3515,2309,2369,3756,1481,1800,1906,1745,1853,1698,1642,1277,1222,6109,6025,6330,7500,6704,6630,6793,6956,7179,7035,6184,6266,6549,6410,6490,5958,7301,7404,7894,7779,7726,7853,1426,4878,5384,5784,5704,5878,5298,5239,5184,5122,1079,1169" }, "to": { - "startLines": "2,8", - "startColumns": "4,4", - "startOffsets": "105,300", - "endLines": "7,11", - "endColumns": "19,19", - "endOffsets": "295,415" + "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": "D:\\git\\TeamProject\\src\\Notes-master\\app\\src\\main\\res\\values\\styles.xml", + "source": "D:\\Notes-master\\app\\src\\main\\res\\values\\styles.xml", "from": { "startLines": "50,55,64,60,22,26,30,35,40,18,45", "startColumns": "4,4,4,4,4,4,4,4,4,4,4", @@ -136,6 +117,25 @@ "endColumns": "12,12,12,12,12,12,12,12,12,12,12", "endOffsets": "8323,8534,8741,8901,9084,9269,9454,9657,9863,10046,10247" } + }, + { + "source": "D:\\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" + } } ] }, @@ -143,26 +143,7 @@ "outputFile": "net.micode.notes.app-merged_res-5:/values-zh-rTW_values-zh-rTW.arsc.flat", "map": [ { - "source": "D:\\git\\TeamProject\\src\\Notes-master\\app\\src\\main\\res\\values-zh-rTW\\arrays.xml", - "from": { - "startLines": "18", - "startColumns": "4", - "startOffsets": "712", - "endLines": "21", - "endColumns": "19", - "endOffsets": "817" - }, - "to": { - "startLines": "2", - "startColumns": "4", - "startOffsets": "105", - "endLines": "5", - "endColumns": "19", - "endOffsets": "210" - } - }, - { - "source": "D:\\git\\TeamProject\\src\\Notes-master\\app\\src\\main\\res\\values-zh-rTW\\strings.xml", + "source": "D:\\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", @@ -179,6 +160,25 @@ "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" } + }, + { + "source": "D:\\Notes-master\\app\\src\\main\\res\\values-zh-rTW\\arrays.xml", + "from": { + "startLines": "18", + "startColumns": "4", + "startOffsets": "712", + "endLines": "21", + "endColumns": "19", + "endOffsets": "817" + }, + "to": { + "startLines": "2", + "startColumns": "4", + "startOffsets": "105", + "endLines": "5", + "endColumns": "19", + "endOffsets": "210" + } } ] } diff --git a/src/Notes-master/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 similarity index 95% rename from src/Notes-master/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rCN.json rename to src/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rCN.json index df47d9a..bacf78a 100644 --- a/src/Notes-master/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,7 +4,7 @@ "outputFile": "net.micode.notes.app-mergeDebugResources-3:/values-zh-rCN/values-zh-rCN.xml", "map": [ { - "source": "D:\\git\\TeamProject\\src\\Notes-master\\app\\src\\main\\res\\values-zh-rCN\\arrays.xml", + "source": "D:\\Notes-master\\app\\src\\main\\res\\values-zh-rCN\\arrays.xml", "from": { "startLines": "18", "startColumns": "4", @@ -23,7 +23,7 @@ } }, { - "source": "D:\\git\\TeamProject\\src\\Notes-master\\app\\src\\main\\res\\values-zh-rCN\\strings.xml", + "source": "D:\\Notes-master\\app\\src\\main\\res\\values-zh-rCN\\strings.xml", "from": { "startLines": "121,71,70,69,68,19,20,21,112,113,120,119,26,77,78,76,75,74,90,89,88,80,60,29,30,81,72,114,67,63,38,44,49,39,59,58,57,53,52,50,51,54,55,45,66,56,64,43,48,47,46,62,42,61,40,41,65,28,34,36,33,35,32,31,25,24,97,96,99,111,104,103,105,106,108,107,98,102,100,101,95,109,110,118,116,115,117,27,79,87,92,91,93,86,85,84,83,22,23", "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", diff --git a/src/Notes-master/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 similarity index 95% rename from src/Notes-master/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rTW.json rename to src/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rTW.json index df53ec7..d9b9a38 100644 --- a/src/Notes-master/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,26 +4,7 @@ "outputFile": "net.micode.notes.app-mergeDebugResources-3:/values-zh-rTW/values-zh-rTW.xml", "map": [ { - "source": "D:\\git\\TeamProject\\src\\Notes-master\\app\\src\\main\\res\\values-zh-rTW\\arrays.xml", - "from": { - "startLines": "18", - "startColumns": "4", - "startOffsets": "712", - "endLines": "21", - "endColumns": "19", - "endOffsets": "817" - }, - "to": { - "startLines": "2", - "startColumns": "4", - "startOffsets": "105", - "endLines": "5", - "endColumns": "19", - "endOffsets": "210" - } - }, - { - "source": "D:\\git\\TeamProject\\src\\Notes-master\\app\\src\\main\\res\\values-zh-rTW\\strings.xml", + "source": "D:\\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", @@ -40,6 +21,25 @@ "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" } + }, + { + "source": "D:\\Notes-master\\app\\src\\main\\res\\values-zh-rTW\\arrays.xml", + "from": { + "startLines": "18", + "startColumns": "4", + "startOffsets": "712", + "endLines": "21", + "endColumns": "19", + "endOffsets": "817" + }, + "to": { + "startLines": "2", + "startColumns": "4", + "startOffsets": "105", + "endLines": "5", + "endColumns": "19", + "endOffsets": "210" + } } ] } diff --git a/src/Notes-master/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 similarity index 93% rename from src/Notes-master/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values.json rename to src/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values.json index 3e75a1d..618e660 100644 --- a/src/Notes-master/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,26 +4,24 @@ "outputFile": "net.micode.notes.app-mergeDebugResources-3:/values/values.xml", "map": [ { - "source": "D:\\git\\TeamProject\\src\\Notes-master\\app\\src\\main\\res\\values\\strings.xml", + "source": "D:\\Notes-master\\app\\src\\main\\res\\values\\dimens.xml", "from": { - "startLines": "128,72,75,74,73,19,20,21,118,119,127,126,26,81,82,80,79,78,94,93,92,84,39,38,64,29,30,85,41,76,120,71,67,42,48,53,43,63,62,61,57,56,54,55,58,59,49,70,60,68,47,52,51,50,66,46,65,44,45,69,28,34,36,33,35,32,31,25,24,101,100,104,116,109,108,110,111,113,112,102,103,107,105,106,99,114,115,125,123,122,124,27,83,91,96,95,97,90,89,88,87,22,23", - "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "8008,3898,4159,4063,3994,827,870,922,7506,7555,7950,7899,1282,4613,4707,4542,4458,4375,5574,5491,5389,4883,2004,1953,3397,1486,1539,4944,2097,4242,7618,3827,3582,2156,2471,2772,2214,3326,3265,3208,2986,2934,2831,2884,3036,3086,2518,3761,3146,3631,2424,2717,2629,2571,3520,2374,3475,2271,2314,3694,1431,1750,1858,1703,1805,1647,1599,1227,1174,6030,5963,6271,7409,6635,6554,6709,6798,7040,6961,6114,6189,6495,6335,6415,5908,7184,7306,7858,7731,7674,7784,1366,4815,5303,5709,5640,5789,5244,5189,5127,5067,974,1084", - "endLines": "132,72,75,74,73,19,20,21,118,119,127,126,26,81,82,80,79,78,94,93,92,84,39,38,64,29,30,85,41,76,120,71,67,42,48,53,43,63,62,61,57,56,54,55,58,59,49,70,60,68,47,52,51,50,66,46,65,44,45,69,28,34,36,33,35,32,31,25,24,101,100,104,116,109,108,110,111,113,112,102,103,107,105,106,99,114,115,125,123,122,124,27,83,91,96,95,97,90,89,88,87,22,23", - "endColumns": "14,95,82,95,68,42,51,51,48,62,57,50,83,93,107,70,83,82,65,82,101,60,61,50,77,52,59,104,58,101,54,70,48,57,46,58,56,70,60,56,49,51,52,49,49,59,52,65,61,62,46,54,87,57,61,49,44,42,59,66,54,54,52,46,52,55,47,54,52,83,66,63,95,73,80,88,162,143,78,74,81,58,79,79,54,121,102,40,52,56,73,64,67,85,79,68,93,58,54,61,59,109,89", - "endOffsets": "8412,3989,4237,4154,4058,865,917,969,7550,7613,8003,7945,1361,4702,4810,4608,4537,4453,5635,5569,5486,4939,2061,1999,3470,1534,1594,5044,2151,4339,7668,3893,3626,2209,2513,2826,2266,3392,3321,3260,3031,2981,2879,2929,3081,3141,2566,3822,3203,3689,2466,2767,2712,2624,3577,2419,3515,2309,2369,3756,1481,1800,1906,1745,1853,1698,1642,1277,1222,6109,6025,6330,7500,6704,6630,6793,6956,7179,7035,6184,6266,6549,6410,6490,5958,7301,7404,7894,7779,7726,7853,1426,4878,5384,5784,5704,5878,5298,5239,5184,5122,1079,1169" + "startLines": "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": "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" + "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": "D:\\git\\TeamProject\\src\\Notes-master\\app\\src\\main\\res\\values\\colors.xml", + "source": "D:\\Notes-master\\app\\src\\main\\res\\values\\colors.xml", "from": { "startLines": "18", "startColumns": "4", @@ -40,43 +38,26 @@ } }, { - "source": "D:\\git\\TeamProject\\src\\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": "D:\\git\\TeamProject\\src\\Notes-master\\app\\src\\main\\res\\values\\arrays.xml", + "source": "D:\\Notes-master\\app\\src\\main\\res\\values\\strings.xml", "from": { - "startLines": "19,26", - "startColumns": "4,4", - "startOffsets": "739,1047", - "endLines": "24,29", - "endColumns": "19,19", - "endOffsets": "1041,1162" + "startLines": "128,72,75,74,73,19,20,21,118,119,127,126,26,81,82,80,79,78,94,93,92,84,39,38,64,29,30,85,41,76,120,71,67,42,48,53,43,63,62,61,57,56,54,55,58,59,49,70,60,68,47,52,51,50,66,46,65,44,45,69,28,34,36,33,35,32,31,25,24,101,100,104,116,109,108,110,111,113,112,102,103,107,105,106,99,114,115,125,123,122,124,27,83,91,96,95,97,90,89,88,87,22,23", + "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", + "startOffsets": "8008,3898,4159,4063,3994,827,870,922,7506,7555,7950,7899,1282,4613,4707,4542,4458,4375,5574,5491,5389,4883,2004,1953,3397,1486,1539,4944,2097,4242,7618,3827,3582,2156,2471,2772,2214,3326,3265,3208,2986,2934,2831,2884,3036,3086,2518,3761,3146,3631,2424,2717,2629,2571,3520,2374,3475,2271,2314,3694,1431,1750,1858,1703,1805,1647,1599,1227,1174,6030,5963,6271,7409,6635,6554,6709,6798,7040,6961,6114,6189,6495,6335,6415,5908,7184,7306,7858,7731,7674,7784,1366,4815,5303,5709,5640,5789,5244,5189,5127,5067,974,1084", + "endLines": "132,72,75,74,73,19,20,21,118,119,127,126,26,81,82,80,79,78,94,93,92,84,39,38,64,29,30,85,41,76,120,71,67,42,48,53,43,63,62,61,57,56,54,55,58,59,49,70,60,68,47,52,51,50,66,46,65,44,45,69,28,34,36,33,35,32,31,25,24,101,100,104,116,109,108,110,111,113,112,102,103,107,105,106,99,114,115,125,123,122,124,27,83,91,96,95,97,90,89,88,87,22,23", + "endColumns": "14,95,82,95,68,42,51,51,48,62,57,50,83,93,107,70,83,82,65,82,101,60,61,50,77,52,59,104,58,101,54,70,48,57,46,58,56,70,60,56,49,51,52,49,49,59,52,65,61,62,46,54,87,57,61,49,44,42,59,66,54,54,52,46,52,55,47,54,52,83,66,63,95,73,80,88,162,143,78,74,81,58,79,79,54,121,102,40,52,56,73,64,67,85,79,68,93,58,54,61,59,109,89", + "endOffsets": "8412,3989,4237,4154,4058,865,917,969,7550,7613,8003,7945,1361,4702,4810,4608,4537,4453,5635,5569,5486,4939,2061,1999,3470,1534,1594,5044,2151,4339,7668,3893,3626,2209,2513,2826,2266,3392,3321,3260,3031,2981,2879,2929,3081,3141,2566,3822,3203,3689,2466,2767,2712,2624,3577,2419,3515,2309,2369,3756,1481,1800,1906,1745,1853,1698,1642,1277,1222,6109,6025,6330,7500,6704,6630,6793,6956,7179,7035,6184,6266,6549,6410,6490,5958,7301,7404,7894,7779,7726,7853,1426,4878,5384,5784,5704,5878,5298,5239,5184,5122,1079,1169" }, "to": { - "startLines": "2,8", - "startColumns": "4,4", - "startOffsets": "105,300", - "endLines": "7,11", - "endColumns": "19,19", - "endOffsets": "295,415" + "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": "D:\\git\\TeamProject\\src\\Notes-master\\app\\src\\main\\res\\values\\styles.xml", + "source": "D:\\Notes-master\\app\\src\\main\\res\\values\\styles.xml", "from": { "startLines": "50,55,64,60,22,26,30,35,40,18,45", "startColumns": "4,4,4,4,4,4,4,4,4,4,4", @@ -93,6 +74,25 @@ "endColumns": "12,12,12,12,12,12,12,12,12,12,12", "endOffsets": "8323,8534,8741,8901,9084,9269,9454,9657,9863,10046,10247" } + }, + { + "source": "D:\\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" + } } ] } diff --git a/src/Notes-master/app/build/intermediates/merged_res_blame_folder/debug/out/single/debug.json b/src/app/build/intermediates/merged_res_blame_folder/debug/out/single/debug.json similarity index 100% rename from src/Notes-master/app/build/intermediates/merged_res_blame_folder/debug/out/single/debug.json rename to src/app/build/intermediates/merged_res_blame_folder/debug/out/single/debug.json diff --git a/src/Notes-master/app/build/intermediates/navigation_json/debug/navigation.json b/src/app/build/intermediates/navigation_json/debug/navigation.json similarity index 100% rename from src/Notes-master/app/build/intermediates/navigation_json/debug/navigation.json rename to src/app/build/intermediates/navigation_json/debug/navigation.json diff --git a/src/Notes-master/app/build/intermediates/packaged_manifests/debug/AndroidManifest.xml b/src/app/build/intermediates/packaged_manifests/debug/AndroidManifest.xml similarity index 100% rename from src/Notes-master/app/build/intermediates/packaged_manifests/debug/AndroidManifest.xml rename to src/app/build/intermediates/packaged_manifests/debug/AndroidManifest.xml diff --git a/src/Notes-master/app/build/intermediates/packaged_manifests/debug/output-metadata.json b/src/app/build/intermediates/packaged_manifests/debug/output-metadata.json similarity index 100% rename from src/Notes-master/app/build/intermediates/packaged_manifests/debug/output-metadata.json rename to src/app/build/intermediates/packaged_manifests/debug/output-metadata.json diff --git a/src/Notes-master/app/build/intermediates/processed_res/debug/out/output-metadata.json b/src/app/build/intermediates/processed_res/debug/out/output-metadata.json similarity index 100% rename from src/Notes-master/app/build/intermediates/processed_res/debug/out/output-metadata.json rename to src/app/build/intermediates/processed_res/debug/out/output-metadata.json diff --git a/src/Notes-master/app/build/intermediates/processed_res/debug/out/resources-debug.ap_ b/src/app/build/intermediates/processed_res/debug/out/resources-debug.ap_ similarity index 100% rename from src/Notes-master/app/build/intermediates/processed_res/debug/out/resources-debug.ap_ rename to src/app/build/intermediates/processed_res/debug/out/resources-debug.ap_ diff --git a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/3b39a0f8c9a74077ddf9126288e67b5aee0b290a2f74293e2d6f45ae0690b824_5.jar b/src/app/build/intermediates/project_dex_archive/debug/out/3b39a0f8c9a74077ddf9126288e67b5aee0b290a2f74293e2d6f45ae0690b824_5.jar similarity index 100% rename from src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/3b39a0f8c9a74077ddf9126288e67b5aee0b290a2f74293e2d6f45ae0690b824_5.jar rename to src/app/build/intermediates/project_dex_archive/debug/out/3b39a0f8c9a74077ddf9126288e67b5aee0b290a2f74293e2d6f45ae0690b824_5.jar diff --git a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/BuildConfig.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/BuildConfig.dex similarity index 100% rename from src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/BuildConfig.dex rename to src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/BuildConfig.dex diff --git a/src/Notes-master/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 similarity index 100% rename from src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Contact.dex rename to src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Contact.dex diff --git a/src/Notes-master/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 similarity index 100% rename from src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$CallNote.dex rename to src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$CallNote.dex diff --git a/src/Notes-master/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 similarity index 100% rename from src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$DataColumns.dex rename to src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$DataColumns.dex diff --git a/src/Notes-master/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 similarity index 100% rename from src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$DataConstants.dex rename to src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$DataConstants.dex diff --git a/src/Notes-master/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 similarity index 100% rename from src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$NoteColumns.dex rename to src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$NoteColumns.dex diff --git a/src/Notes-master/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 similarity index 100% rename from src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$TextNote.dex rename to src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$TextNote.dex diff --git a/src/Notes-master/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 similarity index 100% rename from src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes.dex rename to src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes.dex diff --git a/src/Notes-master/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 similarity index 100% rename from src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/NotesDatabaseHelper$TABLE.dex rename to src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/NotesDatabaseHelper$TABLE.dex diff --git a/src/Notes-master/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 similarity index 100% rename from src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/NotesDatabaseHelper.dex rename to src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/NotesDatabaseHelper.dex diff --git a/src/Notes-master/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 similarity index 100% rename from src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/NotesProvider.dex rename to src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/NotesProvider.dex diff --git a/src/Notes-master/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 similarity index 100% rename from src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/MetaData.dex rename to src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/MetaData.dex diff --git a/src/Notes-master/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 similarity index 100% rename from src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/Node.dex rename to src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/Node.dex diff --git a/src/Notes-master/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 similarity index 100% rename from src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/SqlData.dex rename to src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/SqlData.dex diff --git a/src/Notes-master/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 similarity index 100% rename from src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/SqlNote.dex rename to src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/SqlNote.dex diff --git a/src/Notes-master/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 similarity index 100% rename from src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/Task.dex rename to src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/Task.dex diff --git a/src/Notes-master/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 similarity index 100% rename from src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/TaskList.dex rename to src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/TaskList.dex diff --git a/src/Notes-master/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 similarity index 100% rename from src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/exception/ActionFailureException.dex rename to src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/exception/ActionFailureException.dex diff --git a/src/Notes-master/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 similarity index 100% rename from src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/exception/NetworkFailureException.dex rename to src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/exception/NetworkFailureException.dex diff --git a/src/Notes-master/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 similarity index 100% rename from src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskASyncTask$1.dex rename to src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskASyncTask$1.dex diff --git a/src/Notes-master/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 similarity index 100% rename from src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskASyncTask$OnCompleteListener.dex rename to src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskASyncTask$OnCompleteListener.dex diff --git a/src/Notes-master/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 similarity index 100% rename from src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskASyncTask.dex rename to src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskASyncTask.dex diff --git a/src/Notes-master/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 similarity index 100% rename from src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskClient.dex rename to src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskClient.dex diff --git a/src/Notes-master/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 similarity index 100% rename from src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskManager.dex rename to src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskManager.dex diff --git a/src/Notes-master/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 similarity index 100% rename from src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskSyncService$1.dex rename to src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskSyncService$1.dex diff --git a/src/Notes-master/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 similarity index 100% rename from src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskSyncService.dex rename to src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskSyncService.dex diff --git a/src/Notes-master/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 similarity index 100% rename from src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/Note$NoteData.dex rename to src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/Note$NoteData.dex diff --git a/src/Notes-master/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 similarity index 100% rename from src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/Note.dex rename to src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/Note.dex diff --git a/src/Notes-master/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 similarity index 100% rename from src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/WorkingNote$NoteSettingChangedListener.dex rename to src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/WorkingNote$NoteSettingChangedListener.dex diff --git a/src/Notes-master/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 similarity index 100% rename from src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/WorkingNote.dex rename to src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/WorkingNote.dex diff --git a/src/Notes-master/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 similarity index 100% rename from src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/BackupUtils$TextExport.dex rename to src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/BackupUtils$TextExport.dex diff --git a/src/Notes-master/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 similarity index 100% rename from src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/BackupUtils.dex rename to src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/BackupUtils.dex diff --git a/src/Notes-master/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 similarity index 100% rename from src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/DataUtils.dex rename to src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/DataUtils.dex diff --git a/src/Notes-master/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 similarity index 100% rename from src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/GTaskStringUtils.dex rename to src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/GTaskStringUtils.dex diff --git a/src/Notes-master/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 similarity index 100% rename from src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser$NoteBgResources.dex rename to src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser$NoteBgResources.dex diff --git a/src/Notes-master/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 similarity index 100% rename from src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser$NoteItemBgResources.dex rename to src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser$NoteItemBgResources.dex diff --git a/src/Notes-master/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 similarity index 100% rename from src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser$TextAppearanceResources.dex rename to src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser$TextAppearanceResources.dex diff --git a/src/Notes-master/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 similarity index 100% rename from src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser$WidgetBgResources.dex rename to src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser$WidgetBgResources.dex diff --git a/src/Notes-master/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 similarity index 100% rename from src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser.dex rename to src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser.dex diff --git a/src/Notes-master/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 similarity index 90% rename from src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/AlarmAlertActivity.dex rename to src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/AlarmAlertActivity.dex index 7d15cea..3d37b7c 100644 Binary files a/src/Notes-master/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/Notes-master/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 similarity index 100% rename from src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/AlarmInitReceiver.dex rename to src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/AlarmInitReceiver.dex diff --git a/src/Notes-master/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 similarity index 71% rename from src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/AlarmReceiver.dex rename to src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/AlarmReceiver.dex index 809b0e2..64cbaab 100644 Binary files a/src/Notes-master/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/Notes-master/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 similarity index 100% rename from src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$1.dex rename to src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$1.dex diff --git a/src/Notes-master/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 similarity index 100% rename from src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$2.dex rename to src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$2.dex diff --git a/src/Notes-master/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 similarity index 88% rename from src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$3.dex rename to src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$3.dex index 9dfc065..5ff69b8 100644 Binary files a/src/Notes-master/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/Notes-master/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 similarity index 85% rename from src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$4.dex rename to src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$4.dex index 8cf42dc..08f79c9 100644 Binary files a/src/Notes-master/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/Notes-master/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 similarity index 100% rename from src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$OnDateTimeChangedListener.dex rename to src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$OnDateTimeChangedListener.dex diff --git a/src/Notes-master/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 similarity index 84% rename from src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker.dex rename to src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker.dex index 2fbd883..c00e5b5 100644 Binary files a/src/Notes-master/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/Notes-master/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 similarity index 85% rename from src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePickerDialog$1.dex rename to src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePickerDialog$1.dex index f571fc7..379d253 100644 Binary files a/src/Notes-master/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/Notes-master/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 similarity index 100% rename from src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePickerDialog$OnDateTimeSetListener.dex rename to src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePickerDialog$OnDateTimeSetListener.dex diff --git a/src/Notes-master/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 similarity index 80% rename from src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePickerDialog.dex rename to src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePickerDialog.dex index 728749b..2e21e00 100644 Binary files a/src/Notes-master/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/Notes-master/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 similarity index 80% rename from src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DropdownMenu$1.dex rename to src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DropdownMenu$1.dex index bcb603f..a355446 100644 Binary files a/src/Notes-master/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/Notes-master/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 similarity index 89% rename from src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DropdownMenu.dex rename to src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DropdownMenu.dex index 90d2c6b..7f1ee6d 100644 Binary files a/src/Notes-master/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/Notes-master/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 similarity index 77% rename from src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/FoldersListAdapter$FolderListItem.dex rename to src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/FoldersListAdapter$FolderListItem.dex index 6401f2f..f75d453 100644 Binary files a/src/Notes-master/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/Notes-master/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 similarity index 89% rename from src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/FoldersListAdapter.dex rename to src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/FoldersListAdapter.dex index e3e14c2..a1fad89 100644 Binary files a/src/Notes-master/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/Notes-master/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 similarity index 81% rename from src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$1.dex rename to src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$1.dex index b15d73b..84a4592 100644 Binary files a/src/Notes-master/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/Notes-master/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 similarity index 83% rename from src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$2.dex rename to src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$2.dex index d607323..5651cb4 100644 Binary files a/src/Notes-master/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/Notes-master/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 similarity index 86% rename from src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$3.dex rename to src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$3.dex index 1138329..a52b249 100644 Binary files a/src/Notes-master/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/Notes-master/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 similarity index 100% rename from src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$HeadViewHolder.dex rename to src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$HeadViewHolder.dex diff --git a/src/Notes-master/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 similarity index 64% rename from src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity.dex rename to src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity.dex index 89d0eef..3136635 100644 Binary files a/src/Notes-master/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/Notes-master/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 similarity index 100% rename from src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditText$1.dex rename to src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditText$1.dex diff --git a/src/Notes-master/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 similarity index 100% rename from src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditText$OnTextViewChangeListener.dex rename to src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditText$OnTextViewChangeListener.dex diff --git a/src/Notes-master/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 similarity index 100% rename from src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditText.dex rename to src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditText.dex diff --git a/src/Notes-master/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 similarity index 100% rename from src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteItemData.dex rename to src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteItemData.dex diff --git a/src/Notes-master/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 similarity index 100% rename from src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$1.dex rename to src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$1.dex diff --git a/src/Notes-master/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 similarity index 100% rename from src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$2.dex rename to src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$2.dex diff --git a/src/Notes-master/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 similarity index 100% rename from src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$3.dex rename to src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$3.dex diff --git a/src/Notes-master/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 similarity index 100% rename from src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$4.dex rename to src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$4.dex diff --git a/src/Notes-master/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 similarity index 100% rename from src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$5.dex rename to src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$5.dex diff --git a/src/Notes-master/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 similarity index 100% rename from src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$6.dex rename to src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$6.dex diff --git a/src/Notes-master/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 similarity index 100% rename from src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$7.dex rename to src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$7.dex diff --git a/src/Notes-master/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 similarity index 100% rename from src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$8.dex rename to src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$8.dex diff --git a/src/Notes-master/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 similarity index 100% rename from src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$9.dex rename to src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$9.dex diff --git a/src/Notes-master/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 similarity index 100% rename from src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$BackgroundQueryHandler.dex rename to src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$BackgroundQueryHandler.dex diff --git a/src/Notes-master/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 similarity index 100% rename from src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ListEditState.dex rename to src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ListEditState.dex diff --git a/src/Notes-master/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 similarity index 100% rename from src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback$1.dex rename to src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback$1.dex diff --git a/src/Notes-master/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 similarity index 100% rename from src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback$2.dex rename to src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback$2.dex diff --git a/src/Notes-master/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 similarity index 100% rename from src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback.dex rename to src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback.dex diff --git a/src/Notes-master/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 similarity index 100% rename from src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$NewNoteOnTouchListener.dex rename to src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$NewNoteOnTouchListener.dex diff --git a/src/Notes-master/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 similarity index 100% rename from src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.dex rename to src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.dex diff --git a/src/Notes-master/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 similarity index 100% rename from src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity.dex rename to src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity.dex diff --git a/src/Notes-master/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 similarity index 100% rename from src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListAdapter$AppWidgetAttribute.dex rename to src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListAdapter$AppWidgetAttribute.dex diff --git a/src/Notes-master/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 similarity index 100% rename from src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListAdapter.dex rename to src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListAdapter.dex diff --git a/src/Notes-master/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 similarity index 100% rename from src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListItem.dex rename to src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListItem.dex diff --git a/src/Notes-master/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 similarity index 100% rename from src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$1.dex rename to src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$1.dex diff --git a/src/Notes-master/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 similarity index 100% rename from src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$2.dex rename to src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$2.dex diff --git a/src/Notes-master/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 similarity index 100% rename from src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$3.dex rename to src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$3.dex diff --git a/src/Notes-master/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 similarity index 100% rename from src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$4.dex rename to src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$4.dex diff --git a/src/Notes-master/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 similarity index 100% rename from src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$5.dex rename to src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$5.dex diff --git a/src/Notes-master/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 similarity index 100% rename from src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$6.dex rename to src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$6.dex diff --git a/src/Notes-master/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 similarity index 100% rename from src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$7.dex rename to src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$7.dex diff --git a/src/Notes-master/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 similarity index 100% rename from src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$8.dex rename to src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$8.dex diff --git a/src/Notes-master/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 similarity index 100% rename from src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$GTaskReceiver.dex rename to src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$GTaskReceiver.dex diff --git a/src/Notes-master/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 similarity index 100% rename from src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity.dex rename to src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity.dex diff --git a/src/Notes-master/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 similarity index 92% rename from src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/widget/NoteWidgetProvider.dex rename to src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/widget/NoteWidgetProvider.dex index 9a2eede..0d540b4 100644 Binary files a/src/Notes-master/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/Notes-master/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 similarity index 64% rename from src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/widget/NoteWidgetProvider_2x.dex rename to src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/widget/NoteWidgetProvider_2x.dex index 2cc61c0..39632c6 100644 Binary files a/src/Notes-master/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/Notes-master/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 similarity index 100% rename from src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/widget/NoteWidgetProvider_4x.dex rename to src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/widget/NoteWidgetProvider_4x.dex diff --git a/src/Notes-master/app/build/intermediates/runtime_symbol_list/debug/R.txt b/src/app/build/intermediates/runtime_symbol_list/debug/R.txt similarity index 100% rename from src/Notes-master/app/build/intermediates/runtime_symbol_list/debug/R.txt rename to src/app/build/intermediates/runtime_symbol_list/debug/R.txt diff --git a/src/Notes-master/app/build/intermediates/signing_config_versions/debug/signing-config-versions.json b/src/app/build/intermediates/signing_config_versions/debug/signing-config-versions.json similarity index 100% rename from src/Notes-master/app/build/intermediates/signing_config_versions/debug/signing-config-versions.json rename to src/app/build/intermediates/signing_config_versions/debug/signing-config-versions.json 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 new file mode 100644 index 0000000..d23ca5d --- /dev/null +++ b/src/app/build/intermediates/source_set_path_map/debug/file-map.txt @@ -0,0 +1,8 @@ +net.micode.notes.app-pngs-0 D:\Notes-master\app\build\generated\res\pngs\debug +net.micode.notes.app-resValues-1 D:\Notes-master\app\build\generated\res\resValues\debug +net.micode.notes.app-rs-2 D:\Notes-master\app\build\generated\res\rs\debug +net.micode.notes.app-mergeDebugResources-3 D:\Notes-master\app\build\intermediates\incremental\debug\mergeDebugResources\merged.dir +net.micode.notes.app-mergeDebugResources-4 D:\Notes-master\app\build\intermediates\incremental\debug\mergeDebugResources\stripped.dir +net.micode.notes.app-merged_res-5 D:\Notes-master\app\build\intermediates\merged_res\debug +net.micode.notes.app-debug-6 D:\Notes-master\app\src\debug\res +net.micode.notes.app-main-7 D:\Notes-master\app\src\main\res diff --git a/src/Notes-master/app/build/intermediates/stable_resource_ids_file/debug/stableIds.txt b/src/app/build/intermediates/stable_resource_ids_file/debug/stableIds.txt similarity index 100% rename from src/Notes-master/app/build/intermediates/stable_resource_ids_file/debug/stableIds.txt rename to src/app/build/intermediates/stable_resource_ids_file/debug/stableIds.txt diff --git a/src/Notes-master/app/build/intermediates/variant_model/debug/variant_model.json b/src/app/build/intermediates/variant_model/debug/variant_model.json similarity index 100% rename from src/Notes-master/app/build/intermediates/variant_model/debug/variant_model.json rename to src/app/build/intermediates/variant_model/debug/variant_model.json diff --git a/src/Notes-master/app/build/outputs/apk/debug/app-debug.apk b/src/app/build/outputs/apk/debug/app-debug.apk similarity index 100% rename from src/Notes-master/app/build/outputs/apk/debug/app-debug.apk rename to src/app/build/outputs/apk/debug/app-debug.apk diff --git a/src/Notes-master/app/build/outputs/apk/debug/output-metadata.json b/src/app/build/outputs/apk/debug/output-metadata.json similarity index 100% rename from src/Notes-master/app/build/outputs/apk/debug/output-metadata.json rename to src/app/build/outputs/apk/debug/output-metadata.json diff --git a/src/app/build/outputs/logs/manifest-merger-debug-report.txt b/src/app/build/outputs/logs/manifest-merger-debug-report.txt new file mode 100644 index 0000000..6c54360 --- /dev/null +++ b/src/app/build/outputs/logs/manifest-merger-debug-report.txt @@ -0,0 +1,235 @@ +-- Merging decision tree log --- +manifest +ADDED from D:\Notes-master\app\src\main\AndroidManifest.xml:18:1-150:12 +INJECTED from D:\Notes-master\app\src\main\AndroidManifest.xml:18:1-150:12 +INJECTED from D:\Notes-master\app\src\main\AndroidManifest.xml:18:1-150:12 +INJECTED from D:\Notes-master\app\src\main\AndroidManifest.xml:18:1-150:12 +INJECTED from D:\Notes-master\app\src\main\AndroidManifest.xml:18:1-150:12 +INJECTED from D:\Notes-master\app\src\main\AndroidManifest.xml:18:1-150:12 +INJECTED from D:\Notes-master\app\src\main\AndroidManifest.xml:18:1-150:12 + package + ADDED from D:\Notes-master\app\src\main\AndroidManifest.xml:19:5-31 + INJECTED from D:\Notes-master\app\src\main\AndroidManifest.xml + INJECTED from D:\Notes-master\app\src\main\AndroidManifest.xml + android:versionName + ADDED from D:\Notes-master\app\src\main\AndroidManifest.xml:21:5-30 + INJECTED from D:\Notes-master\app\src\main\AndroidManifest.xml + INJECTED from D:\Notes-master\app\src\main\AndroidManifest.xml + xmlns:android + ADDED from D:\Notes-master\app\src\main\AndroidManifest.xml:18:11-69 + android:versionCode + ADDED from D:\Notes-master\app\src\main\AndroidManifest.xml:20:5-28 + INJECTED from D:\Notes-master\app\src\main\AndroidManifest.xml + INJECTED from D:\Notes-master\app\src\main\AndroidManifest.xml +uses-sdk +ADDED from D:\Notes-master\app\src\main\AndroidManifest.xml:23:5-44 +INJECTED from D:\Notes-master\app\src\main\AndroidManifest.xml:23:5-44 +INJECTED from D:\Notes-master\app\src\main\AndroidManifest.xml:23:5-44 +INJECTED from D:\Notes-master\app\src\main\AndroidManifest.xml:23:5-44 +INJECTED from D:\Notes-master\app\src\main\AndroidManifest.xml:23:5-44 + android:targetSdkVersion + INJECTED from D:\Notes-master\app\src\main\AndroidManifest.xml + ADDED from D:\Notes-master\app\src\main\AndroidManifest.xml:23:5-44 + INJECTED from D:\Notes-master\app\src\main\AndroidManifest.xml + android:minSdkVersion + ADDED from D:\Notes-master\app\src\main\AndroidManifest.xml:23:15-41 + INJECTED from D:\Notes-master\app\src\main\AndroidManifest.xml + INJECTED from D:\Notes-master\app\src\main\AndroidManifest.xml +uses-permission#android.permission.WRITE_EXTERNAL_STORAGE +ADDED from D:\Notes-master\app\src\main\AndroidManifest.xml:25:5-81 + android:name + ADDED from D:\Notes-master\app\src\main\AndroidManifest.xml:25:22-78 +uses-permission#com.android.launcher.permission.INSTALL_SHORTCUT +ADDED from D:\Notes-master\app\src\main\AndroidManifest.xml:26:5-88 + android:name + ADDED from D:\Notes-master\app\src\main\AndroidManifest.xml:26:22-85 +uses-permission#android.permission.INTERNET +ADDED from D:\Notes-master\app\src\main\AndroidManifest.xml:27:5-67 + android:name + ADDED from D:\Notes-master\app\src\main\AndroidManifest.xml:27:22-64 +uses-permission#android.permission.READ_CONTACTS +ADDED from D:\Notes-master\app\src\main\AndroidManifest.xml:28:5-72 + android:name + ADDED from D:\Notes-master\app\src\main\AndroidManifest.xml:28:22-69 +uses-permission#android.permission.MANAGE_ACCOUNTS +ADDED from D:\Notes-master\app\src\main\AndroidManifest.xml:29:5-74 + android:name + ADDED from D:\Notes-master\app\src\main\AndroidManifest.xml:29:22-71 +uses-permission#android.permission.AUTHENTICATE_ACCOUNTS +ADDED from D:\Notes-master\app\src\main\AndroidManifest.xml:30:5-80 + android:name + ADDED from D:\Notes-master\app\src\main\AndroidManifest.xml:30:22-77 +uses-permission#android.permission.GET_ACCOUNTS +ADDED from D:\Notes-master\app\src\main\AndroidManifest.xml:31:5-71 + android:name + ADDED from D:\Notes-master\app\src\main\AndroidManifest.xml:31:22-68 +uses-permission#android.permission.USE_CREDENTIALS +ADDED from D:\Notes-master\app\src\main\AndroidManifest.xml:32:5-74 + android:name + ADDED from D:\Notes-master\app\src\main\AndroidManifest.xml:32:22-71 +uses-permission#android.permission.RECEIVE_BOOT_COMPLETED +ADDED from D:\Notes-master\app\src\main\AndroidManifest.xml:33:5-81 + android:name + ADDED from D:\Notes-master\app\src\main\AndroidManifest.xml:33:22-78 +application +ADDED from D:\Notes-master\app\src\main\AndroidManifest.xml:35:5-149:19 + android:label + ADDED from D:\Notes-master\app\src\main\AndroidManifest.xml:37:9-41 + android:icon + ADDED from D:\Notes-master\app\src\main\AndroidManifest.xml:36:9-42 +activity#net.micode.notes.ui.NotesListActivity +ADDED from D:\Notes-master\app\src\main\AndroidManifest.xml:38:9-51:20 + android:label + ADDED from D:\Notes-master\app\src\main\AndroidManifest.xml:41:13-45 + android:launchMode + ADDED from D:\Notes-master\app\src\main\AndroidManifest.xml:42:13-43 + android:windowSoftInputMode + ADDED from D:\Notes-master\app\src\main\AndroidManifest.xml:45:13-52 + android:uiOptions + ADDED from D:\Notes-master\app\src\main\AndroidManifest.xml:44:13-57 + android:configChanges + ADDED from D:\Notes-master\app\src\main\AndroidManifest.xml:40:13-74 + android:theme + ADDED from D:\Notes-master\app\src\main\AndroidManifest.xml:43:13-45 + android:name + ADDED from D:\Notes-master\app\src\main\AndroidManifest.xml:39:13-49 +intent-filter#action:name:android.intent.action.MAIN+category:name:android.intent.category.LAUNCHER +ADDED from D:\Notes-master\app\src\main\AndroidManifest.xml:47:13-50:29 +action#android.intent.action.MAIN +ADDED from D:\Notes-master\app\src\main\AndroidManifest.xml:48:17-69 + android:name + ADDED from D:\Notes-master\app\src\main\AndroidManifest.xml:48:25-66 +category#android.intent.category.LAUNCHER +ADDED from D:\Notes-master\app\src\main\AndroidManifest.xml:49:17-77 + android:name + ADDED from D:\Notes-master\app\src\main\AndroidManifest.xml:49:27-74 +activity#net.micode.notes.ui.NoteEditActivity +ADDED from D:\Notes-master\app\src\main\AndroidManifest.xml:53:9-81:20 + android:launchMode + ADDED from D:\Notes-master\app\src\main\AndroidManifest.xml:56:13-43 + android:configChanges + ADDED from D:\Notes-master\app\src\main\AndroidManifest.xml:55:13-74 + android:theme + ADDED from D:\Notes-master\app\src\main\AndroidManifest.xml:57:13-45 + android:name + ADDED from D:\Notes-master\app\src\main\AndroidManifest.xml:54:13-48 +intent-filter#action:name:android.intent.action.VIEW+category:name:android.intent.category.DEFAULT+data:mimeType:vnd.android.cursor.item/call_note+data:mimeType:vnd.android.cursor.item/text_note +ADDED from D:\Notes-master\app\src\main\AndroidManifest.xml:59:13-64:29 +action#android.intent.action.VIEW +ADDED from D:\Notes-master\app\src\main\AndroidManifest.xml:60:17-69 + android:name + ADDED from D:\Notes-master\app\src\main\AndroidManifest.xml:60:25-66 +category#android.intent.category.DEFAULT +ADDED from D:\Notes-master\app\src\main\AndroidManifest.xml:61:17-76 + android:name + ADDED from D:\Notes-master\app\src\main\AndroidManifest.xml:61:27-73 +data +ADDED from D:\Notes-master\app\src\main\AndroidManifest.xml:62:17-78 + android:mimeType + ADDED from D:\Notes-master\app\src\main\AndroidManifest.xml:62:23-75 +intent-filter#action:name:android.intent.action.INSERT_OR_EDIT+category:name:android.intent.category.DEFAULT+data:mimeType:vnd.android.cursor.item/call_note+data:mimeType:vnd.android.cursor.item/text_note +ADDED from D:\Notes-master\app\src\main\AndroidManifest.xml:66:13-71:29 +action#android.intent.action.INSERT_OR_EDIT +ADDED from D:\Notes-master\app\src\main\AndroidManifest.xml:67:17-79 + android:name + ADDED from D:\Notes-master\app\src\main\AndroidManifest.xml:67:25-76 +intent-filter#action:name:android.intent.action.SEARCH+category:name:android.intent.category.DEFAULT +ADDED from D:\Notes-master\app\src\main\AndroidManifest.xml:73:13-76:29 +action#android.intent.action.SEARCH +ADDED from D:\Notes-master\app\src\main\AndroidManifest.xml:74:17-71 + android:name + ADDED from D:\Notes-master\app\src\main\AndroidManifest.xml:74:25-68 +meta-data#android.app.searchable +ADDED from D:\Notes-master\app\src\main\AndroidManifest.xml:78:13-80:54 + android:resource + ADDED from D:\Notes-master\app\src\main\AndroidManifest.xml:80:17-51 + android:name + ADDED from D:\Notes-master\app\src\main\AndroidManifest.xml:79:17-54 +provider#net.micode.notes.data.NotesProvider +ADDED from D:\Notes-master\app\src\main\AndroidManifest.xml:83:9-86:43 + android:authorities + ADDED from D:\Notes-master\app\src\main\AndroidManifest.xml:85:13-47 + android:multiprocess + ADDED from D:\Notes-master\app\src\main\AndroidManifest.xml:86:13-40 + android:name + ADDED from D:\Notes-master\app\src\main\AndroidManifest.xml:84:13-63 +receiver#net.micode.notes.widget.NoteWidgetProvider_2x +ADDED from D:\Notes-master\app\src\main\AndroidManifest.xml:88:9-100:20 + android:label + ADDED from D:\Notes-master\app\src\main\AndroidManifest.xml:90:13-50 + android:name + ADDED from D:\Notes-master\app\src\main\AndroidManifest.xml:89:13-57 +intent-filter#action:name:android.appwidget.action.APPWIDGET_DELETED+action:name:android.appwidget.action.APPWIDGET_UPDATE+action:name:android.intent.action.PRIVACY_MODE_CHANGED +ADDED from D:\Notes-master\app\src\main\AndroidManifest.xml:91:13-95:29 +action#android.appwidget.action.APPWIDGET_UPDATE +ADDED from D:\Notes-master\app\src\main\AndroidManifest.xml:92:17-84 + android:name + ADDED from D:\Notes-master\app\src\main\AndroidManifest.xml:92:25-81 +action#android.appwidget.action.APPWIDGET_DELETED +ADDED from D:\Notes-master\app\src\main\AndroidManifest.xml:93:17-85 + android:name + ADDED from D:\Notes-master\app\src\main\AndroidManifest.xml:93:25-82 +action#android.intent.action.PRIVACY_MODE_CHANGED +ADDED from D:\Notes-master\app\src\main\AndroidManifest.xml:94:17-85 + android:name + ADDED from D:\Notes-master\app\src\main\AndroidManifest.xml:94:25-82 +meta-data#android.appwidget.provider +ADDED from D:\Notes-master\app\src\main\AndroidManifest.xml:97:13-99:58 + android:resource + ADDED from D:\Notes-master\app\src\main\AndroidManifest.xml:99:17-55 + android:name + ADDED from D:\Notes-master\app\src\main\AndroidManifest.xml:98:17-58 +receiver#net.micode.notes.widget.NoteWidgetProvider_4x +ADDED from D:\Notes-master\app\src\main\AndroidManifest.xml:101:9-114:20 + android:label + ADDED from D:\Notes-master\app\src\main\AndroidManifest.xml:103:13-50 + android:name + ADDED from D:\Notes-master\app\src\main\AndroidManifest.xml:102:13-57 +receiver#net.micode.notes.ui.AlarmInitReceiver +ADDED from D:\Notes-master\app\src\main\AndroidManifest.xml:116:9-120:20 + android:name + ADDED from D:\Notes-master\app\src\main\AndroidManifest.xml:116:19-55 +intent-filter#action:name:android.intent.action.BOOT_COMPLETED +ADDED from D:\Notes-master\app\src\main\AndroidManifest.xml:117:13-119:29 +action#android.intent.action.BOOT_COMPLETED +ADDED from D:\Notes-master\app\src\main\AndroidManifest.xml:118:17-79 + android:name + ADDED from D:\Notes-master\app\src\main\AndroidManifest.xml:118:25-76 +receiver#net.micode.notes.ui.AlarmReceiver +ADDED from D:\Notes-master\app\src\main\AndroidManifest.xml:122:9-125:20 + android:process + ADDED from D:\Notes-master\app\src\main\AndroidManifest.xml:124:13-38 + android:name + ADDED from D:\Notes-master\app\src\main\AndroidManifest.xml:123:13-61 +activity#net.micode.notes.ui.AlarmAlertActivity +ADDED from D:\Notes-master\app\src\main\AndroidManifest.xml:127:9-132:20 + android:label + ADDED from D:\Notes-master\app\src\main\AndroidManifest.xml:129:13-45 + android:launchMode + ADDED from D:\Notes-master\app\src\main\AndroidManifest.xml:130:13-48 + android:theme + ADDED from D:\Notes-master\app\src\main\AndroidManifest.xml:131:13-75 + android:name + ADDED from D:\Notes-master\app\src\main\AndroidManifest.xml:128:13-50 +activity#net.micode.notes.ui.NotesPreferenceActivity +ADDED from D:\Notes-master\app\src\main\AndroidManifest.xml:134:9-139:20 + android:label + ADDED from D:\Notes-master\app\src\main\AndroidManifest.xml:136:13-54 + android:launchMode + ADDED from D:\Notes-master\app\src\main\AndroidManifest.xml:137:13-43 + android:theme + ADDED from D:\Notes-master\app\src\main\AndroidManifest.xml:138:13-60 + android:name + ADDED from D:\Notes-master\app\src\main\AndroidManifest.xml:135:13-71 +service#net.micode.notes.gtask.remote.GTaskSyncService +ADDED from D:\Notes-master\app\src\main\AndroidManifest.xml:141:9-144:19 + android:exported + ADDED from D:\Notes-master\app\src\main\AndroidManifest.xml:143:13-37 + android:name + ADDED from D:\Notes-master\app\src\main\AndroidManifest.xml:142:13-74 +meta-data#android.app.default_searchable +ADDED from D:\Notes-master\app\src\main\AndroidManifest.xml:146:9-148:52 + android:value + ADDED from D:\Notes-master\app\src\main\AndroidManifest.xml:148:13-49 + android:name + ADDED from D:\Notes-master\app\src\main\AndroidManifest.xml:147:13-58 diff --git a/src/Notes-master/app/build/tmp/compileDebugJavaWithJavac/previous-compilation-data.bin b/src/app/build/tmp/compileDebugJavaWithJavac/previous-compilation-data.bin similarity index 68% rename from src/Notes-master/app/build/tmp/compileDebugJavaWithJavac/previous-compilation-data.bin rename to src/app/build/tmp/compileDebugJavaWithJavac/previous-compilation-data.bin index c110ab7..01bd41e 100644 Binary files a/src/Notes-master/app/build/tmp/compileDebugJavaWithJavac/previous-compilation-data.bin and b/src/app/build/tmp/compileDebugJavaWithJavac/previous-compilation-data.bin differ diff --git a/src/Notes-master/app/src/main/AndroidManifest.xml b/src/app/src/main/AndroidManifest.xml similarity index 92% rename from src/Notes-master/app/src/main/AndroidManifest.xml rename to src/app/src/main/AndroidManifest.xml index 006f76f..e5c7d47 100644 --- a/src/Notes-master/app/src/main/AndroidManifest.xml +++ b/src/app/src/main/AndroidManifest.xml @@ -40,10 +40,9 @@ android:configChanges="keyboardHidden|orientation|screenSize" android:label="@string/app_name" android:launchMode="singleTop" - android:theme="@style/Theme.AppCompat" + android:theme="@style/NoteTheme" android:uiOptions="splitActionBarWhenNarrow" - android:windowSoftInputMode="adjustPan" - android:exported="true" > + android:windowSoftInputMode="adjustPan" > @@ -55,8 +54,7 @@ android:name=".ui.NoteEditActivity" android:configChanges="keyboardHidden|orientation|screenSize" android:launchMode="singleTop" - android:theme="@style/NoteTheme" - android:exported="true" > + android:theme="@style/NoteTheme" > @@ -89,8 +87,7 @@ + android:label="@string/app_widget2x2" > @@ -103,8 +100,7 @@ + android:label="@string/app_widget4x4" > @@ -117,8 +113,7 @@ android:resource="@xml/widget_4x_info" /> - + @@ -140,7 +135,7 @@ android:name="net.micode.notes.ui.NotesPreferenceActivity" android:label="@string/preferences_title" android:launchMode="singleTop" - android:theme="@style/Theme.AppCompat.Light" > + android:theme="@android:style/Theme.Holo.Light" > sContactCache; - - /** - * 声明了一个静态常量TAG，用于在日志中标识该类名。 - */ private static final String TAG = "Contact"; - /** - 定义了一个SQL查询字符串，用于查询满足指定条件的联系人信息。 - */ private static final String CALLER_ID_SELECTION = "PHONE_NUMBERS_EQUAL(" + Phone.NUMBER + ",?) AND " + Data.MIMETYPE + "='" + Phone.CONTENT_ITEM_TYPE + "'" + " AND " + Data.RAW_CONTACT_ID + " IN " @@ -50,12 +36,6 @@ public class Contact { + " FROM phone_lookup" + " WHERE min_match = '+')"; - /** - * 公共方法，用于获取给定电话号码所对应联系人的姓名。 - * @param context - * @param phoneNumber - * @return - */ public static String getContact(Context context, String phoneNumber) { if(sContactCache == null) { sContactCache = new HashMap(); diff --git a/src/Notes-master/app/src/main/java/net/micode/notes/data/Notes.java b/src/app/src/main/java/net/micode/notes/data/Notes.java similarity index 88% rename from src/Notes-master/app/src/main/java/net/micode/notes/data/Notes.java rename to src/app/src/main/java/net/micode/notes/data/Notes.java index 8de418f..f240604 100644 --- a/src/Notes-master/app/src/main/java/net/micode/notes/data/Notes.java +++ b/src/app/src/main/java/net/micode/notes/data/Notes.java @@ -18,18 +18,8 @@ package net.micode.notes.data; import android.net.Uri; public class Notes { - - /** - * 这是一个静态的字符串常量，表示内容提供者的授权标识。 - */ public static final String AUTHORITY = "micode_notes"; - - /** - * 这是一个静态的字符串常量，用于在日志中标识该类名。 - */ public static final String TAG = "Notes"; - - //这些静态的整数常量表示不同类型的便签笔记。 public static final int TYPE_NOTE = 0; public static final int TYPE_FOLDER = 1; public static final int TYPE_SYSTEM = 2; @@ -40,13 +30,11 @@ public class Notes { * {@link Notes#ID_TEMPARAY_FOLDER } is for notes belonging no folder * {@link Notes#ID_CALL_RECORD_FOLDER} is to store call records */ - //这些静态的整数常量表示不同类型的系统文件夹的标识符 public static final int ID_ROOT_FOLDER = 0; public static final int ID_TEMPARAY_FOLDER = -1; public static final int ID_CALL_RECORD_FOLDER = -2; public static final int ID_TRASH_FOLER = -3; - //这些静态的字符串常量表示传递给Intent对象的额外数据的键名。 public static final String INTENT_EXTRA_ALERT_DATE = "net.micode.notes.alert_date"; public static final String INTENT_EXTRA_BACKGROUND_ID = "net.micode.notes.background_color_id"; public static final String INTENT_EXTRA_WIDGET_ID = "net.micode.notes.widget_id"; @@ -54,14 +42,10 @@ public class Notes { public static final String INTENT_EXTRA_FOLDER_ID = "net.micode.notes.folder_id"; public static final String INTENT_EXTRA_CALL_DATE = "net.micode.notes.call_date"; - //这些静态的整数常量表示小部件的类型。 public static final int TYPE_WIDGET_INVALIDE = -1; public static final int TYPE_WIDGET_2X = 0; public static final int TYPE_WIDGET_4X = 1; - /** - * 这是一个静态的内部类，定义了一些用于数据类型的常量字符串。 - */ public static class DataConstants { public static final String NOTE = TextNote.CONTENT_ITEM_TYPE; public static final String CALL_NOTE = CallNote.CONTENT_ITEM_TYPE; @@ -69,19 +53,14 @@ public class Notes { /** * Uri to query all notes and folders - * 这静态的Uri常量表示查询的基础地址。 */ public static final Uri CONTENT_NOTE_URI = Uri.parse("content://" + AUTHORITY + "/note"); /** * Uri to query data - * 这静态的Uri常量表示查询的基础地址。 */ public static final Uri CONTENT_DATA_URI = Uri.parse("content://" + AUTHORITY + "/data"); - /** - * 标准接口，声明了列名。 - */ public interface NoteColumns { /** * The unique ID for a row @@ -188,9 +167,6 @@ public class Notes { public static final String VERSION = "version"; } - /** - * 这些是标准接口，声明了数据类型。 - */ public interface DataColumns { /** * The unique ID for a row @@ -265,9 +241,6 @@ public class Notes { public static final String DATA5 = "data5"; } - /** - * 这个静态的内部类扩展了DataColumns接口，表示不同类型的便签笔记。包含一些额外的列。 - */ public static final class TextNote implements DataColumns { /** * Mode to indicate the text in check list mode or not @@ -284,9 +257,6 @@ public class Notes { public static final Uri CONTENT_URI = Uri.parse("content://" + AUTHORITY + "/text_note"); } - /** - * 这个静态的内部类扩展了DataColumns接口，表示不同类型的便签笔记。包含一些额外的数据类型。 - */ public static final class CallNote implements DataColumns { /** * Call date for this record diff --git a/src/Notes-master/app/src/main/java/net/micode/notes/data/NotesDatabaseHelper.java b/src/app/src/main/java/net/micode/notes/data/NotesDatabaseHelper.java similarity index 74% rename from src/Notes-master/app/src/main/java/net/micode/notes/data/NotesDatabaseHelper.java rename to src/app/src/main/java/net/micode/notes/data/NotesDatabaseHelper.java index d6dec55..ffe5d57 100644 --- a/src/Notes-master/app/src/main/java/net/micode/notes/data/NotesDatabaseHelper.java +++ b/src/app/src/main/java/net/micode/notes/data/NotesDatabaseHelper.java @@ -26,17 +26,12 @@ import net.micode.notes.data.Notes.DataColumns; import net.micode.notes.data.Notes.DataConstants; import net.micode.notes.data.Notes.NoteColumns; -/** - * 用于打开、创建和管理Note应用程序的数据库 - */ + public class NotesDatabaseHelper extends SQLiteOpenHelper { private static final String DB_NAME = "note.db"; private static final int DB_VERSION = 4; - /** - * 这是一个接口，内部定义了一个笔记表和一个数据表的表名常量。 - */ public interface TABLE { public static final String NOTE = "note"; @@ -47,9 +42,6 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper { private static NotesDatabaseHelper mInstance; - /** - * 该字符串表示用于创建“note”表的SQL语句。该表用于存储笔记的基本信息。 - */ private static final String CREATE_NOTE_TABLE_SQL = "CREATE TABLE " + TABLE.NOTE + "(" + NoteColumns.ID + " INTEGER PRIMARY KEY," + @@ -71,9 +63,6 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper { NoteColumns.VERSION + " INTEGER NOT NULL DEFAULT 0" + ")"; - /** - * SQL语句用于创建“data”表的字符串常量 - */ private static final String CREATE_DATA_TABLE_SQL = "CREATE TABLE " + TABLE.DATA + "(" + DataColumns.ID + " INTEGER PRIMARY KEY," + @@ -89,16 +78,12 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper { DataColumns.DATA5 + " TEXT NOT NULL DEFAULT ''" + ")"; - /** - * SQL语句在"data"表上创建索引的字符串常量 - */ private static final String CREATE_DATA_NOTE_ID_INDEX_SQL = "CREATE INDEX IF NOT EXISTS note_id_index ON " + TABLE.DATA + "(" + DataColumns.NOTE_ID + ");"; /** * Increase folder's note count when move note to the folder - * 在将笔记移动到文件夹时增加文件夹的笔记计数 */ private static final String NOTE_INCREASE_FOLDER_COUNT_ON_UPDATE_TRIGGER = "CREATE TRIGGER increase_folder_count_on_update "+ @@ -111,7 +96,6 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper { /** * Decrease folder's note count when move note from folder - * 在将笔记移出文件夹时减少文件夹的笔记计数 */ private static final String NOTE_DECREASE_FOLDER_COUNT_ON_UPDATE_TRIGGER = "CREATE TRIGGER decrease_folder_count_on_update " + @@ -125,7 +109,6 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper { /** * Increase folder's note count when insert new note to the folder - * 此触发器将在向数据库中添加新的笔记时自动触发。当向某个文件夹添加新的笔记时，此触发器将使该文件夹的“notes_count”值增加 1。 */ private static final String NOTE_INCREASE_FOLDER_COUNT_ON_INSERT_TRIGGER = "CREATE TRIGGER increase_folder_count_on_insert " + @@ -138,7 +121,6 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper { /** * Decrease folder's note count when delete note from the folder - * 此触发器将在从数据库中删除笔记时自动触发。当从某个文件夹删除笔记时，此触发器将使该文件夹的“notes_count”值减少 1。 */ private static final String NOTE_DECREASE_FOLDER_COUNT_ON_DELETE_TRIGGER = "CREATE TRIGGER decrease_folder_count_on_delete " + @@ -152,8 +134,6 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper { /** * Update note's content when insert data with type {@link DataConstants#NOTE} - * 此触发器将在向数据库中添加一个数据记录时自动触发。 - * 当添加类型为“note”的数据记录时，此触发器将更新笔记的“snippet”列，将其设置为新增数据记录的“content”列值。 */ private static final String DATA_UPDATE_NOTE_CONTENT_ON_INSERT_TRIGGER = "CREATE TRIGGER update_note_content_on_insert " + @@ -167,8 +147,6 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper { /** * Update note's content when data with {@link DataConstants#NOTE} type has changed - * 此触发器将在数据库中的数据记录被更新时自动触发。 - * 当更新的数据记录类型为“note”时，此触发器将更新笔记的“snippet”列，将其设置为更新后的数据记录的“content”列的值。 */ private static final String DATA_UPDATE_NOTE_CONTENT_ON_UPDATE_TRIGGER = "CREATE TRIGGER update_note_content_on_update " + @@ -182,8 +160,6 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper { /** * Update note's content when data with {@link DataConstants#NOTE} type has deleted - * 此触发器将在从数据库中删除一个数据记录时自动触发。 - * 当被删除的数据记录类型为“note”时，此触发器将更新笔记的“snippet”列，并将其设置为空字符串。 */ private static final String DATA_UPDATE_NOTE_CONTENT_ON_DELETE_TRIGGER = "CREATE TRIGGER update_note_content_on_delete " + @@ -197,7 +173,6 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper { /** * Delete datas belong to note which has been deleted - * 此触发器将在从数据库中删除笔记时自动触发。它将删除与被删除笔记相关联的所有数据记录。 */ private static final String NOTE_DELETE_DATA_ON_DELETE_TRIGGER = "CREATE TRIGGER delete_data_on_delete " + @@ -209,7 +184,6 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper { /** * Delete notes belong to folder which has been deleted - * 此触发器将在从数据库中删除文件夹时自动触发，它将删除该文件夹下的所有笔记。 */ private static final String FOLDER_DELETE_NOTES_ON_DELETE_TRIGGER = "CREATE TRIGGER folder_delete_notes_on_delete " + @@ -221,7 +195,6 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper { /** * Move notes belong to folder which has been moved to trash folder - * 此触发器将在将某个文件夹移动到回收站时自动触发，它会将该文件夹下的所有笔记也移动到回收站。 */ private static final String FOLDER_MOVE_NOTES_ON_TRASH_TRIGGER = "CREATE TRIGGER folder_move_notes_on_trash " + @@ -233,20 +206,10 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper { " WHERE " + NoteColumns.PARENT_ID + "=old." + NoteColumns.ID + ";" + " END"; - /** - * 这是 NotesDatabaseHelper 类的构造函数，用于创建数据库，并将数据库名称、版本等参数传递给基类 SQLiteOpenHelper 的构造函数。 - * @param context - */ public NotesDatabaseHelper(Context context) { super(context, DB_NAME, null, DB_VERSION); } - /** - * 此方法用于在给定的 SQLiteDatabase 对象上创建“note”表。 - * 它执行 CREATE_NOTE_TABLE_SQL 常量中指定的 SQL 语句， - * 并调用 reCreateNoteTableTriggers 和 createSystemFolder 方法以重置触发器并创建系统文件夹。 - * @param db - */ public void createNoteTable(SQLiteDatabase db) { db.execSQL(CREATE_NOTE_TABLE_SQL); reCreateNoteTableTriggers(db); @@ -254,10 +217,6 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper { Log.d(TAG, "note table has been created"); } - /** - * 此私有方法用于重置所有触发器，即在调用此方法之前删除所有现有的触发器，然后重新创建所有触发器。 - * @param db - */ private void reCreateNoteTableTriggers(SQLiteDatabase db) { db.execSQL("DROP TRIGGER IF EXISTS increase_folder_count_on_update"); db.execSQL("DROP TRIGGER IF EXISTS decrease_folder_count_on_update"); @@ -276,12 +235,6 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper { db.execSQL(FOLDER_MOVE_NOTES_ON_TRASH_TRIGGER); } - /** - * 此私有方法用于向数据库中插入四个系统文件夹。 - * 它通过为每个文件夹创建一个 ContentValues 对象来添加数据，并将其插入名为 "note" 的数据库表中。 - * 其中，每个文件夹具有唯一的 ID，类型为 TYPE_SYSTEM。 - * @param db - */ private void createSystemFolder(SQLiteDatabase db) { ContentValues values = new ContentValues(); @@ -317,12 +270,6 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper { db.insert(TABLE.NOTE, null, values); } - /** - * 此方法用于创建数据表。 - * 它执行 CREATE_DATA_TABLE_SQL 常量中指定的 SQL 语句，并调用 reCreateDataTableTriggers 方法以重置触发器。 - * 最后，它还创建了 CREATE_DATA_NOTE_ID_INDEX_SQL 常量中指定的 ID 索引。 - * @param db - */ public void createDataTable(SQLiteDatabase db) { db.execSQL(CREATE_DATA_TABLE_SQL); reCreateDataTableTriggers(db); @@ -330,10 +277,6 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper { Log.d(TAG, "data table has been created"); } - /** - * 用于重置增删改触发器，删除所有现有的触发器，然后重新创建触发器。 - * @param db - */ private void reCreateDataTableTriggers(SQLiteDatabase db) { db.execSQL("DROP TRIGGER IF EXISTS update_note_content_on_insert"); db.execSQL("DROP TRIGGER IF EXISTS update_note_content_on_update"); @@ -344,12 +287,6 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper { db.execSQL(DATA_UPDATE_NOTE_CONTENT_ON_DELETE_TRIGGER); } - /** - * 此方法是 NotesDatabaseHelper 类的静态方法，通过传递上下文对象来获取数据库的实例。 - * 它将确保在多线程环境中只有一个实例创建。 - * @param context - * @return - */ static synchronized NotesDatabaseHelper getInstance(Context context) { if (mInstance == null) { mInstance = new NotesDatabaseHelper(context); @@ -357,25 +294,12 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper { return mInstance; } - /** - * 数据库被第一次创建时，此方法将调用。 - * createNoteTable() 和 createDataTable() 两个方法将被调用，用于创建表和触发器。 - * @param db - */ @Override public void onCreate(SQLiteDatabase db) { createNoteTable(db); createDataTable(db); } - /** - * 当数据库需要更新到一个新版本时，此方法将被调用。 - * 它通过指定旧版本和新版本号来确定进行哪些更新， - * 每个更新都会调用 upgradeToV2()、upgradeToV3() 和 upgradeToV4() 方法之一，以升级数据库结构。 - * @param db - * @param oldVersion - * @param newVersion - */ @Override public void onUpgrade(SQLiteDatabase db, int oldVersion, int newVersion) { boolean reCreateTriggers = false; @@ -409,10 +333,6 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper { } } - /** - * 此方法执行从 v1 升级到 v2 的数据迁移。它首先删除原来的表，然后创建新表，重新建立触发器。 - * @param db - */ private void upgradeToV2(SQLiteDatabase db) { db.execSQL("DROP TABLE IF EXISTS " + TABLE.NOTE); db.execSQL("DROP TABLE IF EXISTS " + TABLE.DATA); @@ -420,11 +340,6 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper { createDataTable(db); } - /** - * 此方法执行从 v2 升级到 v3 的数据迁移。 - * 它删除不再需要的触发器并添加新的 note Gtask Id 列，以便允许在 Google Tasks 中同步任务到笔记应用程序中。 - * @param db - */ private void upgradeToV3(SQLiteDatabase db) { // drop unused triggers db.execSQL("DROP TRIGGER IF EXISTS update_note_modified_date_on_insert"); @@ -440,10 +355,6 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper { db.insert(TABLE.NOTE, null, values); } - /** - * 此方法执行从 v3 升级到 v4 的数据迁移。它为 notes 表添加了版本号列，以便在后续升级中进行版本验证。 - * @param db - */ private void upgradeToV4(SQLiteDatabase db) { db.execSQL("ALTER TABLE " + TABLE.NOTE + " ADD COLUMN " + NoteColumns.VERSION + " INTEGER NOT NULL DEFAULT 0"); diff --git a/src/Notes-master/app/src/main/java/net/micode/notes/data/NotesProvider.java b/src/app/src/main/java/net/micode/notes/data/NotesProvider.java similarity index 81% rename from src/Notes-master/app/src/main/java/net/micode/notes/data/NotesProvider.java rename to src/app/src/main/java/net/micode/notes/data/NotesProvider.java index f8684ac..edb0a60 100644 --- a/src/Notes-master/app/src/main/java/net/micode/notes/data/NotesProvider.java +++ b/src/app/src/main/java/net/micode/notes/data/NotesProvider.java @@ -34,28 +34,14 @@ import net.micode.notes.data.Notes.DataColumns; import net.micode.notes.data.Notes.NoteColumns; import net.micode.notes.data.NotesDatabaseHelper.TABLE; -/** - * 这个类中的方法可以处理来自应用程序的查询、插入、更新和删除等操作，并通过 UriMatcher 帮助确定请求的类型和内容。 - * 同时，它还定义了搜索查询结果的格式，并实现了一些自定义的功能，例如笔记的回收站文件夹。 - */ -public class NotesProvider extends ContentProvider { - /** - * UriMatcher 用于匹配可能的 URI 请求，并将其映射到适当的代码路径。它被声明为静态常量，并在静态块中进行初始化。 - */ +public class NotesProvider extends ContentProvider { private static final UriMatcher mMatcher; - /** - * NotesDatabaseHelper 对象用于打开和操作笔记数据库。 - */ private NotesDatabaseHelper mHelper; - /** - * 日志标签，用于调试目的。 - */ private static final String TAG = "NotesProvider"; - //这几个静态常量是 URIs 返回时的返回值，它们分别对应笔记、单个笔记、数据和单个数据。这些常量被添加到 UriMatcher 中。 private static final int URI_NOTE = 1; private static final int URI_NOTE_ITEM = 2; private static final int URI_DATA = 3; @@ -65,10 +51,6 @@ public class NotesProvider extends ContentProvider { private static final int URI_SEARCH_SUGGEST = 6; static { - /* - 这些语句将具有特定 URI 模式的请求添加到 UriMatcher 中， - 例如 "content://com.example.notes/note"，并与与之关联的 UriMatcher 返回值进行映射。 - */ mMatcher = new UriMatcher(UriMatcher.NO_MATCH); mMatcher.addURI(Notes.AUTHORITY, "note", URI_NOTE); mMatcher.addURI(Notes.AUTHORITY, "note/#", URI_NOTE_ITEM); @@ -82,8 +64,6 @@ public class NotesProvider extends ContentProvider { /** * x'0A' represents the '\n' character in sqlite. For title and content in the search result, * we will trim '\n' and white space in order to show more information. - * 用于定义搜索结果的内容，以及笔记的搜索查询SQL。 - * 它们用于返回包含搜索查询结果的 Cursor 对象，并传递给 CursorAdapter 来填充 ListView 或 RecyclerView。 */ private static final String NOTES_SEARCH_PROJECTION = NoteColumns.ID + "," + NoteColumns.ID + " AS " + SearchManager.SUGGEST_COLUMN_INTENT_EXTRA_DATA + "," @@ -93,35 +73,18 @@ public class NotesProvider extends ContentProvider { + "'" + Intent.ACTION_VIEW + "' AS " + SearchManager.SUGGEST_COLUMN_INTENT_ACTION + "," + "'" + Notes.TextNote.CONTENT_TYPE + "' AS " + SearchManager.SUGGEST_COLUMN_INTENT_DATA; - /** - * 用于定义搜索结果的内容，以及笔记的搜索查询SQL。 - * 它们用于返回包含搜索查询结果的 Cursor 对象，并传递给 CursorAdapter 来填充 ListView 或 RecyclerView。 - */ private static String NOTES_SNIPPET_SEARCH_QUERY = "SELECT " + NOTES_SEARCH_PROJECTION + " FROM " + TABLE.NOTE + " WHERE " + NoteColumns.SNIPPET + " LIKE ?" + " AND " + NoteColumns.PARENT_ID + "<>" + Notes.ID_TRASH_FOLER + " AND " + NoteColumns.TYPE + "=" + Notes.TYPE_NOTE; - /** - * 在 ContentProvider 被创建之后，此方法将被调用，并且在这个例子中，它会初始化 mHelper 变量和返回 true。 - * @return - */ @Override public boolean onCreate() { mHelper = NotesDatabaseHelper.getInstance(getContext()); return true; } - /** - * 这个方法使用传递过来的参数来执行 SQL 查询，并返回一个 Cursor 对象，用于与 Activity 或 Fragment 中的 UI 控件进行交互。 - * @param uri - * @param projection - * @param selection - * @param selectionArgs - * @param sortOrder - * @return - */ @Override public Cursor query(Uri uri, String[] projection, String selection, String[] selectionArgs, String sortOrder) { @@ -184,12 +147,6 @@ public class NotesProvider extends ContentProvider { return c; } - /** - * 向 ContentProvider 中插入数据。 - * @param uri - * @param values - * @return - */ @Override public Uri insert(Uri uri, ContentValues values) { SQLiteDatabase db = mHelper.getWritableDatabase(); @@ -224,13 +181,6 @@ public class NotesProvider extends ContentProvider { return ContentUris.withAppendedId(uri, insertedId); } - /** - * 从 ContentProvider 中删除数据。 - * @param uri - * @param selection - * @param selectionArgs - * @return - */ @Override public int delete(Uri uri, String selection, String[] selectionArgs) { int count = 0; @@ -277,14 +227,6 @@ public class NotesProvider extends ContentProvider { return count; } - /** - * 从 ContentProvider 中更新数据。 - * @param uri - * @param values - * @param selection - * @param selectionArgs - * @return - */ @Override public int update(Uri uri, ContentValues values, String selection, String[] selectionArgs) { int count = 0; @@ -325,21 +267,10 @@ public class NotesProvider extends ContentProvider { return count; } - /** - * 将查询字符串转换为 SQL 语句。如果查询字符串为空，则直接返回空字符串。 - * @param selection - * @return - */ private String parseSelection(String selection) { return (!TextUtils.isEmpty(selection) ? " AND (" + selection + ')' : ""); } - /** - * 将笔记的版本号加一。如果 ID 大于 0 或查询字符串不为空，则将更新语句添加到 SQL 语句中。 - * @param id - * @param selection - * @param selectionArgs - */ private void increaseNoteVersion(long id, String selection, String[] selectionArgs) { StringBuilder sql = new StringBuilder(120); sql.append("UPDATE "); diff --git a/src/Notes-master/app/src/main/java/net/micode/notes/gtask/data/MetaData.java b/src/app/src/main/java/net/micode/notes/gtask/data/MetaData.java similarity index 72% rename from src/Notes-master/app/src/main/java/net/micode/notes/gtask/data/MetaData.java rename to src/app/src/main/java/net/micode/notes/gtask/data/MetaData.java index 40cf17d..3a2050b 100644 --- a/src/Notes-master/app/src/main/java/net/micode/notes/gtask/data/MetaData.java +++ b/src/app/src/main/java/net/micode/notes/gtask/data/MetaData.java @@ -24,19 +24,12 @@ import net.micode.notes.tool.GTaskStringUtils; import org.json.JSONException; import org.json.JSONObject; -/** - *Task类的拓展 - */ + public class MetaData extends Task { private final static String TAG = MetaData.class.getSimpleName(); private String mRelatedGid = null; - /** - * 设置一些元数据 - * @param gid - * @param metaInfo - */ public void setMeta(String gid, JSONObject metaInfo) { try { metaInfo.put(GTaskStringUtils.META_HEAD_GTASK_ID, gid); @@ -47,29 +40,15 @@ public class MetaData extends Task { setName(GTaskStringUtils.META_NOTE_NAME); } - /** - *返回私有变量"mRelatedGid"的值。 - * @return mRelatedGid - */ public String getRelatedGid() { return mRelatedGid; } - /** - * 一个被覆盖的方法 - * 如果当前实例的内容不为null，则返回true - * @return bool - */ @Override public boolean isWorthSaving() { return getNotes() != null; } - /** - * 一个被覆盖的方法 - * 根据给定的JSONObject "js"设置当前实例的内容。如果当前实例的内容不为null，则从注释中提取相关的gid并将其设置为私有变量"mRelatedGid" - * @param js - */ @Override public void setContentByRemoteJSON(JSONObject js) { super.setContentByRemoteJSON(js); @@ -84,32 +63,17 @@ public class MetaData extends Task { } } - /** - * 一个被覆盖的方法; - * 抛出"IllegalAccessError"，因为不应该调用它 - * @param js - */ @Override public void setContentByLocalJSON(JSONObject js) { // this function should not be called throw new IllegalAccessError("MetaData:setContentByLocalJSON should not be called"); } - /** - * 一个被覆盖的方法; - * 抛出"IllegalAccessError"，因为不应该调用它 - * @return - */ @Override public JSONObject getLocalJSONFromContent() { throw new IllegalAccessError("MetaData:getLocalJSONFromContent should not be called"); } - /** - * 一个被覆盖的方法; - * 抛出"IllegalAccessError"，因为不应该调用它 - * @return - */ @Override public int getSyncAction(Cursor c) { throw new IllegalAccessError("MetaData:getSyncAction should not be called"); diff --git a/src/Notes-master/app/src/main/java/net/micode/notes/gtask/data/Node.java b/src/app/src/main/java/net/micode/notes/gtask/data/Node.java similarity index 86% rename from src/Notes-master/app/src/main/java/net/micode/notes/gtask/data/Node.java rename to src/app/src/main/java/net/micode/notes/gtask/data/Node.java index a3311d9..63950e0 100644 --- a/src/Notes-master/app/src/main/java/net/micode/notes/gtask/data/Node.java +++ b/src/app/src/main/java/net/micode/notes/gtask/data/Node.java @@ -20,9 +20,6 @@ import android.database.Cursor; import org.json.JSONObject; -/** - * 一个Node抽象类 - */ public abstract class Node { public static final int SYNC_ACTION_NONE = 0; @@ -50,9 +47,6 @@ public abstract class Node { private boolean mDeleted; - /** - * 构造函数，初始化成员变量 - */ public Node() { mGid = null; mName = ""; @@ -60,7 +54,6 @@ public abstract class Node { mDeleted = false; } - //五个抽象方法,需要实现 public abstract JSONObject getCreateAction(int actionId); public abstract JSONObject getUpdateAction(int actionId); @@ -71,14 +64,8 @@ public abstract class Node { public abstract JSONObject getLocalJSONFromContent(); - /** - * 一个名为"getSyncAction"的抽象方法，接受一个游标参数，返回一个整数值，表示同步操作类型 - * @param c - * @return - */ public abstract int getSyncAction(Cursor c); - //setter和getter方法，分别用于设置或获取节点的各个属性 public void setGid(String gid) { this.mGid = gid; } diff --git a/src/Notes-master/app/src/main/java/net/micode/notes/gtask/data/SqlData.java b/src/app/src/main/java/net/micode/notes/gtask/data/SqlData.java similarity index 83% rename from src/Notes-master/app/src/main/java/net/micode/notes/gtask/data/SqlData.java rename to src/app/src/main/java/net/micode/notes/gtask/data/SqlData.java index 9861fb3..d3ec3be 100644 --- a/src/Notes-master/app/src/main/java/net/micode/notes/gtask/data/SqlData.java +++ b/src/app/src/main/java/net/micode/notes/gtask/data/SqlData.java @@ -34,9 +34,7 @@ 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(); @@ -73,10 +71,6 @@ public class SqlData { private ContentValues mDiffDataValues; - /** - * 创建一个新的SqlData对象，并初始化成员变量。 - * @param context - */ public SqlData(Context context) { mContentResolver = context.getContentResolver(); mIsCreate = true; @@ -88,11 +82,6 @@ public class SqlData { mDiffDataValues = new ContentValues(); } - /** - * 创建一个新的SqlData对象，并使用Cursor中的数据来初始化成员变量 - * @param context - * @param c - */ public SqlData(Context context, Cursor c) { mContentResolver = context.getContentResolver(); mIsCreate = false; @@ -100,10 +89,6 @@ 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); @@ -112,13 +97,6 @@ public class SqlData { mDataContentData3 = c.getString(DATA_CONTENT_DATA_3_COLUMN); } - /** - * 用于设置数据的内容，并将其存储在mDiffDataValues变量中以便稍后提交更改。 - * 该方法接受JSONObject类型的参数，该参数包含要设置的内容。 - * 如果数据还未创建且尝试访问它，则会记录错误并返回null。 - * @param js - * @throws JSONException - */ public void setContent(JSONObject js) throws JSONException { long dataId = js.has(DataColumns.ID) ? js.getLong(DataColumns.ID) : INVALID_ID; if (mIsCreate || mDataId != dataId) { @@ -152,12 +130,6 @@ public class SqlData { mDataContentData3 = dataContentData3; } - /** - * 用于获取数据的内容，并将其作为一个JSONObject对象返回。 - * 如果数据尚未创建，则会记录错误并返回null。 - * @return - * @throws JSONException - */ public JSONObject getContent() throws JSONException { if (mIsCreate) { Log.e(TAG, "it seems that we haven't created this in database yet"); @@ -172,14 +144,6 @@ public class SqlData { return js; } - /** - * 用于将数据提交到ContentProvider中。 - * 如果数据还未创建，则会插入新记录并更新mDataId变量的值。 - * 否则，它将更新现有记录的内容。如果要验证版本，则使用noteId和version参数。 - * @param noteId - * @param validateVersion - * @param version - */ public void commit(long noteId, boolean validateVersion, long version) { if (mIsCreate) { @@ -219,10 +183,6 @@ public class SqlData { mIsCreate = false; } - /** - * 返回数据ID的值，即mDataId的值 - * @return mDataId - */ public long getId() { return mDataId; } diff --git a/src/Notes-master/app/src/main/java/net/micode/notes/gtask/data/SqlNote.java b/src/app/src/main/java/net/micode/notes/gtask/data/SqlNote.java similarity index 92% rename from src/Notes-master/app/src/main/java/net/micode/notes/gtask/data/SqlNote.java rename to src/app/src/main/java/net/micode/notes/gtask/data/SqlNote.java index 8c14b81..79a4095 100644 --- a/src/Notes-master/app/src/main/java/net/micode/notes/gtask/data/SqlNote.java +++ b/src/app/src/main/java/net/micode/notes/gtask/data/SqlNote.java @@ -38,9 +38,6 @@ import org.json.JSONObject; import java.util.ArrayList; -/** - * 数据库中便签数据以及相关方法 - */ public class SqlNote { private static final String TAG = SqlNote.class.getSimpleName(); @@ -55,7 +52,6 @@ public class SqlNote { NoteColumns.VERSION }; - //一些成员变量 public static final int ID_COLUMN = 0; public static final int ALERTED_DATE_COLUMN = 1; @@ -126,11 +122,6 @@ public class SqlNote { private ArrayList mDataList; - /** - * 构造函数 - * 需要传入一个 Context 对象作为参数，并在该构造函数中初始化了 SqlNote 中的一些属性 - * @param context - */ public SqlNote(Context context) { mContext = context; mContentResolver = context.getContentResolver(); @@ -152,12 +143,6 @@ public class SqlNote { mDataList = new ArrayList(); } - /** - * 构造函数 - * 需要传入一个 Context 对象作为参数，以及一个 Cursor 对象 - * @param context - * @param c - */ public SqlNote(Context context, Cursor c) { mContext = context; mContentResolver = context.getContentResolver(); @@ -169,12 +154,6 @@ public class SqlNote { mDiffNoteValues = new ContentValues(); } - /** - * 构造函数 - * 只需要传入一个 Context 对象和 Long 类型的 id 即可创建一个已有的 SqlNote 对象 - * @param context - * @param id - */ public SqlNote(Context context, long id) { mContext = context; mContentResolver = context.getContentResolver(); @@ -187,11 +166,6 @@ public class SqlNote { } - /** - * 利用该参数查询对应 id 的 SqlNote，返回一个 Cursor 对象。 - * 如果查询到了数据，就调用loadFromCursor方法 - * @param id long - */ private void loadFromCursor(long id) { Cursor c = null; try { @@ -211,10 +185,6 @@ public class SqlNote { } } - /** - * 从 Cursor 中读取数据，将这些数据设置为 SqlNote 对象的相应属性值 - * @param c cursor - */ private void loadFromCursor(Cursor c) { mId = c.getLong(ID_COLUMN); mAlertDate = c.getLong(ALERTED_DATE_COLUMN); @@ -230,9 +200,6 @@ public class SqlNote { mVersion = c.getLong(VERSION_COLUMN); } - /** - * 来加载 SqlNote 对象的内容数据的 - */ private void loadDataContent() { Cursor c = null; mDataList.clear(); @@ -259,11 +226,6 @@ public class SqlNote { } } - /** - * 根据传入的 JSON 对象设置便签的内容 - * @param js JSONObject - * @return - */ public boolean setContent(JSONObject js) { try { JSONObject note = js.getJSONObject(GTaskStringUtils.META_HEAD_NOTE); @@ -397,10 +359,6 @@ public class SqlNote { return true; } - /** - * 返回一个 类型的数据，用于保存笔记对象的信息 - * @return JSONObject - */ public JSONObject getContent() { try { JSONObject js = new JSONObject(); @@ -449,7 +407,6 @@ public class SqlNote { return null; } - //一些设置笔记属性的方法 public void setParentId(long id) { mParentId = id; mDiffNoteValues.put(NoteColumns.PARENT_ID, id); @@ -467,7 +424,6 @@ public class SqlNote { mDiffNoteValues.put(NoteColumns.LOCAL_MODIFIED, 0); } - //一些获取笔记属性的方法 public long getId() { return mId; } @@ -484,10 +440,6 @@ public class SqlNote { return mType == Notes.TYPE_NOTE; } - /** - * 将当前未保存的修改提交到数据库中 - * @param validateVersion - */ public void commit(boolean validateVersion) { if (mIsCreate) { if (mId == INVALID_ID && mDiffNoteValues.containsKey(NoteColumns.ID)) { diff --git a/src/Notes-master/app/src/main/java/net/micode/notes/gtask/data/Task.java b/src/app/src/main/java/net/micode/notes/gtask/data/Task.java similarity index 90% rename from src/Notes-master/app/src/main/java/net/micode/notes/gtask/data/Task.java rename to src/app/src/main/java/net/micode/notes/gtask/data/Task.java index c4daca3..6a19454 100644 --- a/src/Notes-master/app/src/main/java/net/micode/notes/gtask/data/Task.java +++ b/src/app/src/main/java/net/micode/notes/gtask/data/Task.java @@ -45,9 +45,6 @@ public class Task extends Node { private TaskList mParent; - /** - * 构造函数 - */ public Task() { super(); mCompleted = false; @@ -57,11 +54,6 @@ public class Task extends Node { mMetaInfo = null; } - /** - * 返回一个 JSONObject 类型的数据，用于表示创建任务的操作 - * @param actionId int - * @return JSONObject - */ public JSONObject getCreateAction(int actionId) { JSONObject js = new JSONObject(); @@ -111,10 +103,6 @@ public class Task extends Node { return js; } - /** - * 回一个 JSONObject 类型的数据，用于表示更新任务的操作 - * @return - */ public JSONObject getUpdateAction(int actionId) { JSONObject js = new JSONObject(); @@ -147,10 +135,6 @@ public class Task extends Node { return js; } - /** - * 用于根据从远程获取的 JSON 对象设置任务的内容 - * @param js - */ public void setContentByRemoteJSON(JSONObject js) { if (js != null) { try { @@ -191,10 +175,6 @@ public class Task extends Node { } } - /** - * 用于根据从本地获取的 JSON 对象设置任务的内容 - * @param js - */ public void setContentByLocalJSON(JSONObject js) { if (js == null || !js.has(GTaskStringUtils.META_HEAD_NOTE) || !js.has(GTaskStringUtils.META_HEAD_DATA)) { @@ -224,10 +204,6 @@ public class Task extends Node { } } - /** - * 用于将当前 Task 对象的内容转化为本地 JSON 数据格式 - * @return - */ public JSONObject getLocalJSONFromContent() { String name = getName(); try { @@ -271,10 +247,6 @@ public class Task extends Node { } } - /** - *用于根据从 MetaData 对象中获取的笔记数据设置 Task 的元数据信息 - * @param metaData - */ public void setMetaInfo(MetaData metaData) { if (metaData != null && metaData.getNotes() != null) { try { @@ -286,11 +258,6 @@ public class Task extends Node { } } - /** - * 用于根据传入的 Cursor 对象和当前 Task 对象的状态判断应该进行的同步操作 - * @param c - * @return - */ public int getSyncAction(Cursor c) { try { JSONObject noteInfo = null; @@ -344,13 +311,11 @@ public class Task extends Node { return SYNC_ACTION_ERROR; } - //方法用于判断当前 Task 对象是否值得被保存 public boolean isWorthSaving() { return mMetaInfo != null || (getName() != null && getName().trim().length() > 0) || (getNotes() != null && getNotes().trim().length() > 0); } - //用于设置 Task 对象的完成状态、笔记信息、前一兄弟 Task 对象和父 TaskList 对象，这些方法将传入的参数设置到对应属性中。 public void setCompleted(boolean completed) { this.mCompleted = completed; } @@ -367,7 +332,6 @@ public class Task extends Node { this.mParent = parent; } - //别用于获取 Task 对象的完成状态、笔记信息、前一兄弟 Task 对象和父 TaskList 对象，这些方法将返回对应属性的值。 public boolean getCompleted() { return this.mCompleted; } diff --git a/src/Notes-master/app/src/main/java/net/micode/notes/gtask/data/TaskList.java b/src/app/src/main/java/net/micode/notes/gtask/data/TaskList.java similarity index 78% rename from src/Notes-master/app/src/main/java/net/micode/notes/gtask/data/TaskList.java rename to src/app/src/main/java/net/micode/notes/gtask/data/TaskList.java index 82bd868..4ea21c5 100644 --- a/src/Notes-master/app/src/main/java/net/micode/notes/gtask/data/TaskList.java +++ b/src/app/src/main/java/net/micode/notes/gtask/data/TaskList.java @@ -43,11 +43,6 @@ public class TaskList extends Node { mIndex = 1; } - /** - * 用于生成一个 JSONObject 对象，该对象表示一个用于创建当前 TaskList 对象的 Action - * @param actionId - * @return - */ public JSONObject getCreateAction(int actionId) { JSONObject js = new JSONObject(); @@ -79,11 +74,6 @@ public class TaskList extends Node { return js; } - /** - * 用于生成一个 JSONObject 对象，该对象表示一个用于更新当前 TaskList 对象的 Action - * @param actionId - * @return - */ public JSONObject getUpdateAction(int actionId) { JSONObject js = new JSONObject(); @@ -113,10 +103,6 @@ public class TaskList extends Node { return js; } - /** - * 将从网络返回的JSONObject对象解析出任务列表的ID、最后修改时间和名称，并根据解析结果设置相应属性的值 - * @param js - */ public void setContentByRemoteJSON(JSONObject js) { if (js != null) { try { @@ -143,10 +129,6 @@ public class TaskList extends Node { } } - /** - * 将从本地存储的JSONObject对象解析出便签的类型和名称，并根据解析结果设置相应任务列表的名称 - * @param js - */ public void setContentByLocalJSON(JSONObject js) { if (js == null || !js.has(GTaskStringUtils.META_HEAD_NOTE)) { Log.w(TAG, "setContentByLocalJSON: nothing is avaiable"); @@ -175,10 +157,6 @@ public class TaskList extends Node { } } - /** - * 将任务列表的名称转换为本地存储JSONObject对象并返回。如果转换过程中出现异常，将返回null。 - * @return - */ public JSONObject getLocalJSONFromContent() { try { JSONObject js = new JSONObject(); @@ -205,15 +183,6 @@ public class TaskList extends Node { } } - /** - * 根据传入的游标Cursor c判断需要同步的操作： - * 如果本地和远程都没有进行更新，则返回“无需同步”状态； - * 如果只有远程数据更新了，则返回“将远程更新应用到本地”状态； - * 如果既有本地数据更新又有远程数据更新，则返回“将本地更新应用到远程”状态； - * 如果出现错误，则返回“同步错误”状态。 - * @param c - * @return - */ public int getSyncAction(Cursor c) { try { if (c.getInt(SqlNote.LOCAL_MODIFIED_COLUMN) == 0) { @@ -247,19 +216,10 @@ public class TaskList extends Node { return SYNC_ACTION_ERROR; } - /** - * 返回当前任务列表下子任务的数量 - * @return - */ public int getChildTaskCount() { return mChildren.size(); } - /** - * 向当前任务列表中添加一个子任务，如果添加成功则返回true。 - * @param task - * @return - */ public boolean addChildTask(Task task) { boolean ret = false; if (task != null && !mChildren.contains(task)) { @@ -274,12 +234,6 @@ public class TaskList extends Node { return ret; } - /** - * 向当前任务列表中特定位置添加一个子任务。如果添加成功，则返回true。如果指定的索引不合法，则返回false。 - * @param task - * @param index - * @return - */ public boolean addChildTask(Task task, int index) { if (index < 0 || index > mChildren.size()) { Log.e(TAG, "add child task: invalid index"); @@ -306,11 +260,6 @@ public class TaskList extends Node { return true; } - /** - * 从当前任务列表中删除一个子任务，并将该子任务的前一个同级任务的后继任务设置为该子任务的后继任务。如果删除成功则返回true，否则返回false。 - * @param task - * @return - */ public boolean removeChildTask(Task task) { boolean ret = false; int index = mChildren.indexOf(task); @@ -332,12 +281,6 @@ public class TaskList extends Node { return ret; } - /** - * 将指定的子任务移至当前任务列表中特定位置。如果移动成功，则返回true，否则返回false。 - * @param task - * @param index - * @return - */ public boolean moveChildTask(Task task, int index) { if (index < 0 || index >= mChildren.size()) { @@ -356,11 +299,6 @@ public class TaskList extends Node { return (removeChildTask(task) && addChildTask(task, index)); } - /** - * 查找并返回与指定任务ID相同的子任务。如果找到则返回该子任务，否则返回null。 - * @param gid - * @return - */ public Task findChildTaskByGid(String gid) { for (int i = 0; i < mChildren.size(); i++) { Task t = mChildren.get(i); @@ -371,20 +309,10 @@ public class TaskList extends Node { return null; } - /** - * 返回当前任务列表中指定子任务的索引。 - * @param task - * @return - */ public int getChildTaskIndex(Task task) { return mChildren.indexOf(task); } - /** - * 返回当前任务列表中指定索引下标的子任务对象。 - * @param index - * @return - */ public Task getChildTaskByIndex(int index) { if (index < 0 || index >= mChildren.size()) { Log.e(TAG, "getTaskByIndex: invalid index"); @@ -393,11 +321,6 @@ public class TaskList extends Node { return mChildren.get(index); } - /** - * 根据指定任务ID查找并返回与之匹配的子任务。 - * @param gid - * @return - */ public Task getChilTaskByGid(String gid) { for (Task task : mChildren) { if (task.getGid().equals(gid)) @@ -406,26 +329,14 @@ public class TaskList extends Node { return null; } - /** - * 返回当前任务列表中包含的所有子任务。 - * @return - */ public ArrayList getChildTaskList() { return this.mChildren; } - /** - * 将当前任务列表的索引设置为指定值。 - * @param index - */ public void setIndex(int index) { this.mIndex = index; } - /** - * 返回当前任务列表的索引值。 - * @return - */ public int getIndex() { return this.mIndex; } diff --git a/src/Notes-master/app/src/main/java/net/micode/notes/gtask/exception/ActionFailureException.java b/src/app/src/main/java/net/micode/notes/gtask/exception/ActionFailureException.java similarity index 67% rename from src/Notes-master/app/src/main/java/net/micode/notes/gtask/exception/ActionFailureException.java rename to src/app/src/main/java/net/micode/notes/gtask/exception/ActionFailureException.java index 56ed92b..15504be 100644 --- a/src/Notes-master/app/src/main/java/net/micode/notes/gtask/exception/ActionFailureException.java +++ b/src/app/src/main/java/net/micode/notes/gtask/exception/ActionFailureException.java @@ -16,32 +16,17 @@ package net.micode.notes.gtask.exception; -/** - * 一个继承了RuntimeException的自定义异常类，用于表示执行某个操作时出现了失败或错误。 - */ public class ActionFailureException extends RuntimeException { private static final long serialVersionUID = 4425249765923293627L; - /** - * 默认构造函数，直接调用父类的默认构造函数。 - */ public ActionFailureException() { super(); } - /** - * 带有一个字符串参数的构造函数，用于设置异常的详细信息。 - * @param paramString - */ public ActionFailureException(String paramString) { super(paramString); } - /** - * 带有两个参数的构造函数，用于同时设置异常的详细信息和原因（即异常链）。 - * @param paramString - * @param paramThrowable - */ public ActionFailureException(String paramString, Throwable paramThrowable) { super(paramString, paramThrowable); } diff --git a/src/Notes-master/app/src/main/java/net/micode/notes/gtask/exception/NetworkFailureException.java b/src/app/src/main/java/net/micode/notes/gtask/exception/NetworkFailureException.java similarity index 67% rename from src/Notes-master/app/src/main/java/net/micode/notes/gtask/exception/NetworkFailureException.java rename to src/app/src/main/java/net/micode/notes/gtask/exception/NetworkFailureException.java index b72a4b9..b08cfb1 100644 --- a/src/Notes-master/app/src/main/java/net/micode/notes/gtask/exception/NetworkFailureException.java +++ b/src/app/src/main/java/net/micode/notes/gtask/exception/NetworkFailureException.java @@ -16,32 +16,17 @@ package net.micode.notes.gtask.exception; -/** - * 一个继承了Exception的自定义异常类，用于表示在进行网络请求时出现了失败或错误。 - */ public class NetworkFailureException extends Exception { private static final long serialVersionUID = 2107610287180234136L; - /** - * 默认构造函数，直接调用父类的默认构造函数。 - */ public NetworkFailureException() { super(); } - /** - * 带有一个字符串参数的构造函数，用于设置异常的详细信息。 - * @param paramString - */ public NetworkFailureException(String paramString) { super(paramString); } - /** - * 带有两个参数的构造函数，用于同时设置异常的详细信息和原因（即异常链）。 - * @param paramString - * @param paramThrowable - */ public NetworkFailureException(String paramString, Throwable paramThrowable) { super(paramString, paramThrowable); } diff --git a/src/Notes-master/app/src/main/java/net/micode/notes/gtask/remote/GTaskASyncTask.java b/src/app/src/main/java/net/micode/notes/gtask/remote/GTaskASyncTask.java similarity index 81% rename from src/Notes-master/app/src/main/java/net/micode/notes/gtask/remote/GTaskASyncTask.java rename to src/app/src/main/java/net/micode/notes/gtask/remote/GTaskASyncTask.java index 05a22c6..afc2fe1 100644 --- a/src/Notes-master/app/src/main/java/net/micode/notes/gtask/remote/GTaskASyncTask.java +++ b/src/app/src/main/java/net/micode/notes/gtask/remote/GTaskASyncTask.java @@ -28,21 +28,15 @@ import net.micode.notes.R; import net.micode.notes.ui.NotesListActivity; import net.micode.notes.ui.NotesPreferenceActivity; -/** - * 一个继承了AsyncTask的异步任务类，用于在后台执行与谷歌任务同步相关的操作，并向用户展示同步进度通知。 - */ + public class GTaskASyncTask extends AsyncTask { private static int GTASK_SYNC_NOTIFICATION_ID = 5234235; - /** - * 一个接口，用于在异步任务完成时回调。 - */ public interface OnCompleteListener { void onComplete(); } - private Context mContext; private NotificationManager mNotifiManager; @@ -59,28 +53,16 @@ public class GTaskASyncTask extends AsyncTask { mTaskManager = GTaskManager.getInstance(); } - /** - * 取消同步操作的方法 - */ public void cancelSync() { mTaskManager.cancelSync(); } - /** - * 将同步进度信息发布到主线程中更新进度通知。 - * @param message - */ public void publishProgess(String message) { publishProgress(new String[] { message }); } - /** - * 根据传入的提示符ID和内容创建并展示通知。 - * @param tickerId - * @param content - */ private void showNotification(int tickerId, String content) { PendingIntent pendingIntent; if (tickerId != R.string.ticker_success) { @@ -104,11 +86,6 @@ public class GTaskASyncTask extends AsyncTask { mNotifiManager.notify(GTASK_SYNC_NOTIFICATION_ID, notification); } - /** - * 在后台线程中执行任务的主要方法，用于启动同步操作并返回同步状态码。 - * @param unused - * @return - */ @Override protected Integer doInBackground(Void... unused) { publishProgess(mContext.getString(R.string.sync_progress_login, NotesPreferenceActivity @@ -116,10 +93,6 @@ public class GTaskASyncTask extends AsyncTask { return mTaskManager.sync(mContext, this); } - /** - * 在主线程中更新同步进度通知的方法，用于将同步进度信息发布到通知栏中。 - * @param progress - */ @Override protected void onProgressUpdate(String... progress) { showNotification(R.string.ticker_syncing, progress[0]); @@ -128,10 +101,6 @@ public class GTaskASyncTask extends AsyncTask { } } - /** - * 在主线程中处理同步结果的方法，根据同步状态码显示相应的通知，并在任务完成时回调OnCompleteListener接口。 - * @param result - */ @Override protected void onPostExecute(Integer result) { if (result == GTaskManager.STATE_SUCCESS) { diff --git a/src/Notes-master/app/src/main/java/net/micode/notes/gtask/remote/GTaskClient.java b/src/app/src/main/java/net/micode/notes/gtask/remote/GTaskClient.java similarity index 87% rename from src/Notes-master/app/src/main/java/net/micode/notes/gtask/remote/GTaskClient.java rename to src/app/src/main/java/net/micode/notes/gtask/remote/GTaskClient.java index 20f8bbd..c67dfdf 100644 --- a/src/Notes-master/app/src/main/java/net/micode/notes/gtask/remote/GTaskClient.java +++ b/src/app/src/main/java/net/micode/notes/gtask/remote/GTaskClient.java @@ -62,8 +62,6 @@ import java.util.zip.InflaterInputStream; public class GTaskClient { - - //一些常量的定义 private static final String TAG = GTaskClient.class.getSimpleName(); private static final String GTASK_URL = "https://mail.google.com/tasks/"; @@ -92,9 +90,6 @@ public class GTaskClient { private JSONArray mUpdateArray; - /** - * Gtask服务器信息 - */ private GTaskClient() { mHttpClient = null; mGetUrl = GTASK_GET_URL; @@ -107,10 +102,6 @@ public class GTaskClient { mUpdateArray = null; } - /** - * 静态方法，用于获取GTaskClient单例对象。 - * @return - */ public static synchronized GTaskClient getInstance() { if (mInstance == null) { mInstance = new GTaskClient(); @@ -118,13 +109,6 @@ public class GTaskClient { return mInstance; } - /** - * 登录Google账户并获取GTask服务的授权Token。 - * 如果已经登录则不做处理，否则重新登录； - * 登录成功后，需要判断是否为自定义域名的Google账户，如是则使用对应的URL地址登录。 - * @param activity Activity - * @return bool - */ public boolean login(Activity activity) { // we suppose that the cookie would expire after 5 minutes // then we need to re-login @@ -180,12 +164,6 @@ public class GTaskClient { return true; } - /** - *该方法实现了登录Google账户并获取授权Token的过程 - * @param activity Activity - * @param invalidateToken Token - * @return NULL or Token - */ private String loginGoogleAccount(Activity activity, boolean invalidateToken) { String authToken; AccountManager accountManager = AccountManager.get(activity); @@ -229,12 +207,6 @@ public class GTaskClient { return authToken; } - /** - * 实现了尝试登录Gtask的过程 - * @param activity Activity - * @param authToken Token - * @return bool - */ private boolean tryToLoginGtask(Activity activity, String authToken) { if (!loginGtask(authToken)) { // maybe the auth token is out of date, now let's invalidate the @@ -253,11 +225,6 @@ public class GTaskClient { return true; } - /** - * 该方法实现了Gtask登录的过程 - * @param authToken - * @return - */ private boolean loginGtask(String authToken) { int timeoutConnection = 10000; int timeoutSocket = 15000; @@ -313,18 +280,10 @@ public class GTaskClient { return true; } - /** - * 实现了获取当前操作id的功能，每次调用该方法时，将操作id加一并返回 - * @return - */ private int getActionId() { return mActionId++; } - /** - * 实现了创建一个HttpPost对象的功能，并设置了请求头信息。 - * @return - */ private HttpPost createHttpPost() { HttpPost httpPost = new HttpPost(mPostUrl); httpPost.setHeader("Content-Type", "application/x-www-form-urlencoded;charset=utf-8"); @@ -332,12 +291,6 @@ public class GTaskClient { return httpPost; } - /** - * 用于将返回结果的流数据读取并转化成字符串形式 - * @param entity - * @return - * @throws IOException - */ private String getResponseContent(HttpEntity entity) throws IOException { String contentEncoding = null; if (entity.getContentEncoding() != null) { @@ -370,12 +323,6 @@ public class GTaskClient { } } - /** - * 实现了POST请求的功能 - * @param js - * @return - * @throws NetworkFailureException - */ private JSONObject postRequest(JSONObject js) throws NetworkFailureException { if (!mLoggedin) { Log.e(TAG, "please login first"); @@ -413,11 +360,6 @@ public class GTaskClient { } } - /** - * 负责创建任务，在请求返回结果后将新增的任务的gid字段设置为返回结果中的新id。 - * @param task - * @throws NetworkFailureException - */ public void createTask(Task task) throws NetworkFailureException { commitUpdate(); try { @@ -444,11 +386,6 @@ public class GTaskClient { } } - /** - * 负责创建任务列表，在请求返回结果后将新增的列表的gid字段设置为返回结果中的新id。 - * @param tasklist - * @throws NetworkFailureException - */ public void createTaskList(TaskList tasklist) throws NetworkFailureException { commitUpdate(); try { @@ -475,10 +412,6 @@ public class GTaskClient { } } - /** - * 用于提交更新，即将所有等待提交的更新操作组成的JSON数组提交到服务器端 - * @throws NetworkFailureException - */ public void commitUpdate() throws NetworkFailureException { if (mUpdateArray != null) { try { @@ -500,11 +433,6 @@ 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 @@ -519,13 +447,6 @@ public class GTaskClient { } } - /** - * 用于将一个任务从一个列表中移动到另一个列表中，或者在同一列表中进行位置调整 - * @param task - * @param preParent - * @param curParent - * @throws NetworkFailureException - */ public void moveTask(Task task, TaskList preParent, TaskList curParent) throws NetworkFailureException { commitUpdate(); @@ -565,11 +486,6 @@ public class GTaskClient { } } - /** - * 用于删除一个节点，即设置节点的deleted属性为true，并将待提交的操作添加到提交数组中 - * @param node - * @throws NetworkFailureException - */ public void deleteNode(Node node) throws NetworkFailureException { commitUpdate(); try { @@ -593,11 +509,6 @@ public class GTaskClient { } } - /** - * 用于获取当前用户的任务列表 - * @return - * @throws NetworkFailureException - */ public JSONArray getTaskLists() throws NetworkFailureException { if (!mLoggedin) { Log.e(TAG, "please login first"); @@ -636,12 +547,6 @@ public class GTaskClient { } } - /** - * 用于获取指定任务列表中的所有任务。 - * @param listGid - * @return - * @throws NetworkFailureException - */ public JSONArray getTaskList(String listGid) throws NetworkFailureException { commitUpdate(); try { @@ -670,17 +575,10 @@ public class GTaskClient { } } - /** - * 返回当前同步的Google账号信息 - * @return - */ public Account getSyncAccount() { return mAccount; } - /** - * 则将待提交的操作数组mUpdateArray重置为null，以便进行下一轮的操作。 - */ public void resetUpdateArray() { mUpdateArray = null; } diff --git a/src/Notes-master/app/src/main/java/net/micode/notes/gtask/remote/GTaskManager.java b/src/app/src/main/java/net/micode/notes/gtask/remote/GTaskManager.java similarity index 91% rename from src/Notes-master/app/src/main/java/net/micode/notes/gtask/remote/GTaskManager.java rename to src/app/src/main/java/net/micode/notes/gtask/remote/GTaskManager.java index e69113e..d2b4082 100644 --- a/src/Notes-master/app/src/main/java/net/micode/notes/gtask/remote/GTaskManager.java +++ b/src/app/src/main/java/net/micode/notes/gtask/remote/GTaskManager.java @@ -49,7 +49,6 @@ import java.util.Map; public class GTaskManager { - //一些常量的定义 private static final String TAG = GTaskManager.class.getSimpleName(); public static final int STATE_SUCCESS = 0; @@ -88,9 +87,6 @@ public class GTaskManager { private HashMap mNidToGid; - /** - * 构造函数中初始化了该类使用到的各种变量，包括任务列表、任务、元数据等。 - */ private GTaskManager() { mSyncing = false; mCancelled = false; @@ -103,10 +99,6 @@ public class GTaskManager { mNidToGid = new HashMap(); } - /** - * 用于获取唯一的实例 - * @return - */ public static synchronized GTaskManager getInstance() { if (mInstance == null) { mInstance = new GTaskManager(); @@ -114,21 +106,11 @@ public class GTaskManager { return mInstance; } - /** - * 用于设置当前活动的上下文环境，即调用该方法的Activity对象。该方法主要用于获取Google账号的AuthToken。 - * @param activity - */ public synchronized void setActivityContext(Activity activity) { // used for getting authtoken mActivity = activity; } - /** - * 用于执行同步操作 - * @param context - * @param asyncTask - * @return - */ public int sync(Context context, GTaskASyncTask asyncTask) { if (mSyncing) { Log.d(TAG, "Sync is in progress"); @@ -186,10 +168,6 @@ public class GTaskManager { return mCancelled ? STATE_SYNC_CANCELLED : STATE_SUCCESS; } - /** - * 用于初始化谷歌任务列表，包括元数据列表和所有任务列表以及它们的任务 - * @throws NetworkFailureException - */ private void initGTaskList() throws NetworkFailureException { if (mCancelled) return; @@ -269,10 +247,6 @@ public class GTaskManager { } } - /** - * 用于执行内容同步操作 - * @throws NetworkFailureException - */ private void syncContent() throws NetworkFailureException { int syncType; Cursor c = null; @@ -377,11 +351,6 @@ public class GTaskManager { } - /** - * 同步本地文件夹和Google Tasks的文件夹 - * 对于根文件夹、通话录音文件夹、本地已存在的文件夹和远程添加的文件夹进行分别处理 - * @throws NetworkFailureException - */ private void syncFolder() throws NetworkFailureException { Cursor c = null; String gid; @@ -507,13 +476,6 @@ public class GTaskManager { GTaskClient.getInstance().commitUpdate(); } - /** - * 具体的同步操作，利用参数syncType的不同，实现增加本地节点、增加远程节点、删除本地节点、删除远程节点、更新本地节点、更新远程节点等操作。 - * @param syncType - * @param node - * @param c - * @throws NetworkFailureException - */ private void doContentSync(int syncType, Node node, Cursor c) throws NetworkFailureException { if (mCancelled) { return; @@ -560,11 +522,6 @@ public class GTaskManager { } } - /** - * 向本地添加新节点的具体操作，包括创建SqlNote、更新gid-nid映射等。 - * @param node - * @throws NetworkFailureException - */ private void addLocalNode(Node node) throws NetworkFailureException { if (mCancelled) { return; @@ -639,12 +596,6 @@ public class GTaskManager { updateRemoteMeta(node.getGid(), sqlNote); } - /** - * 用于更新本地节点，即将Google任务列表或任务的信息更新到本地SQLite数据库中 - * @param node - * @param c - * @throws NetworkFailureException - */ private void updateLocalNode(Node node, Cursor c) throws NetworkFailureException { if (mCancelled) { return; @@ -668,12 +619,6 @@ public class GTaskManager { updateRemoteMeta(node.getGid(), sqlNote); } - /** - * 用于添加远程节点，即在Google服务端新建任务列表或者任务，然后根据返回的Gid来更新本地SQLite数据库，并更新元数据。 - * @param node - * @param c - * @throws NetworkFailureException - */ private void addRemoteNode(Node node, Cursor c) throws NetworkFailureException { if (mCancelled) { return; @@ -747,12 +692,6 @@ public class GTaskManager { mNidToGid.put(sqlNote.getId(), n.getGid()); } - /** - * 用于更新远程节点，即在Google服务端更新任务列表或者任务，在根据返回信息来更新本地SQLite数据库，并更新元数据。 - * @param node - * @param c - * @throws NetworkFailureException - */ private void updateRemoteNode(Node node, Cursor c) throws NetworkFailureException { if (mCancelled) { return; @@ -791,12 +730,6 @@ public class GTaskManager { sqlNote.commit(true); } - /** - * 用于更新笔记的元数据，即与笔记相关的元信息 - * @param gid - * @param sqlNote - * @throws NetworkFailureException - */ private void updateRemoteMeta(String gid, SqlNote sqlNote) throws NetworkFailureException { if (sqlNote != null && sqlNote.isNoteType()) { MetaData metaData = mMetaHashMap.get(gid); @@ -813,10 +746,6 @@ public class GTaskManager { } } - /** - * 用于刷新本地SQLite数据库中笔记的同步ID。 - * @throws NetworkFailureException - */ private void refreshLocalSyncId() throws NetworkFailureException { if (mCancelled) { return; @@ -861,17 +790,10 @@ public class GTaskManager { } } - /** - * 获取当前Google账户的同步账户名称。 - * @return - */ public String getSyncAccount() { return GTaskClient.getInstance().getSyncAccount().name; } - /** - * 取消同步过程。 - */ public void cancelSync() { mCancelled = true; } diff --git a/src/Notes-master/app/src/main/java/net/micode/notes/gtask/remote/GTaskSyncService.java b/src/app/src/main/java/net/micode/notes/gtask/remote/GTaskSyncService.java similarity index 80% rename from src/Notes-master/app/src/main/java/net/micode/notes/gtask/remote/GTaskSyncService.java rename to src/app/src/main/java/net/micode/notes/gtask/remote/GTaskSyncService.java index 51ca7c7..cca36f7 100644 --- a/src/Notes-master/app/src/main/java/net/micode/notes/gtask/remote/GTaskSyncService.java +++ b/src/app/src/main/java/net/micode/notes/gtask/remote/GTaskSyncService.java @@ -23,9 +23,6 @@ import android.content.Intent; import android.os.Bundle; import android.os.IBinder; -/** - * 谷歌任务同步服务，用于将本地备忘录数据同步到Google Tasks中 - */ public class GTaskSyncService extends Service { public final static String ACTION_STRING_NAME = "sync_action_type"; @@ -45,9 +42,6 @@ public class GTaskSyncService extends Service { private static String mSyncProgress = ""; - /** - * 用于启动同步任务 - */ private void startSync() { if (mSyncTask == null) { mSyncTask = new GTaskASyncTask(this, new GTaskASyncTask.OnCompleteListener() { @@ -62,30 +56,17 @@ public class GTaskSyncService extends Service { } } - /** - * 用于取消同步任务 - */ private void cancelSync() { if (mSyncTask != null) { mSyncTask.cancelSync(); } } - /** - * 用于在服务创建时初始化相关资源 - */ @Override public void onCreate() { mSyncTask = null; } - /** - * 在接收同步操作命令时启动同步任务或取消同步任务 - * @param intent - * @param flags - * @param startId - * @return - */ @Override public int onStartCommand(Intent intent, int flags, int startId) { Bundle bundle = intent.getExtras(); @@ -105,9 +86,6 @@ public class GTaskSyncService extends Service { return super.onStartCommand(intent, flags, startId); } - /** - * 在低内存情况下停止同步任务。 - */ @Override public void onLowMemory() { if (mSyncTask != null) { @@ -119,10 +97,6 @@ public class GTaskSyncService extends Service { return null; } - /** - * 向应用内发送广播消息，通知相关观察者同步任务的执行状态和进度信息。 - * @param msg - */ public void sendBroadcast(String msg) { mSyncProgress = msg; Intent intent = new Intent(GTASK_SERVICE_BROADCAST_NAME); @@ -131,10 +105,6 @@ public class GTaskSyncService extends Service { sendBroadcast(intent); } - /** - * 用于在Activity中启动同步服务。 - * @param activity - */ public static void startSync(Activity activity) { GTaskManager.getInstance().setActivityContext(activity); Intent intent = new Intent(activity, GTaskSyncService.class); @@ -142,28 +112,16 @@ public class GTaskSyncService extends Service { activity.startService(intent); } - /** - * 用于在Activity中取消同步服务。 - * @param context - */ public static void cancelSync(Context context) { Intent intent = new Intent(context, GTaskSyncService.class); intent.putExtra(GTaskSyncService.ACTION_STRING_NAME, GTaskSyncService.ACTION_CANCEL_SYNC); context.startService(intent); } - /** - * 用于检测当前是否正在执行同步任务 - * @return - */ public static boolean isSyncing() { return mSyncTask != null; } - /** - * 用于获取同步进度信息。 - * @return - */ public static String getProgressString() { return mSyncProgress; } diff --git a/src/Notes-master/app/src/main/java/net/micode/notes/model/Note.java b/src/app/src/main/java/net/micode/notes/model/Note.java similarity index 86% rename from src/Notes-master/app/src/main/java/net/micode/notes/model/Note.java rename to src/app/src/main/java/net/micode/notes/model/Note.java index 4537e5e..6706cf6 100644 --- a/src/Notes-master/app/src/main/java/net/micode/notes/model/Note.java +++ b/src/app/src/main/java/net/micode/notes/model/Note.java @@ -33,16 +33,13 @@ import net.micode.notes.data.Notes.TextNote; import java.util.ArrayList; -/** - * 要作用是封装了数据操作逻辑，并提供了方便的接口给外部进行调用。 - */ + public class Note { private ContentValues mNoteDiffValues; private NoteData mNoteData; private static final String TAG = "Note"; /** * Create a new note id for adding a new note to databases - * 获取新的笔记 ID */ public static synchronized long getNewNoteId(Context context, long folderId) { // Create a new note in the database @@ -73,73 +70,36 @@ public class Note { mNoteData = new NoteData(); } - /** - * 设置笔记的值。 - * @param key - * @param value - */ public void setNoteValue(String key, String value) { mNoteDiffValues.put(key, value); mNoteDiffValues.put(NoteColumns.LOCAL_MODIFIED, 1); mNoteDiffValues.put(NoteColumns.MODIFIED_DATE, System.currentTimeMillis()); } - /** - * 设置笔记数据的值。 - * @param key - * @param value - */ public void setTextData(String key, String value) { mNoteData.setTextData(key, value); } - /** - * 设置笔记数据的ID。 - * @param id - */ public void setTextDataId(long id) { mNoteData.setTextDataId(id); } - /** - * 获取笔记数据的ID。 - * @return - */ public long getTextDataId() { return mNoteData.mTextDataId; } - /** - * 设置笔记数据的ID。 - * @param id - */ public void setCallDataId(long id) { mNoteData.setCallDataId(id); } - /** - * 设置笔记数据的值。 - * @param key - * @param value - */ public void setCallData(String key, String value) { mNoteData.setCallData(key, value); } - /** - * 返回笔记是否已被本地修改。 - * @return - */ public boolean isLocalModified() { return mNoteDiffValues.size() > 0 || mNoteData.isLocalModified(); } - /** - * 判断笔记是否需要同步，如果需要则更新笔记到 ContentProvider 中。 - * @param context - * @param noteId - * @return - */ public boolean syncNote(Context context, long noteId) { if (noteId <= 0) { throw new IllegalArgumentException("Wrong note id:" + noteId); @@ -188,18 +148,10 @@ public class Note { mCallDataId = 0; } - /** - * 判断笔记数据是否已经被本地修改。 - * @return - */ boolean isLocalModified() { return mTextDataValues.size() > 0 || mCallDataValues.size() > 0; } - /** - * 设置文本数据的 ID。 - * @param id - */ void setTextDataId(long id) { if(id <= 0) { throw new IllegalArgumentException("Text data id should larger than 0"); @@ -207,10 +159,6 @@ public class Note { mTextDataId = id; } - /** - * 设置电话数据的 ID。 - * @param id - */ void setCallDataId(long id) { if (id <= 0) { throw new IllegalArgumentException("Call data id should larger than 0"); @@ -218,34 +166,18 @@ public class Note { mCallDataId = id; } - /** - * 设置笔记中电话数据的值。 - * @param key - * @param value - */ void setCallData(String key, String value) { mCallDataValues.put(key, value); mNoteDiffValues.put(NoteColumns.LOCAL_MODIFIED, 1); mNoteDiffValues.put(NoteColumns.MODIFIED_DATE, System.currentTimeMillis()); } - /** - * 设置笔记中文本数据的值。 - * @param key - * @param value - */ void setTextData(String key, String value) { mTextDataValues.put(key, value); mNoteDiffValues.put(NoteColumns.LOCAL_MODIFIED, 1); mNoteDiffValues.put(NoteColumns.MODIFIED_DATE, System.currentTimeMillis()); } - /** - * 将笔记数据插入 ContentProvider 中，同时更新对应的数据 ID。 - * @param context - * @param noteId - * @return - */ Uri pushIntoContentResolver(Context context, long noteId) { /** * Check for safety diff --git a/src/Notes-master/app/src/main/java/net/micode/notes/model/WorkingNote.java b/src/app/src/main/java/net/micode/notes/model/WorkingNote.java similarity index 87% rename from src/Notes-master/app/src/main/java/net/micode/notes/model/WorkingNote.java rename to src/app/src/main/java/net/micode/notes/model/WorkingNote.java index c20387f..be081e4 100644 --- a/src/Notes-master/app/src/main/java/net/micode/notes/model/WorkingNote.java +++ b/src/app/src/main/java/net/micode/notes/model/WorkingNote.java @@ -31,9 +31,7 @@ import net.micode.notes.data.Notes.NoteColumns; import net.micode.notes.data.Notes.TextNote; import net.micode.notes.tool.ResourceParser.NoteBgResources; -/** - * 它用于代表一条笔记，并提供了一些操作笔记的方法。 - */ + public class WorkingNote { // Note for the working note private Note mNote; @@ -148,7 +146,6 @@ public class WorkingNote { loadNoteData(); } - private void loadNoteData() { Cursor cursor = mContext.getContentResolver().query(Notes.CONTENT_DATA_URI, DATA_PROJECTION, DataColumns.NOTE_ID + "=?", new String[] { @@ -177,15 +174,6 @@ public class WorkingNote { } } - /** - * 创建一个新的空笔记。 - * @param context - * @param folderId - * @param widgetId - * @param widgetType - * @param defaultBgColorId - * @return - */ public static WorkingNote createEmptyNote(Context context, long folderId, int widgetId, int widgetType, int defaultBgColorId) { WorkingNote note = new WorkingNote(context, folderId); @@ -195,20 +183,10 @@ public class WorkingNote { return note; } - /** - * 加载指定 Id 的笔记。 - * @param context - * @param id - * @return - */ public static WorkingNote load(Context context, long id) { return new WorkingNote(context, id, 0); } - /** - * 保存当前笔记。 - * @return - */ public synchronized boolean saveNote() { if (isWorthSaving()) { if (!existInDatabase()) { @@ -247,19 +225,10 @@ public class WorkingNote { } } - /** - * 设置笔记设置变化的监听器。 - * @param l - */ public void setOnSettingStatusChangedListener(NoteSettingChangedListener l) { mNoteSettingStatusListener = l; } - /** - * 设置闹钟提醒时间。 - * @param date - * @param set - */ public void setAlertDate(long date, boolean set) { if (date != mAlertDate) { mAlertDate = date; @@ -270,10 +239,6 @@ public class WorkingNote { } } - /** - * 标记笔记是否被删除。 - * @param mark - */ public void markDeleted(boolean mark) { mIsDeleted = mark; if (mWidgetId != AppWidgetManager.INVALID_APPWIDGET_ID @@ -282,10 +247,6 @@ public class WorkingNote { } } - /** - * 设置笔记的背景颜色。 - * @param id - */ public void setBgColorId(int id) { if (id != mBgColorId) { mBgColorId = id; @@ -296,10 +257,6 @@ public class WorkingNote { } } - /** - * 设置笔记的模式。 - * @param mode - */ public void setCheckListMode(int mode) { if (mMode != mode) { if (mNoteSettingStatusListener != null) { @@ -310,10 +267,6 @@ public class WorkingNote { } } - /** - * 设置笔记关联的小部件类型。 - * @param type - */ public void setWidgetType(int type) { if (type != mWidgetType) { mWidgetType = type; @@ -321,10 +274,6 @@ public class WorkingNote { } } - /** - * 设置笔记关联的小部件 Id。 - * @param id - */ public void setWidgetId(int id) { if (id != mWidgetId) { mWidgetId = id; @@ -332,10 +281,6 @@ public class WorkingNote { } } - /** - * 设置笔记的文本内容。 - * @param text - */ public void setWorkingText(String text) { if (!TextUtils.equals(mContent, text)) { mContent = text; @@ -343,18 +288,12 @@ public class WorkingNote { } } - /** - * 将该笔记转化为呼叫记录。 - * @param phoneNumber - * @param callDate - */ public void convertToCallNote(String phoneNumber, long callDate) { mNote.setCallData(CallNote.CALL_DATE, String.valueOf(callDate)); mNote.setCallData(CallNote.PHONE_NUMBER, phoneNumber); mNote.setNoteValue(NoteColumns.PARENT_ID, String.valueOf(Notes.ID_CALL_RECORD_FOLDER)); } - //一些获取方法 public boolean hasClockAlert() { return (mAlertDate > 0 ? true : false); } @@ -403,31 +342,24 @@ public class WorkingNote { return mWidgetType; } - /** - * 用于监听笔记设置的变化。 - */ public interface NoteSettingChangedListener { /** * Called when the background color of current note has just changed - * 当当前笔记的背景色改变时被调用。 */ void onBackgroundColorChanged(); /** * Called when user set clock - * 当闹钟提醒设置改变时被调用，参数 date 表示提醒时间，set 表示是否设置了提醒。 */ void onClockAlertChanged(long date, boolean set); /** * Call when user create note from widget - * 当用户从小部件创建新笔记时被调用。 */ void onWidgetChanged(); /** * Call when switch between check list mode and normal mode - * 当切换到检查列表模式或常规模式时被调用，参数 oldMode 表示变化前的模式，newMode 表示新的模式。 * @param oldMode is previous mode before change * @param newMode is new mode */ diff --git a/src/Notes-master/app/src/main/java/net/micode/notes/tool/BackupUtils.java b/src/app/src/main/java/net/micode/notes/tool/BackupUtils.java similarity index 100% rename from src/Notes-master/app/src/main/java/net/micode/notes/tool/BackupUtils.java rename to src/app/src/main/java/net/micode/notes/tool/BackupUtils.java diff --git a/src/Notes-master/app/src/main/java/net/micode/notes/tool/DataUtils.java b/src/app/src/main/java/net/micode/notes/tool/DataUtils.java similarity index 100% rename from src/Notes-master/app/src/main/java/net/micode/notes/tool/DataUtils.java rename to src/app/src/main/java/net/micode/notes/tool/DataUtils.java diff --git a/src/Notes-master/app/src/main/java/net/micode/notes/tool/GTaskStringUtils.java b/src/app/src/main/java/net/micode/notes/tool/GTaskStringUtils.java similarity index 100% rename from src/Notes-master/app/src/main/java/net/micode/notes/tool/GTaskStringUtils.java rename to src/app/src/main/java/net/micode/notes/tool/GTaskStringUtils.java diff --git a/src/Notes-master/app/src/main/java/net/micode/notes/tool/ResourceParser.java b/src/app/src/main/java/net/micode/notes/tool/ResourceParser.java similarity index 100% rename from src/Notes-master/app/src/main/java/net/micode/notes/tool/ResourceParser.java rename to src/app/src/main/java/net/micode/notes/tool/ResourceParser.java diff --git a/src/Notes-master/app/src/main/java/net/micode/notes/ui/AlarmAlertActivity.java b/src/app/src/main/java/net/micode/notes/ui/AlarmAlertActivity.java similarity index 100% rename from src/Notes-master/app/src/main/java/net/micode/notes/ui/AlarmAlertActivity.java rename to src/app/src/main/java/net/micode/notes/ui/AlarmAlertActivity.java diff --git a/src/Notes-master/app/src/main/java/net/micode/notes/ui/AlarmInitReceiver.java b/src/app/src/main/java/net/micode/notes/ui/AlarmInitReceiver.java similarity index 100% rename from src/Notes-master/app/src/main/java/net/micode/notes/ui/AlarmInitReceiver.java rename to src/app/src/main/java/net/micode/notes/ui/AlarmInitReceiver.java diff --git a/src/Notes-master/app/src/main/java/net/micode/notes/ui/AlarmReceiver.java b/src/app/src/main/java/net/micode/notes/ui/AlarmReceiver.java similarity index 100% rename from src/Notes-master/app/src/main/java/net/micode/notes/ui/AlarmReceiver.java rename to src/app/src/main/java/net/micode/notes/ui/AlarmReceiver.java diff --git a/src/Notes-master/app/src/main/java/net/micode/notes/ui/DateTimePicker.java b/src/app/src/main/java/net/micode/notes/ui/DateTimePicker.java similarity index 100% rename from src/Notes-master/app/src/main/java/net/micode/notes/ui/DateTimePicker.java rename to src/app/src/main/java/net/micode/notes/ui/DateTimePicker.java diff --git a/src/Notes-master/app/src/main/java/net/micode/notes/ui/DateTimePickerDialog.java b/src/app/src/main/java/net/micode/notes/ui/DateTimePickerDialog.java similarity index 100% rename from src/Notes-master/app/src/main/java/net/micode/notes/ui/DateTimePickerDialog.java rename to src/app/src/main/java/net/micode/notes/ui/DateTimePickerDialog.java diff --git a/src/Notes-master/app/src/main/java/net/micode/notes/ui/DropdownMenu.java b/src/app/src/main/java/net/micode/notes/ui/DropdownMenu.java similarity index 100% rename from src/Notes-master/app/src/main/java/net/micode/notes/ui/DropdownMenu.java rename to src/app/src/main/java/net/micode/notes/ui/DropdownMenu.java diff --git a/src/Notes-master/app/src/main/java/net/micode/notes/ui/FoldersListAdapter.java b/src/app/src/main/java/net/micode/notes/ui/FoldersListAdapter.java similarity index 100% rename from src/Notes-master/app/src/main/java/net/micode/notes/ui/FoldersListAdapter.java rename to src/app/src/main/java/net/micode/notes/ui/FoldersListAdapter.java diff --git a/src/Notes-master/app/src/main/java/net/micode/notes/ui/NoteEditActivity.java b/src/app/src/main/java/net/micode/notes/ui/NoteEditActivity.java similarity index 100% rename from src/Notes-master/app/src/main/java/net/micode/notes/ui/NoteEditActivity.java rename to src/app/src/main/java/net/micode/notes/ui/NoteEditActivity.java diff --git a/src/Notes-master/app/src/main/java/net/micode/notes/ui/NoteEditText.java b/src/app/src/main/java/net/micode/notes/ui/NoteEditText.java similarity index 100% rename from src/Notes-master/app/src/main/java/net/micode/notes/ui/NoteEditText.java rename to src/app/src/main/java/net/micode/notes/ui/NoteEditText.java diff --git a/src/Notes-master/app/src/main/java/net/micode/notes/ui/NoteItemData.java b/src/app/src/main/java/net/micode/notes/ui/NoteItemData.java similarity index 100% rename from src/Notes-master/app/src/main/java/net/micode/notes/ui/NoteItemData.java rename to src/app/src/main/java/net/micode/notes/ui/NoteItemData.java diff --git a/src/Notes-master/app/src/main/java/net/micode/notes/ui/NotesListActivity.java b/src/app/src/main/java/net/micode/notes/ui/NotesListActivity.java similarity index 99% rename from src/Notes-master/app/src/main/java/net/micode/notes/ui/NotesListActivity.java rename to src/app/src/main/java/net/micode/notes/ui/NotesListActivity.java index 2b54931..e843aec 100644 --- a/src/Notes-master/app/src/main/java/net/micode/notes/ui/NotesListActivity.java +++ b/src/app/src/main/java/net/micode/notes/ui/NotesListActivity.java @@ -17,8 +17,6 @@ package net.micode.notes.ui; import android.app.Activity; -import androidx.appcompat.app.AppCompatActivity; - import android.app.AlertDialog; import android.app.Dialog; import android.appwidget.AppWidgetManager; @@ -80,7 +78,7 @@ import java.io.InputStream; import java.io.InputStreamReader; import java.util.HashSet; -public class NotesListActivity extends AppCompatActivity implements OnClickListener, OnItemLongClickListener { +public class NotesListActivity extends Activity implements OnClickListener, OnItemLongClickListener { private static final int FOLDER_NOTE_LIST_QUERY_TOKEN = 0; private static final int FOLDER_LIST_QUERY_TOKEN = 1; diff --git a/src/Notes-master/app/src/main/java/net/micode/notes/ui/NotesListAdapter.java b/src/app/src/main/java/net/micode/notes/ui/NotesListAdapter.java similarity index 100% rename from src/Notes-master/app/src/main/java/net/micode/notes/ui/NotesListAdapter.java rename to src/app/src/main/java/net/micode/notes/ui/NotesListAdapter.java diff --git a/src/Notes-master/app/src/main/java/net/micode/notes/ui/NotesListItem.java b/src/app/src/main/java/net/micode/notes/ui/NotesListItem.java similarity index 100% rename from src/Notes-master/app/src/main/java/net/micode/notes/ui/NotesListItem.java rename to src/app/src/main/java/net/micode/notes/ui/NotesListItem.java diff --git a/src/Notes-master/app/src/main/java/net/micode/notes/ui/NotesPreferenceActivity.java b/src/app/src/main/java/net/micode/notes/ui/NotesPreferenceActivity.java similarity index 100% rename from src/Notes-master/app/src/main/java/net/micode/notes/ui/NotesPreferenceActivity.java rename to src/app/src/main/java/net/micode/notes/ui/NotesPreferenceActivity.java diff --git a/src/Notes-master/app/src/main/java/net/micode/notes/widget/NoteWidgetProvider.java b/src/app/src/main/java/net/micode/notes/widget/NoteWidgetProvider.java similarity index 99% rename from src/Notes-master/app/src/main/java/net/micode/notes/widget/NoteWidgetProvider.java rename to src/app/src/main/java/net/micode/notes/widget/NoteWidgetProvider.java index a5cb7dd..9d7b067 100644 --- a/src/Notes-master/app/src/main/java/net/micode/notes/widget/NoteWidgetProvider.java +++ b/src/app/src/main/java/net/micode/notes/widget/NoteWidgetProvider.java @@ -82,6 +82,7 @@ public abstract class NoteWidgetProvider extends AppWidgetProvider { /** * 用于更新小部件的显示内容。该方法接受三个参数：context、appWidgetManager 和 appWidgetIds，分别表示上下文对象、小部件管理器和要更新的小部件 ID 列表。 */ + private void update(Context context, AppWidgetManager appWidgetManager, int[] appWidgetIds, boolean privacyMode) { for (int i = 0; i < appWidgetIds.length; i++) { diff --git a/src/Notes-master/app/src/main/java/net/micode/notes/widget/NoteWidgetProvider_2x.java b/src/app/src/main/java/net/micode/notes/widget/NoteWidgetProvider_2x.java similarity index 100% rename from src/Notes-master/app/src/main/java/net/micode/notes/widget/NoteWidgetProvider_2x.java rename to src/app/src/main/java/net/micode/notes/widget/NoteWidgetProvider_2x.java diff --git a/src/Notes-master/app/src/main/java/net/micode/notes/widget/NoteWidgetProvider_4x.java b/src/app/src/main/java/net/micode/notes/widget/NoteWidgetProvider_4x.java similarity index 100% rename from src/Notes-master/app/src/main/java/net/micode/notes/widget/NoteWidgetProvider_4x.java rename to src/app/src/main/java/net/micode/notes/widget/NoteWidgetProvider_4x.java diff --git a/src/Notes-master/app/src/main/res/color/primary_text_dark.xml b/src/app/src/main/res/color/primary_text_dark.xml similarity index 100% rename from src/Notes-master/app/src/main/res/color/primary_text_dark.xml rename to src/app/src/main/res/color/primary_text_dark.xml diff --git a/src/Notes-master/app/src/main/res/color/secondary_text_dark.xml b/src/app/src/main/res/color/secondary_text_dark.xml similarity index 100% rename from src/Notes-master/app/src/main/res/color/secondary_text_dark.xml rename to src/app/src/main/res/color/secondary_text_dark.xml diff --git a/src/Notes-master/app/src/main/res/drawable-hdpi/bg_btn_set_color.png b/src/app/src/main/res/drawable-hdpi/bg_btn_set_color.png similarity index 100% rename from src/Notes-master/app/src/main/res/drawable-hdpi/bg_btn_set_color.png rename to src/app/src/main/res/drawable-hdpi/bg_btn_set_color.png diff --git a/src/Notes-master/app/src/main/res/drawable-hdpi/bg_color_btn_mask.png b/src/app/src/main/res/drawable-hdpi/bg_color_btn_mask.png similarity index 100% rename from src/Notes-master/app/src/main/res/drawable-hdpi/bg_color_btn_mask.png rename to src/app/src/main/res/drawable-hdpi/bg_color_btn_mask.png diff --git a/src/Notes-master/app/src/main/res/drawable-hdpi/call_record.png b/src/app/src/main/res/drawable-hdpi/call_record.png similarity index 100% rename from src/Notes-master/app/src/main/res/drawable-hdpi/call_record.png rename to src/app/src/main/res/drawable-hdpi/call_record.png diff --git a/src/Notes-master/app/src/main/res/drawable-hdpi/clock.png b/src/app/src/main/res/drawable-hdpi/clock.png similarity index 100% rename from src/Notes-master/app/src/main/res/drawable-hdpi/clock.png rename to src/app/src/main/res/drawable-hdpi/clock.png diff --git a/src/Notes-master/app/src/main/res/drawable-hdpi/delete.png b/src/app/src/main/res/drawable-hdpi/delete.png similarity index 100% rename from src/Notes-master/app/src/main/res/drawable-hdpi/delete.png rename to src/app/src/main/res/drawable-hdpi/delete.png diff --git a/src/Notes-master/app/src/main/res/drawable-hdpi/dropdown_icon.9.png b/src/app/src/main/res/drawable-hdpi/dropdown_icon.9.png similarity index 100% rename from src/Notes-master/app/src/main/res/drawable-hdpi/dropdown_icon.9.png rename to src/app/src/main/res/drawable-hdpi/dropdown_icon.9.png diff --git a/src/Notes-master/app/src/main/res/drawable-hdpi/edit_blue.9.png b/src/app/src/main/res/drawable-hdpi/edit_blue.9.png similarity index 100% rename from src/Notes-master/app/src/main/res/drawable-hdpi/edit_blue.9.png rename to src/app/src/main/res/drawable-hdpi/edit_blue.9.png diff --git a/src/Notes-master/app/src/main/res/drawable-hdpi/edit_green.9.png b/src/app/src/main/res/drawable-hdpi/edit_green.9.png similarity index 100% rename from src/Notes-master/app/src/main/res/drawable-hdpi/edit_green.9.png rename to src/app/src/main/res/drawable-hdpi/edit_green.9.png diff --git a/src/Notes-master/app/src/main/res/drawable-hdpi/edit_red.9.png b/src/app/src/main/res/drawable-hdpi/edit_red.9.png similarity index 100% rename from src/Notes-master/app/src/main/res/drawable-hdpi/edit_red.9.png rename to src/app/src/main/res/drawable-hdpi/edit_red.9.png diff --git a/src/Notes-master/app/src/main/res/drawable-hdpi/edit_title_blue.9.png b/src/app/src/main/res/drawable-hdpi/edit_title_blue.9.png similarity index 100% rename from src/Notes-master/app/src/main/res/drawable-hdpi/edit_title_blue.9.png rename to src/app/src/main/res/drawable-hdpi/edit_title_blue.9.png diff --git a/src/Notes-master/app/src/main/res/drawable-hdpi/edit_title_green.9.png b/src/app/src/main/res/drawable-hdpi/edit_title_green.9.png similarity index 100% rename from src/Notes-master/app/src/main/res/drawable-hdpi/edit_title_green.9.png rename to src/app/src/main/res/drawable-hdpi/edit_title_green.9.png diff --git a/src/Notes-master/app/src/main/res/drawable-hdpi/edit_title_red.9.png b/src/app/src/main/res/drawable-hdpi/edit_title_red.9.png similarity index 100% rename from src/Notes-master/app/src/main/res/drawable-hdpi/edit_title_red.9.png rename to src/app/src/main/res/drawable-hdpi/edit_title_red.9.png diff --git a/src/Notes-master/app/src/main/res/drawable-hdpi/edit_title_white.9.png b/src/app/src/main/res/drawable-hdpi/edit_title_white.9.png similarity index 100% rename from src/Notes-master/app/src/main/res/drawable-hdpi/edit_title_white.9.png rename to src/app/src/main/res/drawable-hdpi/edit_title_white.9.png diff --git a/src/Notes-master/app/src/main/res/drawable-hdpi/edit_title_yellow.9.png b/src/app/src/main/res/drawable-hdpi/edit_title_yellow.9.png similarity index 100% rename from src/Notes-master/app/src/main/res/drawable-hdpi/edit_title_yellow.9.png rename to src/app/src/main/res/drawable-hdpi/edit_title_yellow.9.png diff --git a/src/Notes-master/app/src/main/res/drawable-hdpi/edit_white.9.png b/src/app/src/main/res/drawable-hdpi/edit_white.9.png similarity index 100% rename from src/Notes-master/app/src/main/res/drawable-hdpi/edit_white.9.png rename to src/app/src/main/res/drawable-hdpi/edit_white.9.png diff --git a/src/Notes-master/app/src/main/res/drawable-hdpi/edit_yellow.9.png b/src/app/src/main/res/drawable-hdpi/edit_yellow.9.png similarity index 100% rename from src/Notes-master/app/src/main/res/drawable-hdpi/edit_yellow.9.png rename to src/app/src/main/res/drawable-hdpi/edit_yellow.9.png diff --git a/src/Notes-master/app/src/main/res/drawable-hdpi/font_large.png b/src/app/src/main/res/drawable-hdpi/font_large.png similarity index 100% rename from src/Notes-master/app/src/main/res/drawable-hdpi/font_large.png rename to src/app/src/main/res/drawable-hdpi/font_large.png diff --git a/src/Notes-master/app/src/main/res/drawable-hdpi/font_normal.png b/src/app/src/main/res/drawable-hdpi/font_normal.png similarity index 100% rename from src/Notes-master/app/src/main/res/drawable-hdpi/font_normal.png rename to src/app/src/main/res/drawable-hdpi/font_normal.png diff --git a/src/Notes-master/app/src/main/res/drawable-hdpi/font_size_selector_bg.9.png b/src/app/src/main/res/drawable-hdpi/font_size_selector_bg.9.png similarity index 100% rename from src/Notes-master/app/src/main/res/drawable-hdpi/font_size_selector_bg.9.png rename to src/app/src/main/res/drawable-hdpi/font_size_selector_bg.9.png diff --git a/src/Notes-master/app/src/main/res/drawable-hdpi/font_small.png b/src/app/src/main/res/drawable-hdpi/font_small.png similarity index 100% rename from src/Notes-master/app/src/main/res/drawable-hdpi/font_small.png rename to src/app/src/main/res/drawable-hdpi/font_small.png diff --git a/src/Notes-master/app/src/main/res/drawable-hdpi/font_super.png b/src/app/src/main/res/drawable-hdpi/font_super.png similarity index 100% rename from src/Notes-master/app/src/main/res/drawable-hdpi/font_super.png rename to src/app/src/main/res/drawable-hdpi/font_super.png diff --git a/src/Notes-master/app/src/main/res/drawable-hdpi/icon_app.png b/src/app/src/main/res/drawable-hdpi/icon_app.png similarity index 100% rename from src/Notes-master/app/src/main/res/drawable-hdpi/icon_app.png rename to src/app/src/main/res/drawable-hdpi/icon_app.png diff --git a/src/Notes-master/app/src/main/res/drawable-hdpi/list_background.png b/src/app/src/main/res/drawable-hdpi/list_background.png similarity index 100% rename from src/Notes-master/app/src/main/res/drawable-hdpi/list_background.png rename to src/app/src/main/res/drawable-hdpi/list_background.png diff --git a/src/Notes-master/app/src/main/res/drawable-hdpi/list_blue_down.9.png b/src/app/src/main/res/drawable-hdpi/list_blue_down.9.png similarity index 100% rename from src/Notes-master/app/src/main/res/drawable-hdpi/list_blue_down.9.png rename to src/app/src/main/res/drawable-hdpi/list_blue_down.9.png diff --git a/src/Notes-master/app/src/main/res/drawable-hdpi/list_blue_middle.9.png b/src/app/src/main/res/drawable-hdpi/list_blue_middle.9.png similarity index 100% rename from src/Notes-master/app/src/main/res/drawable-hdpi/list_blue_middle.9.png rename to src/app/src/main/res/drawable-hdpi/list_blue_middle.9.png diff --git a/src/Notes-master/app/src/main/res/drawable-hdpi/list_blue_single.9.png b/src/app/src/main/res/drawable-hdpi/list_blue_single.9.png similarity index 100% rename from src/Notes-master/app/src/main/res/drawable-hdpi/list_blue_single.9.png rename to src/app/src/main/res/drawable-hdpi/list_blue_single.9.png diff --git a/src/Notes-master/app/src/main/res/drawable-hdpi/list_blue_up.9.png b/src/app/src/main/res/drawable-hdpi/list_blue_up.9.png similarity index 100% rename from src/Notes-master/app/src/main/res/drawable-hdpi/list_blue_up.9.png rename to src/app/src/main/res/drawable-hdpi/list_blue_up.9.png diff --git a/src/Notes-master/app/src/main/res/drawable-hdpi/list_folder.9.png b/src/app/src/main/res/drawable-hdpi/list_folder.9.png similarity index 100% rename from src/Notes-master/app/src/main/res/drawable-hdpi/list_folder.9.png rename to src/app/src/main/res/drawable-hdpi/list_folder.9.png diff --git a/src/Notes-master/app/src/main/res/drawable-hdpi/list_footer_bg.9.png b/src/app/src/main/res/drawable-hdpi/list_footer_bg.9.png similarity index 100% rename from src/Notes-master/app/src/main/res/drawable-hdpi/list_footer_bg.9.png rename to src/app/src/main/res/drawable-hdpi/list_footer_bg.9.png diff --git a/src/Notes-master/app/src/main/res/drawable-hdpi/list_green_down.9.png b/src/app/src/main/res/drawable-hdpi/list_green_down.9.png similarity index 100% rename from src/Notes-master/app/src/main/res/drawable-hdpi/list_green_down.9.png rename to src/app/src/main/res/drawable-hdpi/list_green_down.9.png diff --git a/src/Notes-master/app/src/main/res/drawable-hdpi/list_green_middle.9.png b/src/app/src/main/res/drawable-hdpi/list_green_middle.9.png similarity index 100% rename from src/Notes-master/app/src/main/res/drawable-hdpi/list_green_middle.9.png rename to src/app/src/main/res/drawable-hdpi/list_green_middle.9.png diff --git a/src/Notes-master/app/src/main/res/drawable-hdpi/list_green_single.9.png b/src/app/src/main/res/drawable-hdpi/list_green_single.9.png similarity index 100% rename from src/Notes-master/app/src/main/res/drawable-hdpi/list_green_single.9.png rename to src/app/src/main/res/drawable-hdpi/list_green_single.9.png diff --git a/src/Notes-master/app/src/main/res/drawable-hdpi/list_green_up.9.png b/src/app/src/main/res/drawable-hdpi/list_green_up.9.png similarity index 100% rename from src/Notes-master/app/src/main/res/drawable-hdpi/list_green_up.9.png rename to src/app/src/main/res/drawable-hdpi/list_green_up.9.png diff --git a/src/Notes-master/app/src/main/res/drawable-hdpi/list_red_down.9.png b/src/app/src/main/res/drawable-hdpi/list_red_down.9.png similarity index 100% rename from src/Notes-master/app/src/main/res/drawable-hdpi/list_red_down.9.png rename to src/app/src/main/res/drawable-hdpi/list_red_down.9.png diff --git a/src/Notes-master/app/src/main/res/drawable-hdpi/list_red_middle.9.png b/src/app/src/main/res/drawable-hdpi/list_red_middle.9.png similarity index 100% rename from src/Notes-master/app/src/main/res/drawable-hdpi/list_red_middle.9.png rename to src/app/src/main/res/drawable-hdpi/list_red_middle.9.png diff --git a/src/Notes-master/app/src/main/res/drawable-hdpi/list_red_single.9.png b/src/app/src/main/res/drawable-hdpi/list_red_single.9.png similarity index 100% rename from src/Notes-master/app/src/main/res/drawable-hdpi/list_red_single.9.png rename to src/app/src/main/res/drawable-hdpi/list_red_single.9.png diff --git a/src/Notes-master/app/src/main/res/drawable-hdpi/list_red_up.9.png b/src/app/src/main/res/drawable-hdpi/list_red_up.9.png similarity index 100% rename from src/Notes-master/app/src/main/res/drawable-hdpi/list_red_up.9.png rename to src/app/src/main/res/drawable-hdpi/list_red_up.9.png diff --git a/src/Notes-master/app/src/main/res/drawable-hdpi/list_white_down.9.png b/src/app/src/main/res/drawable-hdpi/list_white_down.9.png similarity index 100% rename from src/Notes-master/app/src/main/res/drawable-hdpi/list_white_down.9.png rename to src/app/src/main/res/drawable-hdpi/list_white_down.9.png diff --git a/src/Notes-master/app/src/main/res/drawable-hdpi/list_white_middle.9.png b/src/app/src/main/res/drawable-hdpi/list_white_middle.9.png similarity index 100% rename from src/Notes-master/app/src/main/res/drawable-hdpi/list_white_middle.9.png rename to src/app/src/main/res/drawable-hdpi/list_white_middle.9.png diff --git a/src/Notes-master/app/src/main/res/drawable-hdpi/list_white_single.9.png b/src/app/src/main/res/drawable-hdpi/list_white_single.9.png similarity index 100% rename from src/Notes-master/app/src/main/res/drawable-hdpi/list_white_single.9.png rename to src/app/src/main/res/drawable-hdpi/list_white_single.9.png diff --git a/src/Notes-master/app/src/main/res/drawable-hdpi/list_white_up.9.png b/src/app/src/main/res/drawable-hdpi/list_white_up.9.png similarity index 100% rename from src/Notes-master/app/src/main/res/drawable-hdpi/list_white_up.9.png rename to src/app/src/main/res/drawable-hdpi/list_white_up.9.png diff --git a/src/Notes-master/app/src/main/res/drawable-hdpi/list_yellow_down.9.png b/src/app/src/main/res/drawable-hdpi/list_yellow_down.9.png similarity index 100% rename from src/Notes-master/app/src/main/res/drawable-hdpi/list_yellow_down.9.png rename to src/app/src/main/res/drawable-hdpi/list_yellow_down.9.png diff --git a/src/Notes-master/app/src/main/res/drawable-hdpi/list_yellow_middle.9.png b/src/app/src/main/res/drawable-hdpi/list_yellow_middle.9.png similarity index 100% rename from src/Notes-master/app/src/main/res/drawable-hdpi/list_yellow_middle.9.png rename to src/app/src/main/res/drawable-hdpi/list_yellow_middle.9.png diff --git a/src/Notes-master/app/src/main/res/drawable-hdpi/list_yellow_single.9.png b/src/app/src/main/res/drawable-hdpi/list_yellow_single.9.png similarity index 100% rename from src/Notes-master/app/src/main/res/drawable-hdpi/list_yellow_single.9.png rename to src/app/src/main/res/drawable-hdpi/list_yellow_single.9.png diff --git a/src/Notes-master/app/src/main/res/drawable-hdpi/list_yellow_up.9.png b/src/app/src/main/res/drawable-hdpi/list_yellow_up.9.png similarity index 100% rename from src/Notes-master/app/src/main/res/drawable-hdpi/list_yellow_up.9.png rename to src/app/src/main/res/drawable-hdpi/list_yellow_up.9.png diff --git a/src/Notes-master/app/src/main/res/drawable-hdpi/menu_delete.png b/src/app/src/main/res/drawable-hdpi/menu_delete.png similarity index 100% rename from src/Notes-master/app/src/main/res/drawable-hdpi/menu_delete.png rename to src/app/src/main/res/drawable-hdpi/menu_delete.png diff --git a/src/Notes-master/app/src/main/res/drawable-hdpi/menu_move.png b/src/app/src/main/res/drawable-hdpi/menu_move.png similarity index 100% rename from src/Notes-master/app/src/main/res/drawable-hdpi/menu_move.png rename to src/app/src/main/res/drawable-hdpi/menu_move.png diff --git a/src/Notes-master/app/src/main/res/drawable-hdpi/new_note_normal.png b/src/app/src/main/res/drawable-hdpi/new_note_normal.png similarity index 100% rename from src/Notes-master/app/src/main/res/drawable-hdpi/new_note_normal.png rename to src/app/src/main/res/drawable-hdpi/new_note_normal.png diff --git a/src/Notes-master/app/src/main/res/drawable-hdpi/new_note_pressed.png b/src/app/src/main/res/drawable-hdpi/new_note_pressed.png similarity index 100% rename from src/Notes-master/app/src/main/res/drawable-hdpi/new_note_pressed.png rename to src/app/src/main/res/drawable-hdpi/new_note_pressed.png diff --git a/src/Notes-master/app/src/main/res/drawable-hdpi/note_edit_color_selector_panel.png b/src/app/src/main/res/drawable-hdpi/note_edit_color_selector_panel.png similarity index 100% rename from src/Notes-master/app/src/main/res/drawable-hdpi/note_edit_color_selector_panel.png rename to src/app/src/main/res/drawable-hdpi/note_edit_color_selector_panel.png diff --git a/src/Notes-master/app/src/main/res/drawable-hdpi/notification.png b/src/app/src/main/res/drawable-hdpi/notification.png similarity index 100% rename from src/Notes-master/app/src/main/res/drawable-hdpi/notification.png rename to src/app/src/main/res/drawable-hdpi/notification.png diff --git a/src/Notes-master/app/src/main/res/drawable-hdpi/search_result.png b/src/app/src/main/res/drawable-hdpi/search_result.png similarity index 100% rename from src/Notes-master/app/src/main/res/drawable-hdpi/search_result.png rename to src/app/src/main/res/drawable-hdpi/search_result.png diff --git a/src/Notes-master/app/src/main/res/drawable-hdpi/selected.png b/src/app/src/main/res/drawable-hdpi/selected.png similarity index 100% rename from src/Notes-master/app/src/main/res/drawable-hdpi/selected.png rename to src/app/src/main/res/drawable-hdpi/selected.png diff --git a/src/Notes-master/app/src/main/res/drawable-hdpi/title_alert.png b/src/app/src/main/res/drawable-hdpi/title_alert.png similarity index 100% rename from src/Notes-master/app/src/main/res/drawable-hdpi/title_alert.png rename to src/app/src/main/res/drawable-hdpi/title_alert.png diff --git a/src/Notes-master/app/src/main/res/drawable-hdpi/title_bar_bg.9.png b/src/app/src/main/res/drawable-hdpi/title_bar_bg.9.png similarity index 100% rename from src/Notes-master/app/src/main/res/drawable-hdpi/title_bar_bg.9.png rename to src/app/src/main/res/drawable-hdpi/title_bar_bg.9.png diff --git a/src/Notes-master/app/src/main/res/drawable-hdpi/widget_2x_blue.png b/src/app/src/main/res/drawable-hdpi/widget_2x_blue.png similarity index 100% rename from src/Notes-master/app/src/main/res/drawable-hdpi/widget_2x_blue.png rename to src/app/src/main/res/drawable-hdpi/widget_2x_blue.png diff --git a/src/Notes-master/app/src/main/res/drawable-hdpi/widget_2x_green.png b/src/app/src/main/res/drawable-hdpi/widget_2x_green.png similarity index 100% rename from src/Notes-master/app/src/main/res/drawable-hdpi/widget_2x_green.png rename to src/app/src/main/res/drawable-hdpi/widget_2x_green.png diff --git a/src/Notes-master/app/src/main/res/drawable-hdpi/widget_2x_red.png b/src/app/src/main/res/drawable-hdpi/widget_2x_red.png similarity index 100% rename from src/Notes-master/app/src/main/res/drawable-hdpi/widget_2x_red.png rename to src/app/src/main/res/drawable-hdpi/widget_2x_red.png diff --git a/src/Notes-master/app/src/main/res/drawable-hdpi/widget_2x_white.png b/src/app/src/main/res/drawable-hdpi/widget_2x_white.png similarity index 100% rename from src/Notes-master/app/src/main/res/drawable-hdpi/widget_2x_white.png rename to src/app/src/main/res/drawable-hdpi/widget_2x_white.png diff --git a/src/Notes-master/app/src/main/res/drawable-hdpi/widget_2x_yellow.png b/src/app/src/main/res/drawable-hdpi/widget_2x_yellow.png similarity index 100% rename from src/Notes-master/app/src/main/res/drawable-hdpi/widget_2x_yellow.png rename to src/app/src/main/res/drawable-hdpi/widget_2x_yellow.png diff --git a/src/Notes-master/app/src/main/res/drawable-hdpi/widget_4x_blue.png b/src/app/src/main/res/drawable-hdpi/widget_4x_blue.png similarity index 100% rename from src/Notes-master/app/src/main/res/drawable-hdpi/widget_4x_blue.png rename to src/app/src/main/res/drawable-hdpi/widget_4x_blue.png diff --git a/src/Notes-master/app/src/main/res/drawable-hdpi/widget_4x_green.png b/src/app/src/main/res/drawable-hdpi/widget_4x_green.png similarity index 100% rename from src/Notes-master/app/src/main/res/drawable-hdpi/widget_4x_green.png rename to src/app/src/main/res/drawable-hdpi/widget_4x_green.png diff --git a/src/Notes-master/app/src/main/res/drawable-hdpi/widget_4x_red.png b/src/app/src/main/res/drawable-hdpi/widget_4x_red.png similarity index 100% rename from src/Notes-master/app/src/main/res/drawable-hdpi/widget_4x_red.png rename to src/app/src/main/res/drawable-hdpi/widget_4x_red.png diff --git a/src/Notes-master/app/src/main/res/drawable-hdpi/widget_4x_white.png b/src/app/src/main/res/drawable-hdpi/widget_4x_white.png similarity index 100% rename from src/Notes-master/app/src/main/res/drawable-hdpi/widget_4x_white.png rename to src/app/src/main/res/drawable-hdpi/widget_4x_white.png diff --git a/src/Notes-master/app/src/main/res/drawable-hdpi/widget_4x_yellow.png b/src/app/src/main/res/drawable-hdpi/widget_4x_yellow.png similarity index 100% rename from src/Notes-master/app/src/main/res/drawable-hdpi/widget_4x_yellow.png rename to src/app/src/main/res/drawable-hdpi/widget_4x_yellow.png diff --git a/src/Notes-master/app/src/main/res/drawable/new_note.xml b/src/app/src/main/res/drawable/new_note.xml similarity index 100% rename from src/Notes-master/app/src/main/res/drawable/new_note.xml rename to src/app/src/main/res/drawable/new_note.xml diff --git a/src/Notes-master/app/src/main/res/layout/account_dialog_title.xml b/src/app/src/main/res/layout/account_dialog_title.xml similarity index 100% rename from src/Notes-master/app/src/main/res/layout/account_dialog_title.xml rename to src/app/src/main/res/layout/account_dialog_title.xml diff --git a/src/Notes-master/app/src/main/res/layout/add_account_text.xml b/src/app/src/main/res/layout/add_account_text.xml similarity index 100% rename from src/Notes-master/app/src/main/res/layout/add_account_text.xml rename to src/app/src/main/res/layout/add_account_text.xml diff --git a/src/Notes-master/app/src/main/res/layout/datetime_picker.xml b/src/app/src/main/res/layout/datetime_picker.xml similarity index 100% rename from src/Notes-master/app/src/main/res/layout/datetime_picker.xml rename to src/app/src/main/res/layout/datetime_picker.xml diff --git a/src/Notes-master/app/src/main/res/layout/dialog_edit_text.xml b/src/app/src/main/res/layout/dialog_edit_text.xml similarity index 100% rename from src/Notes-master/app/src/main/res/layout/dialog_edit_text.xml rename to src/app/src/main/res/layout/dialog_edit_text.xml diff --git a/src/Notes-master/app/src/main/res/layout/folder_list_item.xml b/src/app/src/main/res/layout/folder_list_item.xml similarity index 100% rename from src/Notes-master/app/src/main/res/layout/folder_list_item.xml rename to src/app/src/main/res/layout/folder_list_item.xml diff --git a/src/Notes-master/app/src/main/res/layout/note_edit.xml b/src/app/src/main/res/layout/note_edit.xml similarity index 100% rename from src/Notes-master/app/src/main/res/layout/note_edit.xml rename to src/app/src/main/res/layout/note_edit.xml diff --git a/src/Notes-master/app/src/main/res/layout/note_edit_list_item.xml b/src/app/src/main/res/layout/note_edit_list_item.xml similarity index 100% rename from src/Notes-master/app/src/main/res/layout/note_edit_list_item.xml rename to src/app/src/main/res/layout/note_edit_list_item.xml diff --git a/src/Notes-master/app/src/main/res/layout/note_item.xml b/src/app/src/main/res/layout/note_item.xml similarity index 100% rename from src/Notes-master/app/src/main/res/layout/note_item.xml rename to src/app/src/main/res/layout/note_item.xml diff --git a/src/Notes-master/app/src/main/res/layout/note_list.xml b/src/app/src/main/res/layout/note_list.xml similarity index 100% rename from src/Notes-master/app/src/main/res/layout/note_list.xml rename to src/app/src/main/res/layout/note_list.xml diff --git a/src/Notes-master/app/src/main/res/layout/note_list_dropdown_menu.xml b/src/app/src/main/res/layout/note_list_dropdown_menu.xml similarity index 100% rename from src/Notes-master/app/src/main/res/layout/note_list_dropdown_menu.xml rename to src/app/src/main/res/layout/note_list_dropdown_menu.xml diff --git a/src/Notes-master/app/src/main/res/layout/note_list_footer.xml b/src/app/src/main/res/layout/note_list_footer.xml similarity index 100% rename from src/Notes-master/app/src/main/res/layout/note_list_footer.xml rename to src/app/src/main/res/layout/note_list_footer.xml diff --git a/src/Notes-master/app/src/main/res/layout/settings_header.xml b/src/app/src/main/res/layout/settings_header.xml similarity index 100% rename from src/Notes-master/app/src/main/res/layout/settings_header.xml rename to src/app/src/main/res/layout/settings_header.xml diff --git a/src/Notes-master/app/src/main/res/layout/widget_2x.xml b/src/app/src/main/res/layout/widget_2x.xml similarity index 100% rename from src/Notes-master/app/src/main/res/layout/widget_2x.xml rename to src/app/src/main/res/layout/widget_2x.xml diff --git a/src/Notes-master/app/src/main/res/layout/widget_4x.xml b/src/app/src/main/res/layout/widget_4x.xml similarity index 100% rename from src/Notes-master/app/src/main/res/layout/widget_4x.xml rename to src/app/src/main/res/layout/widget_4x.xml diff --git a/src/Notes-master/app/src/main/res/menu/call_note_edit.xml b/src/app/src/main/res/menu/call_note_edit.xml similarity index 100% rename from src/Notes-master/app/src/main/res/menu/call_note_edit.xml rename to src/app/src/main/res/menu/call_note_edit.xml diff --git a/src/Notes-master/app/src/main/res/menu/call_record_folder.xml b/src/app/src/main/res/menu/call_record_folder.xml similarity index 100% rename from src/Notes-master/app/src/main/res/menu/call_record_folder.xml rename to src/app/src/main/res/menu/call_record_folder.xml diff --git a/src/Notes-master/app/src/main/res/menu/note_edit.xml b/src/app/src/main/res/menu/note_edit.xml similarity index 100% rename from src/Notes-master/app/src/main/res/menu/note_edit.xml rename to src/app/src/main/res/menu/note_edit.xml diff --git a/src/Notes-master/app/src/main/res/menu/note_list.xml b/src/app/src/main/res/menu/note_list.xml similarity index 100% rename from src/Notes-master/app/src/main/res/menu/note_list.xml rename to src/app/src/main/res/menu/note_list.xml diff --git a/src/Notes-master/app/src/main/res/menu/note_list_dropdown.xml b/src/app/src/main/res/menu/note_list_dropdown.xml similarity index 100% rename from src/Notes-master/app/src/main/res/menu/note_list_dropdown.xml rename to src/app/src/main/res/menu/note_list_dropdown.xml diff --git a/src/Notes-master/app/src/main/res/menu/note_list_options.xml b/src/app/src/main/res/menu/note_list_options.xml similarity index 100% rename from src/Notes-master/app/src/main/res/menu/note_list_options.xml rename to src/app/src/main/res/menu/note_list_options.xml diff --git a/src/Notes-master/app/src/main/res/menu/sub_folder.xml b/src/app/src/main/res/menu/sub_folder.xml similarity index 100% rename from src/Notes-master/app/src/main/res/menu/sub_folder.xml rename to src/app/src/main/res/menu/sub_folder.xml diff --git a/src/Notes-master/app/src/main/res/raw-zh-rCN/introduction b/src/app/src/main/res/raw-zh-rCN/introduction similarity index 100% rename from src/Notes-master/app/src/main/res/raw-zh-rCN/introduction rename to src/app/src/main/res/raw-zh-rCN/introduction diff --git a/src/Notes-master/app/src/main/res/raw/introduction b/src/app/src/main/res/raw/introduction similarity index 100% rename from src/Notes-master/app/src/main/res/raw/introduction rename to src/app/src/main/res/raw/introduction diff --git a/src/Notes-master/app/src/main/res/values-zh-rCN/arrays.xml b/src/app/src/main/res/values-zh-rCN/arrays.xml similarity index 100% rename from src/Notes-master/app/src/main/res/values-zh-rCN/arrays.xml rename to src/app/src/main/res/values-zh-rCN/arrays.xml diff --git a/src/Notes-master/app/src/main/res/values-zh-rCN/strings.xml b/src/app/src/main/res/values-zh-rCN/strings.xml similarity index 100% rename from src/Notes-master/app/src/main/res/values-zh-rCN/strings.xml rename to src/app/src/main/res/values-zh-rCN/strings.xml diff --git a/src/Notes-master/app/src/main/res/values-zh-rTW/arrays.xml b/src/app/src/main/res/values-zh-rTW/arrays.xml similarity index 100% rename from src/Notes-master/app/src/main/res/values-zh-rTW/arrays.xml rename to src/app/src/main/res/values-zh-rTW/arrays.xml diff --git a/src/Notes-master/app/src/main/res/values-zh-rTW/strings.xml b/src/app/src/main/res/values-zh-rTW/strings.xml similarity index 100% rename from src/Notes-master/app/src/main/res/values-zh-rTW/strings.xml rename to src/app/src/main/res/values-zh-rTW/strings.xml diff --git a/src/Notes-master/app/src/main/res/values/arrays.xml b/src/app/src/main/res/values/arrays.xml similarity index 100% rename from src/Notes-master/app/src/main/res/values/arrays.xml rename to src/app/src/main/res/values/arrays.xml diff --git a/src/Notes-master/app/src/main/res/values/colors.xml b/src/app/src/main/res/values/colors.xml similarity index 100% rename from src/Notes-master/app/src/main/res/values/colors.xml rename to src/app/src/main/res/values/colors.xml diff --git a/src/Notes-master/app/src/main/res/values/dimens.xml b/src/app/src/main/res/values/dimens.xml similarity index 100% rename from src/Notes-master/app/src/main/res/values/dimens.xml rename to src/app/src/main/res/values/dimens.xml diff --git a/src/Notes-master/app/src/main/res/values/strings.xml b/src/app/src/main/res/values/strings.xml similarity index 100% rename from src/Notes-master/app/src/main/res/values/strings.xml rename to src/app/src/main/res/values/strings.xml diff --git a/src/Notes-master/app/src/main/res/values/styles.xml b/src/app/src/main/res/values/styles.xml similarity index 100% rename from src/Notes-master/app/src/main/res/values/styles.xml rename to src/app/src/main/res/values/styles.xml diff --git a/src/Notes-master/app/src/main/res/xml/preferences.xml b/src/app/src/main/res/xml/preferences.xml similarity index 100% rename from src/Notes-master/app/src/main/res/xml/preferences.xml rename to src/app/src/main/res/xml/preferences.xml diff --git a/src/Notes-master/app/src/main/res/xml/searchable.xml b/src/app/src/main/res/xml/searchable.xml similarity index 100% rename from src/Notes-master/app/src/main/res/xml/searchable.xml rename to src/app/src/main/res/xml/searchable.xml diff --git a/src/Notes-master/app/src/main/res/xml/widget_2x_info.xml b/src/app/src/main/res/xml/widget_2x_info.xml similarity index 100% rename from src/Notes-master/app/src/main/res/xml/widget_2x_info.xml rename to src/app/src/main/res/xml/widget_2x_info.xml diff --git a/src/Notes-master/app/src/main/res/xml/widget_4x_info.xml b/src/app/src/main/res/xml/widget_4x_info.xml similarity index 100% rename from src/Notes-master/app/src/main/res/xml/widget_4x_info.xml rename to src/app/src/main/res/xml/widget_4x_info.xml diff --git a/src/Notes-master/build.gradle b/src/build.gradle similarity index 99% rename from src/Notes-master/build.gradle rename to src/build.gradle index 99857a6..77a1793 100644 --- a/src/Notes-master/build.gradle +++ b/src/build.gradle @@ -1,10 +1,9 @@ - // Top-level build file where you can add configuration options common to all sub-projects/modules. buildscript { repositories { - google()//add jcenter() + google()//add } dependencies { classpath 'com.android.tools.build:gradle:7.4.2' @@ -13,7 +12,7 @@ buildscript { allprojects { repositories { - google()//add jcenter() + google()//add } -} \ No newline at end of file +} diff --git a/src/gradle.properties b/src/gradle.properties deleted file mode 100644 index 0aaace3..0000000 --- a/src/gradle.properties +++ /dev/null @@ -1,3 +0,0 @@ -# Enable AndroidX and Jetifier -android.useAndroidX=true -android.enableJetifier=true diff --git a/src/Notes-master/gradle/wrapper/gradle-wrapper.jar b/src/gradle/wrapper/gradle-wrapper.jar similarity index 100% rename from src/Notes-master/gradle/wrapper/gradle-wrapper.jar rename to src/gradle/wrapper/gradle-wrapper.jar diff --git a/src/Notes-master/gradle/wrapper/gradle-wrapper.properties b/src/gradle/wrapper/gradle-wrapper.properties similarity index 100% rename from src/Notes-master/gradle/wrapper/gradle-wrapper.properties rename to src/gradle/wrapper/gradle-wrapper.properties diff --git a/src/Notes-master/gradlew b/src/gradlew similarity index 100% rename from src/Notes-master/gradlew rename to src/gradlew diff --git a/src/Notes-master/gradlew.bat b/src/gradlew.bat similarity index 100% rename from src/Notes-master/gradlew.bat rename to src/gradlew.bat diff --git a/src/Notes-master/import-summary.txt b/src/import-summary.txt similarity index 100% rename from src/Notes-master/import-summary.txt rename to src/import-summary.txt diff --git a/src/Notes-master/local.properties b/src/local.properties similarity index 100% rename from src/Notes-master/local.properties rename to src/local.properties diff --git a/src/Notes-master/settings.gradle b/src/settings.gradle similarity index 100% rename from src/Notes-master/settings.gradle rename to src/settings.gradle