1 Commits (19573c43da668767e82ae7d5bce4759040130feb)

Author	SHA1	Message	Date
zcx	24cf290765	Squashed commit of the following: ... commit d809f5ae65 Author: zcx <1078327420@qq.com> Date: Tue Jan 9 15:29:18 2024 +0800 1 commit efcb4613c5 Merge: 261f44d 86290a8 Author: zcx <1078327420@qq.com> Date: Tue Jan 9 15:25:21 2024 +0800 Merge branch 'main' of https://bdgit.educoder.net/pq3fnjual/Minotes into 曾晨曦_branch # Conflicts: # doc/实践模板-开源软件泛读、标注和维护报告文档.docx # master/Notes-master1/.idea/.gitignore # master/Notes-master1/app/build/intermediates/packaged_res/debug/color/primary_text_dark.xml # master/Notes-master1/app/build/intermediates/packaged_res/debug/color/secondary_text_dark.xml # master/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/bg_btn_set_color.png # master/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/bg_color_btn_mask.png # master/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/call_record.png # master/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/clock.png # master/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/delete.png # master/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/dropdown_icon.9.png # master/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/edit_blue.9.png # master/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/edit_green.9.png # master/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/edit_red.9.png # master/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/edit_title_blue.9.png # master/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/edit_title_green.9.png # master/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/edit_title_red.9.png # master/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/edit_title_white.9.png # master/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/edit_title_yellow.9.png # master/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/edit_white.9.png # master/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/edit_yellow.9.png # master/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/font_large.png # master/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/font_normal.png # master/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/font_size_selector_bg.9.png # master/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/font_small.png # master/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/font_super.png # master/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/icon_app.png # master/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/list_background.png # master/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/list_blue_down.9.png # master/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/list_blue_middle.9.png # master/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/list_blue_single.9.png # master/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/list_blue_up.9.png # master/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/list_folder.9.png # master/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/list_footer_bg.9.png # master/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/list_green_down.9.png # master/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/list_green_middle.9.png # master/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/list_green_single.9.png # master/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/list_green_up.9.png # master/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/list_red_down.9.png # master/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/list_red_middle.9.png # master/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/list_red_single.9.png # master/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/list_red_up.9.png # master/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/list_white_down.9.png # master/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/list_white_middle.9.png # master/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/list_white_single.9.png # master/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/list_white_up.9.png # master/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/list_yellow_down.9.png # master/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/list_yellow_middle.9.png # master/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/list_yellow_single.9.png # master/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/list_yellow_up.9.png # master/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/menu_delete.png # master/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/menu_move.png # master/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/new_note_normal.png # master/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/new_note_pressed.png # master/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/note_edit_color_selector_panel.png # master/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/notification.png # master/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/search_result.png # master/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/selected.png # master/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/title_alert.png # master/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/title_bar_bg.9.png # master/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/widget_2x_blue.png # master/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/widget_2x_green.png # master/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/widget_2x_red.png # master/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/widget_2x_white.png # master/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/widget_2x_yellow.png # master/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/widget_4x_blue.png # master/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/widget_4x_green.png # master/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/widget_4x_red.png # master/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/widget_4x_white.png # master/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/widget_4x_yellow.png # master/Notes-master1/app/build/intermediates/packaged_res/debug/drawable/new_note.xml # master/Notes-master1/app/build/intermediates/packaged_res/debug/layout/account_dialog_title.xml # master/Notes-master1/app/build/intermediates/packaged_res/debug/layout/add_account_text.xml # master/Notes-master1/app/build/intermediates/packaged_res/debug/layout/datetime_picker.xml # master/Notes-master1/app/build/intermediates/packaged_res/debug/layout/dialog_edit_text.xml # master/Notes-master1/app/build/intermediates/packaged_res/debug/layout/folder_list_item.xml # master/Notes-master1/app/build/intermediates/packaged_res/debug/layout/note_edit.xml # master/Notes-master1/app/build/intermediates/packaged_res/debug/layout/note_edit_list_item.xml # master/Notes-master1/app/build/intermediates/packaged_res/debug/layout/note_item.xml # master/Notes-master1/app/build/intermediates/packaged_res/debug/layout/note_list.xml # master/Notes-master1/app/build/intermediates/packaged_res/debug/layout/note_list_dropdown_menu.xml # master/Notes-master1/app/build/intermediates/packaged_res/debug/layout/note_list_footer.xml # master/Notes-master1/app/build/intermediates/packaged_res/debug/layout/settings_header.xml # master/Notes-master1/app/build/intermediates/packaged_res/debug/layout/widget_2x.xml # master/Notes-master1/app/build/intermediates/packaged_res/debug/layout/widget_4x.xml # master/Notes-master1/app/build/intermediates/packaged_res/debug/menu/call_note_edit.xml # master/Notes-master1/app/build/intermediates/packaged_res/debug/menu/call_record_folder.xml # master/Notes-master1/app/build/intermediates/packaged_res/debug/menu/note_edit.xml # master/Notes-master1/app/build/intermediates/packaged_res/debug/menu/note_list.xml # master/Notes-master1/app/build/intermediates/packaged_res/debug/menu/note_list_dropdown.xml # master/Notes-master1/app/build/intermediates/packaged_res/debug/menu/note_list_options.xml # master/Notes-master1/app/build/intermediates/packaged_res/debug/menu/sub_folder.xml # master/Notes-master1/app/build/intermediates/packaged_res/debug/raw-zh-rCN/introduction # master/Notes-master1/app/build/intermediates/packaged_res/debug/raw/introduction # master/Notes-master1/app/build/intermediates/packaged_res/debug/xml/preferences.xml # master/Notes-master1/app/build/intermediates/packaged_res/debug/xml/searchable.xml # master/Notes-master1/app/build/intermediates/packaged_res/debug/xml/widget_2x_info.xml # master/Notes-master1/app/build/intermediates/packaged_res/debug/xml/widget_4x_info.xml # master/Notes-master1/app/src/main/AndroidManifest.xml # master/Notes-master1/app/src/main/java/net/micode/notes/data/Contact.java # master/Notes-master1/app/src/main/java/net/micode/notes/data/Notes.java # master/Notes-master1/app/src/main/java/net/micode/notes/data/NotesDatabaseHelper.java # master/Notes-master1/app/src/main/java/net/micode/notes/data/NotesProvider.java # master/Notes-master1/app/src/main/java/net/micode/notes/gtask/data/MetaData.java # master/Notes-master1/app/src/main/java/net/micode/notes/gtask/data/Node.java # master/Notes-master1/app/src/main/java/net/micode/notes/gtask/data/SqlData.java # master/Notes-master1/app/src/main/java/net/micode/notes/gtask/data/SqlNote.java # master/Notes-master1/app/src/main/java/net/micode/notes/gtask/data/Task.java # master/Notes-master1/app/src/main/java/net/micode/notes/gtask/data/TaskList.java # master/Notes-master1/app/src/main/java/net/micode/notes/gtask/exception/ActionFailureException.java # master/Notes-master1/app/src/main/java/net/micode/notes/gtask/exception/NetworkFailureException.java # master/Notes-master1/app/src/main/java/net/micode/notes/gtask/remote/GTaskASyncTask.java # master/Notes-master1/app/src/main/java/net/micode/notes/gtask/remote/GTaskClient.java # master/Notes-master1/app/src/main/java/net/micode/notes/gtask/remote/GTaskManager.java # master/Notes-master1/app/src/main/java/net/micode/notes/gtask/remote/GTaskSyncService.java # master/Notes-master1/app/src/main/java/net/micode/notes/model/Note.java # master/Notes-master1/app/src/main/java/net/micode/notes/model/WorkingNote.java # master/Notes-master1/app/src/main/java/net/micode/notes/tool/BackupUtils.java # master/Notes-master1/app/src/main/java/net/micode/notes/tool/DataUtils.java # master/Notes-master1/app/src/main/java/net/micode/notes/tool/GTaskStringUtils.java # master/Notes-master1/app/src/main/java/net/micode/notes/tool/ResourceParser.java # master/Notes-master1/app/src/main/java/net/micode/notes/ui/AlarmAlertActivity.java # master/Notes-master1/app/src/main/java/net/micode/notes/ui/AlarmInitReceiver.java # master/Notes-master1/app/src/main/java/net/micode/notes/ui/AlarmReceiver.java # master/Notes-master1/app/src/main/java/net/micode/notes/ui/DateTimePicker.java # master/Notes-master1/app/src/main/java/net/micode/notes/ui/DateTimePickerDialog.java # master/Notes-master1/app/src/main/java/net/micode/notes/ui/DropdownMenu.java # master/Notes-master1/app/src/main/java/net/micode/notes/ui/FoldersListAdapter.java # master/Notes-master1/app/src/main/java/net/micode/notes/ui/NoteEditActivity.java # master/Notes-master1/app/src/main/java/net/micode/notes/ui/NoteEditText.java # master/Notes-master1/app/src/main/java/net/micode/notes/ui/NoteItemData.java # master/Notes-master1/app/src/main/java/net/micode/notes/ui/NotesListActivity.java # master/Notes-master1/app/src/main/java/net/micode/notes/ui/NotesListAdapter.java # master/Notes-master1/app/src/main/java/net/micode/notes/ui/NotesListItem.java # master/Notes-master1/app/src/main/java/net/micode/notes/ui/NotesPreferenceActivity.java # master/Notes-master1/app/src/main/java/net/micode/notes/widget/NoteWidgetProvider.java # master/Notes-master1/app/src/main/java/net/micode/notes/widget/NoteWidgetProvider_2x.java # master/Notes-master1/app/src/main/java/net/micode/notes/widget/NoteWidgetProvider_4x.java # master/Notes-master1/app/src/main/res/values-zh-rCN/arrays.xml # master/Notes-master1/app/src/main/res/values-zh-rCN/strings.xml # master/Notes-master1/app/src/main/res/values-zh-rTW/arrays.xml # master/Notes-master1/app/src/main/res/values-zh-rTW/strings.xml # master/Notes-master1/app/src/main/res/values/arrays.xml # master/Notes-master1/app/src/main/res/values/colors.xml # master/Notes-master1/app/src/main/res/values/dimens.xml # master/Notes-master1/app/src/main/res/values/strings.xml # master/Notes-master1/app/src/main/res/values/styles.xml # src/Notes-master/src/net/micode/notes/data/Contact.java # src/Notes-master/src/net/micode/notes/data/Notes.java # src/Notes-master/src/net/micode/notes/data/NotesDatabaseHelper.java # src/Notes-master/src/net/micode/notes/ui/.idea/misc.xml # src/Notes-master/src/net/micode/notes/ui/.idea/modules.xml # src/Notes-master/src/net/micode/notes/ui/AlarmAlertActivity.java # src/Notes-master/src/net/micode/notes/ui/AlarmInitReceiver.java # src/Notes-master/src/net/micode/notes/ui/DateTimePicker.java # src/Notes-master/src/net/micode/notes/ui/NotesListItem.java # src/Notes-master/src/net/micode/notes/ui/NotesPreferenceActivity.java # src/Notes-master/src/net/micode/notes/ui/ui.iml commit 261f44dedb Author: zcx <1078327420@qq.com> Date: Tue Jan 9 15:19:32 2024 +0800 1 commit 9f451086c2 Author: zcx <1078327420@qq.com> Date: Sat Dec 23 16:04:43 2023 +0800 12.23添加 commit e5572d51b9 Author: zcx <1078327420@qq.com> Date: Sat Dec 23 10:21:14 2023 +0800 12.23 commit d09e80db11 Author: zcx <1078327420@qq.com> Date: Fri Dec 22 20:54:32 2023 +0800 1 commit 4853527fe5 Author: zcx <1078327420@qq.com> Date: Thu Dec 21 21:16:22 2023 +0800 1 commit b145d72307 Author: zcx <1078327420@qq.com> Date: Thu Dec 21 21:14:41 2023 +0800 1 commit fcc509a830 Author: zcx <1078327420@qq.com> Date: Thu Dec 21 10:01:45 2023 +0800 1 commit 197dfc861e Author: zcx <1078327420@qq.com> Date: Tue Dec 19 11:54:49 2023 +0800 1 commit ed719ab579 Author: zcx <1078327420@qq.com> Date: Tue Dec 19 11:47:13 2023 +0800 最近标注 commit 48849a21d6 Merge: c7b8dfe d23da33 Author: zcx <1078327420@qq.com> Date: Tue Dec 19 07:38:32 2023 +0800 Merge branch 'main' of https://bdgit.educoder.net/pq3fnjual/Minotes into 曾晨曦_branch # Conflicts: # doc/实践模板-开源软件泛读、标注和维护报告文档.docx commit c7b8dfe14a Author: zcx <1078327420@qq.com> Date: Tue Dec 19 07:27:37 2023 +0800 1 commit 781d628f8f Author: zcx <1078327420@qq.com> Date: Sat Dec 16 08:03:54 2023 +0800 标注 commit fe88fa8706 Merge: 40a106a 50cfb15 Author: zcx <1078327420@qq.com> Date: Sat Dec 16 08:02:00 2023 +0800 Merge branch 'main' of https://bdgit.educoder.net/pq3fnjual/Minotes into 曾晨曦_branch commit 40a106ab72 Author: zcx <1078327420@qq.com> Date: Thu Dec 14 18:50:49 2023 +0800 1 commit a6bf1d5701 Author: zcx <1078327420@qq.com> Date: Thu Dec 14 18:36:19 2023 +0800 UI包一部分 commit a99095dbf9 Author: zcx <1078327420@qq.com> Date: Thu Dec 14 18:25:02 2023 +0800 data包 commit b7353d6c78 Merge: b5f43d0 0b1994e Author: zcx <1078327420@qq.com> Date: Thu Dec 14 18:22:15 2023 +0800 Merge branch 'main' of https://bdgit.educoder.net/pq3fnjual/Minotes into 曾晨曦_branch # Conflicts: # .gitignore # doc/实践模板-开源软件泛读、标注和维护报告文档.docx commit b5f43d0721 Author: zcx <1078327420@qq.com> Date: Sun Dec 10 10:38:18 2023 +0800 1 commit a8c79ccdc5 Author: zcx <1078327420@qq.com> Date: Mon Dec 4 21:09:41 2023 +0800 。	2 years ago