diff --git a/src/Notes-master/.gradle/8.0.2/executionHistory/executionHistory.bin b/src/Notes-master/.gradle/8.0.2/executionHistory/executionHistory.bin index b002101..a4050a1 100644 Binary files a/src/Notes-master/.gradle/8.0.2/executionHistory/executionHistory.bin and b/src/Notes-master/.gradle/8.0.2/executionHistory/executionHistory.bin 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 index ea225d5..877d71b 100644 Binary files a/src/Notes-master/.gradle/8.0.2/executionHistory/executionHistory.lock and b/src/Notes-master/.gradle/8.0.2/executionHistory/executionHistory.lock differ diff --git a/src/Notes-master/.gradle/8.0.2/fileHashes/fileHashes.bin b/src/Notes-master/.gradle/8.0.2/fileHashes/fileHashes.bin index 53ffc04..9ae633a 100644 Binary files a/src/Notes-master/.gradle/8.0.2/fileHashes/fileHashes.bin and b/src/Notes-master/.gradle/8.0.2/fileHashes/fileHashes.bin 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 index e6ca08d..8431ebb 100644 Binary files a/src/Notes-master/.gradle/8.0.2/fileHashes/fileHashes.lock and b/src/Notes-master/.gradle/8.0.2/fileHashes/fileHashes.lock differ diff --git a/src/Notes-master/.gradle/8.0.2/fileHashes/resourceHashesCache.bin b/src/Notes-master/.gradle/8.0.2/fileHashes/resourceHashesCache.bin index 0eba6fa..d1e5d23 100644 Binary files a/src/Notes-master/.gradle/8.0.2/fileHashes/resourceHashesCache.bin and b/src/Notes-master/.gradle/8.0.2/fileHashes/resourceHashesCache.bin differ diff --git a/src/Notes-master/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/src/Notes-master/.gradle/buildOutputCleanup/buildOutputCleanup.lock index 9356a87..dfd8515 100644 Binary files a/src/Notes-master/.gradle/buildOutputCleanup/buildOutputCleanup.lock and b/src/Notes-master/.gradle/buildOutputCleanup/buildOutputCleanup.lock differ diff --git a/src/Notes-master/.gradle/buildOutputCleanup/outputFiles.bin b/src/Notes-master/.gradle/buildOutputCleanup/outputFiles.bin index e88d24f..9e48b53 100644 Binary files a/src/Notes-master/.gradle/buildOutputCleanup/outputFiles.bin and b/src/Notes-master/.gradle/buildOutputCleanup/outputFiles.bin differ diff --git a/src/Notes-master/.gradle/file-system.probe b/src/Notes-master/.gradle/file-system.probe index 1088f80..8952541 100644 Binary files a/src/Notes-master/.gradle/file-system.probe and b/src/Notes-master/.gradle/file-system.probe differ diff --git a/src/Notes-master/app/build/intermediates/apk/debug/app-debug.apk b/src/Notes-master/app/build/intermediates/apk/debug/app-debug.apk index f104e85..08a09c2 100644 Binary files a/src/Notes-master/app/build/intermediates/apk/debug/app-debug.apk and b/src/Notes-master/app/build/intermediates/apk/debug/app-debug.apk 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 index 4d30c7b..925e5cb 100644 Binary files a/src/Notes-master/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_0/graph.bin and b/src/Notes-master/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_0/graph.bin 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 index b9925ef..c600316 100644 Binary files a/src/Notes-master/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_1/graph.bin and b/src/Notes-master/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_4/graph.bin b/src/Notes-master/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_4/graph.bin index fdc14db..c115c17 100644 Binary files a/src/Notes-master/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_4/graph.bin and b/src/Notes-master/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_4/graph.bin 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 index 772924b..17483fc 100644 Binary files a/src/Notes-master/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_5/graph.bin and b/src/Notes-master/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_5/graph.bin 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 index eeb4b12..5d56e01 100644 Binary files a/src/Notes-master/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_6/graph.bin and b/src/Notes-master/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_6/graph.bin 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 index abdbf75..1db3e80 100644 Binary files a/src/Notes-master/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_7/graph.bin and b/src/Notes-master/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_7/graph.bin differ diff --git a/src/Notes-master/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_6d0ab88516da0327d26fa9577517adff11f6527d4d72cadc3c35ea0cb5a99197_bucket_0/graph.bin b/src/Notes-master/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_6d0ab88516da0327d26fa9577517adff11f6527d4d72cadc3c35ea0cb5a99197_bucket_0/graph.bin deleted file mode 100644 index 601f245..0000000 Binary files a/src/Notes-master/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_6d0ab88516da0327d26fa9577517adff11f6527d4d72cadc3c35ea0cb5a99197_bucket_0/graph.bin and /dev/null differ diff --git a/src/Notes-master/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_6d0ab88516da0327d26fa9577517adff11f6527d4d72cadc3c35ea0cb5a99197_bucket_1/graph.bin b/src/Notes-master/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_6d0ab88516da0327d26fa9577517adff11f6527d4d72cadc3c35ea0cb5a99197_bucket_1/graph.bin deleted file mode 100644 index 601f245..0000000 Binary files a/src/Notes-master/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_6d0ab88516da0327d26fa9577517adff11f6527d4d72cadc3c35ea0cb5a99197_bucket_1/graph.bin and /dev/null differ diff --git a/src/Notes-master/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_6d0ab88516da0327d26fa9577517adff11f6527d4d72cadc3c35ea0cb5a99197_bucket_2/graph.bin b/src/Notes-master/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_6d0ab88516da0327d26fa9577517adff11f6527d4d72cadc3c35ea0cb5a99197_bucket_2/graph.bin deleted file mode 100644 index 601f245..0000000 Binary files a/src/Notes-master/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_6d0ab88516da0327d26fa9577517adff11f6527d4d72cadc3c35ea0cb5a99197_bucket_2/graph.bin and /dev/null differ diff --git a/src/Notes-master/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_6d0ab88516da0327d26fa9577517adff11f6527d4d72cadc3c35ea0cb5a99197_bucket_3/graph.bin b/src/Notes-master/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_6d0ab88516da0327d26fa9577517adff11f6527d4d72cadc3c35ea0cb5a99197_bucket_3/graph.bin deleted file mode 100644 index 601f245..0000000 Binary files a/src/Notes-master/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_6d0ab88516da0327d26fa9577517adff11f6527d4d72cadc3c35ea0cb5a99197_bucket_3/graph.bin and /dev/null differ diff --git a/src/Notes-master/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_6d0ab88516da0327d26fa9577517adff11f6527d4d72cadc3c35ea0cb5a99197_bucket_4/graph.bin b/src/Notes-master/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_6d0ab88516da0327d26fa9577517adff11f6527d4d72cadc3c35ea0cb5a99197_bucket_4/graph.bin deleted file mode 100644 index 601f245..0000000 Binary files a/src/Notes-master/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_6d0ab88516da0327d26fa9577517adff11f6527d4d72cadc3c35ea0cb5a99197_bucket_4/graph.bin and /dev/null differ diff --git a/src/Notes-master/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_6d0ab88516da0327d26fa9577517adff11f6527d4d72cadc3c35ea0cb5a99197_bucket_5/graph.bin b/src/Notes-master/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_6d0ab88516da0327d26fa9577517adff11f6527d4d72cadc3c35ea0cb5a99197_bucket_5/graph.bin deleted file mode 100644 index 601f245..0000000 Binary files a/src/Notes-master/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_6d0ab88516da0327d26fa9577517adff11f6527d4d72cadc3c35ea0cb5a99197_bucket_5/graph.bin and /dev/null differ diff --git a/src/Notes-master/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_6d0ab88516da0327d26fa9577517adff11f6527d4d72cadc3c35ea0cb5a99197_bucket_6/graph.bin b/src/Notes-master/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_6d0ab88516da0327d26fa9577517adff11f6527d4d72cadc3c35ea0cb5a99197_bucket_6/graph.bin deleted file mode 100644 index 601f245..0000000 Binary files a/src/Notes-master/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_6d0ab88516da0327d26fa9577517adff11f6527d4d72cadc3c35ea0cb5a99197_bucket_6/graph.bin and /dev/null differ diff --git a/src/Notes-master/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_6d0ab88516da0327d26fa9577517adff11f6527d4d72cadc3c35ea0cb5a99197_bucket_7/graph.bin b/src/Notes-master/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_6d0ab88516da0327d26fa9577517adff11f6527d4d72cadc3c35ea0cb5a99197_bucket_7/graph.bin deleted file mode 100644 index 601f245..0000000 Binary files a/src/Notes-master/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_6d0ab88516da0327d26fa9577517adff11f6527d4d72cadc3c35ea0cb5a99197_bucket_7/graph.bin and /dev/null differ diff --git a/src/Notes-master/app/build/intermediates/dex/debug/mergeDexDebug/classes.dex b/src/Notes-master/app/build/intermediates/dex/debug/mergeDexDebug/classes.dex index 29ad11a..baf6061 100644 Binary files a/src/Notes-master/app/build/intermediates/dex/debug/mergeDexDebug/classes.dex and b/src/Notes-master/app/build/intermediates/dex/debug/mergeDexDebug/classes.dex 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 index 1c2a78a..0b64d2b 100644 Binary files a/src/Notes-master/app/build/intermediates/dex_archive_input_jar_hashes/debug/out and b/src/Notes-master/app/build/intermediates/dex_archive_input_jar_hashes/debug/out 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 index 2df8078..ef0ab77 100644 --- 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 @@ -1,96 +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 +#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 index fb47cbf..13662dc 100644 --- a/src/Notes-master/app/build/intermediates/incremental/debug/mergeDebugResources/merger.xml +++ b/src/Notes-master/app/build/intermediates/incremental/debug/mergeDebugResources/merger.xml @@ -1,5 +1,5 @@ - + -%s --%s --%s @@ -7,11 +7,11 @@ Messaging Email - #335b5b5b33sp26sp20sp17sp14spNotesNotes 2x2Notes 4x4No associated note found, click to create associated note.Privacy mode，can not see note content...Add noteDelete reminder successfullySet reminderExpiredyyyyMMddMMMd kk:mmGot itTake a lookCallSend emailBrowse webOpen map/MIUI/notes/notes_%s.txt(%d)New FolderExport textSyncCancel syncingSettingsSearchDeleteMove to folder%d selectedNothing selected, the operation is invalidSelect allDeselect allFont sizeSmallMediumLargeSuperEnter check listLeave check listView folderDelete folderChange folder nameThe folder %1$s exist, please renameShareSend to homeRemind meDelete reminderSelect folderParent folderNote added to homeConfirm to delete folder and its notes?Delete selected notesConfirm to delete the selected %d notes?Confirm to delete this note?Have moved selected %1$d notes to %2$s folderSD card busy, not available nowExport failed, please check SD cardThe note is not existSorry, can not set clock on empty noteSorry, can not send and empty note to homeExport successfulExport failExport text file (%1$s) to SD (%2$s) directorySyncing notes...Sync is successfulSync is failedSync is canceledSync is successful with account %1$sSync failed, please check network and account settingsSync failed, internal error occursSync is canceledLogging into %1$s...Getting remote note list...Synchronize local notes with Google Task...SettingsSync accountSync notes with google taskLast sync time %1$syyyy-MM-dd hh:mm:ssAdd accountChange sync accountRemove sync accountCancelSync immediatelyCancel syncingCurrent account %1$sAll sync related information will be deleted, which may result in duplicated items sometimeSync notesPlease select a google account. Local notes will be synced with google task.Cannot change the account because sync is in progress%1$s has been set as the sync accountNew note background color randomDeleteCall notesInput nameSearching NotesSearch notesText in your notesNotessetcancel + #335b5b5b33sp26sp20sp17sp14spNotesNotes 2x2Notes 4x4No associated note found, click to create associated note.Privacy mode，can not see note content...Add noteDelete reminder successfullySet reminderExpiredyyyyMMddMMMd kk:mmGot itTake a lookCallSend emailBrowse webOpen map/MIUI/notes/notes_%s.txt(%d)New FolderExport textSyncCancel syncingSettingsSearchDeleteMove to folder%d selectedNothing selected, the operation is invalidSelect allDeselect allFont sizeSmallMediumLargeSuperEnter check listLeave check listView folderDelete folderChange folder nameThe folder %1$s exist, please renameShareSend to homeRemind meDelete reminderSelect folderParent folderNote added to homeConfirm to delete folder and its notes?Delete selected notesConfirm to delete the selected %d notes?Confirm to delete this note?Have moved selected %1$d notes to %2$s folderSD card busy, not available nowExport failed, please check SD cardThe note is not existSorry, can not set clock on empty noteSorry, can not send and empty note to homeExport successfulExport failExport text file (%1$s) to SD (%2$s) directorySyncing notes...Sync is successfulSync is failedSync is canceledSync is successful with account %1$sSync failed, please check network and account settingsSync failed, internal error occursSync is canceledLogging into %1$s...Getting remote note list...Synchronize local notes with Google Task...SettingsSync accountSync notes with google taskLast sync time %1$syyyy-MM-dd hh:mm:ssAdd accountChange sync accountRemove sync accountCancelSync immediatelyCancel syncingCurrent account %1$sAll sync related information will be deleted, which may result in duplicated items sometimeSync notesPlease select a google account. Local notes will be synced with google task.Cannot change the account because sync is in progress%1$s has been set as the sync accountNew note background color randomDeleteCall notesInput nameSearching NotesSearch notesText in your notesNotessetcancel %1$s result for \"%2$s\" %1$s results for \"%2$s\" - + 短信 邮件 - 便签便签2x2便签4x4没有关联内容，点击新建便签。访客模式下，便签内容不可见...新建便签成功删除提醒创建提醒已过期yyyyMMddMM月dd日 kk:mm知道了查看呼叫电话发送邮件浏览网页打开地图新建文件夹导出文本同步取消同步设置搜索删除移动到文件夹选中了 %d 项没有选中项，操作无效全选取消全选文字大小小正常大超大进入清单模式退出清单模式查看文件夹刪除文件夹修改文件夹名称文件夹 %1$s 已存在，请重新命名分享发送到桌面提醒我删除提醒选择文件夹上一级文件夹已添加到桌面删除确认要删除所选的 %d 条便签吗?确认要删除该条便签吗?确认删除文件夹及所包含的便签吗？已将所选 %1$d 条便签移到 %2$s 文件夹SD卡被占用，不能操作导出文本时发生错误，请检查SD卡要查看的便签不存在不能为空便签设置闹钟提醒不能将空便签发送到桌面导出成功导出失败已将文本文件(%1$s)输出至SD卡(%2$s)目录同步便签...同步成功同步失败同步已取消与%1$s同步成功同步失败，请检查网络和帐号设置同步失败，发生内部错误同步已取消登录%1$s...正在获取服务器便签列表...正在同步本地便签...设置同步账号与google task同步便签记录上次同步于 %1$s添加账号更换账号删除账号取消立即同步取消同步当前帐号 %1$s如更换同步帐号，过去的帐号同步信息将被清空，再次切换的同时可能会造成数据重复同步便签请选择google帐号，便签将与该帐号的google task内容同步。正在同步中，不能修改同步帐号同步帐号已设置为%1$s新建便签背景颜色随机删除通话便签请输入名称正在搜索便签搜索便签便签中的文字便签设置取消 + 便签便签2x2便签4x4没有关联内容，点击新建便签。访客模式下，便签内容不可见...新建便签成功删除提醒创建提醒已过期yyyyMMddMM月dd日 kk:mm知道了查看呼叫电话发送邮件浏览网页打开地图新建文件夹导出文本同步取消同步设置搜索删除移动到文件夹选中了 %d 项没有选中项，操作无效全选取消全选文字大小小正常大超大进入清单模式退出清单模式查看文件夹刪除文件夹修改文件夹名称文件夹 %1$s 已存在，请重新命名分享发送到桌面提醒我删除提醒选择文件夹上一级文件夹已添加到桌面删除确认要删除所选的 %d 条便签吗?确认要删除该条便签吗?确认删除文件夹及所包含的便签吗？已将所选 %1$d 条便签移到 %2$s 文件夹SD卡被占用，不能操作导出文本时发生错误，请检查SD卡要查看的便签不存在不能为空便签设置闹钟提醒不能将空便签发送到桌面导出成功导出失败已将文本文件(%1$s)输出至SD卡(%2$s)目录同步便签...同步成功同步失败同步已取消与%1$s同步成功同步失败，请检查网络和帐号设置同步失败，发生内部错误同步已取消登录%1$s...正在获取服务器便签列表...正在同步本地便签...设置同步账号与google task同步便签记录上次同步于 %1$s添加账号更换账号删除账号取消立即同步取消同步当前帐号 %1$s如更换同步帐号，过去的帐号同步信息将被清空，再次切换的同时可能会造成数据重复同步便签请选择google帐号，便签将与该帐号的google task内容同步。正在同步中，不能修改同步帐号同步帐号已设置为%1$s新建便签背景颜色随机删除通话便签请输入名称正在搜索便签搜索便签便签中的文字便签设置取消 %1$s 条符合“%2$s”的搜索结果 - + 短信 郵件 - 便簽便簽2x2便簽4x4沒有關聯內容，點擊新建便簽。訪客模式下，便籤內容不可見...新建便簽成功刪除提醒創建提醒已過期yyyyMMddMM月dd日 kk:mm知道了查看呼叫電話發送郵件浏覽網頁打開地圖已將所選 %1$d 便籤移到 %2$s 文件夾新建文件夾導出文本同步取消同步設置搜尋刪除移動到文件夾選中了 %d 項沒有選中項，操作無效全選取消全選文字大小小正常大超大進入清單模式退出清單模式查看文件夾刪除文件夾修改文件夾名稱文件夾 %1$s 已存在，請重新命名分享發送到桌面提醒我刪除提醒選擇文件夾上一級文件夾已添加到桌面刪除确认要刪除所選的 %d 條便籤嗎?确认要删除該條便籤嗎?確認刪除檔夾及所包含的便簽嗎？SD卡被佔用，不能操作導出TXT時發生錯誤，請檢查SD卡要查看的便籤不存在不能爲空便籤設置鬧鐘提醒不能將空便籤發送到桌面導出成功導出失敗已將文本文件(%1$s)導出至SD(%2$s)目錄同步便簽...同步成功同步失敗同步已取消與%1$s同步成功同步失敗，請檢查網絡和帳號設置同步失敗，發生內部錯誤同步已取消登陸%1$s...正在獲取服務器便籤列表...正在同步本地便籤...設置同步賬號与google task同步便簽記錄上次同步于 %1$s添加賬號更換賬號刪除賬號取消立即同步取消同步當前帳號 %1$s如更換同步帳號，過去的帳號同步信息將被清空，再次切換的同時可能會造成數據重復同步便簽請選擇google帳號，便簽將與該帳號的google task內容同步。正在同步中，不能修改同步帳號同步帳號已設置為%1$s新建便籤背景顏色隨機刪除通話便籤請輸入名稱正在搜索便籤搜索便籤便籤中的文字便籤設置取消 + 便簽便簽2x2便簽4x4沒有關聯內容，點擊新建便簽。訪客模式下，便籤內容不可見...新建便簽成功刪除提醒創建提醒已過期yyyyMMddMM月dd日 kk:mm知道了查看呼叫電話發送郵件浏覽網頁打開地圖已將所選 %1$d 便籤移到 %2$s 文件夾新建文件夾導出文本同步取消同步設置搜尋刪除移動到文件夾選中了 %d 項沒有選中項，操作無效全選取消全選文字大小小正常大超大進入清單模式退出清單模式查看文件夾刪除文件夾修改文件夾名稱文件夾 %1$s 已存在，請重新命名分享發送到桌面提醒我刪除提醒選擇文件夾上一級文件夾已添加到桌面刪除确认要刪除所選的 %d 條便籤嗎?确认要删除該條便籤嗎?確認刪除檔夾及所包含的便簽嗎？SD卡被佔用，不能操作導出TXT時發生錯誤，請檢查SD卡要查看的便籤不存在不能爲空便籤設置鬧鐘提醒不能將空便籤發送到桌面導出成功導出失敗已將文本文件(%1$s)導出至SD(%2$s)目錄同步便簽...同步成功同步失敗同步已取消與%1$s同步成功同步失敗，請檢查網絡和帳號設置同步失敗，發生內部錯誤同步已取消登陸%1$s...正在獲取服務器便籤列表...正在同步本地便籤...設置同步賬號与google task同步便簽記錄上次同步于 %1$s添加賬號更換賬號刪除賬號取消立即同步取消同步當前帳號 %1$s如更換同步帳號，過去的帳號同步信息將被清空，再次切換的同時可能會造成數據重復同步便簽請選擇google帳號，便簽將與該帳號的google task內容同步。正在同步中，不能修改同步帳號同步帳號已設置為%1$s新建便籤背景顏色隨機刪除通話便籤請輸入名稱正在搜索便籤搜索便籤便籤中的文字便籤設置取消 %1$s 條符合”%2$s“的搜尋結果 - \ No newline at end of file + \ No newline at end of file diff --git a/src/Notes-master/app/build/intermediates/incremental/mergeDebugAssets/merger.xml b/src/Notes-master/app/build/intermediates/incremental/mergeDebugAssets/merger.xml index 691e379..d59ecbd 100644 --- a/src/Notes-master/app/build/intermediates/incremental/mergeDebugAssets/merger.xml +++ b/src/Notes-master/app/build/intermediates/incremental/mergeDebugAssets/merger.xml @@ -1,2 +1,2 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/src/Notes-master/app/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml b/src/Notes-master/app/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml index 44d215b..f3a0615 100644 --- a/src/Notes-master/app/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml +++ b/src/Notes-master/app/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml @@ -1,2 +1,2 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/src/Notes-master/app/build/intermediates/incremental/mergeDebugShaders/merger.xml b/src/Notes-master/app/build/intermediates/incremental/mergeDebugShaders/merger.xml index f86983c..0c65c1b 100644 --- a/src/Notes-master/app/build/intermediates/incremental/mergeDebugShaders/merger.xml +++ b/src/Notes-master/app/build/intermediates/incremental/mergeDebugShaders/merger.xml @@ -1,2 +1,2 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/src/Notes-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 index 8a9daed..aeb412c 100644 --- 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 @@ -1,4 +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 +#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/javac/debug/classes/net/micode/notes/ui/AlarmAlertActivity.class b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/AlarmAlertActivity.class index 51317a3..a984d5b 100644 Binary files a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/AlarmAlertActivity.class and b/src/Notes-master/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/AlarmReceiver.class b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/AlarmReceiver.class index a41b775..7aa5322 100644 Binary files a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/AlarmReceiver.class and b/src/Notes-master/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$3.class b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$3.class index de51bad..d4087b3 100644 Binary files a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$3.class and b/src/Notes-master/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/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$4.class index d04cbe7..62776e0 100644 Binary files a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$4.class and b/src/Notes-master/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.class b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker.class index 505c291..fd993e7 100644 Binary files a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker.class and b/src/Notes-master/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/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePickerDialog$1.class index 415e755..9830ee9 100644 Binary files a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePickerDialog$1.class and b/src/Notes-master/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.class b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePickerDialog.class index 7f6cc71..84f7a6a 100644 Binary files a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePickerDialog.class and b/src/Notes-master/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/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DropdownMenu$1.class index ddd74fd..e4ce4a7 100644 Binary files a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DropdownMenu$1.class and b/src/Notes-master/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/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DropdownMenu.class index d805d20..1a9d966 100644 Binary files a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DropdownMenu.class and b/src/Notes-master/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/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/FoldersListAdapter$FolderListItem.class index 45d174e..a1dde4d 100644 Binary files a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/FoldersListAdapter$FolderListItem.class and b/src/Notes-master/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/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/FoldersListAdapter.class index 383f2f5..589495c 100644 Binary files a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/FoldersListAdapter.class and b/src/Notes-master/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/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$1.class index f7afcae..9d36124 100644 Binary files a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$1.class and b/src/Notes-master/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/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$2.class index 24c7362..74ee6d2 100644 Binary files a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$2.class and b/src/Notes-master/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/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$3.class index 1725d92..e629cb2 100644 Binary files a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$3.class and b/src/Notes-master/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.class b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity.class index 26e0ea0..8e74b9d 100644 Binary files a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity.class and b/src/Notes-master/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/widget/NoteWidgetProvider.class b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider.class index b06613f..b18ce0d 100644 Binary files a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider.class and b/src/Notes-master/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/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider_2x.class index b11cc4f..efc7fc3 100644 Binary files a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider_2x.class and b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider_2x.class differ 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 index 8af6076..16721d4 100644 --- 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 @@ -20,254 +20,254 @@ 20 android:versionName="0.1" > 21 22 D:\Notes-master\app\src\main\AndroidManifest.xml:23:5-44 +22-->D:\git\TeamProject\src\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 +23-->D:\git\TeamProject\src\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 +24-->D:\git\TeamProject\src\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 +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:\Notes-master\app\src\main\AndroidManifest.xml:26:5-88 -27-->D:\Notes-master\app\src\main\AndroidManifest.xml:26:22-85 +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:\Notes-master\app\src\main\AndroidManifest.xml:27:5-67 -28-->D:\Notes-master\app\src\main\AndroidManifest.xml:27:22-64 +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:\Notes-master\app\src\main\AndroidManifest.xml:28:5-72 -29-->D:\Notes-master\app\src\main\AndroidManifest.xml:28:22-69 +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:\Notes-master\app\src\main\AndroidManifest.xml:29:5-74 -30-->D:\Notes-master\app\src\main\AndroidManifest.xml:29:22-71 +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:\Notes-master\app\src\main\AndroidManifest.xml:30:5-80 -31-->D:\Notes-master\app\src\main\AndroidManifest.xml:30:22-77 +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:\Notes-master\app\src\main\AndroidManifest.xml:31:5-71 -32-->D:\Notes-master\app\src\main\AndroidManifest.xml:31:22-68 +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:\Notes-master\app\src\main\AndroidManifest.xml:32:5-74 -33-->D:\Notes-master\app\src\main\AndroidManifest.xml:32:22-71 +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:\Notes-master\app\src\main\AndroidManifest.xml:33:5-81 -34-->D:\Notes-master\app\src\main\AndroidManifest.xml:33:22-78 +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:\Notes-master\app\src\main\AndroidManifest.xml:35:5-149:19 +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:\Notes-master\app\src\main\AndroidManifest.xml:36:9-42 +38-->D:\git\TeamProject\src\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 +39-->D:\git\TeamProject\src\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 +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:\Notes-master\app\src\main\AndroidManifest.xml:39:13-49 +42-->D:\git\TeamProject\src\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 +43-->D:\git\TeamProject\src\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 +44-->D:\git\TeamProject\src\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 +45-->D:\git\TeamProject\src\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 +46-->D:\git\TeamProject\src\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 +47-->D:\git\TeamProject\src\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 +48-->D:\git\TeamProject\src\Notes-master\app\src\main\AndroidManifest.xml:45:13-52 49 -49-->D:\Notes-master\app\src\main\AndroidManifest.xml:47:13-50:29 +49-->D:\git\TeamProject\src\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 +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:\Notes-master\app\src\main\AndroidManifest.xml:49:17-77 -52-->D:\Notes-master\app\src\main\AndroidManifest.xml:49:27-74 +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:\Notes-master\app\src\main\AndroidManifest.xml:53:9-81:20 +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:\Notes-master\app\src\main\AndroidManifest.xml:54:13-48 +56-->D:\git\TeamProject\src\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 +57-->D:\git\TeamProject\src\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 +58-->D:\git\TeamProject\src\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 +59-->D:\git\TeamProject\src\Notes-master\app\src\main\AndroidManifest.xml:57:13-45 60 -60-->D:\Notes-master\app\src\main\AndroidManifest.xml:59:13-64:29 +60-->D:\git\TeamProject\src\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 +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:\Notes-master\app\src\main\AndroidManifest.xml:61:17-76 -63-->D:\Notes-master\app\src\main\AndroidManifest.xml:61:27-73 +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:\Notes-master\app\src\main\AndroidManifest.xml:62:17-78 -65-->D:\Notes-master\app\src\main\AndroidManifest.xml:62:23-75 +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:\Notes-master\app\src\main\AndroidManifest.xml:62:17-78 -66-->D:\Notes-master\app\src\main\AndroidManifest.xml:62:23-75 +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:\Notes-master\app\src\main\AndroidManifest.xml:66:13-71:29 +68-->D:\git\TeamProject\src\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 +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:\Notes-master\app\src\main\AndroidManifest.xml:61:17-76 -71-->D:\Notes-master\app\src\main\AndroidManifest.xml:61:27-73 +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:\Notes-master\app\src\main\AndroidManifest.xml:62:17-78 -73-->D:\Notes-master\app\src\main\AndroidManifest.xml:62:23-75 +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:\Notes-master\app\src\main\AndroidManifest.xml:62:17-78 -74-->D:\Notes-master\app\src\main\AndroidManifest.xml:62:23-75 +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:\Notes-master\app\src\main\AndroidManifest.xml:73:13-76:29 +76-->D:\git\TeamProject\src\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 +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:\Notes-master\app\src\main\AndroidManifest.xml:61:17-76 -79-->D:\Notes-master\app\src\main\AndroidManifest.xml:61:27-73 +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:\Notes-master\app\src\main\AndroidManifest.xml:78:13-80:54 +82-->D:\git\TeamProject\src\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 +83-->D:\git\TeamProject\src\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 +84-->D:\git\TeamProject\src\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 +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:\Notes-master\app\src\main\AndroidManifest.xml:84:13-63 +88-->D:\git\TeamProject\src\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 +89-->D:\git\TeamProject\src\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 +90-->D:\git\TeamProject\src\Notes-master\app\src\main\AndroidManifest.xml:86:13-40 91 92 D:\Notes-master\app\src\main\AndroidManifest.xml:88:9-100:20 +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:\Notes-master\app\src\main\AndroidManifest.xml:89:13-57 +93-->D:\git\TeamProject\src\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 +94-->D:\git\TeamProject\src\Notes-master\app\src\main\AndroidManifest.xml:90:13-50 95 -95-->D:\Notes-master\app\src\main\AndroidManifest.xml:91:13-95:29 +95-->D:\git\TeamProject\src\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 +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:\Notes-master\app\src\main\AndroidManifest.xml:93:17-85 -97-->D:\Notes-master\app\src\main\AndroidManifest.xml:93:25-82 +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:\Notes-master\app\src\main\AndroidManifest.xml:94:17-85 -98-->D:\Notes-master\app\src\main\AndroidManifest.xml:94:25-82 +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:\Notes-master\app\src\main\AndroidManifest.xml:97:13-99:58 +101-->D:\git\TeamProject\src\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 +102-->D:\git\TeamProject\src\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 +103-->D:\git\TeamProject\src\Notes-master\app\src\main\AndroidManifest.xml:99:17-55 104 105 D:\Notes-master\app\src\main\AndroidManifest.xml:101:9-114:20 +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:\Notes-master\app\src\main\AndroidManifest.xml:102:13-57 +106-->D:\git\TeamProject\src\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 +107-->D:\git\TeamProject\src\Notes-master\app\src\main\AndroidManifest.xml:103:13-50 108 -108-->D:\Notes-master\app\src\main\AndroidManifest.xml:91:13-95:29 +108-->D:\git\TeamProject\src\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 +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:\Notes-master\app\src\main\AndroidManifest.xml:93:17-85 -110-->D:\Notes-master\app\src\main\AndroidManifest.xml:93:25-82 +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:\Notes-master\app\src\main\AndroidManifest.xml:94:17-85 -111-->D:\Notes-master\app\src\main\AndroidManifest.xml:94:25-82 +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:\Notes-master\app\src\main\AndroidManifest.xml:97:13-99:58 +114-->D:\git\TeamProject\src\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 +115-->D:\git\TeamProject\src\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 +116-->D:\git\TeamProject\src\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 +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:\Notes-master\app\src\main\AndroidManifest.xml:117:13-119:29 +119-->D:\git\TeamProject\src\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 +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:\Notes-master\app\src\main\AndroidManifest.xml:122:9-125:20 +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:\Notes-master\app\src\main\AndroidManifest.xml:123:13-61 +124-->D:\git\TeamProject\src\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 +125-->D:\git\TeamProject\src\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 +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:\Notes-master\app\src\main\AndroidManifest.xml:128:13-50 +129-->D:\git\TeamProject\src\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 +130-->D:\git\TeamProject\src\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 +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:\Notes-master\app\src\main\AndroidManifest.xml:131:13-75 +132-->D:\git\TeamProject\src\Notes-master\app\src\main\AndroidManifest.xml:131:13-75 133 134 D:\Notes-master\app\src\main\AndroidManifest.xml:134:9-139:20 +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:\Notes-master\app\src\main\AndroidManifest.xml:135:13-71 +135-->D:\git\TeamProject\src\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 +136-->D:\git\TeamProject\src\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 +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:\Notes-master\app\src\main\AndroidManifest.xml:138:13-60 +138-->D:\git\TeamProject\src\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 +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:\Notes-master\app\src\main\AndroidManifest.xml:142:13-74 +142-->D:\git\TeamProject\src\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 +143-->D:\git\TeamProject\src\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 +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:\Notes-master\app\src\main\AndroidManifest.xml:147:13-58 +147-->D:\git\TeamProject\src\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 +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/merged_res_blame_folder/debug/out/multi-v2/debug.json b/src/Notes-master/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/debug.json index 8df0fc9..350834a 100644 --- a/src/Notes-master/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/debug.json +++ b/src/Notes-master/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:\\Notes-master\\app\\src\\main\\res\\values-zh-rCN\\arrays.xml", + "source": "D:\\git\\TeamProject\\src\\Notes-master\\app\\src\\main\\res\\values-zh-rCN\\arrays.xml", "from": { "startLines": "18", "startColumns": "4", @@ -23,7 +23,7 @@ } }, { - "source": "D:\\Notes-master\\app\\src\\main\\res\\values-zh-rCN\\strings.xml", + "source": "D:\\git\\TeamProject\\src\\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,24 +47,26 @@ "outputFile": "net.micode.notes.app-merged_res-5:/values_values.arsc.flat", "map": [ { - "source": "D:\\Notes-master\\app\\src\\main\\res\\values\\dimens.xml", + "source": "D:\\git\\TeamProject\\src\\Notes-master\\app\\src\\main\\res\\values\\strings.xml", "from": { - "startLines": "19,20,21,22,18", - "startColumns": "4,4,4,4,4", - "startOffsets": "764,816,869,922,712", - "endColumns": "51,52,52,51,51", - "endOffsets": "811,864,917,969,759" + "startLines": "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": "13,14,15,16,17", - "startColumns": "4,4,4,4,4", - "startOffsets": "477,529,582,635,687", - "endColumns": "51,52,52,51,51", - "endOffsets": "524,577,630,682,734" + "startLines": "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:\\Notes-master\\app\\src\\main\\res\\values\\colors.xml", + "source": "D:\\git\\TeamProject\\src\\Notes-master\\app\\src\\main\\res\\values\\colors.xml", "from": { "startLines": "18", "startColumns": "4", @@ -81,45 +83,24 @@ } }, { - "source": "D:\\Notes-master\\app\\src\\main\\res\\values\\strings.xml", - "from": { - "startLines": "128,72,75,74,73,19,20,21,118,119,127,126,26,81,82,80,79,78,94,93,92,84,39,38,64,29,30,85,41,76,120,71,67,42,48,53,43,63,62,61,57,56,54,55,58,59,49,70,60,68,47,52,51,50,66,46,65,44,45,69,28,34,36,33,35,32,31,25,24,101,100,104,116,109,108,110,111,113,112,102,103,107,105,106,99,114,115,125,123,122,124,27,83,91,96,95,97,90,89,88,87,22,23", - "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "8008,3898,4159,4063,3994,827,870,922,7506,7555,7950,7899,1282,4613,4707,4542,4458,4375,5574,5491,5389,4883,2004,1953,3397,1486,1539,4944,2097,4242,7618,3827,3582,2156,2471,2772,2214,3326,3265,3208,2986,2934,2831,2884,3036,3086,2518,3761,3146,3631,2424,2717,2629,2571,3520,2374,3475,2271,2314,3694,1431,1750,1858,1703,1805,1647,1599,1227,1174,6030,5963,6271,7409,6635,6554,6709,6798,7040,6961,6114,6189,6495,6335,6415,5908,7184,7306,7858,7731,7674,7784,1366,4815,5303,5709,5640,5789,5244,5189,5127,5067,974,1084", - "endLines": "132,72,75,74,73,19,20,21,118,119,127,126,26,81,82,80,79,78,94,93,92,84,39,38,64,29,30,85,41,76,120,71,67,42,48,53,43,63,62,61,57,56,54,55,58,59,49,70,60,68,47,52,51,50,66,46,65,44,45,69,28,34,36,33,35,32,31,25,24,101,100,104,116,109,108,110,111,113,112,102,103,107,105,106,99,114,115,125,123,122,124,27,83,91,96,95,97,90,89,88,87,22,23", - "endColumns": "14,95,82,95,68,42,51,51,48,62,57,50,83,93,107,70,83,82,65,82,101,60,61,50,77,52,59,104,58,101,54,70,48,57,46,58,56,70,60,56,49,51,52,49,49,59,52,65,61,62,46,54,87,57,61,49,44,42,59,66,54,54,52,46,52,55,47,54,52,83,66,63,95,73,80,88,162,143,78,74,81,58,79,79,54,121,102,40,52,56,73,64,67,85,79,68,93,58,54,61,59,109,89", - "endOffsets": "8412,3989,4237,4154,4058,865,917,969,7550,7613,8003,7945,1361,4702,4810,4608,4537,4453,5635,5569,5486,4939,2061,1999,3470,1534,1594,5044,2151,4339,7668,3893,3626,2209,2513,2826,2266,3392,3321,3260,3031,2981,2879,2929,3081,3141,2566,3822,3203,3689,2466,2767,2712,2624,3577,2419,3515,2309,2369,3756,1481,1800,1906,1745,1853,1698,1642,1277,1222,6109,6025,6330,7500,6704,6630,6793,6956,7179,7035,6184,6266,6549,6410,6490,5958,7301,7404,7894,7779,7726,7853,1426,4878,5384,5784,5704,5878,5298,5239,5184,5122,1079,1169" - }, - "to": { - "startLines": "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:\\Notes-master\\app\\src\\main\\res\\values\\styles.xml", + "source": "D:\\git\\TeamProject\\src\\Notes-master\\app\\src\\main\\res\\values\\dimens.xml", "from": { - "startLines": "50,55,64,60,22,26,30,35,40,18,45", - "startColumns": "4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "2062,2267,2640,2479,895,1078,1263,1449,1653,712,1860", - "endLines": "53,58,67,62,25,29,33,38,43,21,48", - "endColumns": "12,12,12,12,12,12,12,12,12,12,12", - "endOffsets": "2261,2473,2843,2634,1073,1258,1443,1647,1854,890,2056" + "startLines": "19,20,21,22,18", + "startColumns": "4,4,4,4,4", + "startOffsets": "764,816,869,922,712", + "endColumns": "51,52,52,51,51", + "endOffsets": "811,864,917,969,759" }, "to": { - "startLines": "125,129,133,137,140,144,148,152,156,160,164", - "startColumns": "4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "8124,8328,8539,8746,8906,9089,9274,9459,9662,9868,10051", - "endLines": "128,132,136,139,143,147,151,155,159,163,167", - "endColumns": "12,12,12,12,12,12,12,12,12,12,12", - "endOffsets": "8323,8534,8741,8901,9084,9269,9454,9657,9863,10046,10247" + "startLines": "13,14,15,16,17", + "startColumns": "4,4,4,4,4", + "startOffsets": "477,529,582,635,687", + "endColumns": "51,52,52,51,51", + "endOffsets": "524,577,630,682,734" } }, { - "source": "D:\\Notes-master\\app\\src\\main\\res\\values\\arrays.xml", + "source": "D:\\git\\TeamProject\\src\\Notes-master\\app\\src\\main\\res\\values\\arrays.xml", "from": { "startLines": "19,26", "startColumns": "4,4", @@ -136,6 +117,25 @@ "endColumns": "19,19", "endOffsets": "295,415" } + }, + { + "source": "D:\\git\\TeamProject\\src\\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", + "startOffsets": "2062,2267,2640,2479,895,1078,1263,1449,1653,712,1860", + "endLines": "53,58,67,62,25,29,33,38,43,21,48", + "endColumns": "12,12,12,12,12,12,12,12,12,12,12", + "endOffsets": "2261,2473,2843,2634,1073,1258,1443,1647,1854,890,2056" + }, + "to": { + "startLines": "125,129,133,137,140,144,148,152,156,160,164", + "startColumns": "4,4,4,4,4,4,4,4,4,4,4", + "startOffsets": "8124,8328,8539,8746,8906,9089,9274,9459,9662,9868,10051", + "endLines": "128,132,136,139,143,147,151,155,159,163,167", + "endColumns": "12,12,12,12,12,12,12,12,12,12,12", + "endOffsets": "8323,8534,8741,8901,9084,9269,9454,9657,9863,10046,10247" + } } ] }, @@ -143,26 +143,7 @@ "outputFile": "net.micode.notes.app-merged_res-5:/values-zh-rTW_values-zh-rTW.arsc.flat", "map": [ { - "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", - "startOffsets": "6507,3575,3509,3436,3386,827,867,915,6057,6102,6453,6403,1199,3835,3903,3776,3710,3647,4565,4505,4442,4035,2957,1369,1422,4089,1768,6159,3327,3114,1878,2159,2405,1931,2897,2844,2793,2598,2550,2456,2504,2644,2691,2202,3268,2741,3157,2116,2358,2302,2247,3059,2072,3017,1981,2022,3209,1318,1623,1719,1576,1672,1529,1484,1148,1095,4940,4881,5081,5982,5392,5323,5456,5534,5717,5644,5015,5268,5138,5203,4832,5821,5904,6365,6258,6210,6303,1261,3980,4383,4678,4620,4745,4335,4290,4242,4191,963,1029", - "endLines": "124,72,71,70,69,19,20,21,112,113,121,120,26,76,77,75,74,73,89,88,87,79,61,29,30,80,37,114,68,64,39,45,50,40,60,59,58,54,53,51,52,55,56,46,67,57,65,44,49,48,47,63,43,62,41,42,66,28,34,36,33,35,32,31,25,24,96,95,98,110,103,102,104,105,107,106,97,101,99,100,94,108,109,119,117,116,118,27,78,86,91,90,92,85,84,83,82,22,23", - "endColumns": "14,71,65,72,49,39,47,47,44,56,53,49,61,67,76,58,65,62,54,59,62,53,59,52,61,83,79,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65", - "endOffsets": "6679,3642,3570,3504,3431,862,910,958,6097,6154,6502,6448,1256,3898,3975,3830,3771,3705,4615,4560,4500,4084,3012,1417,1479,4168,1843,6204,3381,3152,1926,2197,2451,1976,2952,2892,2839,2639,2593,2499,2545,2686,2736,2242,3322,2788,3204,2154,2400,2353,2297,3109,2111,3054,2017,2067,3263,1364,1667,1763,1618,1714,1571,1524,1194,1143,5010,4935,5133,6051,5451,5387,5529,5639,5816,5712,5076,5318,5198,5263,4876,5899,5977,6398,6298,6253,6360,1313,4030,4437,4740,4673,4802,4378,4330,4285,4237,1024,1090" - }, - "to": { - "startLines": "6,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106", - "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "215,384,456,522,595,645,685,733,781,826,883,937,987,1049,1117,1194,1253,1319,1382,1437,1497,1560,1614,1674,1727,1789,1873,1953,2003,2062,2105,2158,2201,2252,2302,2362,2415,2466,2512,2560,2608,2654,2701,2751,2796,2855,2907,2959,3002,3049,3105,3160,3215,3259,3301,3342,3392,3451,3502,3551,3600,3647,3694,3741,3786,3837,3890,3965,4024,4081,4155,4219,4288,4366,4476,4580,4653,4719,4774,4839,4904,4953,5036,5114,5152,5197,5245,5307,5364,5419,5478,5545,5603,5665,5713,5758,5806,5857,5923", - "endLines": "8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106", - "endColumns": "14,71,65,72,49,39,47,47,44,56,53,49,61,67,76,58,65,62,54,59,62,53,59,52,61,83,79,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65", - "endOffsets": "379,451,517,590,640,680,728,776,821,878,932,982,1044,1112,1189,1248,1314,1377,1432,1492,1555,1609,1669,1722,1784,1868,1948,1998,2057,2100,2153,2196,2247,2297,2357,2410,2461,2507,2555,2603,2649,2696,2746,2791,2850,2902,2954,2997,3044,3100,3155,3210,3254,3296,3337,3387,3446,3497,3546,3595,3642,3689,3736,3781,3832,3885,3960,4019,4076,4150,4214,4283,4361,4471,4575,4648,4714,4769,4834,4899,4948,5031,5109,5147,5192,5240,5302,5359,5414,5473,5540,5598,5660,5708,5753,5801,5852,5918,5984" - } - }, - { - "source": "D:\\Notes-master\\app\\src\\main\\res\\values-zh-rTW\\arrays.xml", + "source": "D:\\git\\TeamProject\\src\\Notes-master\\app\\src\\main\\res\\values-zh-rTW\\arrays.xml", "from": { "startLines": "18", "startColumns": "4", @@ -179,6 +160,25 @@ "endColumns": "19", "endOffsets": "210" } + }, + { + "source": "D:\\git\\TeamProject\\src\\Notes-master\\app\\src\\main\\res\\values-zh-rTW\\strings.xml", + "from": { + "startLines": "122,72,71,70,69,19,20,21,112,113,121,120,26,76,77,75,74,73,89,88,87,79,61,29,30,80,37,114,68,64,39,45,50,40,60,59,58,54,53,51,52,55,56,46,67,57,65,44,49,48,47,63,43,62,41,42,66,28,34,36,33,35,32,31,25,24,96,95,98,110,103,102,104,105,107,106,97,101,99,100,94,108,109,119,117,116,118,27,78,86,91,90,92,85,84,83,82,22,23", + "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", + "startOffsets": "6507,3575,3509,3436,3386,827,867,915,6057,6102,6453,6403,1199,3835,3903,3776,3710,3647,4565,4505,4442,4035,2957,1369,1422,4089,1768,6159,3327,3114,1878,2159,2405,1931,2897,2844,2793,2598,2550,2456,2504,2644,2691,2202,3268,2741,3157,2116,2358,2302,2247,3059,2072,3017,1981,2022,3209,1318,1623,1719,1576,1672,1529,1484,1148,1095,4940,4881,5081,5982,5392,5323,5456,5534,5717,5644,5015,5268,5138,5203,4832,5821,5904,6365,6258,6210,6303,1261,3980,4383,4678,4620,4745,4335,4290,4242,4191,963,1029", + "endLines": "124,72,71,70,69,19,20,21,112,113,121,120,26,76,77,75,74,73,89,88,87,79,61,29,30,80,37,114,68,64,39,45,50,40,60,59,58,54,53,51,52,55,56,46,67,57,65,44,49,48,47,63,43,62,41,42,66,28,34,36,33,35,32,31,25,24,96,95,98,110,103,102,104,105,107,106,97,101,99,100,94,108,109,119,117,116,118,27,78,86,91,90,92,85,84,83,82,22,23", + "endColumns": "14,71,65,72,49,39,47,47,44,56,53,49,61,67,76,58,65,62,54,59,62,53,59,52,61,83,79,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65", + "endOffsets": "6679,3642,3570,3504,3431,862,910,958,6097,6154,6502,6448,1256,3898,3975,3830,3771,3705,4615,4560,4500,4084,3012,1417,1479,4168,1843,6204,3381,3152,1926,2197,2451,1976,2952,2892,2839,2639,2593,2499,2545,2686,2736,2242,3322,2788,3204,2154,2400,2353,2297,3109,2111,3054,2017,2067,3263,1364,1667,1763,1618,1714,1571,1524,1194,1143,5010,4935,5133,6051,5451,5387,5529,5639,5816,5712,5076,5318,5198,5263,4876,5899,5977,6398,6298,6253,6360,1313,4030,4437,4740,4673,4802,4378,4330,4285,4237,1024,1090" + }, + "to": { + "startLines": "6,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106", + "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", + "startOffsets": "215,384,456,522,595,645,685,733,781,826,883,937,987,1049,1117,1194,1253,1319,1382,1437,1497,1560,1614,1674,1727,1789,1873,1953,2003,2062,2105,2158,2201,2252,2302,2362,2415,2466,2512,2560,2608,2654,2701,2751,2796,2855,2907,2959,3002,3049,3105,3160,3215,3259,3301,3342,3392,3451,3502,3551,3600,3647,3694,3741,3786,3837,3890,3965,4024,4081,4155,4219,4288,4366,4476,4580,4653,4719,4774,4839,4904,4953,5036,5114,5152,5197,5245,5307,5364,5419,5478,5545,5603,5665,5713,5758,5806,5857,5923", + "endLines": "8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106", + "endColumns": "14,71,65,72,49,39,47,47,44,56,53,49,61,67,76,58,65,62,54,59,62,53,59,52,61,83,79,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65", + "endOffsets": "379,451,517,590,640,680,728,776,821,878,932,982,1044,1112,1189,1248,1314,1377,1432,1492,1555,1609,1669,1722,1784,1868,1948,1998,2057,2100,2153,2196,2247,2297,2357,2410,2461,2507,2555,2603,2649,2696,2746,2791,2850,2902,2954,2997,3044,3100,3155,3210,3254,3296,3337,3387,3446,3497,3546,3595,3642,3689,3736,3781,3832,3885,3960,4019,4076,4150,4214,4283,4361,4471,4575,4648,4714,4769,4834,4899,4948,5031,5109,5147,5192,5240,5302,5359,5414,5473,5540,5598,5660,5708,5753,5801,5852,5918,5984" + } } ] } diff --git a/src/Notes-master/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rCN.json b/src/Notes-master/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rCN.json index bacf78a..df47d9a 100644 --- a/src/Notes-master/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rCN.json +++ b/src/Notes-master/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:\\Notes-master\\app\\src\\main\\res\\values-zh-rCN\\arrays.xml", + "source": "D:\\git\\TeamProject\\src\\Notes-master\\app\\src\\main\\res\\values-zh-rCN\\arrays.xml", "from": { "startLines": "18", "startColumns": "4", @@ -23,7 +23,7 @@ } }, { - "source": "D:\\Notes-master\\app\\src\\main\\res\\values-zh-rCN\\strings.xml", + "source": "D:\\git\\TeamProject\\src\\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/Notes-master/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rTW.json index d9b9a38..df53ec7 100644 --- a/src/Notes-master/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rTW.json +++ b/src/Notes-master/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:\\Notes-master\\app\\src\\main\\res\\values-zh-rTW\\strings.xml", - "from": { - "startLines": "122,72,71,70,69,19,20,21,112,113,121,120,26,76,77,75,74,73,89,88,87,79,61,29,30,80,37,114,68,64,39,45,50,40,60,59,58,54,53,51,52,55,56,46,67,57,65,44,49,48,47,63,43,62,41,42,66,28,34,36,33,35,32,31,25,24,96,95,98,110,103,102,104,105,107,106,97,101,99,100,94,108,109,119,117,116,118,27,78,86,91,90,92,85,84,83,82,22,23", - "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "6507,3575,3509,3436,3386,827,867,915,6057,6102,6453,6403,1199,3835,3903,3776,3710,3647,4565,4505,4442,4035,2957,1369,1422,4089,1768,6159,3327,3114,1878,2159,2405,1931,2897,2844,2793,2598,2550,2456,2504,2644,2691,2202,3268,2741,3157,2116,2358,2302,2247,3059,2072,3017,1981,2022,3209,1318,1623,1719,1576,1672,1529,1484,1148,1095,4940,4881,5081,5982,5392,5323,5456,5534,5717,5644,5015,5268,5138,5203,4832,5821,5904,6365,6258,6210,6303,1261,3980,4383,4678,4620,4745,4335,4290,4242,4191,963,1029", - "endLines": "124,72,71,70,69,19,20,21,112,113,121,120,26,76,77,75,74,73,89,88,87,79,61,29,30,80,37,114,68,64,39,45,50,40,60,59,58,54,53,51,52,55,56,46,67,57,65,44,49,48,47,63,43,62,41,42,66,28,34,36,33,35,32,31,25,24,96,95,98,110,103,102,104,105,107,106,97,101,99,100,94,108,109,119,117,116,118,27,78,86,91,90,92,85,84,83,82,22,23", - "endColumns": "14,71,65,72,49,39,47,47,44,56,53,49,61,67,76,58,65,62,54,59,62,53,59,52,61,83,79,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65", - "endOffsets": "6679,3642,3570,3504,3431,862,910,958,6097,6154,6502,6448,1256,3898,3975,3830,3771,3705,4615,4560,4500,4084,3012,1417,1479,4168,1843,6204,3381,3152,1926,2197,2451,1976,2952,2892,2839,2639,2593,2499,2545,2686,2736,2242,3322,2788,3204,2154,2400,2353,2297,3109,2111,3054,2017,2067,3263,1364,1667,1763,1618,1714,1571,1524,1194,1143,5010,4935,5133,6051,5451,5387,5529,5639,5816,5712,5076,5318,5198,5263,4876,5899,5977,6398,6298,6253,6360,1313,4030,4437,4740,4673,4802,4378,4330,4285,4237,1024,1090" - }, - "to": { - "startLines": "6,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106", - "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "215,384,456,522,595,645,685,733,781,826,883,937,987,1049,1117,1194,1253,1319,1382,1437,1497,1560,1614,1674,1727,1789,1873,1953,2003,2062,2105,2158,2201,2252,2302,2362,2415,2466,2512,2560,2608,2654,2701,2751,2796,2855,2907,2959,3002,3049,3105,3160,3215,3259,3301,3342,3392,3451,3502,3551,3600,3647,3694,3741,3786,3837,3890,3965,4024,4081,4155,4219,4288,4366,4476,4580,4653,4719,4774,4839,4904,4953,5036,5114,5152,5197,5245,5307,5364,5419,5478,5545,5603,5665,5713,5758,5806,5857,5923", - "endLines": "8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106", - "endColumns": "14,71,65,72,49,39,47,47,44,56,53,49,61,67,76,58,65,62,54,59,62,53,59,52,61,83,79,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65", - "endOffsets": "379,451,517,590,640,680,728,776,821,878,932,982,1044,1112,1189,1248,1314,1377,1432,1492,1555,1609,1669,1722,1784,1868,1948,1998,2057,2100,2153,2196,2247,2297,2357,2410,2461,2507,2555,2603,2649,2696,2746,2791,2850,2902,2954,2997,3044,3100,3155,3210,3254,3296,3337,3387,3446,3497,3546,3595,3642,3689,3736,3781,3832,3885,3960,4019,4076,4150,4214,4283,4361,4471,4575,4648,4714,4769,4834,4899,4948,5031,5109,5147,5192,5240,5302,5359,5414,5473,5540,5598,5660,5708,5753,5801,5852,5918,5984" - } - }, - { - "source": "D:\\Notes-master\\app\\src\\main\\res\\values-zh-rTW\\arrays.xml", + "source": "D:\\git\\TeamProject\\src\\Notes-master\\app\\src\\main\\res\\values-zh-rTW\\arrays.xml", "from": { "startLines": "18", "startColumns": "4", @@ -40,6 +21,25 @@ "endColumns": "19", "endOffsets": "210" } + }, + { + "source": "D:\\git\\TeamProject\\src\\Notes-master\\app\\src\\main\\res\\values-zh-rTW\\strings.xml", + "from": { + "startLines": "122,72,71,70,69,19,20,21,112,113,121,120,26,76,77,75,74,73,89,88,87,79,61,29,30,80,37,114,68,64,39,45,50,40,60,59,58,54,53,51,52,55,56,46,67,57,65,44,49,48,47,63,43,62,41,42,66,28,34,36,33,35,32,31,25,24,96,95,98,110,103,102,104,105,107,106,97,101,99,100,94,108,109,119,117,116,118,27,78,86,91,90,92,85,84,83,82,22,23", + "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", + "startOffsets": "6507,3575,3509,3436,3386,827,867,915,6057,6102,6453,6403,1199,3835,3903,3776,3710,3647,4565,4505,4442,4035,2957,1369,1422,4089,1768,6159,3327,3114,1878,2159,2405,1931,2897,2844,2793,2598,2550,2456,2504,2644,2691,2202,3268,2741,3157,2116,2358,2302,2247,3059,2072,3017,1981,2022,3209,1318,1623,1719,1576,1672,1529,1484,1148,1095,4940,4881,5081,5982,5392,5323,5456,5534,5717,5644,5015,5268,5138,5203,4832,5821,5904,6365,6258,6210,6303,1261,3980,4383,4678,4620,4745,4335,4290,4242,4191,963,1029", + "endLines": "124,72,71,70,69,19,20,21,112,113,121,120,26,76,77,75,74,73,89,88,87,79,61,29,30,80,37,114,68,64,39,45,50,40,60,59,58,54,53,51,52,55,56,46,67,57,65,44,49,48,47,63,43,62,41,42,66,28,34,36,33,35,32,31,25,24,96,95,98,110,103,102,104,105,107,106,97,101,99,100,94,108,109,119,117,116,118,27,78,86,91,90,92,85,84,83,82,22,23", + "endColumns": "14,71,65,72,49,39,47,47,44,56,53,49,61,67,76,58,65,62,54,59,62,53,59,52,61,83,79,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65", + "endOffsets": "6679,3642,3570,3504,3431,862,910,958,6097,6154,6502,6448,1256,3898,3975,3830,3771,3705,4615,4560,4500,4084,3012,1417,1479,4168,1843,6204,3381,3152,1926,2197,2451,1976,2952,2892,2839,2639,2593,2499,2545,2686,2736,2242,3322,2788,3204,2154,2400,2353,2297,3109,2111,3054,2017,2067,3263,1364,1667,1763,1618,1714,1571,1524,1194,1143,5010,4935,5133,6051,5451,5387,5529,5639,5816,5712,5076,5318,5198,5263,4876,5899,5977,6398,6298,6253,6360,1313,4030,4437,4740,4673,4802,4378,4330,4285,4237,1024,1090" + }, + "to": { + "startLines": "6,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106", + "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", + "startOffsets": "215,384,456,522,595,645,685,733,781,826,883,937,987,1049,1117,1194,1253,1319,1382,1437,1497,1560,1614,1674,1727,1789,1873,1953,2003,2062,2105,2158,2201,2252,2302,2362,2415,2466,2512,2560,2608,2654,2701,2751,2796,2855,2907,2959,3002,3049,3105,3160,3215,3259,3301,3342,3392,3451,3502,3551,3600,3647,3694,3741,3786,3837,3890,3965,4024,4081,4155,4219,4288,4366,4476,4580,4653,4719,4774,4839,4904,4953,5036,5114,5152,5197,5245,5307,5364,5419,5478,5545,5603,5665,5713,5758,5806,5857,5923", + "endLines": "8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106", + "endColumns": "14,71,65,72,49,39,47,47,44,56,53,49,61,67,76,58,65,62,54,59,62,53,59,52,61,83,79,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65", + "endOffsets": "379,451,517,590,640,680,728,776,821,878,932,982,1044,1112,1189,1248,1314,1377,1432,1492,1555,1609,1669,1722,1784,1868,1948,1998,2057,2100,2153,2196,2247,2297,2357,2410,2461,2507,2555,2603,2649,2696,2746,2791,2850,2902,2954,2997,3044,3100,3155,3210,3254,3296,3337,3387,3446,3497,3546,3595,3642,3689,3736,3781,3832,3885,3960,4019,4076,4150,4214,4283,4361,4471,4575,4648,4714,4769,4834,4899,4948,5031,5109,5147,5192,5240,5302,5359,5414,5473,5540,5598,5660,5708,5753,5801,5852,5918,5984" + } } ] } diff --git a/src/Notes-master/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values.json b/src/Notes-master/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values.json index 618e660..3e75a1d 100644 --- a/src/Notes-master/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values.json +++ b/src/Notes-master/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values.json @@ -4,24 +4,26 @@ "outputFile": "net.micode.notes.app-mergeDebugResources-3:/values/values.xml", "map": [ { - "source": "D:\\Notes-master\\app\\src\\main\\res\\values\\dimens.xml", + "source": "D:\\git\\TeamProject\\src\\Notes-master\\app\\src\\main\\res\\values\\strings.xml", "from": { - "startLines": "19,20,21,22,18", - "startColumns": "4,4,4,4,4", - "startOffsets": "764,816,869,922,712", - "endColumns": "51,52,52,51,51", - "endOffsets": "811,864,917,969,759" + "startLines": "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": "13,14,15,16,17", - "startColumns": "4,4,4,4,4", - "startOffsets": "477,529,582,635,687", - "endColumns": "51,52,52,51,51", - "endOffsets": "524,577,630,682,734" + "startLines": "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:\\Notes-master\\app\\src\\main\\res\\values\\colors.xml", + "source": "D:\\git\\TeamProject\\src\\Notes-master\\app\\src\\main\\res\\values\\colors.xml", "from": { "startLines": "18", "startColumns": "4", @@ -38,45 +40,24 @@ } }, { - "source": "D:\\Notes-master\\app\\src\\main\\res\\values\\strings.xml", - "from": { - "startLines": "128,72,75,74,73,19,20,21,118,119,127,126,26,81,82,80,79,78,94,93,92,84,39,38,64,29,30,85,41,76,120,71,67,42,48,53,43,63,62,61,57,56,54,55,58,59,49,70,60,68,47,52,51,50,66,46,65,44,45,69,28,34,36,33,35,32,31,25,24,101,100,104,116,109,108,110,111,113,112,102,103,107,105,106,99,114,115,125,123,122,124,27,83,91,96,95,97,90,89,88,87,22,23", - "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "8008,3898,4159,4063,3994,827,870,922,7506,7555,7950,7899,1282,4613,4707,4542,4458,4375,5574,5491,5389,4883,2004,1953,3397,1486,1539,4944,2097,4242,7618,3827,3582,2156,2471,2772,2214,3326,3265,3208,2986,2934,2831,2884,3036,3086,2518,3761,3146,3631,2424,2717,2629,2571,3520,2374,3475,2271,2314,3694,1431,1750,1858,1703,1805,1647,1599,1227,1174,6030,5963,6271,7409,6635,6554,6709,6798,7040,6961,6114,6189,6495,6335,6415,5908,7184,7306,7858,7731,7674,7784,1366,4815,5303,5709,5640,5789,5244,5189,5127,5067,974,1084", - "endLines": "132,72,75,74,73,19,20,21,118,119,127,126,26,81,82,80,79,78,94,93,92,84,39,38,64,29,30,85,41,76,120,71,67,42,48,53,43,63,62,61,57,56,54,55,58,59,49,70,60,68,47,52,51,50,66,46,65,44,45,69,28,34,36,33,35,32,31,25,24,101,100,104,116,109,108,110,111,113,112,102,103,107,105,106,99,114,115,125,123,122,124,27,83,91,96,95,97,90,89,88,87,22,23", - "endColumns": "14,95,82,95,68,42,51,51,48,62,57,50,83,93,107,70,83,82,65,82,101,60,61,50,77,52,59,104,58,101,54,70,48,57,46,58,56,70,60,56,49,51,52,49,49,59,52,65,61,62,46,54,87,57,61,49,44,42,59,66,54,54,52,46,52,55,47,54,52,83,66,63,95,73,80,88,162,143,78,74,81,58,79,79,54,121,102,40,52,56,73,64,67,85,79,68,93,58,54,61,59,109,89", - "endOffsets": "8412,3989,4237,4154,4058,865,917,969,7550,7613,8003,7945,1361,4702,4810,4608,4537,4453,5635,5569,5486,4939,2061,1999,3470,1534,1594,5044,2151,4339,7668,3893,3626,2209,2513,2826,2266,3392,3321,3260,3031,2981,2879,2929,3081,3141,2566,3822,3203,3689,2466,2767,2712,2624,3577,2419,3515,2309,2369,3756,1481,1800,1906,1745,1853,1698,1642,1277,1222,6109,6025,6330,7500,6704,6630,6793,6956,7179,7035,6184,6266,6549,6410,6490,5958,7301,7404,7894,7779,7726,7853,1426,4878,5384,5784,5704,5878,5298,5239,5184,5122,1079,1169" - }, - "to": { - "startLines": "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:\\Notes-master\\app\\src\\main\\res\\values\\styles.xml", + "source": "D:\\git\\TeamProject\\src\\Notes-master\\app\\src\\main\\res\\values\\dimens.xml", "from": { - "startLines": "50,55,64,60,22,26,30,35,40,18,45", - "startColumns": "4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "2062,2267,2640,2479,895,1078,1263,1449,1653,712,1860", - "endLines": "53,58,67,62,25,29,33,38,43,21,48", - "endColumns": "12,12,12,12,12,12,12,12,12,12,12", - "endOffsets": "2261,2473,2843,2634,1073,1258,1443,1647,1854,890,2056" + "startLines": "19,20,21,22,18", + "startColumns": "4,4,4,4,4", + "startOffsets": "764,816,869,922,712", + "endColumns": "51,52,52,51,51", + "endOffsets": "811,864,917,969,759" }, "to": { - "startLines": "125,129,133,137,140,144,148,152,156,160,164", - "startColumns": "4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "8124,8328,8539,8746,8906,9089,9274,9459,9662,9868,10051", - "endLines": "128,132,136,139,143,147,151,155,159,163,167", - "endColumns": "12,12,12,12,12,12,12,12,12,12,12", - "endOffsets": "8323,8534,8741,8901,9084,9269,9454,9657,9863,10046,10247" + "startLines": "13,14,15,16,17", + "startColumns": "4,4,4,4,4", + "startOffsets": "477,529,582,635,687", + "endColumns": "51,52,52,51,51", + "endOffsets": "524,577,630,682,734" } }, { - "source": "D:\\Notes-master\\app\\src\\main\\res\\values\\arrays.xml", + "source": "D:\\git\\TeamProject\\src\\Notes-master\\app\\src\\main\\res\\values\\arrays.xml", "from": { "startLines": "19,26", "startColumns": "4,4", @@ -93,6 +74,25 @@ "endColumns": "19,19", "endOffsets": "295,415" } + }, + { + "source": "D:\\git\\TeamProject\\src\\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", + "startOffsets": "2062,2267,2640,2479,895,1078,1263,1449,1653,712,1860", + "endLines": "53,58,67,62,25,29,33,38,43,21,48", + "endColumns": "12,12,12,12,12,12,12,12,12,12,12", + "endOffsets": "2261,2473,2843,2634,1073,1258,1443,1647,1854,890,2056" + }, + "to": { + "startLines": "125,129,133,137,140,144,148,152,156,160,164", + "startColumns": "4,4,4,4,4,4,4,4,4,4,4", + "startOffsets": "8124,8328,8539,8746,8906,9089,9274,9459,9662,9868,10051", + "endLines": "128,132,136,139,143,147,151,155,159,163,167", + "endColumns": "12,12,12,12,12,12,12,12,12,12,12", + "endOffsets": "8323,8534,8741,8901,9084,9269,9454,9657,9863,10046,10247" + } } ] } diff --git a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/AlarmAlertActivity.dex b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/AlarmAlertActivity.dex index 3d37b7c..7d15cea 100644 Binary files a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/AlarmAlertActivity.dex and b/src/Notes-master/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/AlarmReceiver.dex b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/AlarmReceiver.dex index 64cbaab..809b0e2 100644 Binary files a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/AlarmReceiver.dex and b/src/Notes-master/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$3.dex b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$3.dex index 5ff69b8..9dfc065 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/Notes-master/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/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$4.dex index 08f79c9..8cf42dc 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/Notes-master/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.dex b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker.dex index c00e5b5..2fbd883 100644 Binary files a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker.dex and b/src/Notes-master/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/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePickerDialog$1.dex index 379d253..f571fc7 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/Notes-master/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.dex b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePickerDialog.dex index 2e21e00..728749b 100644 Binary files a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePickerDialog.dex and b/src/Notes-master/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/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DropdownMenu$1.dex index a355446..bcb603f 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/Notes-master/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/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DropdownMenu.dex index 7f1ee6d..90d2c6b 100644 Binary files a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DropdownMenu.dex and b/src/Notes-master/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/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/FoldersListAdapter$FolderListItem.dex index f75d453..6401f2f 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/Notes-master/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/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/FoldersListAdapter.dex index a1fad89..e3e14c2 100644 Binary files a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/FoldersListAdapter.dex and b/src/Notes-master/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/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$1.dex index 84a4592..b15d73b 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/Notes-master/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/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$2.dex index 5651cb4..d607323 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/Notes-master/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/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$3.dex index a52b249..1138329 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/Notes-master/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.dex b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity.dex index 3136635..89d0eef 100644 Binary files a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity.dex and b/src/Notes-master/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/widget/NoteWidgetProvider.dex b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/widget/NoteWidgetProvider.dex index 0d540b4..9a2eede 100644 Binary files a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/widget/NoteWidgetProvider.dex and b/src/Notes-master/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/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/widget/NoteWidgetProvider_2x.dex index 39632c6..2cc61c0 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/Notes-master/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/source_set_path_map/debug/file-map.txt b/src/Notes-master/app/build/intermediates/source_set_path_map/debug/file-map.txt index d23ca5d..ce4415c 100644 --- 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 @@ -1,8 +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 +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 index 6c54360..605c133 100644 --- 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 @@ -1,235 +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 +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:\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 + 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:\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 + 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:\Notes-master\app\src\main\AndroidManifest.xml:18:11-69 + ADDED from D:\git\TeamProject\src\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 + 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:\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 +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:\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 + 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:\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 + 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:\Notes-master\app\src\main\AndroidManifest.xml:25:5-81 +ADDED from D:\git\TeamProject\src\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 + 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:\Notes-master\app\src\main\AndroidManifest.xml:26:5-88 +ADDED from D:\git\TeamProject\src\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 + ADDED from D:\git\TeamProject\src\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 +ADDED from D:\git\TeamProject\src\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 + 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:\Notes-master\app\src\main\AndroidManifest.xml:28:5-72 +ADDED from D:\git\TeamProject\src\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 + 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:\Notes-master\app\src\main\AndroidManifest.xml:29:5-74 +ADDED from D:\git\TeamProject\src\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 + 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:\Notes-master\app\src\main\AndroidManifest.xml:30:5-80 +ADDED from D:\git\TeamProject\src\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 + 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:\Notes-master\app\src\main\AndroidManifest.xml:31:5-71 +ADDED from D:\git\TeamProject\src\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 + 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:\Notes-master\app\src\main\AndroidManifest.xml:32:5-74 +ADDED from D:\git\TeamProject\src\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 + 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:\Notes-master\app\src\main\AndroidManifest.xml:33:5-81 +ADDED from D:\git\TeamProject\src\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 + ADDED from D:\git\TeamProject\src\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 +ADDED from D:\git\TeamProject\src\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 + ADDED from D:\git\TeamProject\src\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 + 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:\Notes-master\app\src\main\AndroidManifest.xml:38:9-51:20 +ADDED from D:\git\TeamProject\src\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 + ADDED from D:\git\TeamProject\src\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 + ADDED from D:\git\TeamProject\src\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 + ADDED from D:\git\TeamProject\src\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 + ADDED from D:\git\TeamProject\src\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 + ADDED from D:\git\TeamProject\src\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 + ADDED from D:\git\TeamProject\src\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 + 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:\Notes-master\app\src\main\AndroidManifest.xml:47:13-50:29 +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:\Notes-master\app\src\main\AndroidManifest.xml:48:17-69 +ADDED from D:\git\TeamProject\src\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 + ADDED from D:\git\TeamProject\src\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 +ADDED from D:\git\TeamProject\src\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 + 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:\Notes-master\app\src\main\AndroidManifest.xml:53:9-81:20 +ADDED from D:\git\TeamProject\src\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 + ADDED from D:\git\TeamProject\src\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 + ADDED from D:\git\TeamProject\src\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 + ADDED from D:\git\TeamProject\src\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 + 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:\Notes-master\app\src\main\AndroidManifest.xml:59:13-64:29 +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:\Notes-master\app\src\main\AndroidManifest.xml:60:17-69 +ADDED from D:\git\TeamProject\src\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 + ADDED from D:\git\TeamProject\src\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 +ADDED from D:\git\TeamProject\src\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 + ADDED from D:\git\TeamProject\src\Notes-master\app\src\main\AndroidManifest.xml:61:27-73 data -ADDED from D:\Notes-master\app\src\main\AndroidManifest.xml:62:17-78 +ADDED from D:\git\TeamProject\src\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 + 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:\Notes-master\app\src\main\AndroidManifest.xml:66:13-71:29 +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:\Notes-master\app\src\main\AndroidManifest.xml:67:17-79 +ADDED from D:\git\TeamProject\src\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 + 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:\Notes-master\app\src\main\AndroidManifest.xml:73:13-76:29 +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:\Notes-master\app\src\main\AndroidManifest.xml:74:17-71 +ADDED from D:\git\TeamProject\src\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 + ADDED from D:\git\TeamProject\src\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 +ADDED from D:\git\TeamProject\src\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 + ADDED from D:\git\TeamProject\src\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 + 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:\Notes-master\app\src\main\AndroidManifest.xml:83:9-86:43 +ADDED from D:\git\TeamProject\src\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 + ADDED from D:\git\TeamProject\src\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 + ADDED from D:\git\TeamProject\src\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 + 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:\Notes-master\app\src\main\AndroidManifest.xml:88:9-100:20 +ADDED from D:\git\TeamProject\src\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 + ADDED from D:\git\TeamProject\src\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 + 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:\Notes-master\app\src\main\AndroidManifest.xml:91:13-95:29 +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:\Notes-master\app\src\main\AndroidManifest.xml:92:17-84 +ADDED from D:\git\TeamProject\src\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 + 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:\Notes-master\app\src\main\AndroidManifest.xml:93:17-85 +ADDED from D:\git\TeamProject\src\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 + 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:\Notes-master\app\src\main\AndroidManifest.xml:94:17-85 +ADDED from D:\git\TeamProject\src\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 + ADDED from D:\git\TeamProject\src\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 +ADDED from D:\git\TeamProject\src\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 + ADDED from D:\git\TeamProject\src\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 + 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:\Notes-master\app\src\main\AndroidManifest.xml:101:9-114:20 +ADDED from D:\git\TeamProject\src\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 + ADDED from D:\git\TeamProject\src\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 + 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:\Notes-master\app\src\main\AndroidManifest.xml:116:9-120:20 +ADDED from D:\git\TeamProject\src\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 + 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:\Notes-master\app\src\main\AndroidManifest.xml:117:13-119:29 +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:\Notes-master\app\src\main\AndroidManifest.xml:118:17-79 +ADDED from D:\git\TeamProject\src\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 + 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:\Notes-master\app\src\main\AndroidManifest.xml:122:9-125:20 +ADDED from D:\git\TeamProject\src\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 + ADDED from D:\git\TeamProject\src\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 + 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:\Notes-master\app\src\main\AndroidManifest.xml:127:9-132:20 +ADDED from D:\git\TeamProject\src\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 + ADDED from D:\git\TeamProject\src\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 + ADDED from D:\git\TeamProject\src\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 + ADDED from D:\git\TeamProject\src\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 + 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:\Notes-master\app\src\main\AndroidManifest.xml:134:9-139:20 +ADDED from D:\git\TeamProject\src\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 + ADDED from D:\git\TeamProject\src\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 + ADDED from D:\git\TeamProject\src\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 + ADDED from D:\git\TeamProject\src\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 + 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:\Notes-master\app\src\main\AndroidManifest.xml:141:9-144:19 +ADDED from D:\git\TeamProject\src\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 + ADDED from D:\git\TeamProject\src\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 + 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:\Notes-master\app\src\main\AndroidManifest.xml:146:9-148:52 +ADDED from D:\git\TeamProject\src\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 + ADDED from D:\git\TeamProject\src\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 + ADDED from D:\git\TeamProject\src\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/Notes-master/app/build/tmp/compileDebugJavaWithJavac/previous-compilation-data.bin index 01bd41e..c110ab7 100644 Binary files a/src/Notes-master/app/build/tmp/compileDebugJavaWithJavac/previous-compilation-data.bin and b/src/Notes-master/app/build/tmp/compileDebugJavaWithJavac/previous-compilation-data.bin differ diff --git a/src/Notes-master/app/src/main/java/net/micode/notes/widget/NoteWidgetProvider.java b/src/Notes-master/app/src/main/java/net/micode/notes/widget/NoteWidgetProvider.java index 9d7b067..a5cb7dd 100644 --- a/src/Notes-master/app/src/main/java/net/micode/notes/widget/NoteWidgetProvider.java +++ b/src/Notes-master/app/src/main/java/net/micode/notes/widget/NoteWidgetProvider.java @@ -82,7 +82,6 @@ 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++) {