Merge pull request '合并' (#4) from main into MASTER

MASTER
pgy6mavf3 7 months ago
commit 77ff94186b

@ -2,7 +2,7 @@
<project version="4">
<component name="ProjectModuleManager">
<modules>
<module fileurl="file://$PROJECT_DIR$/Notes-master.iml" filepath="$PROJECT_DIR$/Notes-master.iml" />
<module fileurl="file://$PROJECT_DIR$/ReadCodeAndAnalyse.iml" filepath="$PROJECT_DIR$/ReadCodeAndAnalyse.iml" />
</modules>
</component>
</project>

@ -0,0 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="VcsDirectoryMappings">
<mapping directory="" vcs="Git" />
</component>
</project>

@ -1,9 +0,0 @@
# generated files
bin/
gen/
# Local configuration file (sdk path, etc)
project.properties
.settings/
.classpath
.project

@ -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

@ -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

@ -1,2 +1,3 @@
# ReadCodeAndAnalyse
[便签.apk.1](..%2F..%2FSOFTWARE%2FQQ%CC%E5%D1%E9%B0%E6%2FQQ%CA%FD%BE%DD%B4%E6%B4%A2%CE%C4%BC%FE%BC%D0%2F%BD%D3%CA%D5%B5%C4%CE%C4%BC%FE%2F%B1%E3%C7%A9.apk.1)

@ -3,7 +3,7 @@
<component name="NewModuleRootManager" inherit-compiler-output="true">
<exclude-output />
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/Notes-master/src" isTestSource="false" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />

@ -0,0 +1,2 @@
#Mon Apr 22 16:27:11 CST 2024
java.home=C\:\\SOFTWARE\\Android_Studio\\jbr

@ -0,0 +1,3 @@
# Default ignored files
/shelf/
/workspace.xml

@ -0,0 +1,18 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="GradleSettings">
<option name="linkedExternalProjectsSettings">
<GradleProjectSettings>
<option name="externalProjectPath" value="$PROJECT_DIR$" />
<option name="gradleJvm" value="#GRADLE_LOCAL_JAVA_HOME" />
<option name="modules">
<set>
<option value="$PROJECT_DIR$" />
<option value="$PROJECT_DIR$/app" />
</set>
</option>
<option name="resolveExternalAnnotations" value="false" />
</GradleProjectSettings>
</option>
</component>
</project>

@ -0,0 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ProjectMigrations">
<option name="MigrateToGradleLocalJavaHome">
<set>
<option value="$PROJECT_DIR$" />
</set>
</option>
</component>
</project>

@ -0,0 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ExternalStorageConfigurationManager" enabled="true" />
<component name="ProjectRootManager">
<output url="file://$PROJECT_DIR$/build/classes" />
</component>
<component name="ProjectType">
<option name="id" value="Android" />
</component>
</project>

@ -0,0 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="VcsDirectoryMappings">
<mapping directory="$PROJECT_DIR$/.." vcs="Git" />
</component>
</project>

@ -0,0 +1,2 @@
#Mon Apr 22 16:48:52 CST 2024
java.home=C\:\\SOFTWARE\\Android_Studio\\jbr

@ -0,0 +1,18 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="GradleSettings">
<option name="linkedExternalProjectsSettings">
<GradleProjectSettings>
<option name="externalProjectPath" value="$PROJECT_DIR$" />
<option name="gradleJvm" value="#GRADLE_LOCAL_JAVA_HOME" />
<option name="modules">
<set>
<option value="$PROJECT_DIR$" />
<option value="$PROJECT_DIR$/app" />
</set>
</option>
<option name="resolveExternalAnnotations" value="false" />
</GradleProjectSettings>
</option>
</component>
</project>

@ -0,0 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ProjectMigrations">
<option name="MigrateToGradleLocalJavaHome">
<set>
<option value="$PROJECT_DIR$" />
</set>
</option>
</component>
</project>

@ -0,0 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ExternalStorageConfigurationManager" enabled="true" />
<component name="ProjectRootManager">
<output url="file://$PROJECT_DIR$/build/classes" />
</component>
<component name="ProjectType">
<option name="id" value="Android" />
</component>
</project>

@ -0,0 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="VcsDirectoryMappings">
<mapping directory="$PROJECT_DIR$/../.." vcs="Git" />
</component>
</project>

@ -0,0 +1,205 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="AutoImportSettings">
<option name="autoReloadType" value="NONE" />
</component>
<component name="ChangeListManager">
<list default="true" id="8872f43c-c857-49cd-baa8-b1d00d8f4cdc" name="Changes" comment="">
<change beforePath="$PROJECT_DIR$/../../Notes-master/.gitignore" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/../../Notes-master/.idea/.gitignore" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/../../Notes-master/.idea/misc.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/../../Notes-master/.idea/modules.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/../../Notes-master/AndroidManifest.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/../../Notes-master/NOTICE" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/../../Notes-master/Notes-master.iml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/../../Notes-master/README" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/../../Notes-master/res/color/primary_text_dark.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/../../Notes-master/res/color/secondary_text_dark.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/../../Notes-master/res/drawable-hdpi/bg_btn_set_color.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/../../Notes-master/res/drawable-hdpi/bg_color_btn_mask.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/../../Notes-master/res/drawable-hdpi/call_record.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/../../Notes-master/res/drawable-hdpi/clock.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/../../Notes-master/res/drawable-hdpi/delete.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/../../Notes-master/res/drawable-hdpi/dropdown_icon.9.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/../../Notes-master/res/drawable-hdpi/edit_blue.9.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/../../Notes-master/res/drawable-hdpi/edit_green.9.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/../../Notes-master/res/drawable-hdpi/edit_red.9.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/../../Notes-master/res/drawable-hdpi/edit_title_blue.9.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/../../Notes-master/res/drawable-hdpi/edit_title_green.9.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/../../Notes-master/res/drawable-hdpi/edit_title_red.9.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/../../Notes-master/res/drawable-hdpi/edit_title_white.9.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/../../Notes-master/res/drawable-hdpi/edit_title_yellow.9.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/../../Notes-master/res/drawable-hdpi/edit_white.9.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/../../Notes-master/res/drawable-hdpi/edit_yellow.9.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/../../Notes-master/res/drawable-hdpi/font_large.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/../../Notes-master/res/drawable-hdpi/font_normal.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/../../Notes-master/res/drawable-hdpi/font_size_selector_bg.9.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/../../Notes-master/res/drawable-hdpi/font_small.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/../../Notes-master/res/drawable-hdpi/font_super.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/../../Notes-master/res/drawable-hdpi/icon_app.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/../../Notes-master/res/drawable-hdpi/list_background.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/../../Notes-master/res/drawable-hdpi/list_blue_down.9.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/../../Notes-master/res/drawable-hdpi/list_blue_middle.9.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/../../Notes-master/res/drawable-hdpi/list_blue_single.9.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/../../Notes-master/res/drawable-hdpi/list_blue_up.9.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/../../Notes-master/res/drawable-hdpi/list_folder.9.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/../../Notes-master/res/drawable-hdpi/list_footer_bg.9.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/../../Notes-master/res/drawable-hdpi/list_green_down.9.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/../../Notes-master/res/drawable-hdpi/list_green_middle.9.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/../../Notes-master/res/drawable-hdpi/list_green_single.9.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/../../Notes-master/res/drawable-hdpi/list_green_up.9.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/../../Notes-master/res/drawable-hdpi/list_red_down.9.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/../../Notes-master/res/drawable-hdpi/list_red_middle.9.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/../../Notes-master/res/drawable-hdpi/list_red_single.9.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/../../Notes-master/res/drawable-hdpi/list_red_up.9.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/../../Notes-master/res/drawable-hdpi/list_white_down.9.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/../../Notes-master/res/drawable-hdpi/list_white_middle.9.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/../../Notes-master/res/drawable-hdpi/list_white_single.9.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/../../Notes-master/res/drawable-hdpi/list_white_up.9.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/../../Notes-master/res/drawable-hdpi/list_yellow_down.9.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/../../Notes-master/res/drawable-hdpi/list_yellow_middle.9.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/../../Notes-master/res/drawable-hdpi/list_yellow_single.9.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/../../Notes-master/res/drawable-hdpi/list_yellow_up.9.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/../../Notes-master/res/drawable-hdpi/menu_delete.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/../../Notes-master/res/drawable-hdpi/menu_move.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/../../Notes-master/res/drawable-hdpi/new_note_normal.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/../../Notes-master/res/drawable-hdpi/new_note_pressed.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/../../Notes-master/res/drawable-hdpi/note_edit_color_selector_panel.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/../../Notes-master/res/drawable-hdpi/notification.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/../../Notes-master/res/drawable-hdpi/search_result.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/../../Notes-master/res/drawable-hdpi/selected.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/../../Notes-master/res/drawable-hdpi/title_alert.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/../../Notes-master/res/drawable-hdpi/title_bar_bg.9.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/../../Notes-master/res/drawable-hdpi/widget_2x_blue.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/../../Notes-master/res/drawable-hdpi/widget_2x_green.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/../../Notes-master/res/drawable-hdpi/widget_2x_red.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/../../Notes-master/res/drawable-hdpi/widget_2x_white.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/../../Notes-master/res/drawable-hdpi/widget_2x_yellow.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/../../Notes-master/res/drawable-hdpi/widget_4x_blue.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/../../Notes-master/res/drawable-hdpi/widget_4x_green.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/../../Notes-master/res/drawable-hdpi/widget_4x_red.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/../../Notes-master/res/drawable-hdpi/widget_4x_white.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/../../Notes-master/res/drawable-hdpi/widget_4x_yellow.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/../../Notes-master/res/drawable/new_note.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/../../Notes-master/res/layout/account_dialog_title.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/../../Notes-master/res/layout/add_account_text.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/../../Notes-master/res/layout/datetime_picker.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/../../Notes-master/res/layout/dialog_edit_text.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/../../Notes-master/res/layout/folder_list_item.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/../../Notes-master/res/layout/note_edit.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/../../Notes-master/res/layout/note_edit_list_item.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/../../Notes-master/res/layout/note_item.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/../../Notes-master/res/layout/note_list.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/../../Notes-master/res/layout/note_list_dropdown_menu.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/../../Notes-master/res/layout/note_list_footer.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/../../Notes-master/res/layout/settings_header.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/../../Notes-master/res/layout/widget_2x.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/../../Notes-master/res/layout/widget_4x.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/../../Notes-master/res/menu/call_note_edit.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/../../Notes-master/res/menu/call_record_folder.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/../../Notes-master/res/menu/note_edit.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/../../Notes-master/res/menu/note_list.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/../../Notes-master/res/menu/note_list_dropdown.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/../../Notes-master/res/menu/note_list_options.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/../../Notes-master/res/menu/sub_folder.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/../../Notes-master/res/raw-zh-rCN/introduction" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/../../Notes-master/res/raw/introduction" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/../../Notes-master/res/values-zh-rCN/arrays.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/../../Notes-master/res/values-zh-rCN/strings.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/../../Notes-master/res/values-zh-rTW/arrays.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/../../Notes-master/res/values-zh-rTW/strings.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/../../Notes-master/res/values/arrays.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/../../Notes-master/res/values/colors.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/../../Notes-master/res/values/dimens.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/../../Notes-master/res/values/strings.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/../../Notes-master/res/values/styles.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/../../Notes-master/res/xml/preferences.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/../../Notes-master/res/xml/searchable.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/../../Notes-master/res/xml/widget_2x_info.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/../../Notes-master/res/xml/widget_4x_info.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/../../Notes-master/src/net/micode/notes/data/Contact.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/../../Notes-master/src/net/micode/notes/data/Notes.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/../../Notes-master/src/net/micode/notes/data/NotesDatabaseHelper.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/../../Notes-master/src/net/micode/notes/data/NotesProvider.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/../../Notes-master/src/net/micode/notes/gtask/data/MetaData.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/../../Notes-master/src/net/micode/notes/gtask/data/Node.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/../../Notes-master/src/net/micode/notes/gtask/data/SqlData.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/../../Notes-master/src/net/micode/notes/gtask/data/SqlNote.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/../../Notes-master/src/net/micode/notes/gtask/data/Task.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/../../Notes-master/src/net/micode/notes/gtask/data/TaskList.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/../../Notes-master/src/net/micode/notes/gtask/exception/ActionFailureException.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/../../Notes-master/src/net/micode/notes/gtask/exception/NetworkFailureException.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/../../Notes-master/src/net/micode/notes/gtask/remote/GTaskASyncTask.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/../../Notes-master/src/net/micode/notes/gtask/remote/GTaskClient.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/../../Notes-master/src/net/micode/notes/gtask/remote/GTaskManager.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/../../Notes-master/src/net/micode/notes/gtask/remote/GTaskSyncService.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/../../Notes-master/src/net/micode/notes/model/Note.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/../../Notes-master/src/net/micode/notes/model/WorkingNote.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/../../Notes-master/src/net/micode/notes/tool/BackupUtils.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/../../Notes-master/src/net/micode/notes/tool/DataUtils.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/../../Notes-master/src/net/micode/notes/tool/GTaskStringUtils.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/../../Notes-master/src/net/micode/notes/tool/ResourceParser.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/../../Notes-master/src/net/micode/notes/ui/AlarmAlertActivity.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/../../Notes-master/src/net/micode/notes/ui/AlarmInitReceiver.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/../../Notes-master/src/net/micode/notes/ui/AlarmReceiver.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/../../Notes-master/src/net/micode/notes/ui/DateTimePicker.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/../../Notes-master/src/net/micode/notes/ui/DateTimePickerDialog.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/../../Notes-master/src/net/micode/notes/ui/DropdownMenu.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/../../Notes-master/src/net/micode/notes/ui/FoldersListAdapter.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/../../Notes-master/src/net/micode/notes/ui/NoteEditActivity.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/../../Notes-master/src/net/micode/notes/ui/NoteEditText.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/../../Notes-master/src/net/micode/notes/ui/NoteItemData.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/../../Notes-master/src/net/micode/notes/ui/NotesListActivity.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/../../Notes-master/src/net/micode/notes/ui/NotesListAdapter.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/../../Notes-master/src/net/micode/notes/ui/NotesListItem.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/../../Notes-master/src/net/micode/notes/ui/NotesPreferenceActivity.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/../../Notes-master/src/net/micode/notes/widget/NoteWidgetProvider.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/../../Notes-master/src/net/micode/notes/widget/NoteWidgetProvider_2x.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/../../Notes-master/src/net/micode/notes/widget/NoteWidgetProvider_4x.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/../../README.md" beforeDir="false" afterPath="$PROJECT_DIR$/../../README.md" afterDir="false" />
<change beforePath="$PROJECT_DIR$/../../新建 DOCX 文档.docx" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/../../测试2.docx" beforeDir="false" />
</list>
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />
<option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
<option name="LAST_RESOLUTION" value="IGNORE" />
</component>
<component name="ClangdSettings">
<option name="formatViaClangd" value="false" />
</component>
<component name="Git.Settings">
<option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$/../.." />
</component>
<component name="ProjectColorInfo"><![CDATA[{
"customColor": "",
"associatedIndex": 6
}]]></component>
<component name="ProjectId" id="2fRtTlEYrfFKm9MDc3bfDVoDdPH" />
<component name="ProjectViewState">
<option name="hideEmptyMiddlePackages" value="true" />
<option name="showLibraryContents" value="true" />
</component>
<component name="PropertiesComponent"><![CDATA[{
"keyToString": {
"RunOnceActivity.OpenProjectViewOnStart": "true",
"RunOnceActivity.ShowReadmeOnStart": "true",
"RunOnceActivity.cidr.known.project.marker": "true",
"android.gradle.sync.needed": "true",
"cf.first.check.clang-format": "false",
"cidr.known.project.marker": "true",
"git-widget-placeholder": "main"
}
}]]></component>
<component name="SpellCheckerSettings" RuntimeDictionaries="0" Folders="0" CustomDictionaries="0" DefaultDictionary="application-level" UseSingleDictionary="true" transferred="true" />
<component name="TaskManager">
<task active="true" id="Default" summary="Default task">
<changelist id="8872f43c-c857-49cd-baa8-b1d00d8f4cdc" name="Changes" comment="" />
<created>1713775730227</created>
<option name="number" value="Default" />
<option name="presentableId" value="Default" />
<updated>1713775730227</updated>
</task>
<servers />
</component>
</project>

@ -0,0 +1,15 @@
*.iml
.gradle
/local.properties
/.idea/caches
/.idea/libraries
/.idea/modules.xml
/.idea/workspace.xml
/.idea/navEditor.xml
/.idea/assetWizardSettings.xml
.DS_Store
/build
/captures
.externalNativeBuild
.cxx
local.properties

@ -0,0 +1,3 @@
# Default ignored files
/shelf/
/workspace.xml

@ -0,0 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="CompilerConfiguration">
<bytecodeTargetLevel target="17" />
</component>
</project>

@ -0,0 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="deploymentTargetDropDown">
<value>
<entry key="app">
<State />
</entry>
</value>
</component>
</project>

@ -0,0 +1,19 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="GradleMigrationSettings" migrationVersion="1" />
<component name="GradleSettings">
<option name="linkedExternalProjectsSettings">
<GradleProjectSettings>
<option name="externalProjectPath" value="$PROJECT_DIR$" />
<option name="gradleJvm" value="#GRADLE_LOCAL_JAVA_HOME" />
<option name="modules">
<set>
<option value="$PROJECT_DIR$" />
<option value="$PROJECT_DIR$/app" />
</set>
</option>
<option name="resolveExternalAnnotations" value="false" />
</GradleProjectSettings>
</option>
</component>
</project>

@ -0,0 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ProjectMigrations">
<option name="MigrateToGradleLocalJavaHome">
<set>
<option value="$PROJECT_DIR$" />
</set>
</option>
</component>
</project>

@ -0,0 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ExternalStorageConfigurationManager" enabled="true" />
<component name="ProjectRootManager" version="2" languageLevel="JDK_17" default="true" project-jdk-name="jbr-17" project-jdk-type="JavaSDK">
<output url="file://$PROJECT_DIR$/build/classes" />
</component>
<component name="ProjectType">
<option name="id" value="Android" />
</component>
</project>

@ -0,0 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="VcsDirectoryMappings">
<mapping directory="$PROJECT_DIR$/../.." vcs="Git" />
</component>
</project>

@ -0,0 +1,58 @@
plugins {
alias(libs.plugins.androidApplication)
}
android {
namespace = "net.micode.notes"
compileSdk = 34
defaultConfig {
applicationId = "net.micode.notes"
minSdk = 24
targetSdk = 34
versionCode = 1
versionName = "1.0"
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
//新增
packaging {
resources.excludes.add("META-INF/DEPENDENCIES");
resources.excludes.add("META-INF/NOTICE");
resources.excludes.add("META-INF/LICENSE");
resources.excludes.add("META-INF/LICENSE.txt");
resources.excludes.add("META-INF/NOTICE.txt");
}
}
buildTypes {
release {
isMinifyEnabled = false
proguardFiles(getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro")
}
}
compileOptions {
sourceCompatibility = JavaVersion.VERSION_1_8
targetCompatibility = JavaVersion.VERSION_1_8
}
}
dependencies {
implementation(libs.appcompat)
implementation(libs.material)
implementation(libs.activity)
implementation(libs.constraintlayout)
// implementation(fileTree(mapOf("dir" to "C:\\RGDL\\ReadCodeAndAnalyse\\src\\Notesmaster\\httpcomponents-client-4.5.14-bin\\lib",
// "include" to listOf("*.aar", "*.jar"),
// "exclude" to listOf("")
// )))
//修改为如下代码:
implementation(files("C:\\RGDL\\ReadCodeAndAnalyse\\src\\Notesmaster\\httpcomponents-client-4.5.14-bin\\lib\\httpclient-osgi-4.5.14.jar"))
implementation(files("C:\\RGDL\\ReadCodeAndAnalyse\\src\\Notesmaster\\httpcomponents-client-4.5.14-bin\\lib\\httpclient-win-4.5.14.jar"))
implementation(files("C:\\RGDL\\ReadCodeAndAnalyse\\src\\Notesmaster\\httpcomponents-client-4.5.14-bin\\lib\\httpcore-4.4.16.jar"))
testImplementation(libs.junit)
androidTestImplementation(libs.ext.junit)
androidTestImplementation(libs.espresso.core)
}

@ -0,0 +1,21 @@
# Add project specific ProGuard rules here.
# You can control the set of applied configuration files using the
# proguardFiles setting in build.gradle.
#
# For more details, see
# http://developer.android.com/guide/developing/tools/proguard.html
# If your project uses WebView with JS, uncomment the following
# and specify the fully qualified class name to the JavaScript interface
# class:
#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
# public *;
#}
# Uncomment this to preserve the line number information for
# debugging stack traces.
#-keepattributes SourceFile,LineNumberTable
# If you keep the line number information, uncomment this to
# hide the original source file name.
#-renamesourcefileattribute SourceFile

@ -0,0 +1,26 @@
package net.micode.notes;
import android.content.Context;
import androidx.test.platform.app.InstrumentationRegistry;
import androidx.test.ext.junit.runners.AndroidJUnit4;
import org.junit.Test;
import org.junit.runner.RunWith;
import static org.junit.Assert.*;
/**
* Instrumented test, which will execute on an Android device.
*
* @see <a href="http://d.android.com/tools/testing">Testing documentation</a>
*/
@RunWith(AndroidJUnit4.class)
public class ExampleInstrumentedTest {
@Test
public void useAppContext() {
// Context of the app under test.
Context appContext = InstrumentationRegistry.getInstrumentation().getTargetContext();
assertEquals("net.micode.notes", appContext.getPackageName());
}
}

@ -1,26 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- 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.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
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.
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="net.micode.notes"
android:versionCode="1"
android:versionName="0.1" >
<uses-sdk android:minSdkVersion="14" />
xmlns:tools="http://schemas.android.com/tools">
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
<uses-permission android:name="com.android.launcher.permission.INSTALL_SHORTCUT" />
@ -33,8 +13,16 @@
<uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
<application
android:icon="@drawable/icon_app"
android:label="@string/app_name" >
android:allowBackup="true"
android:dataExtractionRules="@xml/data_extraction_rules"
android:fullBackupContent="@xml/backup_rules"
android:icon="@mipmap/ic_launcher"
android:label="@string/app_name"
android:roundIcon="@mipmap/ic_launcher_round"
android:supportsRtl="true"
android:theme="@style/Theme.Notesmaster"
tools:targetApi="31">
<activity
android:name=".ui.NotesListActivity"
android:configChanges="keyboardHidden|orientation|screenSize"
@ -42,7 +30,8 @@
android:launchMode="singleTop"
android:theme="@style/NoteTheme"
android:uiOptions="splitActionBarWhenNarrow"
android:windowSoftInputMode="adjustPan" >
android:windowSoftInputMode="adjustPan"
android:exported="true">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
@ -54,7 +43,8 @@
android:name=".ui.NoteEditActivity"
android:configChanges="keyboardHidden|orientation|screenSize"
android:launchMode="singleTop"
android:theme="@style/NoteTheme" >
android:theme="@style/NoteTheme"
android:exported="true">
<intent-filter>
<action android:name="android.intent.action.VIEW" />
@ -80,6 +70,7 @@
android:resource="@xml/searchable" />
</activity>
<provider
android:name="net.micode.notes.data.NotesProvider"
android:authorities="micode_notes"
@ -87,7 +78,8 @@
<receiver
android:name=".widget.NoteWidgetProvider_2x"
android:label="@string/app_widget2x2" >
android:label="@string/app_widget2x2"
android:exported="true">
<intent-filter>
<action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
<action android:name="android.appwidget.action.APPWIDGET_DELETED" />
@ -100,7 +92,8 @@
</receiver>
<receiver
android:name=".widget.NoteWidgetProvider_4x"
android:label="@string/app_widget4x4" >
android:label="@string/app_widget4x4"
android:exported="true">
<intent-filter>
<action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
@ -113,7 +106,8 @@
android:resource="@xml/widget_4x_info" />
</receiver>
<receiver android:name=".ui.AlarmInitReceiver" >
<receiver android:name=".ui.AlarmInitReceiver"
android:exported="true">
<intent-filter>
<action android:name="android.intent.action.BOOT_COMPLETED" />
</intent-filter>
@ -146,5 +140,17 @@
<meta-data
android:name="android.app.default_searchable"
android:value=".ui.NoteEditActivity" />
<!-- <activity-->
<!-- android:name=".MainActivity"-->
<!-- android:exported="true">-->
<!-- <intent-filter>-->
<!-- <action android:name="android.intent.action.MAIN" />-->
<!-- <category android:name="android.intent.category.LAUNCHER" />-->
<!-- </intent-filter>-->
<!-- </activity>-->
</application>
</manifest>
</manifest>

@ -0,0 +1,24 @@
package net.micode.notes;
import android.os.Bundle;
import androidx.activity.EdgeToEdge;
import androidx.appcompat.app.AppCompatActivity;
import androidx.core.graphics.Insets;
import androidx.core.view.ViewCompat;
import androidx.core.view.WindowInsetsCompat;
public class MainActivity extends AppCompatActivity {
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
EdgeToEdge.enable(this);
setContentView(R.layout.activity_main);
ViewCompat.setOnApplyWindowInsetsListener(findViewById(R.id.main), (v, insets) -> {
Insets systemBars = insets.getInsets(WindowInsetsCompat.Type.systemBars());
v.setPadding(systemBars.left, systemBars.top, systemBars.right, systemBars.bottom);
return insets;
});
}
}

@ -30,19 +30,19 @@ import net.micode.notes.data.Notes.NoteColumns;
public class NotesDatabaseHelper extends SQLiteOpenHelper {
private static final String DB_NAME = "note.db";
private static final int DB_VERSION = 4;// 数据库版本号
private static final int DB_VERSION = 4;
public interface TABLE {
public static final String NOTE = "note";// 笔记表名
public static final String NOTE = "note";
public static final String DATA = "data";// 数据表名
public static final String DATA = "data";
}
private static final String TAG = "NotesDatabaseHelper";
private static NotesDatabaseHelper mInstance;
private static final String CREATE_NOTE_TABLE_SQL =// 创建笔记表的SQL语句
private static final String CREATE_NOTE_TABLE_SQL =
"CREATE TABLE " + TABLE.NOTE + "(" +
NoteColumns.ID + " INTEGER PRIMARY KEY," +
NoteColumns.PARENT_ID + " INTEGER NOT NULL DEFAULT 0," +
@ -63,7 +63,7 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper {
NoteColumns.VERSION + " INTEGER NOT NULL DEFAULT 0" +
")";
private static final String CREATE_DATA_TABLE_SQL =// 创建数据表的SQL语句
private static final String CREATE_DATA_TABLE_SQL =
"CREATE TABLE " + TABLE.DATA + "(" +
DataColumns.ID + " INTEGER PRIMARY KEY," +
DataColumns.MIME_TYPE + " TEXT NOT NULL," +
@ -78,14 +78,14 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper {
DataColumns.DATA5 + " TEXT NOT NULL DEFAULT ''" +
")";
private static final String CREATE_DATA_NOTE_ID_INDEX_SQL =// 创建数据表中NOTE_ID的索引SQL语句
private static final String CREATE_DATA_NOTE_ID_INDEX_SQL =
"CREATE INDEX IF NOT EXISTS note_id_index ON " +
TABLE.DATA + "(" + DataColumns.NOTE_ID + ");";
/**
* Increase folder's note count when move note to the folder
*/
private static final String NOTE_INCREASE_FOLDER_COUNT_ON_UPDATE_TRIGGER =// 触发器:更新时增加文件夹笔记数量
private static final String NOTE_INCREASE_FOLDER_COUNT_ON_UPDATE_TRIGGER =
"CREATE TRIGGER increase_folder_count_on_update "+
" AFTER UPDATE OF " + NoteColumns.PARENT_ID + " ON " + TABLE.NOTE +
" BEGIN " +
@ -97,7 +97,7 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper {
/**
* Decrease folder's note count when move note from folder
*/
private static final String NOTE_DECREASE_FOLDER_COUNT_ON_UPDATE_TRIGGER = // 触发器:更新时减少文件夹笔记数量
private static final String NOTE_DECREASE_FOLDER_COUNT_ON_UPDATE_TRIGGER =
"CREATE TRIGGER decrease_folder_count_on_update " +
" AFTER UPDATE OF " + NoteColumns.PARENT_ID + " ON " + TABLE.NOTE +
" BEGIN " +
@ -110,7 +110,7 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper {
/**
* Increase folder's note count when insert new note to the folder
*/
private static final String NOTE_INCREASE_FOLDER_COUNT_ON_INSERT_TRIGGER =// 触发器:删除时减少文件夹笔记数量
private static final String NOTE_INCREASE_FOLDER_COUNT_ON_INSERT_TRIGGER =
"CREATE TRIGGER increase_folder_count_on_insert " +
" AFTER INSERT ON " + TABLE.NOTE +
" BEGIN " +
@ -133,7 +133,7 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper {
" END";
/**
* {@link DataConstants#NOTE}
* Update note's content when insert data with type {@link DataConstants#NOTE}
*/
private static final String DATA_UPDATE_NOTE_CONTENT_ON_INSERT_TRIGGER =
"CREATE TRIGGER update_note_content_on_insert " +
@ -146,7 +146,7 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper {
" END";
/**
* {@link DataConstants#NOTE}
* Update note's content when data with {@link DataConstants#NOTE} type has changed
*/
private static final String DATA_UPDATE_NOTE_CONTENT_ON_UPDATE_TRIGGER =
"CREATE TRIGGER update_note_content_on_update " +
@ -172,7 +172,7 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper {
" END";
/**
*
* Delete datas belong to note which has been deleted
*/
private static final String NOTE_DELETE_DATA_ON_DELETE_TRIGGER =
"CREATE TRIGGER delete_data_on_delete " +
@ -182,9 +182,8 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper {
" WHERE " + DataColumns.NOTE_ID + "=old." + NoteColumns.ID + ";" +
" END";
/**
*
* Delete notes belong to folder which has been deleted
*/
private static final String FOLDER_DELETE_NOTES_ON_DELETE_TRIGGER =
"CREATE TRIGGER folder_delete_notes_on_delete " +
@ -195,7 +194,7 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper {
" END";
/**
*
* Move notes belong to folder which has been moved to trash folder
*/
private static final String FOLDER_MOVE_NOTES_ON_TRASH_TRIGGER =
"CREATE TRIGGER folder_move_notes_on_trash " +
@ -212,13 +211,13 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper {
}
public void createNoteTable(SQLiteDatabase db) {
db.execSQL(CREATE_NOTE_TABLE_SQL); // 创建笔记表
db.execSQL(CREATE_NOTE_TABLE_SQL);
reCreateNoteTableTriggers(db);
createSystemFolder(db);
Log.d(TAG, "note table has been created");
}
private void reCreateNoteTableTriggers(SQLiteDatabase db) {// 重新创建笔记表触发器
private void reCreateNoteTableTriggers(SQLiteDatabase db) {
db.execSQL("DROP TRIGGER IF EXISTS increase_folder_count_on_update");
db.execSQL("DROP TRIGGER IF EXISTS decrease_folder_count_on_update");
db.execSQL("DROP TRIGGER IF EXISTS decrease_folder_count_on_delete");
@ -236,17 +235,18 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper {
db.execSQL(FOLDER_MOVE_NOTES_ON_TRASH_TRIGGER);
}
private void createSystemFolder(SQLiteDatabase db) { // 创建系统文件夹
private void createSystemFolder(SQLiteDatabase db) {
ContentValues values = new ContentValues();
/**
*
*/
/**
* call record foler for call notes
*/
values.put(NoteColumns.ID, Notes.ID_CALL_RECORD_FOLDER);
values.put(NoteColumns.TYPE, Notes.TYPE_SYSTEM);
db.insert(TABLE.NOTE, null, values);
/**
*
* root folder which is default folder
*/
values.clear();
values.put(NoteColumns.ID, Notes.ID_ROOT_FOLDER);
@ -254,7 +254,7 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper {
db.insert(TABLE.NOTE, null, values);
/**
*
* temporary folder which is used for moving note
*/
values.clear();
values.put(NoteColumns.ID, Notes.ID_TEMPARAY_FOLDER);
@ -262,7 +262,7 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper {
db.insert(TABLE.NOTE, null, values);
/**
*
* create trash folder
*/
values.clear();
values.put(NoteColumns.ID, Notes.ID_TRASH_FOLER);
@ -270,24 +270,24 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper {
db.insert(TABLE.NOTE, null, values);
}
public void createDataTable(SQLiteDatabase db) { // 创建数据表
public void createDataTable(SQLiteDatabase db) {
db.execSQL(CREATE_DATA_TABLE_SQL);
reCreateDataTableTriggers(db);
db.execSQL(CREATE_DATA_NOTE_ID_INDEX_SQL);
Log.d(TAG, "data table has been created");
}
private void reCreateDataTableTriggers(SQLiteDatabase db) { // 删除旧的触发器
private void reCreateDataTableTriggers(SQLiteDatabase db) {
db.execSQL("DROP TRIGGER IF EXISTS update_note_content_on_insert");
db.execSQL("DROP TRIGGER IF EXISTS update_note_content_on_update");
db.execSQL("DROP TRIGGER IF EXISTS update_note_content_on_delete");
// 创建新的数据表触发器
db.execSQL(DATA_UPDATE_NOTE_CONTENT_ON_INSERT_TRIGGER);
db.execSQL(DATA_UPDATE_NOTE_CONTENT_ON_UPDATE_TRIGGER);
db.execSQL(DATA_UPDATE_NOTE_CONTENT_ON_DELETE_TRIGGER);
}
static synchronized NotesDatabaseHelper getInstance(Context context) { // 获取单例实例
static synchronized NotesDatabaseHelper getInstance(Context context) {
if (mInstance == null) {
mInstance = new NotesDatabaseHelper(context);
}
@ -295,7 +295,7 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper {
}
@Override
public void onCreate(SQLiteDatabase db) { // 创建数据库时调用的方法,创建笔记表和数据表
public void onCreate(SQLiteDatabase db) {
createNoteTable(db);
createDataTable(db);
}
@ -305,24 +305,24 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper {
boolean reCreateTriggers = false;
boolean skipV2 = false;
if (oldVersion == 1) { // 升级到版本2
if (oldVersion == 1) {
upgradeToV2(db);
skipV2 = true; // 此次升级包括从版本2到版本3的升级
skipV2 = true; // this upgrade including the upgrade from v2 to v3
oldVersion++;
}
if (oldVersion == 2 && !skipV2) {
upgradeToV3(db); // 升级到版本3
upgradeToV3(db);
reCreateTriggers = true;
oldVersion++;
}
if (oldVersion == 3) { // 升级到版本4
if (oldVersion == 3) {
upgradeToV4(db);
oldVersion++;
}
if (reCreateTriggers) { // 重新创建触发器
if (reCreateTriggers) {
reCreateNoteTableTriggers(db);
reCreateDataTableTriggers(db);
}
@ -333,14 +333,14 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper {
}
}
private void upgradeToV2(SQLiteDatabase db) { // 升级到版本2重新创建笔记表和数据表
private void upgradeToV2(SQLiteDatabase db) {
db.execSQL("DROP TABLE IF EXISTS " + TABLE.NOTE);
db.execSQL("DROP TABLE IF EXISTS " + TABLE.DATA);
createNoteTable(db);
createDataTable(db);
}
private void upgradeToV3(SQLiteDatabase db) { // 升级到版本3添加新列和系统文件夹
private void upgradeToV3(SQLiteDatabase db) {
// drop unused triggers
db.execSQL("DROP TRIGGER IF EXISTS update_note_modified_date_on_insert");
db.execSQL("DROP TRIGGER IF EXISTS update_note_modified_date_on_delete");
@ -355,7 +355,7 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper {
db.insert(TABLE.NOTE, null, values);
}
private void upgradeToV4(SQLiteDatabase db) { // 升级到版本4添加新列
private void upgradeToV4(SQLiteDatabase db) {
db.execSQL("ALTER TABLE " + TABLE.NOTE + " ADD COLUMN " + NoteColumns.VERSION
+ " INTEGER NOT NULL DEFAULT 0");
}

@ -63,24 +63,43 @@ public class GTaskASyncTask extends AsyncTask<Void, String, Integer> {
});
}
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,
NotesPreferenceActivity.class), 0);
} else {
pendingIntent = PendingIntent.getActivity(mContext, 0, new Intent(mContext,
NotesListActivity.class), 0);
}
notification.setLatestEventInfo(mContext, mContext.getString(R.string.app_name), content,
pendingIntent);
mNotifiManager.notify(GTASK_SYNC_NOTIFICATION_ID, notification);
// 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,
// NotesPreferenceActivity.class), 0);
//
// } else {
// pendingIntent = PendingIntent.getActivity(mContext, 0, new Intent(mContext,
// NotesListActivity.class), 0);
// }
// notification.setLatestEventInfo(mContext, mContext.getString(R.string.app_name), content,
// pendingIntent);
// mNotifiManager.notify(GTASK_SYNC_NOTIFICATION_ID, notification);
// }
private void showNotification(int tickerId, String content) {
PendingIntent pendingIntent;
if (tickerId != R.string.ticker_success) {
pendingIntent = PendingIntent.getActivity(mContext, 0, new Intent(mContext,
NotesPreferenceActivity.class), PendingIntent.FLAG_IMMUTABLE);
} else {
pendingIntent = PendingIntent.getActivity(mContext, 0, new Intent(mContext,
NotesListActivity.class), PendingIntent.FLAG_IMMUTABLE);
}
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) {

Before

Width:  |  Height:  |  Size: 3.9 KiB

After

Width:  |  Height:  |  Size: 3.9 KiB

Before

Width:  |  Height:  |  Size: 3.4 KiB

After

Width:  |  Height:  |  Size: 3.4 KiB

Some files were not shown because too many files have changed in this diff Show More

Loading…
Cancel
Save