From 272626833f98547fc73a47a6285e54dfa1ef52b2 Mon Sep 17 00:00:00 2001 From: ClearDewy <2233408834@qq.com> Date: Fri, 24 Feb 2023 21:48:29 +0800 Subject: [PATCH] Changes --- .gitignore | 3 + Notes-master/.gitignore | 9 - Notes-master/NOTICE | 190 ------------------ Notes-master/README | 23 --- app/build.gradle | 20 ++ .../src/main}/AndroidManifest.xml | 0 .../java}/net/micode/notes/data/Contact.java | 0 .../java}/net/micode/notes/data/Notes.java | 0 .../notes/data/NotesDatabaseHelper.java | 0 .../net/micode/notes/data/NotesProvider.java | 0 .../net/micode/notes/gtask/data/MetaData.java | 0 .../net/micode/notes/gtask/data/Node.java | 0 .../net/micode/notes/gtask/data/SqlData.java | 0 .../net/micode/notes/gtask/data/SqlNote.java | 0 .../net/micode/notes/gtask/data/Task.java | 0 .../net/micode/notes/gtask/data/TaskList.java | 0 .../exception/ActionFailureException.java | 0 .../exception/NetworkFailureException.java | 0 .../notes/gtask/remote/GTaskASyncTask.java | 17 +- .../notes/gtask/remote/GTaskClient.java | 0 .../notes/gtask/remote/GTaskManager.java | 0 .../notes/gtask/remote/GTaskSyncService.java | 0 .../java}/net/micode/notes/model/Note.java | 0 .../net/micode/notes/model/WorkingNote.java | 0 .../net/micode/notes/tool/BackupUtils.java | 0 .../net/micode/notes/tool/DataUtils.java | 0 .../micode/notes/tool/GTaskStringUtils.java | 0 .../net/micode/notes/tool/ResourceParser.java | 0 .../micode/notes/ui/AlarmAlertActivity.java | 0 .../micode/notes/ui/AlarmInitReceiver.java | 0 .../net/micode/notes/ui/AlarmReceiver.java | 0 .../net/micode/notes/ui/DateTimePicker.java | 0 .../micode/notes/ui/DateTimePickerDialog.java | 0 .../net/micode/notes/ui/DropdownMenu.java | 0 .../micode/notes/ui/FoldersListAdapter.java | 0 .../net/micode/notes/ui/NoteEditActivity.java | 0 .../net/micode/notes/ui/NoteEditText.java | 0 .../net/micode/notes/ui/NoteItemData.java | 0 .../micode/notes/ui/NotesListActivity.java | 0 .../net/micode/notes/ui/NotesListAdapter.java | 0 .../net/micode/notes/ui/NotesListItem.java | 0 .../notes/ui/NotesPreferenceActivity.java | 0 .../notes/widget/NoteWidgetProvider.java | 0 .../notes/widget/NoteWidgetProvider_2x.java | 0 .../notes/widget/NoteWidgetProvider_4x.java | 0 .../src/main}/res/color/primary_text_dark.xml | 2 +- .../main}/res/color/secondary_text_dark.xml | 2 +- .../res/drawable-hdpi/bg_btn_set_color.png | Bin .../res/drawable-hdpi/bg_color_btn_mask.png | Bin .../main}/res/drawable-hdpi/call_record.png | Bin .../src/main}/res/drawable-hdpi/clock.png | Bin .../src/main}/res/drawable-hdpi/delete.png | Bin .../res/drawable-hdpi/dropdown_icon.9.png | Bin .../main}/res/drawable-hdpi/edit_blue.9.png | Bin .../main}/res/drawable-hdpi/edit_green.9.png | Bin .../main}/res/drawable-hdpi/edit_red.9.png | Bin .../res/drawable-hdpi/edit_title_blue.9.png | Bin .../res/drawable-hdpi/edit_title_green.9.png | Bin .../res/drawable-hdpi/edit_title_red.9.png | Bin .../res/drawable-hdpi/edit_title_white.9.png | Bin .../res/drawable-hdpi/edit_title_yellow.9.png | Bin .../main}/res/drawable-hdpi/edit_white.9.png | Bin .../main}/res/drawable-hdpi/edit_yellow.9.png | Bin .../main}/res/drawable-hdpi/font_large.png | Bin .../main}/res/drawable-hdpi/font_normal.png | Bin .../drawable-hdpi/font_size_selector_bg.9.png | Bin .../main}/res/drawable-hdpi/font_small.png | Bin .../main}/res/drawable-hdpi/font_super.png | Bin .../src/main}/res/drawable-hdpi/icon_app.png | Bin .../res/drawable-hdpi/list_background.png | Bin .../res/drawable-hdpi/list_blue_down.9.png | Bin .../res/drawable-hdpi/list_blue_middle.9.png | Bin .../res/drawable-hdpi/list_blue_single.9.png | Bin .../res/drawable-hdpi/list_blue_up.9.png | Bin .../main}/res/drawable-hdpi/list_folder.9.png | Bin .../res/drawable-hdpi/list_footer_bg.9.png | Bin .../res/drawable-hdpi/list_green_down.9.png | Bin .../res/drawable-hdpi/list_green_middle.9.png | Bin .../res/drawable-hdpi/list_green_single.9.png | Bin .../res/drawable-hdpi/list_green_up.9.png | Bin .../res/drawable-hdpi/list_red_down.9.png | Bin .../res/drawable-hdpi/list_red_middle.9.png | Bin .../res/drawable-hdpi/list_red_single.9.png | Bin .../main}/res/drawable-hdpi/list_red_up.9.png | Bin .../res/drawable-hdpi/list_white_down.9.png | Bin .../res/drawable-hdpi/list_white_middle.9.png | Bin .../res/drawable-hdpi/list_white_single.9.png | Bin .../res/drawable-hdpi/list_white_up.9.png | Bin .../res/drawable-hdpi/list_yellow_down.9.png | Bin .../drawable-hdpi/list_yellow_middle.9.png | Bin .../drawable-hdpi/list_yellow_single.9.png | Bin .../res/drawable-hdpi/list_yellow_up.9.png | Bin .../main}/res/drawable-hdpi/menu_delete.png | Bin .../src/main}/res/drawable-hdpi/menu_move.png | Bin .../res/drawable-hdpi/new_note_normal.png | Bin .../res/drawable-hdpi/new_note_pressed.png | Bin .../note_edit_color_selector_panel.png | Bin .../main}/res/drawable-hdpi/notification.png | Bin .../main}/res/drawable-hdpi/search_result.png | Bin .../src/main}/res/drawable-hdpi/selected.png | Bin .../main}/res/drawable-hdpi/title_alert.png | Bin .../res/drawable-hdpi/title_bar_bg.9.png | Bin .../res/drawable-hdpi/widget_2x_blue.png | Bin .../res/drawable-hdpi/widget_2x_green.png | Bin .../main}/res/drawable-hdpi/widget_2x_red.png | Bin .../res/drawable-hdpi/widget_2x_white.png | Bin .../res/drawable-hdpi/widget_2x_yellow.png | Bin .../res/drawable-hdpi/widget_4x_blue.png | Bin .../res/drawable-hdpi/widget_4x_green.png | Bin .../main}/res/drawable-hdpi/widget_4x_red.png | Bin .../res/drawable-hdpi/widget_4x_white.png | Bin .../res/drawable-hdpi/widget_4x_yellow.png | Bin .../src/main}/res/drawable/new_note.xml | 0 .../main}/res/layout/account_dialog_title.xml | 0 .../src/main}/res/layout/add_account_text.xml | 0 .../src/main}/res/layout/datetime_picker.xml | 0 .../src/main}/res/layout/dialog_edit_text.xml | 0 .../src/main}/res/layout/folder_list_item.xml | 0 .../src/main}/res/layout/note_edit.xml | 0 .../main}/res/layout/note_edit_list_item.xml | 0 .../src/main}/res/layout/note_item.xml | 0 .../src/main}/res/layout/note_list.xml | 0 .../res/layout/note_list_dropdown_menu.xml | 0 .../src/main}/res/layout/note_list_footer.xml | 0 .../src/main}/res/layout/settings_header.xml | 0 .../src/main}/res/layout/widget_2x.xml | 0 .../src/main}/res/layout/widget_4x.xml | 0 .../src/main}/res/menu/call_note_edit.xml | 0 .../src/main}/res/menu/call_record_folder.xml | 0 .../src/main}/res/menu/note_edit.xml | 0 .../src/main}/res/menu/note_list.xml | 0 .../src/main}/res/menu/note_list_dropdown.xml | 0 .../src/main}/res/menu/note_list_options.xml | 0 .../src/main}/res/menu/sub_folder.xml | 0 .../src/main}/res/raw-zh-rCN/introduction | 0 .../src/main}/res/raw/introduction | 0 .../src/main}/res/values-zh-rCN/arrays.xml | 0 .../src/main}/res/values-zh-rCN/strings.xml | 0 .../src/main}/res/values-zh-rTW/arrays.xml | 0 .../src/main}/res/values-zh-rTW/strings.xml | 2 +- .../src/main}/res/values/arrays.xml | 0 .../src/main}/res/values/colors.xml | 0 .../src/main}/res/values/dimens.xml | 0 .../src/main}/res/values/strings.xml | 0 .../src/main}/res/values/styles.xml | 0 .../src/main}/res/xml/preferences.xml | 0 .../src/main}/res/xml/searchable.xml | 0 .../src/main}/res/xml/widget_2x_info.xml | 0 .../src/main}/res/xml/widget_4x_info.xml | 0 build.gradle | 17 ++ gradle/wrapper/gradle-wrapper.properties | 6 + gradlew | 185 +++++++++++++++++ gradlew.bat | 89 ++++++++ import-summary.txt | 36 ++++ local.properties | 7 + settings.gradle | 1 + 156 files changed, 378 insertions(+), 231 deletions(-) delete mode 100644 Notes-master/.gitignore delete mode 100644 Notes-master/NOTICE delete mode 100644 Notes-master/README create mode 100644 app/build.gradle rename {Notes-master => app/src/main}/AndroidManifest.xml (100%) rename {Notes-master/src => app/src/main/java}/net/micode/notes/data/Contact.java (100%) rename {Notes-master/src => app/src/main/java}/net/micode/notes/data/Notes.java (100%) rename {Notes-master/src => app/src/main/java}/net/micode/notes/data/NotesDatabaseHelper.java (100%) rename {Notes-master/src => app/src/main/java}/net/micode/notes/data/NotesProvider.java (100%) rename {Notes-master/src => app/src/main/java}/net/micode/notes/gtask/data/MetaData.java (100%) rename {Notes-master/src => app/src/main/java}/net/micode/notes/gtask/data/Node.java (100%) rename {Notes-master/src => app/src/main/java}/net/micode/notes/gtask/data/SqlData.java (100%) rename {Notes-master/src => app/src/main/java}/net/micode/notes/gtask/data/SqlNote.java (100%) rename {Notes-master/src => app/src/main/java}/net/micode/notes/gtask/data/Task.java (100%) rename {Notes-master/src => app/src/main/java}/net/micode/notes/gtask/data/TaskList.java (100%) rename {Notes-master/src => app/src/main/java}/net/micode/notes/gtask/exception/ActionFailureException.java (100%) rename {Notes-master/src => app/src/main/java}/net/micode/notes/gtask/exception/NetworkFailureException.java (100%) rename {Notes-master/src => app/src/main/java}/net/micode/notes/gtask/remote/GTaskASyncTask.java (90%) rename {Notes-master/src => app/src/main/java}/net/micode/notes/gtask/remote/GTaskClient.java (100%) rename {Notes-master/src => app/src/main/java}/net/micode/notes/gtask/remote/GTaskManager.java (100%) rename {Notes-master/src => app/src/main/java}/net/micode/notes/gtask/remote/GTaskSyncService.java (100%) rename {Notes-master/src => app/src/main/java}/net/micode/notes/model/Note.java (100%) rename {Notes-master/src => app/src/main/java}/net/micode/notes/model/WorkingNote.java (100%) rename {Notes-master/src => app/src/main/java}/net/micode/notes/tool/BackupUtils.java (100%) rename {Notes-master/src => app/src/main/java}/net/micode/notes/tool/DataUtils.java (100%) rename {Notes-master/src => app/src/main/java}/net/micode/notes/tool/GTaskStringUtils.java (100%) rename {Notes-master/src => app/src/main/java}/net/micode/notes/tool/ResourceParser.java (100%) rename {Notes-master/src => app/src/main/java}/net/micode/notes/ui/AlarmAlertActivity.java (100%) rename {Notes-master/src => app/src/main/java}/net/micode/notes/ui/AlarmInitReceiver.java (100%) rename {Notes-master/src => app/src/main/java}/net/micode/notes/ui/AlarmReceiver.java (100%) rename {Notes-master/src => app/src/main/java}/net/micode/notes/ui/DateTimePicker.java (100%) rename {Notes-master/src => app/src/main/java}/net/micode/notes/ui/DateTimePickerDialog.java (100%) rename {Notes-master/src => app/src/main/java}/net/micode/notes/ui/DropdownMenu.java (100%) rename {Notes-master/src => app/src/main/java}/net/micode/notes/ui/FoldersListAdapter.java (100%) rename {Notes-master/src => app/src/main/java}/net/micode/notes/ui/NoteEditActivity.java (100%) rename {Notes-master/src => app/src/main/java}/net/micode/notes/ui/NoteEditText.java (100%) rename {Notes-master/src => app/src/main/java}/net/micode/notes/ui/NoteItemData.java (100%) rename {Notes-master/src => app/src/main/java}/net/micode/notes/ui/NotesListActivity.java (100%) rename {Notes-master/src => app/src/main/java}/net/micode/notes/ui/NotesListAdapter.java (100%) rename {Notes-master/src => app/src/main/java}/net/micode/notes/ui/NotesListItem.java (100%) rename {Notes-master/src => app/src/main/java}/net/micode/notes/ui/NotesPreferenceActivity.java (100%) rename {Notes-master/src => app/src/main/java}/net/micode/notes/widget/NoteWidgetProvider.java (100%) rename {Notes-master/src => app/src/main/java}/net/micode/notes/widget/NoteWidgetProvider_2x.java (100%) rename {Notes-master/src => app/src/main/java}/net/micode/notes/widget/NoteWidgetProvider_4x.java (100%) rename {Notes-master => app/src/main}/res/color/primary_text_dark.xml (94%) rename {Notes-master => app/src/main}/res/color/secondary_text_dark.xml (93%) rename {Notes-master => app/src/main}/res/drawable-hdpi/bg_btn_set_color.png (100%) rename {Notes-master => app/src/main}/res/drawable-hdpi/bg_color_btn_mask.png (100%) rename {Notes-master => app/src/main}/res/drawable-hdpi/call_record.png (100%) rename {Notes-master => app/src/main}/res/drawable-hdpi/clock.png (100%) rename {Notes-master => app/src/main}/res/drawable-hdpi/delete.png (100%) rename {Notes-master => app/src/main}/res/drawable-hdpi/dropdown_icon.9.png (100%) rename {Notes-master => app/src/main}/res/drawable-hdpi/edit_blue.9.png (100%) rename {Notes-master => app/src/main}/res/drawable-hdpi/edit_green.9.png (100%) rename {Notes-master => app/src/main}/res/drawable-hdpi/edit_red.9.png (100%) rename {Notes-master => app/src/main}/res/drawable-hdpi/edit_title_blue.9.png (100%) rename {Notes-master => app/src/main}/res/drawable-hdpi/edit_title_green.9.png (100%) rename {Notes-master => app/src/main}/res/drawable-hdpi/edit_title_red.9.png (100%) rename {Notes-master => app/src/main}/res/drawable-hdpi/edit_title_white.9.png (100%) rename {Notes-master => app/src/main}/res/drawable-hdpi/edit_title_yellow.9.png (100%) rename {Notes-master => app/src/main}/res/drawable-hdpi/edit_white.9.png (100%) rename {Notes-master => app/src/main}/res/drawable-hdpi/edit_yellow.9.png (100%) rename {Notes-master => app/src/main}/res/drawable-hdpi/font_large.png (100%) rename {Notes-master => app/src/main}/res/drawable-hdpi/font_normal.png (100%) rename {Notes-master => app/src/main}/res/drawable-hdpi/font_size_selector_bg.9.png (100%) rename {Notes-master => app/src/main}/res/drawable-hdpi/font_small.png (100%) rename {Notes-master => app/src/main}/res/drawable-hdpi/font_super.png (100%) rename {Notes-master => app/src/main}/res/drawable-hdpi/icon_app.png (100%) rename {Notes-master => app/src/main}/res/drawable-hdpi/list_background.png (100%) rename {Notes-master => app/src/main}/res/drawable-hdpi/list_blue_down.9.png (100%) rename {Notes-master => app/src/main}/res/drawable-hdpi/list_blue_middle.9.png (100%) rename {Notes-master => app/src/main}/res/drawable-hdpi/list_blue_single.9.png (100%) rename {Notes-master => app/src/main}/res/drawable-hdpi/list_blue_up.9.png (100%) rename {Notes-master => app/src/main}/res/drawable-hdpi/list_folder.9.png (100%) rename {Notes-master => app/src/main}/res/drawable-hdpi/list_footer_bg.9.png (100%) rename {Notes-master => app/src/main}/res/drawable-hdpi/list_green_down.9.png (100%) rename {Notes-master => app/src/main}/res/drawable-hdpi/list_green_middle.9.png (100%) rename {Notes-master => app/src/main}/res/drawable-hdpi/list_green_single.9.png (100%) rename {Notes-master => app/src/main}/res/drawable-hdpi/list_green_up.9.png (100%) rename {Notes-master => app/src/main}/res/drawable-hdpi/list_red_down.9.png (100%) rename {Notes-master => app/src/main}/res/drawable-hdpi/list_red_middle.9.png (100%) rename {Notes-master => app/src/main}/res/drawable-hdpi/list_red_single.9.png (100%) rename {Notes-master => app/src/main}/res/drawable-hdpi/list_red_up.9.png (100%) rename {Notes-master => app/src/main}/res/drawable-hdpi/list_white_down.9.png (100%) rename {Notes-master => app/src/main}/res/drawable-hdpi/list_white_middle.9.png (100%) rename {Notes-master => app/src/main}/res/drawable-hdpi/list_white_single.9.png (100%) rename {Notes-master => app/src/main}/res/drawable-hdpi/list_white_up.9.png (100%) rename {Notes-master => app/src/main}/res/drawable-hdpi/list_yellow_down.9.png (100%) rename {Notes-master => app/src/main}/res/drawable-hdpi/list_yellow_middle.9.png (100%) rename {Notes-master => app/src/main}/res/drawable-hdpi/list_yellow_single.9.png (100%) rename {Notes-master => app/src/main}/res/drawable-hdpi/list_yellow_up.9.png (100%) rename {Notes-master => app/src/main}/res/drawable-hdpi/menu_delete.png (100%) rename {Notes-master => app/src/main}/res/drawable-hdpi/menu_move.png (100%) rename {Notes-master => app/src/main}/res/drawable-hdpi/new_note_normal.png (100%) rename {Notes-master => app/src/main}/res/drawable-hdpi/new_note_pressed.png (100%) rename {Notes-master => app/src/main}/res/drawable-hdpi/note_edit_color_selector_panel.png (100%) rename {Notes-master => app/src/main}/res/drawable-hdpi/notification.png (100%) rename {Notes-master => app/src/main}/res/drawable-hdpi/search_result.png (100%) rename {Notes-master => app/src/main}/res/drawable-hdpi/selected.png (100%) rename {Notes-master => app/src/main}/res/drawable-hdpi/title_alert.png (100%) rename {Notes-master => app/src/main}/res/drawable-hdpi/title_bar_bg.9.png (100%) rename {Notes-master => app/src/main}/res/drawable-hdpi/widget_2x_blue.png (100%) rename {Notes-master => app/src/main}/res/drawable-hdpi/widget_2x_green.png (100%) rename {Notes-master => app/src/main}/res/drawable-hdpi/widget_2x_red.png (100%) rename {Notes-master => app/src/main}/res/drawable-hdpi/widget_2x_white.png (100%) rename {Notes-master => app/src/main}/res/drawable-hdpi/widget_2x_yellow.png (100%) rename {Notes-master => app/src/main}/res/drawable-hdpi/widget_4x_blue.png (100%) rename {Notes-master => app/src/main}/res/drawable-hdpi/widget_4x_green.png (100%) rename {Notes-master => app/src/main}/res/drawable-hdpi/widget_4x_red.png (100%) rename {Notes-master => app/src/main}/res/drawable-hdpi/widget_4x_white.png (100%) rename {Notes-master => app/src/main}/res/drawable-hdpi/widget_4x_yellow.png (100%) rename {Notes-master => app/src/main}/res/drawable/new_note.xml (100%) rename {Notes-master => app/src/main}/res/layout/account_dialog_title.xml (100%) rename {Notes-master => app/src/main}/res/layout/add_account_text.xml (100%) rename {Notes-master => app/src/main}/res/layout/datetime_picker.xml (100%) rename {Notes-master => app/src/main}/res/layout/dialog_edit_text.xml (100%) rename {Notes-master => app/src/main}/res/layout/folder_list_item.xml (100%) rename {Notes-master => app/src/main}/res/layout/note_edit.xml (100%) rename {Notes-master => app/src/main}/res/layout/note_edit_list_item.xml (100%) rename {Notes-master => app/src/main}/res/layout/note_item.xml (100%) rename {Notes-master => app/src/main}/res/layout/note_list.xml (100%) rename {Notes-master => app/src/main}/res/layout/note_list_dropdown_menu.xml (100%) rename {Notes-master => app/src/main}/res/layout/note_list_footer.xml (100%) rename {Notes-master => app/src/main}/res/layout/settings_header.xml (100%) rename {Notes-master => app/src/main}/res/layout/widget_2x.xml (100%) rename {Notes-master => app/src/main}/res/layout/widget_4x.xml (100%) rename {Notes-master => app/src/main}/res/menu/call_note_edit.xml (100%) rename {Notes-master => app/src/main}/res/menu/call_record_folder.xml (100%) rename {Notes-master => app/src/main}/res/menu/note_edit.xml (100%) rename {Notes-master => app/src/main}/res/menu/note_list.xml (100%) rename {Notes-master => app/src/main}/res/menu/note_list_dropdown.xml (100%) rename {Notes-master => app/src/main}/res/menu/note_list_options.xml (100%) rename {Notes-master => app/src/main}/res/menu/sub_folder.xml (100%) rename {Notes-master => app/src/main}/res/raw-zh-rCN/introduction (100%) rename {Notes-master => app/src/main}/res/raw/introduction (100%) rename {Notes-master => app/src/main}/res/values-zh-rCN/arrays.xml (100%) rename {Notes-master => app/src/main}/res/values-zh-rCN/strings.xml (100%) rename {Notes-master => app/src/main}/res/values-zh-rTW/arrays.xml (100%) rename {Notes-master => app/src/main}/res/values-zh-rTW/strings.xml (99%) rename {Notes-master => app/src/main}/res/values/arrays.xml (100%) rename {Notes-master => app/src/main}/res/values/colors.xml (100%) rename {Notes-master => app/src/main}/res/values/dimens.xml (100%) rename {Notes-master => app/src/main}/res/values/strings.xml (100%) rename {Notes-master => app/src/main}/res/values/styles.xml (100%) rename {Notes-master => app/src/main}/res/xml/preferences.xml (100%) rename {Notes-master => app/src/main}/res/xml/searchable.xml (100%) rename {Notes-master => app/src/main}/res/xml/widget_2x_info.xml (100%) rename {Notes-master => app/src/main}/res/xml/widget_4x_info.xml (100%) create mode 100644 build.gradle create mode 100644 gradle/wrapper/gradle-wrapper.properties create mode 100644 gradlew create mode 100644 gradlew.bat create mode 100644 import-summary.txt create mode 100644 local.properties create mode 100644 settings.gradle diff --git a/.gitignore b/.gitignore index 85e7c1d..04fe8e7 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,4 @@ +/.gradle/ /.idea/ +/app/build/ +/gradle/wrapper/gradle-wrapper.jar diff --git a/Notes-master/.gitignore b/Notes-master/.gitignore deleted file mode 100644 index 7df8dff..0000000 --- a/Notes-master/.gitignore +++ /dev/null @@ -1,9 +0,0 @@ -# generated files -bin/ -gen/ - -# Local configuration file (sdk path, etc) -project.properties -.settings/ -.classpath -.project diff --git a/Notes-master/NOTICE b/Notes-master/NOTICE deleted file mode 100644 index 9a54521..0000000 --- a/Notes-master/NOTICE +++ /dev/null @@ -1,190 +0,0 @@ - - Copyright (c) 2010-2011, The MiCode Open Source Community (www.micode.net) - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. - - - Apache License - Version 2.0, January 2004 - http://www.apache.org/licenses/ - - TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION - - 1. Definitions. - - "License" shall mean the terms and conditions for use, reproduction, - and distribution as defined by Sections 1 through 9 of this document. - - "Licensor" shall mean the copyright owner or entity authorized by - the copyright owner that is granting the License. - - "Legal Entity" shall mean the union of the acting entity and all - other entities that control, are controlled by, or are under common - control with that entity. For the purposes of this definition, - "control" means (i) the power, direct or indirect, to cause the - direction or management of such entity, whether by contract or - otherwise, or (ii) ownership of fifty percent (50%) or more of the - outstanding shares, or (iii) beneficial ownership of such entity. - - "You" (or "Your") shall mean an individual or Legal Entity - exercising permissions granted by this License. - - "Source" form shall mean the preferred form for making modifications, - including but not limited to software source code, documentation - source, and configuration files. - - "Object" form shall mean any form resulting from mechanical - transformation or translation of a Source form, including but - not limited to compiled object code, generated documentation, - and conversions to other media types. - - "Work" shall mean the work of authorship, whether in Source or - Object form, made available under the License, as indicated by a - copyright notice that is included in or attached to the work - (an example is provided in the Appendix below). - - "Derivative Works" shall mean any work, whether in Source or Object - form, that is based on (or derived from) the Work and for which the - editorial revisions, annotations, elaborations, or other modifications - represent, as a whole, an original work of authorship. For the purposes - of this License, Derivative Works shall not include works that remain - separable from, or merely link (or bind by name) to the interfaces of, - the Work and Derivative Works thereof. - - "Contribution" shall mean any work of authorship, including - the original version of the Work and any modifications or additions - to that Work or Derivative Works thereof, that is intentionally - submitted to Licensor for inclusion in the Work by the copyright owner - or by an individual or Legal Entity authorized to submit on behalf of - the copyright owner. For the purposes of this definition, "submitted" - means any form of electronic, verbal, or written communication sent - to the Licensor or its representatives, including but not limited to - communication on electronic mailing lists, source code control systems, - and issue tracking systems that are managed by, or on behalf of, the - Licensor for the purpose of discussing and improving the Work, but - excluding communication that is conspicuously marked or otherwise - designated in writing by the copyright owner as "Not a Contribution." - - "Contributor" shall mean Licensor and any individual or Legal Entity - on behalf of whom a Contribution has been received by Licensor and - subsequently incorporated within the Work. - - 2. Grant of Copyright License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - copyright license to reproduce, prepare Derivative Works of, - publicly display, publicly perform, sublicense, and distribute the - Work and such Derivative Works in Source or Object form. - - 3. Grant of Patent License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - (except as stated in this section) patent license to make, have made, - use, offer to sell, sell, import, and otherwise transfer the Work, - where such license applies only to those patent claims licensable - by such Contributor that are necessarily infringed by their - Contribution(s) alone or by combination of their Contribution(s) - with the Work to which such Contribution(s) was submitted. If You - institute patent litigation against any entity (including a - cross-claim or counterclaim in a lawsuit) alleging that the Work - or a Contribution incorporated within the Work constitutes direct - or contributory patent infringement, then any patent licenses - granted to You under this License for that Work shall terminate - as of the date such litigation is filed. - - 4. Redistribution. You may reproduce and distribute copies of the - Work or Derivative Works thereof in any medium, with or without - modifications, and in Source or Object form, provided that You - meet the following conditions: - - (a) You must give any other recipients of the Work or - Derivative Works a copy of this License; and - - (b) You must cause any modified files to carry prominent notices - stating that You changed the files; and - - (c) You must retain, in the Source form of any Derivative Works - that You distribute, all copyright, patent, trademark, and - attribution notices from the Source form of the Work, - excluding those notices that do not pertain to any part of - the Derivative Works; and - - (d) If the Work includes a "NOTICE" text file as part of its - distribution, then any Derivative Works that You distribute must - include a readable copy of the attribution notices contained - within such NOTICE file, excluding those notices that do not - pertain to any part of the Derivative Works, in at least one - of the following places: within a NOTICE text file distributed - as part of the Derivative Works; within the Source form or - documentation, if provided along with the Derivative Works; or, - within a display generated by the Derivative Works, if and - wherever such third-party notices normally appear. The contents - of the NOTICE file are for informational purposes only and - do not modify the License. You may add Your own attribution - notices within Derivative Works that You distribute, alongside - or as an addendum to the NOTICE text from the Work, provided - that such additional attribution notices cannot be construed - as modifying the License. - - You may add Your own copyright statement to Your modifications and - may provide additional or different license terms and conditions - for use, reproduction, or distribution of Your modifications, or - for any such Derivative Works as a whole, provided Your use, - reproduction, and distribution of the Work otherwise complies with - the conditions stated in this License. - - 5. Submission of Contributions. Unless You explicitly state otherwise, - any Contribution intentionally submitted for inclusion in the Work - by You to the Licensor shall be under the terms and conditions of - this License, without any additional terms or conditions. - Notwithstanding the above, nothing herein shall supersede or modify - the terms of any separate license agreement you may have executed - with Licensor regarding such Contributions. - - 6. Trademarks. This License does not grant permission to use the trade - names, trademarks, service marks, or product names of the Licensor, - except as required for reasonable and customary use in describing the - origin of the Work and reproducing the content of the NOTICE file. - - 7. Disclaimer of Warranty. Unless required by applicable law or - agreed to in writing, Licensor provides the Work (and each - Contributor provides its Contributions) on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - implied, including, without limitation, any warranties or conditions - of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A - PARTICULAR PURPOSE. You are solely responsible for determining the - appropriateness of using or redistributing the Work and assume any - risks associated with Your exercise of permissions under this License. - - 8. Limitation of Liability. In no event and under no legal theory, - whether in tort (including negligence), contract, or otherwise, - unless required by applicable law (such as deliberate and grossly - negligent acts) or agreed to in writing, shall any Contributor be - liable to You for damages, including any direct, indirect, special, - incidental, or consequential damages of any character arising as a - result of this License or out of the use or inability to use the - Work (including but not limited to damages for loss of goodwill, - work stoppage, computer failure or malfunction, or any and all - other commercial damages or losses), even if such Contributor - has been advised of the possibility of such damages. - - 9. Accepting Warranty or Additional Liability. While redistributing - the Work or Derivative Works thereof, You may choose to offer, - and charge a fee for, acceptance of support, warranty, indemnity, - or other liability obligations and/or rights consistent with this - License. However, in accepting such obligations, You may act only - on Your own behalf and on Your sole responsibility, not on behalf - of any other Contributor, and only if You agree to indemnify, - defend, and hold each Contributor harmless for any liability - incurred by, or claims asserted against, such Contributor by reason - of your accepting any such warranty or additional liability. - - END OF TERMS AND CONDITIONS - diff --git a/Notes-master/README b/Notes-master/README deleted file mode 100644 index fc0d824..0000000 --- a/Notes-master/README +++ /dev/null @@ -1,23 +0,0 @@ -[中文] - -1. MiCode便签是小米便签的社区开源版，由MIUI团队(www.miui.com) 发起并贡献第一批代码，遵循NOTICE文件所描述的开源协议， - 今后为MiCode社区(www.micode.net) 拥有，并由社区发布和维护。 - -2. Bug反馈和跟踪，请访问Github, - https://github.com/MiCode/Notes/issues?sort=created&direction=desc&state=open - -3. 功能建议和综合讨论，请访问MiCode, - http://micode.net/forum.php?mod=forumdisplay&fid=38 - - -[English] - -1. MiCode Notes is open source edition of XM notepad, it's first initiated and sponsored by MIUI team (www.miui.com). - It's opened under license described by NOTICE file. It's owned by the MiCode community (www.micode.net). In future, - the MiCode community will release and maintain this project. - -2. Regarding issue tracking, please visit Github, - https://github.com/MiCode/Notes/issues?sort=created&direction=desc&state=open - -3. Regarding feature request and general discussion, please visit Micode forum, - http://micode.net/forum.php?mod=forumdisplay&fid=38 diff --git a/app/build.gradle b/app/build.gradle new file mode 100644 index 0000000..eb11a3d --- /dev/null +++ b/app/build.gradle @@ -0,0 +1,20 @@ +apply plugin: 'com.android.application' + +android { + compileSdkVersion 33 + buildToolsVersion "33.0.2" + useLibrary 'org.apache.http.legacy' + + defaultConfig { + applicationId "net.micode.notes" + minSdkVersion 14 + targetSdkVersion 30 + } + + buildTypes { + release { + minifyEnabled false + proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt' + } + } +} diff --git a/Notes-master/AndroidManifest.xml b/app/src/main/AndroidManifest.xml similarity index 100% rename from Notes-master/AndroidManifest.xml rename to app/src/main/AndroidManifest.xml diff --git a/Notes-master/src/net/micode/notes/data/Contact.java b/app/src/main/java/net/micode/notes/data/Contact.java similarity index 100% rename from Notes-master/src/net/micode/notes/data/Contact.java rename to app/src/main/java/net/micode/notes/data/Contact.java diff --git a/Notes-master/src/net/micode/notes/data/Notes.java b/app/src/main/java/net/micode/notes/data/Notes.java similarity index 100% rename from Notes-master/src/net/micode/notes/data/Notes.java rename to app/src/main/java/net/micode/notes/data/Notes.java diff --git a/Notes-master/src/net/micode/notes/data/NotesDatabaseHelper.java b/app/src/main/java/net/micode/notes/data/NotesDatabaseHelper.java similarity index 100% rename from Notes-master/src/net/micode/notes/data/NotesDatabaseHelper.java rename to app/src/main/java/net/micode/notes/data/NotesDatabaseHelper.java diff --git a/Notes-master/src/net/micode/notes/data/NotesProvider.java b/app/src/main/java/net/micode/notes/data/NotesProvider.java similarity index 100% rename from Notes-master/src/net/micode/notes/data/NotesProvider.java rename to app/src/main/java/net/micode/notes/data/NotesProvider.java diff --git a/Notes-master/src/net/micode/notes/gtask/data/MetaData.java b/app/src/main/java/net/micode/notes/gtask/data/MetaData.java similarity index 100% rename from Notes-master/src/net/micode/notes/gtask/data/MetaData.java rename to app/src/main/java/net/micode/notes/gtask/data/MetaData.java diff --git a/Notes-master/src/net/micode/notes/gtask/data/Node.java b/app/src/main/java/net/micode/notes/gtask/data/Node.java similarity index 100% rename from Notes-master/src/net/micode/notes/gtask/data/Node.java rename to app/src/main/java/net/micode/notes/gtask/data/Node.java diff --git a/Notes-master/src/net/micode/notes/gtask/data/SqlData.java b/app/src/main/java/net/micode/notes/gtask/data/SqlData.java similarity index 100% rename from Notes-master/src/net/micode/notes/gtask/data/SqlData.java rename to app/src/main/java/net/micode/notes/gtask/data/SqlData.java diff --git a/Notes-master/src/net/micode/notes/gtask/data/SqlNote.java b/app/src/main/java/net/micode/notes/gtask/data/SqlNote.java similarity index 100% rename from Notes-master/src/net/micode/notes/gtask/data/SqlNote.java rename to app/src/main/java/net/micode/notes/gtask/data/SqlNote.java diff --git a/Notes-master/src/net/micode/notes/gtask/data/Task.java b/app/src/main/java/net/micode/notes/gtask/data/Task.java similarity index 100% rename from Notes-master/src/net/micode/notes/gtask/data/Task.java rename to app/src/main/java/net/micode/notes/gtask/data/Task.java diff --git a/Notes-master/src/net/micode/notes/gtask/data/TaskList.java b/app/src/main/java/net/micode/notes/gtask/data/TaskList.java similarity index 100% rename from Notes-master/src/net/micode/notes/gtask/data/TaskList.java rename to app/src/main/java/net/micode/notes/gtask/data/TaskList.java diff --git a/Notes-master/src/net/micode/notes/gtask/exception/ActionFailureException.java b/app/src/main/java/net/micode/notes/gtask/exception/ActionFailureException.java similarity index 100% rename from Notes-master/src/net/micode/notes/gtask/exception/ActionFailureException.java rename to app/src/main/java/net/micode/notes/gtask/exception/ActionFailureException.java diff --git a/Notes-master/src/net/micode/notes/gtask/exception/NetworkFailureException.java b/app/src/main/java/net/micode/notes/gtask/exception/NetworkFailureException.java similarity index 100% rename from Notes-master/src/net/micode/notes/gtask/exception/NetworkFailureException.java rename to app/src/main/java/net/micode/notes/gtask/exception/NetworkFailureException.java diff --git a/Notes-master/src/net/micode/notes/gtask/remote/GTaskASyncTask.java b/app/src/main/java/net/micode/notes/gtask/remote/GTaskASyncTask.java similarity index 90% rename from Notes-master/src/net/micode/notes/gtask/remote/GTaskASyncTask.java rename to app/src/main/java/net/micode/notes/gtask/remote/GTaskASyncTask.java index b3b61e7..440a871 100644 --- a/Notes-master/src/net/micode/notes/gtask/remote/GTaskASyncTask.java +++ b/app/src/main/java/net/micode/notes/gtask/remote/GTaskASyncTask.java @@ -64,10 +64,6 @@ public class GTaskASyncTask extends AsyncTask { } private void showNotification(int tickerId, String content) { - Notification notification = new Notification(R.drawable.notification, mContext - .getString(tickerId), System.currentTimeMillis()); - notification.defaults = Notification.DEFAULT_LIGHTS; - notification.flags = Notification.FLAG_AUTO_CANCEL; PendingIntent pendingIntent; if (tickerId != R.string.ticker_success) { pendingIntent = PendingIntent.getActivity(mContext, 0, new Intent(mContext, @@ -77,11 +73,20 @@ public class GTaskASyncTask extends AsyncTask { pendingIntent = PendingIntent.getActivity(mContext, 0, new Intent(mContext, NotesListActivity.class), 0); } - notification.setLatestEventInfo(mContext, mContext.getString(R.string.app_name), content, - pendingIntent); + + + Notification.Builder builder = new Notification.Builder(mContext) + .setAutoCancel(true) + .setContentTitle(mContext.getString(R.string.app_name)) + .setContentText(content) + .setContentIntent(pendingIntent) + .setWhen(System.currentTimeMillis()) + .setOngoing(true); + Notification notification=builder.getNotification(); mNotifiManager.notify(GTASK_SYNC_NOTIFICATION_ID, notification); } + @Override protected Integer doInBackground(Void... unused) { publishProgess(mContext.getString(R.string.sync_progress_login, NotesPreferenceActivity diff --git a/Notes-master/src/net/micode/notes/gtask/remote/GTaskClient.java b/app/src/main/java/net/micode/notes/gtask/remote/GTaskClient.java similarity index 100% rename from Notes-master/src/net/micode/notes/gtask/remote/GTaskClient.java rename to app/src/main/java/net/micode/notes/gtask/remote/GTaskClient.java diff --git a/Notes-master/src/net/micode/notes/gtask/remote/GTaskManager.java b/app/src/main/java/net/micode/notes/gtask/remote/GTaskManager.java similarity index 100% rename from Notes-master/src/net/micode/notes/gtask/remote/GTaskManager.java rename to app/src/main/java/net/micode/notes/gtask/remote/GTaskManager.java diff --git a/Notes-master/src/net/micode/notes/gtask/remote/GTaskSyncService.java b/app/src/main/java/net/micode/notes/gtask/remote/GTaskSyncService.java similarity index 100% rename from Notes-master/src/net/micode/notes/gtask/remote/GTaskSyncService.java rename to app/src/main/java/net/micode/notes/gtask/remote/GTaskSyncService.java diff --git a/Notes-master/src/net/micode/notes/model/Note.java b/app/src/main/java/net/micode/notes/model/Note.java similarity index 100% rename from Notes-master/src/net/micode/notes/model/Note.java rename to app/src/main/java/net/micode/notes/model/Note.java diff --git a/Notes-master/src/net/micode/notes/model/WorkingNote.java b/app/src/main/java/net/micode/notes/model/WorkingNote.java similarity index 100% rename from Notes-master/src/net/micode/notes/model/WorkingNote.java rename to app/src/main/java/net/micode/notes/model/WorkingNote.java diff --git a/Notes-master/src/net/micode/notes/tool/BackupUtils.java b/app/src/main/java/net/micode/notes/tool/BackupUtils.java similarity index 100% rename from Notes-master/src/net/micode/notes/tool/BackupUtils.java rename to app/src/main/java/net/micode/notes/tool/BackupUtils.java diff --git a/Notes-master/src/net/micode/notes/tool/DataUtils.java b/app/src/main/java/net/micode/notes/tool/DataUtils.java similarity index 100% rename from Notes-master/src/net/micode/notes/tool/DataUtils.java rename to app/src/main/java/net/micode/notes/tool/DataUtils.java diff --git a/Notes-master/src/net/micode/notes/tool/GTaskStringUtils.java b/app/src/main/java/net/micode/notes/tool/GTaskStringUtils.java similarity index 100% rename from Notes-master/src/net/micode/notes/tool/GTaskStringUtils.java rename to app/src/main/java/net/micode/notes/tool/GTaskStringUtils.java diff --git a/Notes-master/src/net/micode/notes/tool/ResourceParser.java b/app/src/main/java/net/micode/notes/tool/ResourceParser.java similarity index 100% rename from Notes-master/src/net/micode/notes/tool/ResourceParser.java rename to app/src/main/java/net/micode/notes/tool/ResourceParser.java diff --git a/Notes-master/src/net/micode/notes/ui/AlarmAlertActivity.java b/app/src/main/java/net/micode/notes/ui/AlarmAlertActivity.java similarity index 100% rename from Notes-master/src/net/micode/notes/ui/AlarmAlertActivity.java rename to app/src/main/java/net/micode/notes/ui/AlarmAlertActivity.java diff --git a/Notes-master/src/net/micode/notes/ui/AlarmInitReceiver.java b/app/src/main/java/net/micode/notes/ui/AlarmInitReceiver.java similarity index 100% rename from Notes-master/src/net/micode/notes/ui/AlarmInitReceiver.java rename to app/src/main/java/net/micode/notes/ui/AlarmInitReceiver.java diff --git a/Notes-master/src/net/micode/notes/ui/AlarmReceiver.java b/app/src/main/java/net/micode/notes/ui/AlarmReceiver.java similarity index 100% rename from Notes-master/src/net/micode/notes/ui/AlarmReceiver.java rename to app/src/main/java/net/micode/notes/ui/AlarmReceiver.java diff --git a/Notes-master/src/net/micode/notes/ui/DateTimePicker.java b/app/src/main/java/net/micode/notes/ui/DateTimePicker.java similarity index 100% rename from Notes-master/src/net/micode/notes/ui/DateTimePicker.java rename to app/src/main/java/net/micode/notes/ui/DateTimePicker.java diff --git a/Notes-master/src/net/micode/notes/ui/DateTimePickerDialog.java b/app/src/main/java/net/micode/notes/ui/DateTimePickerDialog.java similarity index 100% rename from Notes-master/src/net/micode/notes/ui/DateTimePickerDialog.java rename to app/src/main/java/net/micode/notes/ui/DateTimePickerDialog.java diff --git a/Notes-master/src/net/micode/notes/ui/DropdownMenu.java b/app/src/main/java/net/micode/notes/ui/DropdownMenu.java similarity index 100% rename from Notes-master/src/net/micode/notes/ui/DropdownMenu.java rename to app/src/main/java/net/micode/notes/ui/DropdownMenu.java diff --git a/Notes-master/src/net/micode/notes/ui/FoldersListAdapter.java b/app/src/main/java/net/micode/notes/ui/FoldersListAdapter.java similarity index 100% rename from Notes-master/src/net/micode/notes/ui/FoldersListAdapter.java rename to app/src/main/java/net/micode/notes/ui/FoldersListAdapter.java diff --git a/Notes-master/src/net/micode/notes/ui/NoteEditActivity.java b/app/src/main/java/net/micode/notes/ui/NoteEditActivity.java similarity index 100% rename from Notes-master/src/net/micode/notes/ui/NoteEditActivity.java rename to app/src/main/java/net/micode/notes/ui/NoteEditActivity.java diff --git a/Notes-master/src/net/micode/notes/ui/NoteEditText.java b/app/src/main/java/net/micode/notes/ui/NoteEditText.java similarity index 100% rename from Notes-master/src/net/micode/notes/ui/NoteEditText.java rename to app/src/main/java/net/micode/notes/ui/NoteEditText.java diff --git a/Notes-master/src/net/micode/notes/ui/NoteItemData.java b/app/src/main/java/net/micode/notes/ui/NoteItemData.java similarity index 100% rename from Notes-master/src/net/micode/notes/ui/NoteItemData.java rename to app/src/main/java/net/micode/notes/ui/NoteItemData.java diff --git a/Notes-master/src/net/micode/notes/ui/NotesListActivity.java b/app/src/main/java/net/micode/notes/ui/NotesListActivity.java similarity index 100% rename from Notes-master/src/net/micode/notes/ui/NotesListActivity.java rename to app/src/main/java/net/micode/notes/ui/NotesListActivity.java diff --git a/Notes-master/src/net/micode/notes/ui/NotesListAdapter.java b/app/src/main/java/net/micode/notes/ui/NotesListAdapter.java similarity index 100% rename from Notes-master/src/net/micode/notes/ui/NotesListAdapter.java rename to app/src/main/java/net/micode/notes/ui/NotesListAdapter.java diff --git a/Notes-master/src/net/micode/notes/ui/NotesListItem.java b/app/src/main/java/net/micode/notes/ui/NotesListItem.java similarity index 100% rename from Notes-master/src/net/micode/notes/ui/NotesListItem.java rename to app/src/main/java/net/micode/notes/ui/NotesListItem.java diff --git a/Notes-master/src/net/micode/notes/ui/NotesPreferenceActivity.java b/app/src/main/java/net/micode/notes/ui/NotesPreferenceActivity.java similarity index 100% rename from Notes-master/src/net/micode/notes/ui/NotesPreferenceActivity.java rename to app/src/main/java/net/micode/notes/ui/NotesPreferenceActivity.java diff --git a/Notes-master/src/net/micode/notes/widget/NoteWidgetProvider.java b/app/src/main/java/net/micode/notes/widget/NoteWidgetProvider.java similarity index 100% rename from Notes-master/src/net/micode/notes/widget/NoteWidgetProvider.java rename to app/src/main/java/net/micode/notes/widget/NoteWidgetProvider.java diff --git a/Notes-master/src/net/micode/notes/widget/NoteWidgetProvider_2x.java b/app/src/main/java/net/micode/notes/widget/NoteWidgetProvider_2x.java similarity index 100% rename from Notes-master/src/net/micode/notes/widget/NoteWidgetProvider_2x.java rename to app/src/main/java/net/micode/notes/widget/NoteWidgetProvider_2x.java diff --git a/Notes-master/src/net/micode/notes/widget/NoteWidgetProvider_4x.java b/app/src/main/java/net/micode/notes/widget/NoteWidgetProvider_4x.java similarity index 100% rename from Notes-master/src/net/micode/notes/widget/NoteWidgetProvider_4x.java rename to app/src/main/java/net/micode/notes/widget/NoteWidgetProvider_4x.java diff --git a/Notes-master/res/color/primary_text_dark.xml b/app/src/main/res/color/primary_text_dark.xml similarity index 94% rename from Notes-master/res/color/primary_text_dark.xml rename to app/src/main/res/color/primary_text_dark.xml index 7c85459..8ad98e3 100644 --- a/Notes-master/res/color/primary_text_dark.xml +++ b/app/src/main/res/color/primary_text_dark.xml @@ -1,4 +1,4 @@ - +