diff --git a/doc/实践模板-开源软件泛读、标注和维护报告文档.docx b/doc/实践模板-开源软件泛读、标注和维护报告文档.docx index d129725..754fbeb 100644 Binary files a/doc/实践模板-开源软件泛读、标注和维护报告文档.docx and b/doc/实践模板-开源软件泛读、标注和维护报告文档.docx differ diff --git a/doc/设置闹铃提醒-周锦兴.doc b/doc/设置闹铃提醒-周锦兴.doc new file mode 100644 index 0000000..e4d8344 Binary files /dev/null and b/doc/设置闹铃提醒-周锦兴.doc differ diff --git a/src/.gradle/7.5/fileHashes/fileHashes.lock b/src/.gradle/7.5/fileHashes/fileHashes.lock index dcde69f..f4b0e0e 100644 Binary files a/src/.gradle/7.5/fileHashes/fileHashes.lock and b/src/.gradle/7.5/fileHashes/fileHashes.lock differ diff --git a/src/.gradle/7.5/fileHashes/resourceHashesCache.bin b/src/.gradle/7.5/fileHashes/resourceHashesCache.bin index 5f54b99..235a93d 100644 Binary files a/src/.gradle/7.5/fileHashes/resourceHashesCache.bin and b/src/.gradle/7.5/fileHashes/resourceHashesCache.bin differ diff --git a/src/app/build/intermediates/apk/debug/app-debug.apk b/src/app/build/intermediates/apk/debug/app-debug.apk index 4e08921..99de8a9 100644 Binary files a/src/app/build/intermediates/apk/debug/app-debug.apk and b/src/app/build/intermediates/apk/debug/app-debug.apk differ diff --git a/src/app/build/intermediates/dex/debug/mergeDexDebug/classes.dex b/src/app/build/intermediates/dex/debug/mergeDexDebug/classes.dex index 74f6083..a234864 100644 Binary files a/src/app/build/intermediates/dex/debug/mergeDexDebug/classes.dex and b/src/app/build/intermediates/dex/debug/mergeDexDebug/classes.dex differ diff --git a/src/app/build/intermediates/incremental/debug/mergeDebugResources/compile-file-map.properties b/src/app/build/intermediates/incremental/debug/mergeDebugResources/compile-file-map.properties index 296e895..fec3cb0 100644 --- a/src/app/build/intermediates/incremental/debug/mergeDebugResources/compile-file-map.properties +++ b/src/app/build/intermediates/incremental/debug/mergeDebugResources/compile-file-map.properties @@ -1,3 +1,4 @@ +<<<<<<< HEAD #Sun Oct 29 17:15:21 CST 2023 net.micode.notes.app-main-7\:/drawable-hdpi/font_super.png=E\:\\code\\Android\\mi-note\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_super.png.flat net.micode.notes.app-main-7\:/drawable-hdpi/call_record.png=E\:\\code\\Android\\mi-note\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_call_record.png.flat @@ -94,3 +95,101 @@ net.micode.notes.app-main-7\:/drawable-hdpi/list_folder.9.png=E\:\\code\\Android net.micode.notes.app-main-7\:/drawable-hdpi/widget_4x_blue.png=E\:\\code\\Android\\mi-note\\src\\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=E\:\\code\\Android\\mi-note\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_down.9.png.flat net.micode.notes.app-main-7\:/menu/note_edit.xml=E\:\\code\\Android\\mi-note\\src\\app\\build\\intermediates\\merged_res\\debug\\menu_note_edit.xml.flat +======= +#Sun Oct 29 18:34:46 CST 2023 +net.micode.notes.app-main-7\:/drawable-hdpi/font_super.png=D\:\\Code\\Repository\\Android\\Notes2\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_super.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/call_record.png=D\:\\Code\\Repository\\Android\\Notes2\\src\\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\:\\Code\\Repository\\Android\\Notes2\\src\\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\:\\Code\\Repository\\Android\\Notes2\\src\\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\:\\Code\\Repository\\Android\\Notes2\\src\\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\:\\Code\\Repository\\Android\\Notes2\\src\\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\:\\Code\\Repository\\Android\\Notes2\\src\\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\:\\Code\\Repository\\Android\\Notes2\\src\\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\:\\Code\\Repository\\Android\\Notes2\\src\\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\:\\Code\\Repository\\Android\\Notes2\\src\\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\:\\Code\\Repository\\Android\\Notes2\\src\\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\:\\Code\\Repository\\Android\\Notes2\\src\\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\:\\Code\\Repository\\Android\\Notes2\\src\\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\:\\Code\\Repository\\Android\\Notes2\\src\\app\\build\\intermediates\\merged_res\\debug\\color_secondary_text_dark.xml.flat +net.micode.notes.app-main-7\:/layout/dialog_edit_text.xml=D\:\\Code\\Repository\\Android\\Notes2\\src\\app\\build\\intermediates\\merged_res\\debug\\layout_dialog_edit_text.xml.flat +net.micode.notes.app-main-7\:/layout/widget_4x.xml=D\:\\Code\\Repository\\Android\\Notes2\\src\\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\:\\Code\\Repository\\Android\\Notes2\\src\\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\:\\Code\\Repository\\Android\\Notes2\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_menu_delete.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/clock.png=D\:\\Code\\Repository\\Android\\Notes2\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_clock.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/font_normal.png=D\:\\Code\\Repository\\Android\\Notes2\\src\\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\:\\Code\\Repository\\Android\\Notes2\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_dropdown_icon.9.png.flat +net.micode.notes.app-main-7\:/layout/note_edit.xml=D\:\\Code\\Repository\\Android\\Notes2\\src\\app\\build\\intermediates\\merged_res\\debug\\layout_note_edit.xml.flat +net.micode.notes.app-main-7\:/drawable-hdpi/edit_green.9.png=D\:\\Code\\Repository\\Android\\Notes2\\src\\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\:\\Code\\Repository\\Android\\Notes2\\src\\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\:\\Code\\Repository\\Android\\Notes2\\src\\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\:\\Code\\Repository\\Android\\Notes2\\src\\app\\build\\intermediates\\merged_res\\debug\\raw-zh-rCN_introduction.flat +net.micode.notes.app-main-7\:/drawable-hdpi/widget_2x_green.png=D\:\\Code\\Repository\\Android\\Notes2\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_green.png.flat +net.micode.notes.app-main-7\:/xml/preferences.xml=D\:\\Code\\Repository\\Android\\Notes2\\src\\app\\build\\intermediates\\merged_res\\debug\\xml_preferences.xml.flat +net.micode.notes.app-main-7\:/drawable-hdpi/list_red_single.9.png=D\:\\Code\\Repository\\Android\\Notes2\\src\\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\:\\Code\\Repository\\Android\\Notes2\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_delete.png.flat +net.micode.notes.app-main-7\:/menu/call_record_folder.xml=D\:\\Code\\Repository\\Android\\Notes2\\src\\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\:\\Code\\Repository\\Android\\Notes2\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_red.png.flat +net.micode.notes.app-main-7\:/layout/widget_2x.xml=D\:\\Code\\Repository\\Android\\Notes2\\src\\app\\build\\intermediates\\merged_res\\debug\\layout_widget_2x.xml.flat +net.micode.notes.app-main-7\:/drawable-hdpi/menu_move.png=D\:\\Code\\Repository\\Android\\Notes2\\src\\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\:\\Code\\Repository\\Android\\Notes2\\src\\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\:\\Code\\Repository\\Android\\Notes2\\src\\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\:\\Code\\Repository\\Android\\Notes2\\src\\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\:\\Code\\Repository\\Android\\Notes2\\src\\app\\build\\intermediates\\merged_res\\debug\\layout_add_account_text.xml.flat +net.micode.notes.app-main-7\:/xml/widget_4x_info.xml=D\:\\Code\\Repository\\Android\\Notes2\\src\\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\:\\Code\\Repository\\Android\\Notes2\\src\\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\:\\Code\\Repository\\Android\\Notes2\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_selected.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/search_result.png=D\:\\Code\\Repository\\Android\\Notes2\\src\\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\:\\Code\\Repository\\Android\\Notes2\\src\\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\:\\Code\\Repository\\Android\\Notes2\\src\\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\:\\Code\\Repository\\Android\\Notes2\\src\\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\:\\Code\\Repository\\Android\\Notes2\\src\\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\:\\Code\\Repository\\Android\\Notes2\\src\\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\:\\Code\\Repository\\Android\\Notes2\\src\\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\:\\Code\\Repository\\Android\\Notes2\\src\\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\:\\Code\\Repository\\Android\\Notes2\\src\\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\:\\Code\\Repository\\Android\\Notes2\\src\\app\\build\\intermediates\\merged_res\\debug\\layout_settings_header.xml.flat +net.micode.notes.app-main-7\:/menu/note_list.xml=D\:\\Code\\Repository\\Android\\Notes2\\src\\app\\build\\intermediates\\merged_res\\debug\\menu_note_list.xml.flat +net.micode.notes.app-main-7\:/menu/call_note_edit.xml=D\:\\Code\\Repository\\Android\\Notes2\\src\\app\\build\\intermediates\\merged_res\\debug\\menu_call_note_edit.xml.flat +net.micode.notes.app-main-7\:/drawable/new_note.xml=D\:\\Code\\Repository\\Android\\Notes2\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable_new_note.xml.flat +net.micode.notes.app-main-7\:/drawable-hdpi/edit_red.9.png=D\:\\Code\\Repository\\Android\\Notes2\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_red.9.png.flat +net.micode.notes.app-main-7\:/layout/note_list.xml=D\:\\Code\\Repository\\Android\\Notes2\\src\\app\\build\\intermediates\\merged_res\\debug\\layout_note_list.xml.flat +net.micode.notes.app-main-7\:/color/primary_text_dark.xml=D\:\\Code\\Repository\\Android\\Notes2\\src\\app\\build\\intermediates\\merged_res\\debug\\color_primary_text_dark.xml.flat +net.micode.notes.app-main-7\:/layout/datetime_picker.xml=D\:\\Code\\Repository\\Android\\Notes2\\src\\app\\build\\intermediates\\merged_res\\debug\\layout_datetime_picker.xml.flat +net.micode.notes.app-main-7\:/raw/introduction=D\:\\Code\\Repository\\Android\\Notes2\\src\\app\\build\\intermediates\\merged_res\\debug\\raw_introduction.flat +net.micode.notes.app-main-7\:/drawable-hdpi/list_yellow_single.9.png=D\:\\Code\\Repository\\Android\\Notes2\\src\\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\:\\Code\\Repository\\Android\\Notes2\\src\\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\:\\Code\\Repository\\Android\\Notes2\\src\\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\:\\Code\\Repository\\Android\\Notes2\\src\\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\:\\Code\\Repository\\Android\\Notes2\\src\\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\:\\Code\\Repository\\Android\\Notes2\\src\\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\:\\Code\\Repository\\Android\\Notes2\\src\\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\:\\Code\\Repository\\Android\\Notes2\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_icon_app.png.flat +net.micode.notes.app-main-7\:/layout/note_item.xml=D\:\\Code\\Repository\\Android\\Notes2\\src\\app\\build\\intermediates\\merged_res\\debug\\layout_note_item.xml.flat +net.micode.notes.app-main-7\:/drawable-hdpi/list_background.png=D\:\\Code\\Repository\\Android\\Notes2\\src\\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\:\\Code\\Repository\\Android\\Notes2\\src\\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\:\\Code\\Repository\\Android\\Notes2\\src\\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\:\\Code\\Repository\\Android\\Notes2\\src\\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\:\\Code\\Repository\\Android\\Notes2\\src\\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\:\\Code\\Repository\\Android\\Notes2\\src\\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\:\\Code\\Repository\\Android\\Notes2\\src\\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\:\\Code\\Repository\\Android\\Notes2\\src\\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\:\\Code\\Repository\\Android\\Notes2\\src\\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\:\\Code\\Repository\\Android\\Notes2\\src\\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\:\\Code\\Repository\\Android\\Notes2\\src\\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\:\\Code\\Repository\\Android\\Notes2\\src\\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\:\\Code\\Repository\\Android\\Notes2\\src\\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\:\\Code\\Repository\\Android\\Notes2\\src\\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\:\\Code\\Repository\\Android\\Notes2\\src\\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\:\\Code\\Repository\\Android\\Notes2\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_white.9.png.flat +net.micode.notes.app-main-7\:/xml/searchable.xml=D\:\\Code\\Repository\\Android\\Notes2\\src\\app\\build\\intermediates\\merged_res\\debug\\xml_searchable.xml.flat +net.micode.notes.app-main-7\:/drawable-hdpi/notification.png=D\:\\Code\\Repository\\Android\\Notes2\\src\\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\:\\Code\\Repository\\Android\\Notes2\\src\\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\:\\Code\\Repository\\Android\\Notes2\\src\\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\:\\Code\\Repository\\Android\\Notes2\\src\\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\:\\Code\\Repository\\Android\\Notes2\\src\\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\:\\Code\\Repository\\Android\\Notes2\\src\\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\:\\Code\\Repository\\Android\\Notes2\\src\\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\:\\Code\\Repository\\Android\\Notes2\\src\\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\:\\Code\\Repository\\Android\\Notes2\\src\\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\:\\Code\\Repository\\Android\\Notes2\\src\\app\\build\\intermediates\\merged_res\\debug\\menu_note_edit.xml.flat +>>>>>>> zjx_branch diff --git a/src/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt b/src/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt index 9115a16..4f00a6d 100644 --- a/src/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt +++ b/src/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt @@ -1,4 +1,4 @@ -#Sun Oct 29 15:17:31 CST 2023 +#Sun Oct 29 18:35:01 CST 2023 base.0=D\:\\Code\\Repository\\Android\\Notes2\\src\\app\\build\\intermediates\\dex\\debug\\mergeDexDebug\\classes.dex renamed.0=classes.dex path.0=classes.dex diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/BuildConfig.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/BuildConfig.class index f98637b..d0ec272 100644 Binary files a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/BuildConfig.class and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/BuildConfig.class differ diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Contact.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Contact.class index 6e28b50..a7948fd 100644 Binary files a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Contact.class and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Contact.class differ diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$CallNote.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$CallNote.class index 89d3194..c7c17ff 100644 Binary files a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$CallNote.class and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$CallNote.class differ diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$DataColumns.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$DataColumns.class index 4be9a30..569dbdc 100644 Binary files a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$DataColumns.class and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$DataColumns.class differ diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$DataConstants.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$DataConstants.class index ee0265e..d535ff3 100644 Binary files a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$DataConstants.class and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$DataConstants.class differ diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$NoteColumns.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$NoteColumns.class index 37c051d..36c8d49 100644 Binary files a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$NoteColumns.class and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$NoteColumns.class differ diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$TextNote.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$TextNote.class index 7640e9f..c895fb0 100644 Binary files a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$TextNote.class and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$TextNote.class differ diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes.class index 4f372f4..bfc2f8a 100644 Binary files a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes.class and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes.class differ diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/data/NotesDatabaseHelper$TABLE.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/data/NotesDatabaseHelper$TABLE.class index 56d65f1..64fe9eb 100644 Binary files a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/data/NotesDatabaseHelper$TABLE.class and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/data/NotesDatabaseHelper$TABLE.class differ diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/data/NotesDatabaseHelper.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/data/NotesDatabaseHelper.class index 1f3ea0b..0b075b4 100644 Binary files a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/data/NotesDatabaseHelper.class and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/data/NotesDatabaseHelper.class differ diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/data/NotesProvider.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/data/NotesProvider.class index f9c1ed4..fab7db5 100644 Binary files a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/data/NotesProvider.class and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/data/NotesProvider.class differ diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/MetaData.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/MetaData.class index 2319eaf..20ff3f7 100644 Binary files a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/MetaData.class and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/MetaData.class differ diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/Node.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/Node.class index d2dcfb5..5236c5e 100644 Binary files a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/Node.class and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/Node.class differ diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/SqlData.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/SqlData.class index c61d69f..099f3ba 100644 Binary files a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/SqlData.class and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/SqlData.class differ diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/SqlNote.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/SqlNote.class index 26c68fb..2783ae3 100644 Binary files a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/SqlNote.class and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/SqlNote.class differ diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/Task.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/Task.class index d4e7deb..5aaf1d4 100644 Binary files a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/Task.class and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/Task.class differ diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/TaskList.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/TaskList.class index 69ac9b5..359609e 100644 Binary files a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/TaskList.class and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/TaskList.class differ diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/exception/ActionFailureException.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/exception/ActionFailureException.class index 3c7e5b6..1a059ce 100644 Binary files a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/exception/ActionFailureException.class and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/exception/ActionFailureException.class differ diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/exception/NetworkFailureException.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/exception/NetworkFailureException.class index 06827bd..75665c2 100644 Binary files a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/exception/NetworkFailureException.class and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/exception/NetworkFailureException.class differ diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskASyncTask$1.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskASyncTask$1.class index b4e4bec..c22bcc2 100644 Binary files a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskASyncTask$1.class and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskASyncTask$1.class differ diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskASyncTask$OnCompleteListener.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskASyncTask$OnCompleteListener.class index fd895e5..f73069c 100644 Binary files a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskASyncTask$OnCompleteListener.class and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskASyncTask$OnCompleteListener.class differ diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskASyncTask.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskASyncTask.class index e381749..973f5e6 100644 Binary files a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskASyncTask.class and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskASyncTask.class differ diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskClient.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskClient.class index 2910488..afe7a57 100644 Binary files a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskClient.class and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskClient.class differ diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskManager.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskManager.class index f105e8c..afad37e 100644 Binary files a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskManager.class and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskManager.class differ diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskSyncService$1.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskSyncService$1.class index cecf07f..f246eb8 100644 Binary files a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskSyncService$1.class and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskSyncService$1.class differ diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskSyncService.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskSyncService.class index 5d5ada0..18da491 100644 Binary files a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskSyncService.class and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskSyncService.class differ diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/model/Note$NoteData.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/model/Note$NoteData.class index 30318fc..c40e945 100644 Binary files a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/model/Note$NoteData.class and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/model/Note$NoteData.class differ diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/model/Note.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/model/Note.class index bbbea2e..d2041cc 100644 Binary files a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/model/Note.class and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/model/Note.class differ diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/model/WorkingNote$NoteSettingChangedListener.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/model/WorkingNote$NoteSettingChangedListener.class index 46734e7..15f1f77 100644 Binary files a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/model/WorkingNote$NoteSettingChangedListener.class and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/model/WorkingNote$NoteSettingChangedListener.class differ diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/model/WorkingNote.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/model/WorkingNote.class index e9f5b68..df71afc 100644 Binary files a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/model/WorkingNote.class and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/model/WorkingNote.class differ diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/BackupUtils$TextExport.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/BackupUtils$TextExport.class index bfb671c..a8b5858 100644 Binary files a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/BackupUtils$TextExport.class and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/BackupUtils$TextExport.class differ diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/BackupUtils.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/BackupUtils.class index ed4ac8e..59b1fff 100644 Binary files a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/BackupUtils.class and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/BackupUtils.class differ diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/DataUtils.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/DataUtils.class index 38ff8c9..75eb4ee 100644 Binary files a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/DataUtils.class and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/DataUtils.class differ diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/GTaskStringUtils.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/GTaskStringUtils.class index d4500ff..d320e3e 100644 Binary files a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/GTaskStringUtils.class and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/GTaskStringUtils.class differ diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$NoteBgResources.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$NoteBgResources.class index f1053bc..3a43d3e 100644 Binary files a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$NoteBgResources.class and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$NoteBgResources.class differ diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$NoteItemBgResources.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$NoteItemBgResources.class index 34b5c02..76971f6 100644 Binary files a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$NoteItemBgResources.class and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$NoteItemBgResources.class differ diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$TextAppearanceResources.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$TextAppearanceResources.class index 1714fc2..5868ba7 100644 Binary files a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$TextAppearanceResources.class and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$TextAppearanceResources.class differ diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$WidgetBgResources.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$WidgetBgResources.class index 595f36d..e8542fb 100644 Binary files a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$WidgetBgResources.class and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$WidgetBgResources.class differ diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser.class index 7ded6f4..f2e1b62 100644 Binary files a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser.class and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser.class differ diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/AlarmAlertActivity.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/AlarmAlertActivity.class index 2b1d0b1..e59e13f 100644 Binary files a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/AlarmAlertActivity.class and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/AlarmAlertActivity.class differ diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/AlarmInitReceiver.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/AlarmInitReceiver.class index 124eb6a..a1d202d 100644 Binary files a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/AlarmInitReceiver.class and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/AlarmInitReceiver.class differ diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/AlarmReceiver.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/AlarmReceiver.class index e8e0e45..a41b775 100644 Binary files a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/AlarmReceiver.class and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/AlarmReceiver.class differ diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$1.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$1.class index 1db6c46..4e3869d 100644 Binary files a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$1.class and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$1.class differ diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$2.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$2.class index 0aa6669..41197f6 100644 Binary files a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$2.class and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$2.class differ diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$3.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$3.class index 9ebe061..f4ddb3f 100644 Binary files a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$3.class and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$3.class differ diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$4.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$4.class index 7ae8c83..30e549b 100644 Binary files a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$4.class and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$4.class differ diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$OnDateTimeChangedListener.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$OnDateTimeChangedListener.class index 6597282..255a4e6 100644 Binary files a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$OnDateTimeChangedListener.class and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$OnDateTimeChangedListener.class differ diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker.class index fecb501..71e74f5 100644 Binary files a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker.class and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker.class differ diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePickerDialog$1.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePickerDialog$1.class index c9eaebc..50823eb 100644 Binary files a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePickerDialog$1.class and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePickerDialog$1.class differ diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePickerDialog$OnDateTimeSetListener.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePickerDialog$OnDateTimeSetListener.class index fa573a1..70481dd 100644 Binary files a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePickerDialog$OnDateTimeSetListener.class and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePickerDialog$OnDateTimeSetListener.class differ diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePickerDialog.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePickerDialog.class index ffce8e9..ed6fd76 100644 Binary files a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePickerDialog.class and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePickerDialog.class differ diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DropdownMenu$1.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DropdownMenu$1.class index 27317ad..7c0d343 100644 Binary files a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DropdownMenu$1.class and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DropdownMenu$1.class differ diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DropdownMenu.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DropdownMenu.class index d11f5bf..0f0cca0 100644 Binary files a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DropdownMenu.class and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DropdownMenu.class differ diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/FoldersListAdapter$FolderListItem.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/FoldersListAdapter$FolderListItem.class index ff8642f..d9b88e6 100644 Binary files a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/FoldersListAdapter$FolderListItem.class and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/FoldersListAdapter$FolderListItem.class differ diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/FoldersListAdapter.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/FoldersListAdapter.class index d08ded4..c956e26 100644 Binary files a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/FoldersListAdapter.class and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/FoldersListAdapter.class differ diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$1.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$1.class index 92a3d52..5e31419 100644 Binary files a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$1.class and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$1.class differ diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$2.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$2.class index 7ac402d..7f3a7c7 100644 Binary files a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$2.class and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$2.class differ diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$3.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$3.class index 506a0e5..ccb02d9 100644 Binary files a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$3.class and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$3.class differ diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$HeadViewHolder.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$HeadViewHolder.class index 432dd4e..8e1f0bf 100644 Binary files a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$HeadViewHolder.class and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$HeadViewHolder.class differ diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity.class index 024f278..1c7f604 100644 Binary files a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity.class and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity.class differ diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditText$1.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditText$1.class index 1de3fa1..39095e3 100644 Binary files a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditText$1.class and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditText$1.class differ diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditText$OnTextViewChangeListener.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditText$OnTextViewChangeListener.class index 1a3310a..9874f47 100644 Binary files a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditText$OnTextViewChangeListener.class and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditText$OnTextViewChangeListener.class differ diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditText.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditText.class index 63a2a9f..78780d3 100644 Binary files a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditText.class and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditText.class differ diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteItemData.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteItemData.class index ef21b0e..57475db 100644 Binary files a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteItemData.class and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteItemData.class differ diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$1.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$1.class index e087897..c1cf675 100644 Binary files a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$1.class and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$1.class differ diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$2.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$2.class index 4b2d550..529038d 100644 Binary files a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$2.class and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$2.class differ diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$3.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$3.class index 204a0a0..3c1262f 100644 Binary files a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$3.class and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$3.class differ diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$4.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$4.class index bbb0303..7bf348d 100644 Binary files a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$4.class and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$4.class differ diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$5.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$5.class index f7d5ea4..aaab36e 100644 Binary files a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$5.class and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$5.class differ diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$6.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$6.class index 43090a8..949eedb 100644 Binary files a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$6.class and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$6.class differ diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$7.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$7.class index 583d22f..3d7d04d 100644 Binary files a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$7.class and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$7.class differ diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$8.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$8.class index 5afa794..f2cb2ef 100644 Binary files a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$8.class and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$8.class differ diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$9.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$9.class index 31b8227..3f8fa4f 100644 Binary files a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$9.class and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$9.class differ diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$BackgroundQueryHandler.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$BackgroundQueryHandler.class index 04bd75e..e36a706 100644 Binary files a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$BackgroundQueryHandler.class and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$BackgroundQueryHandler.class differ diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ListEditState.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ListEditState.class index cb3a29b..38c1b55 100644 Binary files a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ListEditState.class and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ListEditState.class differ diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback$1.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback$1.class index dc3e2d0..614be82 100644 Binary files a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback$1.class and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback$1.class differ diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback$2.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback$2.class index 92dc30a..99e161f 100644 Binary files a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback$2.class and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback$2.class differ diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback.class index f615588..94ca9ce 100644 Binary files a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback.class and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback.class differ diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$NewNoteOnTouchListener.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$NewNoteOnTouchListener.class index 7409a83..5e342b4 100644 Binary files a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$NewNoteOnTouchListener.class and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$NewNoteOnTouchListener.class differ diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.class index 5f76dfc..c8baeb7 100644 Binary files a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.class and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.class differ diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity.class index 0ce94a4..2044082 100644 Binary files a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity.class and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity.class differ diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListAdapter$AppWidgetAttribute.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListAdapter$AppWidgetAttribute.class index f5fd9db..18be735 100644 Binary files a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListAdapter$AppWidgetAttribute.class and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListAdapter$AppWidgetAttribute.class differ diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListAdapter.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListAdapter.class index 80c444a..8c0b1aa 100644 Binary files a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListAdapter.class and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListAdapter.class differ diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListItem.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListItem.class index 414fe22..2a82619 100644 Binary files a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListItem.class and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListItem.class differ diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$1.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$1.class index 0a9dee2..3013deb 100644 Binary files a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$1.class and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$1.class differ diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$2.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$2.class index eb2280f..1daed8b 100644 Binary files a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$2.class and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$2.class differ diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$3.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$3.class index 1133cb0..2cfdd8d 100644 Binary files a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$3.class and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$3.class differ diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$4.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$4.class index ffc4505..6a14a5c 100644 Binary files a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$4.class and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$4.class differ diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$5.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$5.class index 90c206e..b51ef1c 100644 Binary files a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$5.class and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$5.class differ diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$6.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$6.class index 7ff90f9..ca0269d 100644 Binary files a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$6.class and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$6.class differ diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$7.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$7.class index 9b5b504..f3b61b8 100644 Binary files a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$7.class and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$7.class differ diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$8.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$8.class index 85b6fda..c18cb73 100644 Binary files a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$8.class and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$8.class differ diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$GTaskReceiver.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$GTaskReceiver.class index 8ba5f19..7ab46f8 100644 Binary files a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$GTaskReceiver.class and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$GTaskReceiver.class differ diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity.class index 86d6d09..0316bfb 100644 Binary files a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity.class and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity.class differ diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider.class index fabc84f..b06613f 100644 Binary files a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider.class and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider.class differ diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider_2x.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider_2x.class index e33d1c0..b11cc4f 100644 Binary files a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider_2x.class and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider_2x.class differ diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider_4x.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider_4x.class index e315716..f7e3c77 100644 Binary files a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider_4x.class and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider_4x.class differ diff --git a/src/app/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt b/src/app/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt index 42d38d8..85bb861 100644 --- a/src/app/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt +++ b/src/app/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt @@ -58,6 +58,7 @@ 36-->E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:36:5-159:19 37 android:debuggable="true" 38 android:icon="@drawable/icon_app" +<<<<<<< HEAD 38-->E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:37:9-42 39 android:label="@string/app_name" > 39-->E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:38:9-41 @@ -290,3 +291,238 @@ 158 159 160 +======= +38-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:37:9-42 +39 android:label="@string/app_name" +39-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:38:9-41 +40 android:testOnly="true" > +41 D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:39:9-53:20 +42 android:name="net.micode.notes.ui.NotesListActivity" +42-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:41:13-49 +43 android:configChanges="keyboardHidden|orientation|screenSize" +43-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:42:13-74 +44 android:exported="true" +44-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:40:13-36 +45 android:label="@string/app_name" +45-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:43:13-45 +46 android:launchMode="singleTop" +46-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:44:13-43 +47 android:theme="@style/NoteTheme" +47-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:45:13-45 +48 android:uiOptions="splitActionBarWhenNarrow" +48-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:46:13-57 +49 android:windowSoftInputMode="adjustPan" > +49-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:47:13-52 +50 +50-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:49:13-52:29 +51 +51-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:50:17-69 +51-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:50:25-66 +52 +53 +53-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:51:17-77 +53-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:51:27-74 +54 +55 +56 D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:55:9-85:20 +57 android:name="net.micode.notes.ui.NoteEditActivity" +57-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:57:13-48 +58 android:configChanges="keyboardHidden|orientation|screenSize" +58-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:58:13-74 +59 android:exported="true" +59-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:56:13-36 +60 android:launchMode="singleTop" +60-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:59:13-43 +61 android:theme="@style/NoteTheme" > +61-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:60:13-45 +62 +62-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:62:13-68:29 +62-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:62:28-49 +63 +63-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:64:17-69 +63-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:64:25-66 +64 +65 +65-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:65:17-76 +65-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:65:27-73 +66 +67 +67-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:66:17-78 +67-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:66:23-75 +68 +68-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:66:17-78 +68-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:66:23-75 +69 +70 +70-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:70:13-75:29 +71 +71-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:71:17-79 +71-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:71:25-76 +72 +73 +73-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:65:17-76 +73-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:65:27-73 +74 +75 +75-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:66:17-78 +75-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:66:23-75 +76 +76-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:66:17-78 +76-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:66:23-75 +77 +78 +78-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:77:13-80:29 +79 +79-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:78:17-71 +79-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:78:25-68 +80 +81 +81-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:65:17-76 +81-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:65:27-73 +82 +83 +84 D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:82:13-84:54 +85 android:name="android.app.searchable" +85-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:83:17-54 +86 android:resource="@xml/searchable" /> +86-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:84:17-51 +87 +88 +89 D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:87:9-91:43 +90 android:name="net.micode.notes.data.NotesProvider" +90-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:89:13-63 +91 android:authorities="micode_notes" +91-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:90:13-47 +92 android:exported="false" +92-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:88:13-37 +93 android:multiprocess="true" /> +93-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:91:13-40 +94 +95 D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:93:9-106:20 +96 android:name="net.micode.notes.widget.NoteWidgetProvider_2x" +96-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:95:13-57 +97 android:exported="false" +97-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:94:13-37 +98 android:label="@string/app_widget2x2" > +98-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:96:13-50 +99 +99-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:97:13-101:29 +100 +100-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:98:17-84 +100-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:98:25-81 +101 +101-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:99:17-85 +101-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:99:25-82 +102 +102-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:100:17-85 +102-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:100:25-82 +103 +104 +105 D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:103:13-105:58 +106 android:name="android.appwidget.provider" +106-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:104:17-58 +107 android:resource="@xml/widget_2x_info" /> +107-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:105:17-55 +108 +109 D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:107:9-121:20 +110 android:name="net.micode.notes.widget.NoteWidgetProvider_4x" +110-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:109:13-57 +111 android:exported="true" +111-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:108:13-36 +112 android:label="@string/app_widget4x4" > +112-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:110:13-50 +113 +113-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:97:13-101:29 +114 +114-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:98:17-84 +114-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:98:25-81 +115 +115-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:99:17-85 +115-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:99:25-82 +116 +116-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:100:17-85 +116-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:100:25-82 +117 +118 +119 D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:103:13-105:58 +120 android:name="android.appwidget.provider" +120-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:104:17-58 +121 android:resource="@xml/widget_4x_info" /> +121-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:105:17-55 +122 +123 D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:123:9-127:20 +124 android:name="net.micode.notes.ui.AlarmInitReceiver" +124-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:123:19-55 +125 android:exported="false" > +125-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:123:56-80 +126 +126-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:124:13-126:29 +127 +127-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:125:17-79 +127-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:125:25-76 +128 +129 +130 D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:129:9-133:20 +131 android:name="net.micode.notes.ui.AlarmReceiver" +131-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:131:13-61 +132 android:exported="false" +132-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:130:13-37 +133 android:process=":remote" > +133-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:132:13-38 +134 +135 +136 D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:135:9-141:20 +137 android:name="net.micode.notes.ui.AlarmAlertActivity" +137-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:137:13-50 +138 android:exported="false" +138-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:136:13-37 +139 android:label="@string/app_name" +139-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:138:13-45 +140 android:launchMode="singleInstance" +140-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:139:13-48 +141 android:theme="@android:style/Theme.Holo.Wallpaper.NoTitleBar" > +141-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:140:13-75 +142 +143 D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:143:9-149:20 +144 android:name="net.micode.notes.ui.NotesPreferenceActivity" +144-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:145:13-71 +145 android:exported="false" +145-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:144:13-37 +146 android:label="@string/preferences_title" +146-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:146:13-54 +147 android:launchMode="singleTop" +147-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:147:13-43 +148 android:theme="@android:style/Theme.Holo.Light" > +148-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:148:13-60 +149 +150 +151 D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:151:9-154:19 +152 android:name="net.micode.notes.gtask.remote.GTaskSyncService" +152-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:152:13-74 +153 android:exported="false" > +153-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:153:13-37 +154 +155 +156 D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:156:9-158:52 +157 android:name="android.app.default_searchable" +157-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:157:13-58 +158 android:value=".ui.NoteEditActivity" /> +158-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:158:13-49 +159 +160 +161 +>>>>>>> zjx_branch diff --git a/src/app/build/intermediates/merged_manifest/debug/AndroidManifest.xml b/src/app/build/intermediates/merged_manifest/debug/AndroidManifest.xml index 702093d..99bc97a 100644 --- a/src/app/build/intermediates/merged_manifest/debug/AndroidManifest.xml +++ b/src/app/build/intermediates/merged_manifest/debug/AndroidManifest.xml @@ -36,7 +36,8 @@ + android:label="@string/app_name" + android:testOnly="true" > + android:label="@string/app_name" + android:testOnly="true" > + android:label="@string/app_name" + android:testOnly="true" > sBgSelectorBtnsMap = new HashMap(); static { sBgSelectorBtnsMap.put(R.id.iv_bg_yellow, ResourceParser.YELLOW); @@ -93,6 +94,7 @@ public class NoteEditActivity extends Activity implements OnClickListener, sBgSelectorBtnsMap.put(R.id.iv_bg_white, ResourceParser.WHITE); } + //存储提供背景选择的资源 private static final Map sBgSelectorSelectionMap = new HashMap(); static { sBgSelectorSelectionMap.put(ResourceParser.YELLOW, R.id.iv_bg_yellow_select); @@ -102,6 +104,7 @@ public class NoteEditActivity extends Activity implements OnClickListener, sBgSelectorSelectionMap.put(ResourceParser.WHITE, R.id.iv_bg_white_select); } + //存储字体大小 private static final Map sFontSizeBtnsMap = new HashMap(); static { sFontSizeBtnsMap.put(R.id.ll_font_large, ResourceParser.TEXT_LARGE); @@ -110,6 +113,7 @@ public class NoteEditActivity extends Activity implements OnClickListener, sFontSizeBtnsMap.put(R.id.ll_font_super, ResourceParser.TEXT_SUPER); } + //存储提供字体大小选择的资源 private static final Map sFontSelectorSelectionMap = new HashMap(); static { sFontSelectorSelectionMap.put(ResourceParser.TEXT_LARGE, R.id.iv_large_select); @@ -268,6 +272,7 @@ public class NoteEditActivity extends Activity implements OnClickListener, initNoteScreen(); } + //初始化编辑界面 private void initNoteScreen() { mNoteEditor.setTextAppearance(this, TextAppearanceResources .getTexAppearanceResource(mFontSizeId)); @@ -363,6 +368,9 @@ public class NoteEditActivity extends Activity implements OnClickListener, return true; } + /** + * 初始化资源，组件 + */ private void initResources() { mHeadViewPanel = findViewById(R.id.note_title); mNoteHeaderHolder = new HeadViewHolder(); @@ -406,6 +414,7 @@ public class NoteEditActivity extends Activity implements OnClickListener, clearSettingState(); } + //更新桌面部件内容 private void updateWidget() { Intent intent = new Intent(AppWidgetManager.ACTION_APPWIDGET_UPDATE); if (mWorkingNote.getWidgetType() == Notes.TYPE_WIDGET_2X) { @@ -425,18 +434,20 @@ public class NoteEditActivity extends Activity implements OnClickListener, setResult(RESULT_OK, intent); } + //按钮监听 public void onClick(View v) { int id = v.getId(); + //点击更改背景颜色按钮，弹出选择背景颜色的弹窗 if (id == R.id.btn_set_bg_color) { mNoteBgColorSelector.setVisibility(View.VISIBLE); findViewById(sBgSelectorSelectionMap.get(mWorkingNote.getBgColorId())).setVisibility( View.VISIBLE); - } else if (sBgSelectorBtnsMap.containsKey(id)) { + } else if (sBgSelectorBtnsMap.containsKey(id)) {//根据选择的背景颜色来更改背景颜色 findViewById(sBgSelectorSelectionMap.get(mWorkingNote.getBgColorId())).setVisibility( View.GONE); mWorkingNote.setBgColorId(sBgSelectorBtnsMap.get(id)); mNoteBgColorSelector.setVisibility(View.GONE); - } else if (sFontSizeBtnsMap.containsKey(id)) { + } else if (sFontSizeBtnsMap.containsKey(id)) {//根据选择的字体大小来更改字体大小 findViewById(sFontSelectorSelectionMap.get(mFontSizeId)).setVisibility(View.GONE); mFontSizeId = sFontSizeBtnsMap.get(id); mSharedPrefs.edit().putInt(PREFERENCE_FONT_SIZE, mFontSizeId).commit(); @@ -452,6 +463,9 @@ public class NoteEditActivity extends Activity implements OnClickListener, } } + /** + * 按返回键调用的事件,存储当前编辑的便签 + */ @Override public void onBackPressed() { if(clearSettingState()) { @@ -462,6 +476,7 @@ public class NoteEditActivity extends Activity implements OnClickListener, super.onBackPressed(); } + //清除当前设置,即当前处在选择背景颜色,或选择字体大小时,先关掉弹窗 private boolean clearSettingState() { if (mNoteBgColorSelector.getVisibility() == View.VISIBLE) { mNoteBgColorSelector.setVisibility(View.GONE); @@ -473,6 +488,7 @@ public class NoteEditActivity extends Activity implements OnClickListener, return false; } + //实际更改背景颜色 public void onBackgroundColorChanged() { findViewById(sBgSelectorSelectionMap.get(mWorkingNote.getBgColorId())).setVisibility( View.VISIBLE); @@ -480,6 +496,12 @@ public class NoteEditActivity extends Activity implements OnClickListener, mHeadViewPanel.setBackgroundResource(mWorkingNote.getTitleBgResId()); } + /** + * //准备菜单选项 + * @param menu The options menu as last shown or first initialized by + * onCreateOptionsMenu(). + * @return + */ @Override public boolean onPrepareOptionsMenu(Menu menu) { if (isFinishing()) { @@ -508,8 +530,6 @@ public class NoteEditActivity extends Activity implements OnClickListener, /** * 菜单选择事件 * @param item The menu item that was selected. - * - * @return */ @Override public boolean onOptionsItemSelected(MenuItem item) { @@ -559,6 +579,9 @@ public class NoteEditActivity extends Activity implements OnClickListener, return true; } + /** + * 为便签设置闹铃提醒 + */ private void setReminder() { DateTimePickerDialog d = new DateTimePickerDialog(this, System.currentTimeMillis()); d.setOnDateTimeSetListener(new OnDateTimeSetListener() { @@ -570,6 +593,7 @@ public class NoteEditActivity extends Activity implements OnClickListener, } /** + * 分享便签 * Share note to apps that support {@link Intent#ACTION_SEND} action * and {@text/plain} type */ @@ -580,6 +604,9 @@ public class NoteEditActivity extends Activity implements OnClickListener, context.startActivity(intent); } + /** + * 创建新便签 + */ private void createNewNote() { // Firstly, save current editing notes saveNote(); @@ -592,6 +619,9 @@ public class NoteEditActivity extends Activity implements OnClickListener, startActivity(intent); } + /** + * 删除当前便签 + */ private void deleteCurrentNote() { if (mWorkingNote.existInDatabase()) { HashSet ids = new HashSet(); @@ -697,6 +727,10 @@ public class NoteEditActivity extends Activity implements OnClickListener, } } + /** + * 进入清单模式 + * @param text + */ private void switchToListMode(String text) { mEditTextList.removeAllViews(); String[] items = text.split("\n"); @@ -731,6 +765,12 @@ public class NoteEditActivity extends Activity implements OnClickListener, return spannable; } + /** + * 清单模式编辑转换 + * @param item + * @param index + * @return + */ private View getListItem(String item, int index) { View view = LayoutInflater.from(this).inflate(R.layout.note_edit_list_item, null); final NoteEditText edit = (NoteEditText) view.findViewById(R.id.et_edit_text); @@ -827,6 +867,9 @@ public class NoteEditActivity extends Activity implements OnClickListener, return saved; } + /** + * 发送到桌面 + */ private void sendToDesktop() { /** * Before send message to home, we should make sure that current diff --git a/src/app/src/main/java/net/micode/notes/ui/NotesListActivity.java b/src/app/src/main/java/net/micode/notes/ui/NotesListActivity.java index 7567ff5..151cdff 100644 --- a/src/app/src/main/java/net/micode/notes/ui/NotesListActivity.java +++ b/src/app/src/main/java/net/micode/notes/ui/NotesListActivity.java @@ -76,6 +76,7 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt private static final String PREFERENCE_ADD_INTRODUCTION = "net.micode.notes.introduction"; + //列表编辑状态 1 根目录便签列表编辑装状态，2 子文件夹便签列表编辑状态，3 通话文件夹便签列表编辑状态 private enum ListEditState { NOTE_LIST, SUB_FOLDER, CALL_RECORD_FOLDER }; @@ -125,9 +126,6 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt super.onCreate(savedInstanceState); setContentView(R.layout.note_list); initResources(); - /** - * Insert an introduction when user firstly use this application - */ setAppInfoFromRawRes(); } @@ -140,23 +138,23 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt mNotesListAdapter.changeCursor(null); } else { super.onActivityResult(requestCode, resultCode, data); - // 调用 Activity 的onActivityResult（） } } + /** + * 第一次使用时，新建一个欢迎的便签，便签内容存储在资源文件中的raw/introduction + */ private void setAppInfoFromRawRes() { SharedPreferences sp = PreferenceManager.getDefaultSharedPreferences(this); - if (!sp.getBoolean(PREFERENCE_ADD_INTRODUCTION, false)) { + if (!sp.getBoolean(PREFERENCE_ADD_INTRODUCTION, false)) {//如果第一次使用，该值为false StringBuilder sb = new StringBuilder(); InputStream in = null; try { - // 把资源文件放到应用程序的/raw/raw下，那么就可以在应用中使用getResources获取资源后, - // 以openRawResource方法（不带后缀的资源文件名）打开这个文件。 in = getResources().openRawResource(R.raw.introduction); if (in != null) { InputStreamReader isr = new InputStreamReader(in); BufferedReader br = new BufferedReader(isr); - char [] buf = new char[1024]; // 自行定义的数值，使用者不知道有什么意义 + char [] buf = new char[1024]; int len = 0; while ((len = br.read(buf)) > 0) { sb.append(buf, 0, len); @@ -186,7 +184,7 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt note.setWorkingText(sb.toString()); if (note.saveNote()) { // 更新保存note的信息 - sp.edit().putBoolean(PREFERENCE_ADD_INTRODUCTION, true).commit(); + sp.edit().putBoolean(PREFERENCE_ADD_INTRODUCTION, true).commit();//将该值设置为true，确保第二次及以后打开不会再创建欢迎便签 } else { Log.e(TAG, "Save introduction note error"); return; @@ -206,7 +204,7 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt mContentResolver = this.getContentResolver(); // 获取应用程序的数据，操纵应用数据表 mBackgroundQueryHandler = new BackgroundQueryHandler(this.getContentResolver()); mCurrentFolderId = Notes.ID_ROOT_FOLDER;//当前文件夹ID初始化为根目录ID - + //绑定组件以及为组件设置监听器 mNotesListView = (ListView) findViewById(R.id.notes_list); mNotesListView.addFooterView(LayoutInflater.from(this).inflate(R.layout.note_list_footer, null), null, false); @@ -221,11 +219,13 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt mDispatchY = 0; mOriginY = 0; mTitleBar = (TextView) findViewById(R.id.tv_title_bar); - mState = ListEditState.NOTE_LIST; + mState = ListEditState.NOTE_LIST;//开始设置根目录列表编辑状态 mModeCallBack = new ModeCallback(); } - // 长按笔记后执行的回调 + /** + * 长按笔记后执行的回调，实现了ListView.MultiChoiceModeListener, OnMenuItemClickListener + */ private class ModeCallback implements ListView.MultiChoiceModeListener, OnMenuItemClickListener { private DropdownMenu mDropDownMenu; private ActionMode mActionMode; @@ -235,7 +235,7 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt getMenuInflater().inflate(R.menu.note_list_options, menu); menu.findItem(R.id.delete).setOnMenuItemClickListener(this); mMoveMenu = menu.findItem(R.id.move);//移动便签按钮 - //如果该便签的父节点ID为。。或用户总文件夹个数为0，则移动变迁按钮隐藏 + //如果该便签的父节点ID为通话文件夹ID或用户总文件夹个数为0，则移动变迁按钮隐藏 if (mFocusNoteDataItem.getParentId() == Notes.ID_CALL_RECORD_FOLDER || DataUtils.getUserFolderCount(mContentResolver) == 0) { mMoveMenu.setVisible(false); @@ -247,7 +247,6 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt mNotesListAdapter.setChoiceMode(true);//选择模式开启 mNotesListView.setLongClickable(false);//长按功能关闭 mAddNewNote.setVisibility(View.GONE);//新建便签按钮隐藏 - View customView = LayoutInflater.from(NotesListActivity.this).inflate( R.layout.note_list_dropdown_menu, null); mode.setCustomView(customView); @@ -255,13 +254,13 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt mDropDownMenu = new DropdownMenu(NotesListActivity.this, (Button) customView.findViewById(R.id.selection_menu), R.menu.note_list_dropdown); + // TODO 好像是包含全选功能的菜单，但在测试过程中未发现 mDropDownMenu.setOnDropdownMenuItemClickListener(new PopupMenu.OnMenuItemClickListener(){ public boolean onMenuItemClick(final MenuItem item) { mNotesListAdapter.selectAll(!mNotesListAdapter.isAllSelected()); updateMenu(); return true; } - }); return true; } @@ -317,7 +316,7 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt Toast.LENGTH_SHORT).show(); return true; } - + //根据选择的键来进行移动或删除操作 switch (item.getItemId()) { case R.id.delete: AlertDialog.Builder builder = new AlertDialog.Builder(NotesListActivity.this); @@ -422,7 +421,7 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt }, NoteColumns.TYPE + " DESC," + NoteColumns.MODIFIED_DATE + " DESC"); } - //后台SQL操作类 + //后台数据查询类 private final class BackgroundQueryHandler extends AsyncQueryHandler { public BackgroundQueryHandler(ContentResolver contentResolver) { super(contentResolver); @@ -448,7 +447,7 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt } /** - * 移动便签是产生选择文件夹弹窗列表 + * 移动便签时产生选择文件夹弹窗列表 */ private void showFolderListMenu(Cursor cursor) { AlertDialog.Builder builder = new AlertDialog.Builder(NotesListActivity.this); @@ -913,7 +912,6 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt } /** - * @return * 功能：判断是否正在同步 */ private boolean isSyncMode() { @@ -921,7 +919,7 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt } /** - * 功能：跳转到PreferenceActivity界面 + * 功能：跳转到偏好设置界面 */ private void startPreferenceActivity() { Activity from = getParent() != null ? getParent() : this; @@ -979,9 +977,9 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt */ private void startQueryDestinationFolders() { String selection = NoteColumns.TYPE + "=? AND " + NoteColumns.PARENT_ID + "<>? AND " + NoteColumns.ID + "<>?"; + //根据列表编辑状态构造查询语句 selection = (mState == ListEditState.NOTE_LIST) ? selection: "(" + selection + ") OR (" + NoteColumns.ID + "=" + Notes.ID_ROOT_FOLDER + ")"; - mBackgroundQueryHandler.startQuery(FOLDER_LIST_QUERY_TOKEN, null, Notes.CONTENT_NOTE_URI,