diff --git a/.gitignore b/.gitignore deleted file mode 100644 index 7df8dff..0000000 --- a/.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/.gradle/8.0/checksums/checksums.lock b/.gradle/8.0/checksums/checksums.lock new file mode 100644 index 0000000..d562ca8 Binary files /dev/null and b/.gradle/8.0/checksums/checksums.lock differ diff --git a/.gradle/8.0/checksums/md5-checksums.bin b/.gradle/8.0/checksums/md5-checksums.bin new file mode 100644 index 0000000..03c4b6f Binary files /dev/null and b/.gradle/8.0/checksums/md5-checksums.bin differ diff --git a/.gradle/8.0/checksums/sha1-checksums.bin b/.gradle/8.0/checksums/sha1-checksums.bin new file mode 100644 index 0000000..08facd6 Binary files /dev/null and b/.gradle/8.0/checksums/sha1-checksums.bin differ diff --git a/.gradle/8.0/dependencies-accessors/dependencies-accessors.lock b/.gradle/8.0/dependencies-accessors/dependencies-accessors.lock new file mode 100644 index 0000000..09b2df5 Binary files /dev/null and b/.gradle/8.0/dependencies-accessors/dependencies-accessors.lock differ diff --git a/.gradle/8.0/dependencies-accessors/gc.properties b/.gradle/8.0/dependencies-accessors/gc.properties new file mode 100644 index 0000000..e69de29 diff --git a/.gradle/8.0/executionHistory/executionHistory.bin b/.gradle/8.0/executionHistory/executionHistory.bin new file mode 100644 index 0000000..04f59a5 Binary files /dev/null and b/.gradle/8.0/executionHistory/executionHistory.bin differ diff --git a/.gradle/8.0/executionHistory/executionHistory.lock b/.gradle/8.0/executionHistory/executionHistory.lock new file mode 100644 index 0000000..b204e17 Binary files /dev/null and b/.gradle/8.0/executionHistory/executionHistory.lock differ diff --git a/.gradle/8.0/fileChanges/last-build.bin b/.gradle/8.0/fileChanges/last-build.bin new file mode 100644 index 0000000..f76dd23 Binary files /dev/null and b/.gradle/8.0/fileChanges/last-build.bin differ diff --git a/.gradle/8.0/fileHashes/fileHashes.bin b/.gradle/8.0/fileHashes/fileHashes.bin new file mode 100644 index 0000000..ec5c642 Binary files /dev/null and b/.gradle/8.0/fileHashes/fileHashes.bin differ diff --git a/.gradle/8.0/fileHashes/fileHashes.lock b/.gradle/8.0/fileHashes/fileHashes.lock new file mode 100644 index 0000000..44f7357 Binary files /dev/null and b/.gradle/8.0/fileHashes/fileHashes.lock differ diff --git a/.gradle/8.0/fileHashes/resourceHashesCache.bin b/.gradle/8.0/fileHashes/resourceHashesCache.bin new file mode 100644 index 0000000..fcc107b Binary files /dev/null and b/.gradle/8.0/fileHashes/resourceHashesCache.bin differ diff --git a/.gradle/8.0/gc.properties b/.gradle/8.0/gc.properties new file mode 100644 index 0000000..e69de29 diff --git a/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/.gradle/buildOutputCleanup/buildOutputCleanup.lock new file mode 100644 index 0000000..26b9d86 Binary files /dev/null and b/.gradle/buildOutputCleanup/buildOutputCleanup.lock differ diff --git a/.gradle/buildOutputCleanup/cache.properties b/.gradle/buildOutputCleanup/cache.properties new file mode 100644 index 0000000..9380bba --- /dev/null +++ b/.gradle/buildOutputCleanup/cache.properties @@ -0,0 +1,2 @@ +#Tue Nov 07 14:35:52 CST 2023 +gradle.version=8.0 diff --git a/.gradle/buildOutputCleanup/outputFiles.bin b/.gradle/buildOutputCleanup/outputFiles.bin new file mode 100644 index 0000000..89eaff0 Binary files /dev/null and b/.gradle/buildOutputCleanup/outputFiles.bin differ diff --git a/.gradle/file-system.probe b/.gradle/file-system.probe new file mode 100644 index 0000000..4398a6f Binary files /dev/null and b/.gradle/file-system.probe differ diff --git a/.gradle/vcs-1/gc.properties b/.gradle/vcs-1/gc.properties new file mode 100644 index 0000000..e69de29 diff --git a/.idea/compiler.xml b/.idea/compiler.xml new file mode 100644 index 0000000..b589d56 --- /dev/null +++ b/.idea/compiler.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/.idea/gradle.xml b/.idea/gradle.xml new file mode 100644 index 0000000..ae388c2 --- /dev/null +++ b/.idea/gradle.xml @@ -0,0 +1,20 @@ + + + + + + + \ No newline at end of file diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml new file mode 100644 index 0000000..a5f05cd --- /dev/null +++ b/.idea/jarRepositories.xml @@ -0,0 +1,25 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml index b09d4bc..da73036 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -1,8 +1,10 @@ + - - + + + \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml deleted file mode 100644 index 7800270..0000000 --- a/.idea/modules.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 0000000..35eb1dd --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/LICENSE.txt b/LICENSE.txt new file mode 100644 index 0000000..32f01ed --- /dev/null +++ b/LICENSE.txt @@ -0,0 +1,558 @@ + 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 + +========================================================================= + +This project includes Public Suffix List copied from + +licensed under the terms of the Mozilla Public License, v. 2.0 + +Full license text: + +Mozilla Public License Version 2.0 +================================== + +1. Definitions +-------------- + +1.1. "Contributor" + means each individual or legal entity that creates, contributes to + the creation of, or owns Covered Software. + +1.2. "Contributor Version" + means the combination of the Contributions of others (if any) used + by a Contributor and that particular Contributor's Contribution. + +1.3. "Contribution" + means Covered Software of a particular Contributor. + +1.4. "Covered Software" + means Source Code Form to which the initial Contributor has attached + the notice in Exhibit A, the Executable Form of such Source Code + Form, and Modifications of such Source Code Form, in each case + including portions thereof. + +1.5. "Incompatible With Secondary Licenses" + means + + (a) that the initial Contributor has attached the notice described + in Exhibit B to the Covered Software; or + + (b) that the Covered Software was made available under the terms of + version 1.1 or earlier of the License, but not also under the + terms of a Secondary License. + +1.6. "Executable Form" + means any form of the work other than Source Code Form. + +1.7. "Larger Work" + means a work that combines Covered Software with other material, in + a separate file or files, that is not Covered Software. + +1.8. "License" + means this document. + +1.9. "Licensable" + means having the right to grant, to the maximum extent possible, + whether at the time of the initial grant or subsequently, any and + all of the rights conveyed by this License. + +1.10. "Modifications" + means any of the following: + + (a) any file in Source Code Form that results from an addition to, + deletion from, or modification of the contents of Covered + Software; or + + (b) any new file in Source Code Form that contains any Covered + Software. + +1.11. "Patent Claims" of a Contributor + means any patent claim(s), including without limitation, method, + process, and apparatus claims, in any patent Licensable by such + Contributor that would be infringed, but for the grant of the + License, by the making, using, selling, offering for sale, having + made, import, or transfer of either its Contributions or its + Contributor Version. + +1.12. "Secondary License" + means either the GNU General Public License, Version 2.0, the GNU + Lesser General Public License, Version 2.1, the GNU Affero General + Public License, Version 3.0, or any later versions of those + licenses. + +1.13. "Source Code Form" + means the form of the work preferred for making modifications. + +1.14. "You" (or "Your") + means an individual or a legal entity exercising rights under this + License. For legal entities, "You" includes any entity that + controls, is controlled by, or is under common control with You. For + purposes of this definition, "control" means (a) the power, direct + or indirect, to cause the direction or management of such entity, + whether by contract or otherwise, or (b) ownership of more than + fifty percent (50%) of the outstanding shares or beneficial + ownership of such entity. + +2. License Grants and Conditions +-------------------------------- + +2.1. Grants + +Each Contributor hereby grants You a world-wide, royalty-free, +non-exclusive license: + +(a) under intellectual property rights (other than patent or trademark) + Licensable by such Contributor to use, reproduce, make available, + modify, display, perform, distribute, and otherwise exploit its + Contributions, either on an unmodified basis, with Modifications, or + as part of a Larger Work; and + +(b) under Patent Claims of such Contributor to make, use, sell, offer + for sale, have made, import, and otherwise transfer either its + Contributions or its Contributor Version. + +2.2. Effective Date + +The licenses granted in Section 2.1 with respect to any Contribution +become effective for each Contribution on the date the Contributor first +distributes such Contribution. + +2.3. Limitations on Grant Scope + +The licenses granted in this Section 2 are the only rights granted under +this License. No additional rights or licenses will be implied from the +distribution or licensing of Covered Software under this License. +Notwithstanding Section 2.1(b) above, no patent license is granted by a +Contributor: + +(a) for any code that a Contributor has removed from Covered Software; + or + +(b) for infringements caused by: (i) Your and any other third party's + modifications of Covered Software, or (ii) the combination of its + Contributions with other software (except as part of its Contributor + Version); or + +(c) under Patent Claims infringed by Covered Software in the absence of + its Contributions. + +This License does not grant any rights in the trademarks, service marks, +or logos of any Contributor (except as may be necessary to comply with +the notice requirements in Section 3.4). + +2.4. Subsequent Licenses + +No Contributor makes additional grants as a result of Your choice to +distribute the Covered Software under a subsequent version of this +License (see Section 10.2) or under the terms of a Secondary License (if +permitted under the terms of Section 3.3). + +2.5. Representation + +Each Contributor represents that the Contributor believes its +Contributions are its original creation(s) or it has sufficient rights +to grant the rights to its Contributions conveyed by this License. + +2.6. Fair Use + +This License is not intended to limit any rights You have under +applicable copyright doctrines of fair use, fair dealing, or other +equivalents. + +2.7. Conditions + +Sections 3.1, 3.2, 3.3, and 3.4 are conditions of the licenses granted +in Section 2.1. + +3. Responsibilities +------------------- + +3.1. Distribution of Source Form + +All distribution of Covered Software in Source Code Form, including any +Modifications that You create or to which You contribute, must be under +the terms of this License. You must inform recipients that the Source +Code Form of the Covered Software is governed by the terms of this +License, and how they can obtain a copy of this License. You may not +attempt to alter or restrict the recipients' rights in the Source Code +Form. + +3.2. Distribution of Executable Form + +If You distribute Covered Software in Executable Form then: + +(a) such Covered Software must also be made available in Source Code + Form, as described in Section 3.1, and You must inform recipients of + the Executable Form how they can obtain a copy of such Source Code + Form by reasonable means in a timely manner, at a charge no more + than the cost of distribution to the recipient; and + +(b) You may distribute such Executable Form under the terms of this + License, or sublicense it under different terms, provided that the + license for the Executable Form does not attempt to limit or alter + the recipients' rights in the Source Code Form under this License. + +3.3. Distribution of a Larger Work + +You may create and distribute a Larger Work under terms of Your choice, +provided that You also comply with the requirements of this License for +the Covered Software. If the Larger Work is a combination of Covered +Software with a work governed by one or more Secondary Licenses, and the +Covered Software is not Incompatible With Secondary Licenses, this +License permits You to additionally distribute such Covered Software +under the terms of such Secondary License(s), so that the recipient of +the Larger Work may, at their option, further distribute the Covered +Software under the terms of either this License or such Secondary +License(s). + +3.4. Notices + +You may not remove or alter the substance of any license notices +(including copyright notices, patent notices, disclaimers of warranty, +or limitations of liability) contained within the Source Code Form of +the Covered Software, except that You may alter any license notices to +the extent required to remedy known factual inaccuracies. + +3.5. Application of Additional Terms + +You may choose to offer, and to charge a fee for, warranty, support, +indemnity or liability obligations to one or more recipients of Covered +Software. However, You may do so only on Your own behalf, and not on +behalf of any Contributor. You must make it absolutely clear that any +such warranty, support, indemnity, or liability obligation is offered by +You alone, and You hereby agree to indemnify every Contributor for any +liability incurred by such Contributor as a result of warranty, support, +indemnity or liability terms You offer. You may include additional +disclaimers of warranty and limitations of liability specific to any +jurisdiction. + +4. Inability to Comply Due to Statute or Regulation +--------------------------------------------------- + +If it is impossible for You to comply with any of the terms of this +License with respect to some or all of the Covered Software due to +statute, judicial order, or regulation then You must: (a) comply with +the terms of this License to the maximum extent possible; and (b) +describe the limitations and the code they affect. Such description must +be placed in a text file included with all distributions of the Covered +Software under this License. Except to the extent prohibited by statute +or regulation, such description must be sufficiently detailed for a +recipient of ordinary skill to be able to understand it. + +5. Termination +-------------- + +5.1. The rights granted under this License will terminate automatically +if You fail to comply with any of its terms. However, if You become +compliant, then the rights granted under this License from a particular +Contributor are reinstated (a) provisionally, unless and until such +Contributor explicitly and finally terminates Your grants, and (b) on an +ongoing basis, if such Contributor fails to notify You of the +non-compliance by some reasonable means prior to 60 days after You have +come back into compliance. Moreover, Your grants from a particular +Contributor are reinstated on an ongoing basis if such Contributor +notifies You of the non-compliance by some reasonable means, this is the +first time You have received notice of non-compliance with this License +from such Contributor, and You become compliant prior to 30 days after +Your receipt of the notice. + +5.2. If You initiate litigation against any entity by asserting a patent +infringement claim (excluding declaratory judgment actions, +counter-claims, and cross-claims) alleging that a Contributor Version +directly or indirectly infringes any patent, then the rights granted to +You by any and all Contributors for the Covered Software under Section +2.1 of this License shall terminate. + +5.3. In the event of termination under Sections 5.1 or 5.2 above, all +end user license agreements (excluding distributors and resellers) which +have been validly granted by You or Your distributors under this License +prior to termination shall survive termination. + +************************************************************************ +* * +* 6. Disclaimer of Warranty * +* ------------------------- * +* * +* Covered Software is provided under this License on an "as is" * +* basis, without warranty of any kind, either expressed, implied, or * +* statutory, including, without limitation, warranties that the * +* Covered Software is free of defects, merchantable, fit for a * +* particular purpose or non-infringing. The entire risk as to the * +* quality and performance of the Covered Software is with You. * +* Should any Covered Software prove defective in any respect, You * +* (not any Contributor) assume the cost of any necessary servicing, * +* repair, or correction. This disclaimer of warranty constitutes an * +* essential part of this License. No use of any Covered Software is * +* authorized under this License except under this disclaimer. * +* * +************************************************************************ + +************************************************************************ +* * +* 7. Limitation of Liability * +* -------------------------- * +* * +* Under no circumstances and under no legal theory, whether tort * +* (including negligence), contract, or otherwise, shall any * +* Contributor, or anyone who distributes Covered Software as * +* permitted above, be liable to You for any direct, indirect, * +* special, incidental, or consequential damages of any character * +* including, without limitation, damages for lost profits, loss of * +* goodwill, work stoppage, computer failure or malfunction, or any * +* and all other commercial damages or losses, even if such party * +* shall have been informed of the possibility of such damages. This * +* limitation of liability shall not apply to liability for death or * +* personal injury resulting from such party's negligence to the * +* extent applicable law prohibits such limitation. Some * +* jurisdictions do not allow the exclusion or limitation of * +* incidental or consequential damages, so this exclusion and * +* limitation may not apply to You. * +* * +************************************************************************ + +8. Litigation +------------- + +Any litigation relating to this License may be brought only in the +courts of a jurisdiction where the defendant maintains its principal +place of business and such litigation shall be governed by laws of that +jurisdiction, without reference to its conflict-of-law provisions. +Nothing in this Section shall prevent a party's ability to bring +cross-claims or counter-claims. + +9. Miscellaneous +---------------- + +This License represents the complete agreement concerning the subject +matter hereof. If any provision of this License is held to be +unenforceable, such provision shall be reformed only to the extent +necessary to make it enforceable. Any law or regulation which provides +that the language of a contract shall be construed against the drafter +shall not be used to construe this License against a Contributor. + +10. Versions of the License +--------------------------- + +10.1. New Versions + +Mozilla Foundation is the license steward. Except as provided in Section +10.3, no one other than the license steward has the right to modify or +publish new versions of this License. Each version will be given a +distinguishing version number. + +10.2. Effect of New Versions + +You may distribute the Covered Software under the terms of the version +of the License under which You originally received the Covered Software, +or under the terms of any subsequent version published by the license +steward. + +10.3. Modified Versions + +If you create software not governed by this License, and you want to +create a new license for such software, you may create and use a +modified version of this License if you rename the license and remove +any references to the name of the license steward (except to note that +such modified license differs from this License). + +10.4. Distributing Source Code Form that is Incompatible With Secondary +Licenses + +If You choose to distribute Source Code Form that is Incompatible With +Secondary Licenses under the terms of this version of the License, the +notice described in Exhibit B of this License must be attached. + +Exhibit A - Source Code Form License Notice +------------------------------------------- + + This Source Code Form is subject to the terms of the Mozilla Public + License, v. 2.0. If a copy of the MPL was not distributed with this + file, You can obtain one at http://mozilla.org/MPL/2.0/. + +If it is not possible or desirable to put the notice in a particular +file, then You may include the notice in a location (such as a LICENSE +file in a relevant directory) where a recipient would be likely to look +for such a notice. + +You may add additional accurate notices of copyright ownership. + +Exhibit B - "Incompatible With Secondary Licenses" Notice +--------------------------------------------------------- + + This Source Code Form is "Incompatible With Secondary Licenses", as + defined by the Mozilla Public License, v. 2.0. diff --git a/NOTICE b/NOTICE deleted file mode 100644 index 9a54521..0000000 --- a/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/NOTICE.txt b/NOTICE.txt new file mode 100644 index 0000000..10a2916 --- /dev/null +++ b/NOTICE.txt @@ -0,0 +1,6 @@ +Apache HttpComponents Client +Copyright 1999-2021 The Apache Software Foundation + +This product includes software developed at +The Apache Software Foundation (http://www.apache.org/). + diff --git a/Notes-master.iml b/Notes-master.iml deleted file mode 100644 index c90834f..0000000 --- a/Notes-master.iml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/README b/README deleted file mode 100644 index fc0d824..0000000 --- a/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/README.md b/README.md deleted file mode 100644 index 457841c..0000000 --- a/README.md +++ /dev/null @@ -1,2 +0,0 @@ -# Notes-master - diff --git a/RELEASE_NOTES.txt b/RELEASE_NOTES.txt new file mode 100644 index 0000000..c1f0a0f --- /dev/null +++ b/RELEASE_NOTES.txt @@ -0,0 +1,2613 @@ +Release 4.5.14 +------------------- + +This is a maintenance release that fixes several minor bugs reported discovered since +the 4.5.13 release. + + +Changelog: +------------------- + +* HTTPCLIENT-2206: Corrected resource de-allocation by fluent response objects. + Contributed by Oleg Kalnichevski + +* HTTPCLIENT-2174: URIBuilder to return a new empty list instead of unmodifiable + Collections#emptyList. + Contributed by Oleg Kalnichevski + +* Don't retry requests in case of NoRouteToHostException. + Contributed by Jaikiran Pai + +* HTTPCLIENT-2144: RequestBuilder fails to correctly copy charset of requests with + form url-encoded body. + Contributed by Oleg Kalnichevski + +* PR #269: 4.5.x use array fill and more. + - Use Arrays.fill(). + - Remove redundant modifiers. + - Use Collections.addAll() and Collection.addAll() APIs instead of loops. + - Remove redundant returns. + - No need to explicitly declare an array when calling a vararg method. + - Remote extra semicolons (;). + - Use a 'L' instead of 'l' to make long literals more readable. + Contributed by Gary Gregory + +* PublicSuffixListParser.parseByType(Reader) allocates but does not use a 256 char + StringBuilder. + Contributed by Gary Gregory + + + +Release 4.5.13 +------------------- + +This is a maintenance release that fixes incorrect handling of malformed authority component +in request URIs. + + +Changelog: +------------------- + +* Incorrect handling of malformed authority component by URIUtils#extractHost. + Contributed by Oleg Kalnichevski + +* Avoid updating Content-Length header in a 304 response. + Contributed by Dirk Henselin + +* Bug fix: BasicExpiresHandler is annotated as immutable but is not (#239) + Contributed by Gary Gregory + +* HTTPCLIENT-2076: Fixed NPE in LaxExpiresHandler (#222). + Contributed by heejeongkim + + +Release 4.5.12 +------------------- + +This is a maintenance release that fixes a regression introduced by the previous release +that caused rejection of certificates with non-standard domains. + +Changelog: +------------------- + +* HTTPCLIENT-2053: Add SC_PERMANENT_REDIRECT (308) to DefaultRedirectStrategy + Contributed by Michael Osipov + +* HTTPCLIENT-2052: Fixed redirection of entity enclosing requests with non-repeatable entities + Contributed by Oleg Kalnichevski + +* HTTPCLIENT-2047: Fixed regression in DefaultHostnameVerifier causing rejection of certificates + with non-standard domains. + Contributed by Oleg Kalnichevski + +* Bug fix: Fixed handling of private domains by PublicSuffixMatcher + Contributed by Oleg Kalnichevski + + +Release 4.5.11 +------------------- + +This is a maintenance release that fixes a number defects discovered since 4.5.10 +and upgrades HttpCore dependency to version 4.4.13. + + +Changelog: +------------------- + +* Improved domain name normalization by DefaultHostnameVerifier. + Contributed by Oleg Kalnichevski + +* HTTPCLIENT-2033: Connection managers to immediately shut down all leased connection upon shutdown. + Contributed by Oleg Kalnichevski + +* HTTPCLIENT-2020: DefaultBackoffStrategy to support TOO_MANY_REQUESTS (429). + Contributed by Michael Osipov + +* HTTPCLIENT-2030: Fixed PublicSuffixMatcher#getDomainRoot behavior with invalid hostnames. + Contributed by Niels Basjes + +* HTTPCLIENT-2029: URIBuilder to support parsing of non-UTF8 URIs. + Contributed by Oleg Kalnichevski + +* HTTPCLIENT-2026: Fixed URIBuilder#isOpaque() logic. + Contributed by Oleg Kalnichevski + +* Updated text in pool stats description + Contributed by chao chang + +* HTTPCLIENT-2023: Allow nested arrays and all primitive types in DefaultHttpCacheEntrySerializer. + Contributed by Olof Larsson + +* Fixed fallback PublicSuffixMatcher instance. + Contributed by Ryan Schmitt + +* Added family property #145. + Contributed by behrangsa + + +Release 4.5.10 +------------------- + +This is a maintenance release that fixes a number defects discovered since 4.5.9 +and upgrades HttpCore dependency to version 4.4.12. + + +Changelog: +------------------- + +* Refactor DefaultRedirectStrategy for subclassing. + Contributed by Gary Gregory + +* Improved handling of request cancellation. + Contributed by Oleg Kalnichevski + +* Fixed concurrent use of threading unsafe HttpUriRequest messages. + Contributed by Oleg Kalnichevski + +* HTTPCLIENT-1997: Return the last domain segment instead of normalized domain name + from PublicSuffixMatcher#getDomainRoot in case there is no match. + Contributed by jeromedemangel + +* Preserve original encoding of the URI path component if the URI is valid. + Contributed by Oleg Kalnichevski + + +Release 4.5.9 +------------------- + +This is a maintenance release that fixes a number defects discovered since 4.5.8. + + +Changelog: +------------------- + +* HTTPCLIENT-1991: incorrect handling of non-standard DNS entries by PublicSuffixMatcher + Contributed by Oleg Kalnichevski + +* Fix bug in URIBuilder#isPathEmpty method to verify if encodedPath is an empty string + Contributed by Varun Nandi + +* HTTPCLIENT-1984: Add normalize URI to RequestConfig copy constructor + Contributed by Matt Nelson + +* HTTPCLIENT-1976: Unsafe deserialization in DefaultHttpCacheEntrySerializer + Contributed by Artem Smotrakov + + + +Release 4.5.8 +------------------- + +This is a maintenance release that makes request URI normalization configurable on per request basis +and also ports several improvements in URI handling from HttpCore master. + + +Changelog: +------------------- + +* HTTPCLIENT-1969: Filter out weak cipher suites. + Contributed by Artem Smotrakov + +* HTTPCLIENT-1968: Preserve escaped PATHSAFE characters when normalizing URI path segments. + Contributed by Oleg Kalnichevski + +* HTTPCLIENT-1968: URIBuilder to split path component into path segments when digesting a URI + (ported from HttpCore master). + Contributed by Oleg Kalnichevski + +* Improved cache key generation (ported from HttpCore master). + Contributed by Oleg Kalnichevski + +* HTTPCLIENT-1968: added utility methods to parse and format URI path segments (ported + from HttpCore master). + Contributed by Oleg Kalnichevski + +* HTTPCLIENT-1968: Make normalization of URI paths optional. + Contributed by Tamas Cservenak + +* Some well known proxies respond with Content-Length=0, when returning 304. For robustness, always use the + cached entity's content length, as modern browsers do. + Contributed by Author: Jayson Raymond + + + +Release 4.5.7 +------------------- + +This is a maintenance release that corrects Automatic-Module-Name definitions added in the previous +release and fixes a number of minor defects discovered since 4.5.6. + +Please note that as of 4.4, HttpClient requires Java 1.6 or newer. + +Changelog: +------------------- + +* Upgraded HttpCore to version 4.4.11 + Contributed by Oleg Kalnichevski + +* HTTPCLIENT-1960: URIBuilder incorrect handling of multiple leading slashes in path component + Contributed by Oleg Kalnichevski + +* HTTPCLIENT-1958: PoolingHttpClientConnectionManager to throw ExecutionException in case of a lease operation + cancellation instead of InterruptedException. + Contributed by Oleg Kalnichevski + +* HTTPCLIENT-1952: Allow default User Agent to be disabled. + Contributed by Michael Osipov + +* HTTPCLIENT-1956: CONNECT overwrites the main request object in the HTTP context when requests are executed + via a proxy tunnel. + Contributed by Oleg Kalnichevski + +* HTTPCLIENT-1940: deprecated SSLSocketFactory made to rethrow SocketTimeoutException as + ConnectTimeoutException for consistency with non-deprecated code. + Contributed by Oleg Kalnichevski + +* Fixed regression in BasicCookieStore serialization. + Contributed by Author: Mark Mielke + +* HTTPCLIENT-1929: Corrected Automatic-Module-Name entries for HttpClient Fluent, HttpClient Windows + and HttpClient Cache. + Contributed by Oleg Kalnichevski + +* HTTPCLIENT-1927: URLEncodedUtils#parse breaks at double quotes when parsing unquoted values. + Contributed by Oleg Kalnichevski + +* HTTPCLIENT-1939: Update Apache Commons Codec from 1.10 to 1.11 + Contributed by Gary Gregory + + +Release 4.5.6 +------------------- + +This is a maintenance release that adds Automatic-Module-Name to the manifest for compatibility +with Java 9 Platform Module System and fixes a number of issues discovered since 4.5.5 + +Please note that as of 4.4, HttpClient requires Java 1.6 or newer. + +Changelog: +------------------- + +* [HTTPCLIENT-1882=: reset authentication state on I/O or runtime error for connection based + authentication schemes (such as NTLM) + Contributed by Oleg Kalnichevski + +* [HTTPCLIENT-1924]: HttpClient to shut down the connection manager if a fatal error occurs + in the course of a request execution. + Contributed by Oleg Kalnichevski + +* Add Automatic-Module-Name in manifest so Java9 modular applications can depend on this library + Contributed by Varun Nandi + +* [HTTPCLIENT-1923]: fixed incorrect connection close on shutdown + fixed corresponding test + Contributed by Aleksei Arsenev + +* [HTTPCLIENT-1906]: certificates containing alternative subject names other than DNS and IP + (such as RFC822) get rejected as invalid + Contributed by Oleg Kalnichevski + +* [HTTPCLIENT-1904]: check cookie domain for null + Contributed by Hans-Peter Keck + +* [HTTPCLIENT-1900]: proxy protocol processor does not post-process CONNECT response messages + Contributed by Oleg Kalnichevski + +* [HTTPCLIENT-1911]: Failing tests on Fedora 28 due to weak encryption algorithms in test + keystore. + Contributed by Gary Gregory and Michael Simacek + + +Release 4.5.5 +------------------- + +HttpClient 4.5.5 (GA) is a maintenance release that fixes a regression introduced +by the previous release causing a NPE in SystemDefaultCredentialsProvider. + +Please note that as of 4.4, HttpClient requires Java 1.6 or newer. + +Changelog: +------------------- + +* [HTTPCLIENT-1690] Avoid merging Content-Encoding headers coming with 304 status to cache entry. + Contributed by Sudheera Palihakkara + +* [HTTPCLIENT-1888] Regression in SystemDefaultCredentialsProvider#getCredentials causing NPE. + Contributed by Oleg Kalnichevski + +* [HTTPCLIENT-1886] Update HttpClient 4.5.x from HttpCore 4.4.7 to 4.4.9 + Contributed by Gary Gregory + +* [HTTPCLIENT-1889] org.apache.http.client.utils.URLEncodedUtils.parse() + should return a new ArrayList when there are no query parameters. + Contributed by Gary Gregory + + +Release 4.5.4 +------------------- + +HttpClient 4.5.4 (GA) is a maintenance release that fixes a number of defects found since 4.5.3. + +Please note that as of 4.4, HttpClient requires Java 1.6 or newer. + +Changelog: +------------------- + +* [HTTPCLIENT-1883] SystemDefaultCredentialsProvider to use https.proxy* system properties + for origins with port 443. + Contributed by Oleg Kalnichevski + +* [HTTPCLIENT-1881] Allow truncated NTLM packets to work with this client. + Contributed by Karl Wright + +* [HTTPCLIENT-1855] Disabled caching of DIGEST auth scheme instances due to unreliability of nonce counter + when the auth cache is shared by multiple sessions. + Contributed by Oleg Kalnichevski + +* BasicCookieStore uses a ReentrantReadWriteLock to avoid synchronization on #getCookies/#toString + while maintaining thread safety. + Contributed by Carter Kozak + +* [HTTPCLIENT-1865] DefaultServiceUnavailableRetryStrategy does not respect HttpEntity#isRepeatable. + Contributed by Tomas Celaya + +* [HTTPCLIENT-1859] Encode Content-Disposition name and filename elements appropriately. + Contributed by Karl Wright + +* Avoid fetching the cached entity twice on cache hit. + Contributed by Leandro Nunes + +* [HTTPCLIENT-1835] #evictExpiredConnections no longer causes the #evictIdleConnections behaviour + to be implicitly enabled. + Contributed by Oleg Kalnichevski + +* [HTTPCLIENT-1831= URIBuilder should not prepend a leading slash to relative URIs. + Contributed by Oleg Kalnichevski + +* [HTTPCLIENT-1833] Fix Windows Negotiate-NTLM handling of proxies. + Contributed by Roman Stoffel + +* [HTTPCLIENT-1817] Add a "Trust All" TrustStrategy implementation. + Contributed by Gary Gregory + +* [HTTPCLIENT-1816] Update Apache Commons Codec 1.9 to 1.10. + Contributed by Gary Gregory + +* [HTTPCLIENT-1836] DefaultHostnameVerifier#getSubjectAltNames(X509Certificate) throws java.lang.ClassCastException. + Contributed by Gary Gregory , Ilian Iliev + +* [HTTPCLIENT-1845]: Extract InputStreamFactory classes out of GzipDecompressingEntity and + DeflateDecompressingEntity for reuse and to create less garbage. + Contributed by Gary Gregory + +* [HTTPCLIENT-1847] Update Ehcache from 2.6.9 to 2.6.11. + Contributed by Gary Gregory + +* [HTTPCLIENT-1848] Update spymemcached from 2.11.4 to 2.12.3. + Contributed by Gary Gregory + +* [HTTPCLIENT-1849] Update JNA from 4.1.0 to 4.4.0. + Contributed by Gary Gregory + +* [HTTPCLIENT-1850] Update SLF4J from 1.7.6 to 1.7.25. + Contributed by Gary Gregory + + +Release 4.5.3 +------------------- + +HttpClient 4.5.3 (GA) is a maintenance release that fixes a number of defects found since 4.5.2. + +Please note that as of 4.4, HttpClient requires Java 1.6 or newer. + +Changelog: +------------------- + +* [HTTPCLIENT-1803] Improved handling of malformed paths by URIBuilder. + Contributed by Oleg Kalnichevski + +* [HTTPCLIENT-1802] Do not attempt to match SSL host to subject CN if subject alternative name of any type are given. + Contributed by Oleg Kalnichevski + +* [HTTPCLIENT-1788] RFC 6265 policy must not reject cookies with paths that are no prefix of the uri path. + Contributed by Oleg Kalnichevski + +* [HTTPCLIENT-1792] SSLConnectionSocketFactory to throw SSLPeerUnverifiedException with a better error message + when hostname verification fails. + Contributed by Oleg Kalnichevski + +* [HTTPCLIENT-1779] [OSGi] support NTLM proxy authentication. + Contributed by Julian Sedding + +* [HTTPCLIENT-1773] [OSGi] HttpProxyConfigurationActivator does not unregister HttpClientBuilderFactory. + Contributed by Julian Sedding + +* [HTTPCLIENT-1771] improve OSGi webconsole display for org.apache.http.proxyconfigurator. + Contributed by Julian Sedding + +* [HTTPCLIENT-1770] OSGi metatype for org.apache.http.proxyconfigurator missing factoryPid. + Contributed by Julian Sedding + +* [HTTPCLIENT-1767] Null pointer dereference in EofSensorInputStream and ResponseEntityProxy. + Contributed by Peter Ansell + +* Support changing system default ProxySelector. + Contributed by Robin Stevens + +* All services registered in the OSGi service registry provide the whole bundle header dictionary as vendor + property value. + Contributed by Christoph Fiehe + +* [HTTPCLIENT-1750] OSGi support for CachingHttpClientBuilder. + Contributed by Justin Edelson + +* [HTTPCLIENT-1749] OSGi client builder to use weak references to track HttpClient instances. + Contributed by Justin Edelson + +* [HTTPCLIENT-1747] apply RequestConfig defaults when using HttpParams values in backward compatibility mode. + Contributed by Oleg Kalnichevski + +* Override LaxRedirectStrategy's INSTANCE field. + Contributed by Eric Wu + +* [HTTPCLIENT-1736] do not request cred delegation by default when using Kerberos auth. + Contributed by Oleg Kalnichevski + +* [HTTPCLIENT-1744] normalize hostname and certificate CN when matching to CN. + Contributed by Oleg Kalnichevski + +* [HTTPCLIENT-1732] SystemDefaultCredentialsProvider to take http.proxyHost and http.proxyPort system + properties into account. + Contributed by Oleg Kalnichevski + +* Revert "HTTPCLIENT-1712: SPNego schemes to take service scheme into account when generating auth token". + Contributed by Oleg Kalnichevski + +* [HTTPCLIENT-1727] AbstractHttpClient#createClientConnectionManager does not account for context class loader. + Contributed by Charles Allen + +* [HTTPCLIENT-1726:] Copy the SNI fix from SSLConnectionSocketFactory to the deprecated SSLSocketFactory class. + Contributed by David Black + + +Release 4.5.2 +------------------- + +HttpClient 4.5.2 (GA) is a maintenance release that fixes a number of minor defects found since 4.5.1. + +Please note that as of 4.4, HttpClient requires Java 1.6 or newer. + +Changelog: +------------------- + +* [HTTPCLIENT-1710, HTTPCLIENT-1718, HTTPCLEINT-1719] OSGi container compatibility improvements. + Contributed by 212427891 + +* [HTTPCLIENT-1717] Make fluent API Content#Content(byte[], ContentType) public. + Contributed by Cash Costello + +* [HTTPCLIENT-1715] NTLMEngineImpl#Type1Message not thread safe but declared as a constant. + Contributed by Olivier Lafontaine , Gary Gregory + +* [HTTPCLIENT-1714] Add HttpClientBuilder#setDnsResolver(DnsResolver). + Contributed by Alexis Thaveau + +* [HTTPCLIENT-1712] SPNego schemes to take service scheme into account when generating auth token. + Contributed by Georg Romstorfer + +* [HTTPCLIENT-1700] Netscape draft, browser compatibility, RFC 2109, RFC 2965 and default cookie + specs to ignore cookies with empty name for consistency with RFC 6265 specs. + Contributed by Oleg Kalnichevski + +* [HTTPCLIENT-1704] IgnoreSpec#match to always return false. + Contributed by Oleg Kalnichevski + +* [HTTPCLIENT-1550] Fixed 'deflate' zlib header check. + Contributed by Oleg Kalnichevski + +* [HTTPCLIENT-1698] Fixed matching of IPv6 addresses by DefaultHostnameVerifier + Contributed by Oleg Kalnichevski + +* [HTTPCLIENT-1695] RFC 6265 compliant cookie spec to ignore cookies with empty name / missing + value. + Contributed by Oleg Kalnichevski + +* [HTTPCLIENT-1216] Removed ThreadLocal subclass from DateUtils. + Contributed by Jochen Kemnade + +* [HTTPCLIENT-1685] PublicSuffixDomainFilter to ignore local hosts and local domains. + Contributed by Oleg Kalnichevski + + + +Release 4.5.1 +------------------- + +HttpClient 4.5.1 (GA) is a maintenance release that fixes a number of minor defects found since 4.5. + +Please note that as of 4.4, HttpClient requires Java 1.6 or newer. + +Changelog: +------------------- + +* [HTTPCLIENT-1680] redirect of a POST request causes ClientProtocolException. + Contributed by Oleg Kalnichevski + +* [HTTPCLIENT-1673] org.apache.http.entity.mime.content.* missing from OSGi exports. + Contributed by Benson Margulies + +* [HTTPCLIENT-1668] Fluent request incorrectly handles connect timeout setting. + Contributed by Oleg Kalnichevski + +* [HTTPCLIENT-1667] RequestBuilder does not take charset into account when creating + UrlEncodedFormEntity. + Contributed by Sergey Smith + +* [HTTPCLIENT-1655] HttpClient sends RST instead of FIN ACK sequence when using non-persistant + connections. + Contributed by Oleg Kalnichevski + + + +Release 4.5 +------------------- + +HttpClient 4.5 (GA) is a minor feature release that includes several incremental enhancements +to the exisitng functionality such as support for private domains in the Mozilla Public Suffix List. + +Changelog: +------------------- + +* Reduced default validate after inactivity setting from 5 sec to 2 sec + Contributed by Oleg Kalnichevski + +* [HTTPCLIENT-1649] Fixed serialization of auth schemes + Contributed by Oleg Kalnichevski + +* [HTTPCLIENT-1645]: Fluent requests to inherit config parameters of the executor. + Contributed by Oleg Kalnichevski + +* [HTTPCLIENT-1640]: RFC6265 lax cookie policy fails to parse 'max-age' attribute. + Contributed by Oleg Kalnichevski + +* [HTTPCLIENT-1633]: RFC6265CookieSpecProvider compatibility level setting has no effect. + Contributed by Oleg Kalnichevski + +* [HTTPCLIENT-1613]: Support for private domains in Mozilla Public Suffix List. + Contributed by Oleg Kalnichevski + +* [HTTPCLIENT-1651]: Add ability to disable content compression on a request basis + Contributed by Michael Osipov + +* [HTTPCLIENT-1654]: Deprecate/remove RequestConfig#decompressionEnabled in favor of #contentCompressionEnabled + Contributed by Michael Osipov + + + +Release 4.4.1 +------------------- + +HttpClient 4.4.1 (GA) is a maintenance release that fixes a number of defects in new functionality +introduced in version 4.4. + +Users of HttpClient 4.4 are encouraged to upgrade. + +Please note that as of 4.4, HttpClient requires Java 1.6 or newer. + +Changelog: +------------------- + +* Marked RFC 2109, RFC 2965, Netscape draft cookie specs as obsolete + Contributed by Oleg Kalnichevski + +* [HTTPCLIENT-1633] RFC6265CookieSpecProvider compatibility level setting has no effect. + Contributed by Oleg Kalnichevski + +* [HTTPCLIENT-1628]: Auth cache can fail when domain name contains uppercase characters. + Contributed by Dennis Ju + +* [HTTPCLIENT-1609] Stale connection check in PoolingHttpClientConnectionManager has no effect. + Internal connection pool does not correctly implement connection validation. + Contributed by Charles Lip + + + +Release 4.4 Final +------------------- + +This is the first stable (GA) release of HttpClient 4.4. Notable features and enhancements included +in 4.4 series are: + +* Support for the latest HTTP state management specification (RFC 6265). Please note that the old +cookie policy is still used by default for compatibility reasons. RFC 6265 compliant cookie +policies need to be explicitly configured by the user. Please also note that as of next feature +release support for Netscape draft, RFC 2109 and RFC 2965 cookie policies will be deprecated +and disabled by default. It is recommended to use RFC 6265 compliant policies for new applications +unless compatibility with RFC 2109 and RFC 2965 is required and to migrate existing applications +to the default cookie policy. + +* Enhanced, redesigned and rewritten default SSL hostname verifier with improved RFC 2818 +compliance + +* Default SSL hostname verifier and default cookie policy now validate certificate identity +and cookie domain of origin against the public suffix list maintained by Mozilla.org + + +* More efficient stale connection checking: indiscriminate connection checking which results +in approximately 20 to 50 ms overhead per request has been deprecated in favor of conditional +connection state validation (persistent connections are to be re-validated only if a specified +period inactivity has elapsed) + +* Authentication cache thread-safety: authentication cache used by HttpClient is now thread-safe +and can be shared by multiple threads in order to re-use authentication state for subsequent +requests + +* Native Windows Negotiate and NTLM via SSPI through JNA: when running on Windows OS HttpClient +configured to use native NTLM or SPNEGO authentication schemes can make use of platform specific +functionality via JNA and current user credentials. This functionality is still considered +experimental, known to have compatibility issues and subject to change without prior notice. +Use at your discretion. + +This release also includes all fixes from the stable 4.3.x release branch. + +Please note that as of 4.4, HttpClient requires Java 1.6 or newer. + + +Changelog: +------------------- + +* Support for the latest HTTP state management specification (RFC 6265). + Contributed by Oleg Kalnichevski + +* [HTTPCLIENT-1515] Caching of responses to HEAD requests + Contributed by Tyrone Cutajar and + Francois-Xavier Bonnet + +* [HTTPCLIENT-1560] Native Windows auth improvements + Contributed by Michael Osipov + +* Update Apache Commons Logging version from 1.1.3 to 1.2. + Contributed by Gary Gregory + +* Update Apache Commons Codec version from 1.6 to 1.9. + Contributed by Gary Gregory + +* Update Ehcache version from 2.2.0 to 2.6.9. + Contributed by Gary Gregory + +* Update Ehcache version from 2.2.0 to 2.6.9. + Contributed by Gary Gregory + +* Update Spymemcached version from 2.6 to 2.11.4. + Contributed by Gary Gregory + +* Update SLF4J version from 1.5.11 to 1.7.7. + Contributed by Gary Gregory + + + + + +Release 4.4 BETA1 +------------------- + +This is the first BETA release of HttpClient 4.4. Notable features and enhancements included +in 4.4 series are: + +* Enhanced redesigned and rewritten default SSL hostname verifier with improved RFC 2818 +compliance + +* Default SSL hostname verifier and default cookie policy now validate certificate identity +and cookie domain of origin against the public suffix list maintained by Mozilla.org + + +* Native windows Negotiate/NTLM via JNA: when running on Windows OS HttpClient configured to use +native NTLM or SPNEGO authentication schemes can make use of platform specific functionality +via JNA and current user system credentials + +* More efficient stale connection checking: indiscriminate connection checking which results +in approximately 20 to 50 ms overhead per request has been deprecated in favor of conditional +connection state validation (persistent connections are to be re-validated only if a specified +period inactivity has elapsed) + +* Authentication cache thread-safety: authentication caches used by HttpClient is now thread-safe +and can be shared by multiple threads in order to re-use authentication state for subsequent +requests + +This release also includes all fixes from the stable 4.3.x release branch. + +Please note that as of 4.4, HttpClient requires Java 1.6 or newer. + + +Changelog: +------------------- + +* [HTTPCLIENT-1547] HttpClient OSGi bundle doesn't import the package "javax.naming". + Contributed by Willem Jiang + +* [HTTPCLIENT-1541] Use correct (HTTP/hostname) service principal name for Windows native + Negotiate/NTLM auth schemes. + Contributed by Ka-Lok Fung + +* Improved compliance with RFC 2818: default hostname verifier to ignore the common name of the + certificate subject if alternative subject names (dNSName or iPAddress) are present. + Contributed by Oleg Kalnichevski + +* [HTTPCLIENT-1540] Support delegated credentials (ISC_REQ_DELEGATE) by Native windows + native Negotiate/NTLM auth schemes. + Contributed by Ka-Lok Fung + + + +Release 4.4 ALPHA1 +------------------- + +This is the first ALPHA release of HttpClient 4.4. Notable features and enhancements included +in the 4.4 branch are: + +* More efficient stale connection checking: indiscriminate connection checking which results +in approximately 20 to 50 ms overhead per request has been deprecated in favor of conditional +connection state validation (persistent connections are to be re-validated only if a specified +period inactivity has elapsed) + +* Native windows Negotiate/NTLM via JNA: when running on Windows OS HttpClient configured to use +native NTLM or SPNEGO authentication schemes can make use of platform specific functionality +via JNA and current user system credentials + +* Authentication cache thread-safety: authentication caches used by HttpClient is now thread-safe +and can be shared by multiple threads in order to re-use authentication state for subsequent +requests + +This release also includes all fixes from the stable 4.3.x release branch. + +Please note that as of 4.4, HttpClient requires Java 1.6 or newer. + +Please note that new features included in this release are still considered experimental and +their API may change in the future 4.4 alpha and beta releases. + + +Changelog: +------------------- + +* [HTTPCLIENT-1493] Indiscriminate connection checking has been deprecated in favor of conditional + connection state validation. Persistent connections are to be re-validated only after a defined + period inactivity prior to being leased to the consumer. + Contributed by Oleg Kalnichevski + +* [HTTPCLIENT-1519] Use the original HttpHost instance passed as a parameter to + HttpClient#execute when generating 'Host' request header. + Contributed by Oleg Kalnichevski + +* [HTTPCLIENT-1491] Enable provision of Service Principal Name in Windows native + auth scheme. + Contributed by Malcolm Smith + +* [HTTPCLIENT-1403] Pluggable content decoders. + Contributed by Oleg Kalnichevski + +* [HTTPCLIENT-1466] FileBodyPart#generateContentType() ignores custom ContentType values. + Contributed by Oleg Kalnichevski + +* [HTTPCLIENT-1461] fixed performance degradation in gzip encoded content processing + introduced by HTTPCLIENT-1432. + Contributed by Oleg Kalnichevski + +* [HTTPCLIENT-1457] Incorrect handling of Windows (NT) credentials by + SystemDefaultCredentialsProvider. + Contributed by Oleg Kalnichevski + +* [HTTPCLIENT-1456] Request retrial after status 503 causes ClientProtocolException. + Contributed by Oleg Kalnichevski + +* [HTTPCLIENT-1454] Make connection operator APIs public. + Contributed by Tamas Cservenak + +* Update JUnit to version 4.11 from 4.9 + Contributed by Gary Gregory + + + +Release 4.3.4 +------------------- + +HttpClient 4.3.4 (GA) is a maintenance release that improves performance in high concurrency +scenarios. This version replaces dynamic proxies with custom proxy classes and eliminates thread +contention in java.reflect.Proxy.newInstance() when leasing connections from the connection pool +and processing response messages. + + +Changelog: +------------------- + +* Replaced dynamic proxies with custom proxy classes to reduce thread contention. + Contributed by Oleg Kalnichevski + +* [HTTPCLIENT-1484] GzipCompressingEntity should not close the underlying output stream + if the entity has not been fully written out due to an exception. + Contributed by Oleg Kalnichevski + +* [HTTPCLIENT-1474] Fixed broken entity enclosing requests in HC Fluent. + Contributed by Oleg Kalnichevski + +* [HTTPCLIENT-1470] CachingExec(ClientExecChain, HttpCache, CacheConfig, AsynchronousValidator) + throws NPE if config is null + + + + +Release 4.3.3 +------------------- + +HttpClient 4.3.3 (GA) is a bug fix release that fixes a regression introduced by the previous +release causing a significant performance degradation in compressed content processing. + +Users of HttpClient 4.3 are encouraged to upgrade. + +Changelog: +------------------- + +* [HTTPCLIENT-1466] FileBodyPart#generateContentType() ignores custom ContentType values. + Contributed by Oleg Kalnichevski + +* [HTTPCLIENT-1453] Thread safety regression in PoolingHttpClientConnectionManager + #closeExpiredConnections that can lead to ConcurrentModificationException. + Contributed by Oleg Kalnichevski + +* [HTTPCLIENT-1461] fixed performance degradation in compressed content processing + introduced by HTTPCLIENT-1432. + Contributed by Oleg Kalnichevski + +* [HTTPCLIENT-1457] Incorrect handling of Windows (NT) credentials by + SystemDefaultCredentialsProvider. + Contributed by Oleg Kalnichevski + +* [HTTPCLIENT-1456] Request retrial after status 503 causes ClientProtocolException. + Contributed by Oleg Kalnichevski + + +Release 4.3.2 +------------------- + +HttpClient 4.3.2 (GA) is a maintenance release that delivers a number of improvements +as well as bug fixes for issues reported since 4.3.1 release. SNI support for +Oracle JRE 1.7+ is being among the most notable improvements. + +Users of HttpClient 4.3 are encouraged to upgrade. + +Changelog: +------------------- + +* [HTTPCLIENT-1447] Clients created with HttpClients.createMinimal do not work with absolute URIs + Contributed by Joseph Walton + +* [HTTPCLIENT-1446] NTLM proxy + BASIC target auth fails with 'Unexpected state: + MSG_TYPE3_GENERATED'. + Contributed by Oleg Kalnichevski + +* [HTTPCLIENT-1443] HttpCache uses the physical host instead of the virtual host as a cache key. + Contributed by Francois-Xavier Bonnet + +* [HTTPCLIENT-1442] Authentication header set by the user gets removed in case + of proxy authentication (affects plan HTTP requests only). + Contributed by Oleg Kalnichevski + +* [HTTPCLIENT-1441] Caching AsynchronousValidationRequest leaks connections. + Contributed by Dominic Tootell + +* [HTTPCLIENT-1440] 'file' scheme in redirect location URI causes NPE. + Contributed by James Leigh + +* [HTTPCLIENT-1437] Made Executor#execute thread safe. + Contributed by Oleg Kalnichevski + +* [HTTPCLIENT-1119] SNI support (Oracle Java 1.7+ only). + Contributed by Bruno Harbulot + +* [HTTPCLIENT-1435] Fluent Executor ignores custom request properties. + Contributed by Oleg Kalnichevski + +* [HTTPCLIENT-1432] Lazy decompressing of HttpEntity#getContent() to avoid EOFException + in case of an empty response with 'Content-Encoding: gzip' header. + Contributed by Yihua Huang + +* [HTTPCLIENT-1431] (Regression) deprecated connection manager cannot be used with + a custom LayeredSchemeSocketFactory. + Contributed by Oleg Kalnichevski + +* [HTTPCLIENT-1425] Fixed socket closed exception thrown by caching HttpClient when the origin + server sends a long chunked response. + Contributed by James Leigh + +* [HTTPCLIENT-1417] Fixed NPE in BrowserCompatSpec#formatCookies caused by version 1 + cookies with null cookie value. + Contributed by Oleg Kalnichevski + +* [HTTPCLIENT-1416] Fixed NPE in CachingHttpClientBuilder#build(). + Contributed by Oleg Kalnichevski + + + +Release 4.3.1 +------------------- + +HttpClient 4.3.1 (GA) is a bug fix release that addresses a number of issues reported since +release 4.3. + +Users of HttpClient 4.3 are strongly encouraged to upgrade. + +Changelog +------------------- + +* [HTTPCLIENT-1410] Browser compatible hostname verifier no longer rejects + *.co., *.gov., *.info., etc as invalid. + Contributed by Oleg Kalnichevski + +* Ensure X509HostnameVerifier is never null. + Contributed by Oleg Kalnichevski + +* [HTTPCLIENT-1405] CONNECT HTTP/1.1 requests lack mandatory 'Host' header. + Contributed by Oleg Kalnichevski + +* [HTTPCLIENT-1402] Cache default User-Agent value. + Contributed by yuexiaojun + +* [HTTPCLIENT-1398] Fixed invalid OSGi metadata caused by corrupted Maven bundle plugin metadata. + Contributed by Oleg Kalnichevski + +* [HTTPCLIENT-1399] Fixed NPE in RequestBuilder. + Contributed by Oleg Kalnichevski + + + + +Release 4.3 Final +------------------- + +This is the first stable (GA) release of HttpClient 4.3. The most notable enhancements included +in this release are: + +* Support for Java 7 try-with-resources for resource management (connection release.) + +* Added fluent Builder classes for HttpEntity, HttpRequest, HttpClient and SSLContext instances. + +* Deprecation of preference and configuration API based on HttpParams interface in favor of +constructor injection and plain configuration objects. + +* Reliance on object immutability instead of access synchronization for thread safety. +Several old classes whose instances can be shared by multiple request exchanges have +been replaced by immutable equivalents. + +* DefaultHttpClient, DecompressingHttpClient, CachingHttpClient and similar classes are +deprecated in favor of builder classes that produce immutable HttpClient instances. + +* HttpClient builders now dynamically construct a request execution pipeline tailored +specifically to the user configuration by physically excluding unnecessary protocol components. + +* There is now an option to construct a minimal HttpClient implementation that can only execute +basic HTTP message exchanges without redirects, authentication, state management or proxy support. +This feature might be of particular use in web crawler development. + +* There is now option to avoid strict URI syntax for request URIs by executing HTTP requests +with an explicitly specified target host. HttpClient will no longer attempt to parse the request +URI if it does not need to extract the target host from it. + +This release also includes all fixes from the stable 4.2.x release branch. + + +Changelog +------------------- +* [HTTPCLIENT-1371] Weak ETag Validation is Useful On PUT With If-Match + Contributed by James Leigh + +* [HTTPCLIENT-1394] Support for Native windows Negotiate/NTLM via JNA + Contributed by Ryan McKinley + +* [HTTPCLIENT-1384] Expose CacheInvalidator interface. + Contributed by Nicolas Richeton + +* [HTTPCLIENT-1385] Fixed path normalization in CacheKeyGenerator + Contributed by James Leigh + +* [HTTPCLIENT-1370] Response to non-GET requests should never be cached with the default + ResponseCachingPolicy + Contributed by James Leigh + +* [HTTPCLIENT-1373] OPTIONS and TRACE should not invalidate cache + Contributed by James Leigh + +* [HTTPCLIENT-1383] HttpClient enters an infinite loop during NTLM authentication if the opposite + endpoint keeps responding with a type 2 NTLM response after type 3 MTLM message has already been + sent by the client. + Contributed by Oleg Kalnichevski + +* [HTTPCLIENT-1372] Refactor HttpMultipart, and add RFC6532 mode, so that headers in post + are no longer constrained to ASCII values. + Contributed by Karl Wright + +* [HTTPCLIENT-1377] User principal for non-NTLM authentication is incorrectly generated when using + user credentials are specified as NTCredentials + Contributed by Gary Gregory + + + +Release 4.3 BETA2 +------------------- + +This is the second BETA release of HttpClient 4.3. The most notable features and improvements +in the 4.3 branch are: Support for Java 7 try-with-resources for resource management (connection +release); fluent Builder classes for HttpEntity, HttpRequest and HttpClient instances, deprecation +of preference and configuration API based on HttpParams interface in favor of constructor injection +and plain configuration objects, reliance on object immutability instead of access synchronization +for thread safety. + +This release also includes all fixes from the stable 4.2.x release branch. + +Changelog +------------------- + + +* [HTTPCLIENT-1366] org.apache.http.client.utils.URLEncodedUtils should parse the semicolon as a query parameter separator. + Contributed by Gary Gregory + +* [HTTPCLIENT-1365] NPE when ManagedHttpClientConnectionFactory.create(ConnectionConfig) is called with null. + Contributed by Gary Gregory + +* [HTTPCLIENT-1362] Better error messages for connect timed out and connection refused + exceptions. + Contributed by Oleg Kalnichevski + +* [HTTPCLIENT-1360] separate out DeflateInputStream as an independent class, + so it can be used by others. + Contributed by Karl Wright + +* [HTTPCLIENT-1359] repeated requests using the same context fail if they redirect. + Contributed by James Leigh + +* [HTTPCLIENT-1354] do not quote algorithm parameter in DIGEST auth response. + Contributed by Oleg Kalnichevski + +* [HTTPCLIENT-1351] Added utility method to resolve final location from original request, + target host and a list of redirects. + Contributed by James Leigh + +* [HTTPCLIENT-1344] Userinfo credentials in URI should not default to preemptive BASIC + authentication. + Contributed by Oleg Kalnichevski + +* [HTTPCLIENT-1345] Useinfo credentials ignored in redirect location header. + Contributed by Oleg Kalnichevski + +* [HTTPCLIENT-1294] HttpClient to rewrite host name of the redirect location URI in order + to avoid circular redirect exception due to host name case mismatch. + Contributed by Oleg Kalnichevski + +* [HTTPCLIENT-1264] Add support for multiple levels of browser compatibility + to BrowserCompatSpec and BrowserCompatSpecFactory. Include constructor + argument for IE medium-security compatibility. + Contributed by Karl Wright (kwright at apache.org) + +* [HTTPCLIENT-1349] SSLSocketFactory incorrectly identifies key passed with keystore as + the keystore password. + Contributed by David Graff + +* [HTTPCLIENT-1346] Ensure propagation of SSL handshake exceptions. + Contributed by Pasi Eronen + +* [HTTPCLIENT-1343] SSLSocketFactory optional parameters for supported SSL protocols and cipher + suites. + Contributed by Oleg Kalnichevski + +* [HTTPCLIENT-1238] Contribute Bundle Activator And Central Proxy Configuration. + Contributed by Simone Tripodi + +* [HTTPCLIENT-1299] (regression) cache incorrectly disposes of the underlying cache resource + when storing variant entry. + Contributed by James Leigh + +* [HTTPCLIENT-1342] Redirects with underscore character in the location hostname cause + "java.lang.IllegalArgumentException: Host name may not be null". + Contributed by Oleg Kalnichevski + + + +Release 4.3 BETA1 +------------------- + +This is the first BETA release of HttpClient 4.3. The 4.3 branch enhances HttpClient in several +key areas and includes several notable features and improvements: Support for Java 7 +try-with-resources for resource management (connection release); fluent Builder classes for +HttpEntity, HttpRequest and HttpClient instances, deprecation of preference and configuration API +based on HttpParams interface in favor of constructor injection and plain configuration objects, +reliance on object immutability instead of access synchronization for thread safety. + +This release also includes all fixes from the stable 4.2.x release branch. + + +Changelog +------------------- + +* [HTTPCLIENT-1317] InetAddressUtils should handle IPv6 Addresses with Embedded IPv4 Addresses + Contributed Sebastian Bazley . + +* [HTTPCLIENT-1320] Leverage javax.net.ssl.SSLSocketFactory#getDefault() to initialize SSL context + based on system defaults instead of using an internal custom routine. + Contributed by Abe Backus and Oleg Kalnichevski + +* [HTTPCLIENT-1316] Certificate verification rejects IPv6 addresses which are not String-equal. + Contributed Sebastian Bazley . + +* [HTTPCLIENT-1307] Future based asynchronous request execution. + Contributed by Jilles van Gurp + +* [HTTPCLIENT-1313] Fixed IllegalStateException in deprecated ThreadSafeClientConnManager. + Contributed by Oleg Kalnichevski + +* [HTTPCLIENT-1298] Add AsynchronousValidator in HttpClientBuilder's list of closeable objects. + Contributed by Martin Meinhold + + + +Release 4.3 ALPHA1 +------------------- + +This is the first ALPHA release of HttpClient 4.3. The 4.3 branch enhances HttpClient in several +key areas and includes several notable features and improvements: Support for Java 7 +try-with-resources for resource management (connection release); fluent Builder classes for +HttpEntity, HttpRequest and HttpClient instances, deprecation of preference and configuration API +based on HttpParams interface in favor of constructor injection and plain configuration objects, +reliance on object immutability instead of access synchronization for thread safety. + +We are kindly asking all upstream projects to review API changes and help us improve +the APIs by providing feedback and sharing ideas on dev@hc.apache.org. + +This release also includes all fixes from the stable 4.2.x release branch. + +Please note that new features included in this release are still considered experimental and +their API may change in the future 4.3 alpha and beta releases. + + +Changelog +------------------- + +* [HTTPCLIENT-1250] Allow query string to be ignored when determining cacheability for + HTTP 1.0 responses. + Contributed by Don Brown + +* [HTTPCLIENT-1261] Make SystemDefaultHttpClient honor http.agent system property. + Contributed by Oleg Kalnichevski + +* [HTTPCLIENT-900] Don't enforce URI syntax for messages with an explicit target host. + Contributed by Oleg Kalnichevski + +* [HTTPCLIENT-1190] HttpClient cache does not support "Vary: Cookie" + Contributed by Oleg Kalnichevski + +* [HTTPCLIENT-1259] Calling #abort() on requests executed with DecompressingHttpClient has no + effect. + Contributed by Oleg Kalnichevski + +* [HTTPCLIENT-1253] URIBuilder setParameter() method could exceed the HTTP header size. + Contributed by Oleg Kalnichevski + +* [HTTPCLIENT-1216] Added method to force clean thread-local used by DateUtils. + Contributed by Oleg Kalnichevski + + +Release 4.2.3 +------------------- + +HttpClient 4.2.3 (GA) is a bug fix release that addresses a number of issues reported since +release 4.2.2. This release also includes a thoroughly reworked NTLM authentication engine +which should result in a better compatibility with the newest Microsoft products. + +Users of HttpClient 4.x are advised to upgrade. + +Changelog +------------------- + +* [HTTPCLIENT-1296] NPE gets thrown if you combine a default host with a virtual host + that has a -1 value for the port. + Contributed by Karl Wright + +* [HTTPCLIENT-1290] 304 cached response never reused with If-modified-since conditional + requests. + Contributed by Francois-Xavier Bonnet + +* [HTTPCLIENT-1291] Absolute request URIs without an explicitly specified path are rewritten + to have "/" path). + Contributed by Oleg Kalnichevski + +* [HTTPCLIENT-1286] Request URI rewriting is inconsistent - URI fragments are not removed + from absolute request URIs. + Contributed by Oleg Kalnichevski + +* [HTTPCLIENT-1284] HttpClient incorrectly generates Host header when physical connection + route differs from the host name specified in the request URI. + Contributed by Oleg Kalnichevski + +* [HTTPCLIENT-1293] Kerberos and SPNego auth schemes use incorrect authorization header name + when authenticating with a proxy. + Contributed by Oleg Kalnichevski + +* [HTTPCLIENT-1283] NTLM needs to use Locale-independent form of + toUpperCase(). + Contributed by Karl Wright + +* [HTTPCLIENT-1279] Target host responding with status 407 (proxy authentication required) + causes an NPE. + Contributed by Oleg Kalnichevski + +* [HTTPCLIENT-1281] GzipDecompressingEntity does not release InputStream when an IOException + occurs while reading the Gzip header + Contributed by Francois-Xavier Bonnet + +* [HTTPCLIENT-1277] Caching client sends a 304 to an unconditional request. + Contributed by Francois-Xavier Bonnet + +* [HTTPCLIENT-1278] Update NTLM documentation. + Contributed by Karl Wright + +* SystemDefaultHttpClient misinterprets 'http.keepAlive' default value and disables + connection persistence if the system property is not set. This causes connection + based authentication schemes such as NTLM to fail. + +* [HTTPCLIENT-1276] cache update on a 304 response causes NPE. + Contributed by Francois-Xavier Bonnet + +* [HTTPCLIENT-1273] DecompressingHttpClient does not automatically consume response + content in case of an i/o, HTTP or runtime exception thrown by the decompressing + protocol interceptor leading to a potential connection leak. + Contributed by Oleg Kalnichevski + +* [HTTPCLIENT-1268] NTLM engine refactor fix, to correct a buffer overrun, and get NTLMv2 + flags right. + Contributed by Karl Wright + +* [HTTPCLIENT-1266] NTLM engine refactoring and compatibility improvements. + Contributed by Karl Wright + +* [HTTPCLIENT-1263] BrowserCompatSpec: attribute values containing spaces or special characters + should be enclosed with quotes marks for version 1 cookies. + Contributed by Francois-Xavier Bonnet + +* [HTTPCLIENT-1263] CachingHttpClient fails to release connections back to the connection + manager for some type of HTTP response messages when used together with DecompressingHttpClient. + Contributed by Francois-Xavier Bonnet + +* [HTTPCLIENT-1258] Fixed NullPointerException in NTLMEngineImpl caused by null NT domain + attribute. + Contributed by Oleg Kalnichevski + +* [HTTPCLIENT-1254] Redirect with underscore in hostname causes ProtocolException. + Contributed by Oleg Kalnichevski + +* [HTTPCLIENT-1255] AbstractVerifier incorrectly parses certificate CN containing wildcard. + Contributed by Oleg Kalnichevski + + + +Release 4.2.2 +------------------- + +HttpClient 4.2.2 (GA) is a bug fix release that addresses a number of issues reported since +release 4.2.1. + +Users of HttpClient 4.2 are advised to upgrade. + +Changelog +------------------- + +* [HTTPCLIENT-1248] Default and lax redirect strategies should not convert requests redirected + with 307 status to GET method. + Contributed by Oleg Kalnichevski + +* [HTTPCLIENT-1215] BasicAuthCache does not take default ports into consideration when + looking up cached authentication details by HttpHost key. + Contributed by Oleg Kalnichevski + +* [HTTPCLIENT-1241] (regression) Preemptive BASIC authentication failure should be considered + final and no further attempts to re-authenticate using the same credentials should be made. + Contributed by Oleg Kalnichevski + +* [HTTPCLIENT-1229] Fixed NPE in BasicClientConnectionManager that can be triggered by releasing + connection after the connection manager has already been shut down. + Contributed by Oleg Kalnichevski + +* [HTTPCLIENT-1227] Date parsing in DateUtils made more efficient. + Contributed by Patrick Linskey + +* [HTTPCLIENT-1224] (regression) NTLM auth not retried after a redirect over a non-persistent + connection. + Contributed by Oleg Kalnichevski + +* [HTTPCLIENT-1223] Cache could be more aggressive on cache invalidations + from Content-Location. Contributed by Jon Moore . + Contributed by Jon Moore + +* [HTTPCLIENT-1217] AutoRetryHttpClient does not release connection used by the previous response + when request is retried + Contributed by Oleg Kalnichevski + + + +Release 4.2.1 +------------------- + +HttpClient 4.2.1 (GA) is a bug fix release that addresses a number of issues reported since +release 4.2. + +Users of HttpClient 4.2 are advised to upgrade. + +Changelog +------------------- + +* [HTTPCLIENT-1209] Redirect URIs are now normalized. + Contributed by Oleg Kalnichevski + +* [HTTPCLIENT-1202] ResponseCachingPolicy should honor explicit cache-control + directives for other status codes + Contributed by Jon Moore + +* [HTTPCLIENT-1199] DecompressingHttpClient strips content from entity enclosing requests + Contributed by Oleg Kalnichevski + +* [HTTPCLIENT-1198] HttpHost is not set in HttpContext in CachingHttpClient. + Contributed by Jon Moore + +* [HTTPCLIENT-1200] DecompressingHttpClient fails to generate correct HttpHost context attribute. + Contributed by Guillaume Castagnino + +* [HTTPCLIENT-1192] URIBuilder encodes query parameters twice. + Contributed by Oleg Kalnichevski and Sebastian Bazley . + +* [HTTPCLIENT-1196] Fixed NPE in UrlEncodedFormEntity constructor thrown if charset is null. + Contributed by Oleg Kalnichevski + +* [HTTPCLIENT-1193] Fixed regression in the route tracking logic of the default connection manager + causing cross-site redirect failures. + Contributed by Oleg Kalnichevski + +Release 4.2 +------------------- + +This is the first stable (GA) release of HttpClient 4.2. The most notable enhancements included +in this release are: + +* New facade API for HttpClient based on the concept of a fluent interface. The fluent API exposes + only the most fundamental functions of HttpClient and is intended for relatively simple use cases + that do not require the full flexibility of HttpClient. However, the fluent API almost fully + relieves the users from having to deal with connection management and resource deallocation. + +* Redesigned and rewritten connection management code. + +* Enhanced HTTP authentication API that enables HttpClient to handle more complex authentication + scenarios. HttpClient 4.2 is now capable of making use of multiple authentication challenges + and retry authentication with a fall-back scheme in case the primary one fails. This can be + important for compatibility with Microsoft products that are often configured to use + SPNEGO/Kerberos as the preferred authentication scheme. + + +Changelog +------------------- + +* [HTTPCLIENT-1187] If a revalidation response is deemed too old CachingHttpClient fails to + consume its content resulting in a connection leak. + Contributed by Oleg Kalnichevski + +* [HTTPCLIENT-1186] State of newly created connections in the connection pool is not always + correctly updated potentially allowing those connections to be leased to users with a different + security context. + Contributed by Ralf Poehlmann + +* [HTTPCLIENT-1179] Upgraded Commons Codec dependency to version 1.6 + Contributed by Oleg Kalnichevski + +* [HTTPCLIENT-1177] always remove fragments from request URIs + Contributed by Oleg Kalnichevski + +Incompatible changes +-------------------- +[Compared to release version 4.1.3] + +The following fields have been deprecated for some time now and have been deleted: + +org.apache.http.client.params.ClientPNames#CONNECTION_MANAGER_FACTORY +org.apache.http.impl.cookie.BrowserCompatSpec#DATE_PATTERNS + +The following methods have been deprecated for some time now and have been deleted: + +org.apache.http.client.params.ClientParamBean#setConnectionManagerFactory(org.apache.http.conn.ClientConnectionManagerFactory) +org.apache.http.client.protocol.ClientContextConfigurer#setAuthSchemePref(java.util.List) +org.apache.http.entity.mime.content.FileBody#writeTo(java.io.OutputStream, int) +org.apache.http.entity.mime.content.InputStreamBody#writeTo(java.io.OutputStream, int) +org.apache.http.entity.mime.content.StringBody#writeTo(java.io.OutputStream, int) + +The following classes have been deprecated for some while now and have been deleted: + +org.apache.http.impl.conn.tsccm.RefQueueHandler +org.apache.http.impl.conn.tsccm.AbstractConnPool no longer implements interface org.apache.http.impl.conn.tsccm.RefQueueHandler +org.apache.http.impl.conn.tsccm.ConnPoolByRoute no longer implements interface org.apache.http.impl.conn.tsccm.RefQueueHandler +org.apache.http.impl.conn.tsccm.RefQueueWorker + + + +Release 4.2 BETA1 +------------------- + +This is the first BETA release of HttpClient 4.2. This release completes development of several +notable enhancements in HttpClient: + +* New facade API for HttpClient based on the concept of a fluent interface. The fluent API exposes + only the most fundamental functions of HttpClient and is intended for relatively simple use cases + that do not require the full flexibility of HttpClient. However, the fluent API almost fully + relieves the users from having to deal with connection management and resource deallocation. + +* Redesigned and rewritten connection management code. As of release 4.2 HttpClient will be using + pooling connection manager per default. + +* Enhanced HTTP authentication API that enables HttpClient to handle more complex authentication + scenarios. HttpClient 4.2 is now capable of making use of multiple authentication challenges + and retry authentication with a fall-back scheme in case the primary one fails. This can be + important for compatibility with Microsoft products that are often configured to use + SPNEGO/Kerberos as the preferred authentication scheme. + + +Changelog +------------------- + +* [HTTPCLIENT-1164] Compressed entities are not being cached properly. + Contributed by Jon Moore . + +* [HTTPCLIENT-1154] MemcachedHttpCacheStorage should allow client to + specify custom prefix string for keys. + Contributed by Jon Moore . + +* [HTTPCLIENT-1153] MemcachedHttpCacheStorage uses URL as cache key; + shouldn't due to fixed maximum-length memcached keys. + Contributed by Jon Moore . + +* [HTTPCLIENT-1157] MemcachedHttpCacheStroage should throw IOExceptions + instead of RuntimeExceptions. + Contributed by James Miller . + +* [HTTPCLIENT-1152] MemcachedHttpCacheStorage should verify class of + returned object before casting. + Contributed by Rajika Kumarasiri . + +* [HTTPCLIENT-1155] CachingHttpClient fails to ensure that the response content gets fully consumed + when using a ResponseHandler, which can potentially lead to connection leaks. + Contributed by James Miller + +* [HTTPCLIENT-1147] When HttpClient-Cache cannot open cache file, should act like miss. + Contributed by Joe Campbell + +* [HTTPCLIENT-1137] Values for the Via header are cached and reused by httpclient-cache. + Contributed by Alin Vasile + +* [HTTPCLIENT-1142] Infinite loop on NTLM authentication failure. + Contributed by Oleg Kalnichevski + +* [HTTPCLIENT-1143] CachingHttpClient leaks connections with stale-if-error. + Contributed by James Miller + +Release 4.2 ALPHA1 +------------------- + +This is the first ALPHA release of HttpClient 4.2. The 4.2 branch enhances HttpClient in several +key areas and includes several notable features and improvements: + +* New facade API for HttpClient based on the concept of a fluent interface. The fluent API exposes + only the most fundamental functions of HttpClient and is intended for relatively simple use cases + that do not require the full flexibility of HttpClient. However, the fluent API almost fully + relieves the users from having to deal with connection management and resource deallocation. + +* Redesigned and rewritten connection management code. As of release 4.2 HttpClient will be using + pooling connection manager per default. + +* Enhanced HTTP authentication API that enables HttpClient to handle more complex authentication + scenarios. HttpClient 4.2 is now capable of making use of multiple authentication challenges + and retry authentication with a fall-back scheme in case the primary one fails. This can be + important for compatibility with Microsoft products that are often configured to use + SPNEGO/Kerberos as the preferred authentication scheme. + +Please note that new features included in this release are still considered experimental and +their API may change in the future ALPHA releases. + +Changelog +------------------- + +* [HTTPCLIENT-1128] SystemDefaultHttpClient (HttpClient implementation initialized using system + properties). + Contributed by Oleg Kalnichevski + +* [HTTPCLIENT-1135] RandomAccessFile mode 'w' used by HttpClientCache is not valid. + Contributed by Oleg Kalnichevski + +* [HTTPCLIENT-1131] HttpClient to authenticate preemptively using BASIC scheme if a userinfo + attribute is specified in the request URI. + Contributed by Oleg Kalnichevski + +* [HTTPCLIENT-1134] make BasicResponseHandler consume response content in case of an unsuccessful + result (status code >= 300). + Contributed by Oleg Kalnichevski + +* [HTTPCLIENT-1132] ProxyClient implementation. + Contributed by Oleg Kalnichevski + +* [HTTPCLIENT-1127] fixed dead-lock between SingleClientConnManager and AbstractPooledConnAdapter. + Contributed by Oleg Kalnichevski + +* [HTTPCLIENT-1107] Auth framework redesign. + Contributed by Oleg Kalnichevski + +* [HTTPCLIENT-1116] ResponseCachingPolicy uses integers for sizes + Contributed by Greg Bowyer + +* [HTTPCLIENT-1123] Support for pluggable DNS resolvers. + Contributed by Alin Vasile + +* [HTTPCLIENT-1120] DefaultHttpRequestRetryHandler#retryRequest should not retry aborted requests. + Contributed by Alin Vasile + +* Support for auth-int qop (quality of protection) option in Digest auth scheme. + Contributed by Oleg Kalnichevski + +* [HTTPCLIENT-1076] Fluent facade API (Google summer of code 2011 project). + Contributed by Xu Lilu + +* UriBuilder implementation. + Contributed by Xu Lilu + +* Redesign of connection management classes based on new pooling components from HttpCore. + Contributed by Oleg Kalnichevski + +* [HTTPCLIENT-1111] Added #prepareSocket method to SSLSocketFactory. + Contributed by Pasi Eronen + +* Added #reset() and #releaseConnection() methods to HttpRequestBase. + Contributed by Oleg Kalnichevski + +* [HTTPCLIENT-1105] AutoRetryHttpClient: built-in way to do auto-retry for certain status codes. + Contributed by Dan Checkoway + +* [HTTPCLIENT-1094] Digest auth scheme refactoring. + Contributed by Oleg Kalnichevski + +* Lax implementation of RedirectStrategy. + Contributed by Bartosz Firyn + +* [HTTPCLIENT-1044] HttpRequestRetryHandler implementation compliant with the definition of + idempotent methods given in the RFC 2616. + Contributed by Oleg Kalnichevski + + +Release 4.1.2 +------------------- + +The HttpClient 4.1.2 is a bug fix release that addresses a number of non-critical issues reported +since release 4.1.1. + +* [HTTPCLIENT-1100] Missing Content-Length header makes cached entry invalid + Contributed by Bart Robeyns + +* [HTTPCLIENT-1098] Avoid expensive reverse DNS lookup on connect timeout exception. + Contributed by Thomas Boettcher + +* [HTTPCLIENT-1097] BrowserCompatHostnameVerifier and StrictHostnameVerifier should handle + wildcards in SSL certificates better. + Contributed by Sebastian Bazley + +* [HTTPCLIENT-1092] If ClientPNames.VIRTUAL_HOST does not provide the port, derive it from the + current request. + Contributed by Sebastian Bazley + +* [HTTPCLIENT-1087] NTLM proxy authentication fails on retry if the underlying connection is closed + as a result of a target authentication failure. + Contributed by Oleg Kalnichevski + +* [HTTPCLIENT-1079] Fixed Kerberos cross-realm support + Contributed by Michael Osipov <1983-01-06 at gmx.net> + +* [HTTPCLIENT-1078] Decompressing entities (DeflateDecompressingEntity, GzipDecompressingEntity) + do not close content stream in #writeTo() method. + Contributed by Oleg Kalnichevski + +* [HTTPCLIENT-1075] Decompressing entities (DeflateDecompressingEntity, GzipDecompressingEntity) + do not correctly handle content streaming. + Contributed by James Abley + +* [HTTPCLIENT-1051] Avoid reverse DNS lookups when opening SSL connections by IP address. + Contributed by Oleg Kalnichevski + + +Release 4.1.1 +------------------- + +HttpClient v4.1.1 is a bug fix release that addresses a number of issues reported since +release 4.1, including one critical security issue (HTTPCLIENT-1061). All users of HttpClient 4.0.x +and 4.1 are strongly encouraged to upgrade. + +* [HTTPCLIENT-1069] HttpHostConnectException not correctly retried for direct and non-tunnelled + proxy connections. + Contributed by Oleg Kalnichevski + +* [HTTPCLIENT-1066] Changed the way URIUtils#rewriteURI handles multiple consecutive slashes in the + URI path component: multiple leading slashes will be replaced by one slash in order to avoid + confusion with the authority component. The remaining content of the path will not be modified. + (also see HTTPCLIENT-929). + Contributed by Oleg Kalnichevski + +* [HTTPCLIENT-1061] Fixed critical bug causing Proxy-Authorization header to be sent to the target + host when tunneling requests through a proxy server that requires authentication. + Contributed by Oleg Kalnichevski + +* [HTTPCLIENT-1056] Fixed bug causing the RequestAuthCache protocol interceptor to generate + an invalid AuthScope instance when looking up user credentials for preemptive authentication. + Contributed by Oleg Kalnichevski + +* [HTTPCLIENT-1053] Fixed the way DigestScheme generates nonce-count values. + Contributed by Oleg Kalnichevski + + +Release 4.1 +------------------- + +The HttpClient 4.1 release builds upon the stable foundation laid by HttpClient 4.0 and adds several +functional improvements and popular features. + +* Response caching conditionally compliant with HTTP/1.1 specification (full compliance with + MUST requirements, partial compliance with SHOULD requirements) + +* Full support for NTLMv1, NTLMv2, and NTLM2 Session authentication. The NTLM protocol code + was kindly contributed by the Lucene Connector Framework project. + +* Support for SPNEGO/Kerberos authentication. + +* Persistence of authentication data between request executions within the same execution context. + +* Support for preemptive authentication for BASIC and DIGEST schemes. + +* Support for transparent content encoding. Please note transparent content encoding is not + enabled per default in order to avoid conflicts with already existing custom content encoding + solutions. + +* Mechanism to bypass the standard certificate trust verification (useful when dealing with + self-signed certificates). + +* Simplified configuration for connection managers. + +* Transparent support for host multihoming. + +IMPORTANT: please note that the HttpClient 3.x branch is now officially END OF LIFE and is no longer +maintained and supported by the Apache HttpComponents project. + +Changelog +------------------- +* The public API for the caching module had a minor change between 4.1-beta and 4.1-GA to the + HttpCacheEntry class - the deprecated public Set getVariantURIs() method and constructor + public HttpCacheEntry(Date requestDate, Date responseDate, + StatusLine statusLine, Header[] responseHeaders, + Resource resource, Set variants) + were both removed. This will not affect you unless you are implementing new storage backends + that use the deprecated code and/or are implementing custom serializers for cache entries. + +* Changed Browser-Compatibility and Best-Match cookie policies to emulate the behaviour of FireFox + more closely when parsing Netscape style cookies. Comma will no longer be treated as a header + element separator if Set-Cookie does not contain a Version attribute mandated by the + RFC2109 / RFC 2965 cookie specifications. + Contributed by Oleg Kalnichevski + +* [HTTPCLIENT-1036] StringBody has incorrect default for characterset. (Default changed + to US-ASCII) + Contributed by Sebastian Bazley + +* [HTTPCLIENT-975] Support stale-if-error and stale-while-revalidate extension directive (RFC5861). + Contributed by Mohammed Azeem Uddin , + Michajlo Matijkiw , and + Matthew Hawthorne . + +* [HTTPCLIENT-1033] HttpRoute.equals(Object o) is quite inefficient, as it does not take full + advantage of shortcut logic. + Contributed by Sebastian Bazley + +* [HTTPCLIENT-1030] Implement "ignoreCookies" CookieSpec + Contributed by Sebastian Bazley + +Release 4.1 BETA1 +------------------- + +HttpClient 4.1 BETA1 finalizes the 4.1 API and brings a number of major improvements to the HTTP +caching module. This release also adds full support for NTLMv1, NTLMv2, and NTLM2 Session +authentication. The NTLM protocol code was kindly contributed by the Lucene Connector Framework +project. + +Changelog +------------------- +* [HTTPCLIENT-1015] Support only-if-cached directive. + Contributed by Michajlo Matijkiw + +* [HTTPCLIENT-990] Allow heuristic freshness caching. + Contributed by Michajlo Matijkiw + +* [HTTPCLIENT-919] Support for NTLMv1, NTLMv2, and NTLM2 Session authentication. + Contributed by Karl Wright + +* [HTTPCLIENT-1008] Send all variants' ETags on "variant miss". + Contributed by Michajlo Matijkiw and + Mohammed Azeem Uddin + +* [HTTPCLIENT-1011] Handling of IOExceptions thrown by cache components. + Contributed by Jonathan Moore + +* [HTTPCLIENT-1003] Handle conditional requests in cache. + Contributed by Michajlo Matijkiw and + Mohammed Azeem Uddin + +* [HTTPCLIENT-1002] Stale connection check fails if wire logging is on. + Contributed by Oleg Kalnichevski + +* [HTTPCLIENT-1000] Maximum connection lifetimes settings for ThreadSafeClientConnManager. + Contributed by Michajlo Matijkiw + +* [HTTPCLIENT-960] HttpMultipart doesn't generate Content-Type header for binary parts in + BROWSER_COMPATIBLE mode. + Contributed by Oleg Kalnichevski + +* [HTTPCLIENT-998] Cache should use both Last-Modified and ETag for validations when available. + Contributed by Jonathan Moore + +* [HTTPCLIENT-997] Cache module should handle out-of-order validations properly and unconditionally + refresh. + Contributed by Jonathan Moore + +* [HTTPCLIENT-994] Cache does not allow client to override origin-specified freshness using + max-stale. + Contributed by Jonathan Moore + +* [HTTPCLIENT-995] Cache returns cached responses even if validators not consistent with all + conditional headers. + Contributed by Jonathan Moore + +* [HTTPCLIENT-977] Memcached implementation for HttpCache. + Contributed by Mohammed Azeem Uddin + +* [HTTPCLIENT-992] cache should not generate stale responses to requests explicitly requesting + first-hand or fresh ones. + Contributed by Jonathan Moore + +* [HTTPCLIENT-991] cache module produces improperly formatted Warning header when revalidation + fails. + Contributed by Jonathan Moore + +* [HTTPCLIENT-989] DefaultHttpRequestRetryHandler no longer retries non-idempotent http methods + if NoHttpResponseException is thrown. + Contributed by Oleg Kalnichevski + +* [HTTPCLIENT-988] Cache module should strip 'Content-Encoding: identity' from responses + Contributed by Jonathan Moore + +* [HTTPCLIENT-987] cache module does not recognize equivalent URIs. + Contributed by Jonathan Moore + +* [HTTPCLIENT-986] cache module does not completely handle upstream Warning headers correctly + Contributed by Jonathan Moore + +* [HTTPCLIENT-985] cache module should populate Via header to capture upstream and downstream protocols + Contributed by Jonathan Moore + +* [HTTPCLIENT-984] Additional conditional compliance tests for the caching module for + Content-Encoding, Content-Location, Date, Expires, Server, Transfer-Encoding, and Vary headers. + Contributed by Jonathan Moore + +* [HTTPCLIENT-978] HTTP cache update exception handling + Contributed by Michajlo Matijkiw + +* [HTTPCLIENT-981] CachingHttpClient returns a 411 respones when executing a POST (HttpPost) + request. + Contributed by Joe Campbell + +* [HTTPCLIENT-980] CachingHttpClient returns a 503 response when the backend HttpClient produces + an IOException. + Contributed by Jonathan Moore + +* [HTTPCLIENT-978] Ehcache based HTTP cache implementation + Contributed by Michajlo Matijkiw + +* [HTTPCLIENT-967] support for non-shared (private) caches + Contributed by Jonathan Moore + +* [HTTPCLIENT-969] BasicCookieStore#getCookies() to return a copy of Cookie list + Contributed by David Smiley + +* [HTTPCLIENT-965] Fixed problem with cache not honoring must-revalidate or + proxy-revalidate Cache-Control directives. + Contributed by Jonathan Moore + +* [HTTPCLIENT-964] 'no-cache' directives with field names are no longer transmitted + downstream. + Contributed by Jonathan Moore + +* [HTTPCLIENT-963] Fixed handling of 'Cache-Control: no-store' on requests. + Contributed by Jonathan Moore + +* [HTTPCLIENT-962] Fixed handling of Authorization headers in shared cache mode. + Contributed by Jonathan Moore + +* [HTTPCLIENT-961] Not all applicable URIs are invalidated on PUT/POST/DELETEs + that pass through client cache. + Contributed by Jonathan Moore + +* [HTTPCLIENT-958] Client cache no longer allows incomplete responses to be + passed on to the client. + Contributed by Jonathan Moore + +* [HTTPCLIENT-951] Non-repeatable entity enclosing requests are not correctly + retried when 'expect-continue' handshake is active. + Contributed by Oleg Kalnichevski + +* [HTTPCLIENT-948] In rare circumstances the idle connection handling code + can leave closed connections in a inconsistent state. + Contributed by Oleg Kalnichevski + +* [HTTPCLIENT-953] IllegalStateException thrown by RouteSpecificPool. + Contributed by Guillaume + +* [HTTPCLIENT-952] Trust store parameter is ignored by SSLSocketFactory + (affects version 4.1-alpha2 only) + Contributed by Oleg Kalnichevski + +* [HTTPCLIENT-937] CacheEntry made immutable; now uses immutable HttpEntity + to store cached content. + Contributed by David Mays and + Oleg Kalnichevski + +Release 4.1 ALPHA2 +------------------- + +HttpClient 4.1 ALPHA2 fixes a number of non-severe bugs discovered since +the last release and introduces support for two frequently requested features: + +* HTTP/1.1 response caching + +* transparent support for host multihoming + +* a mechanism to bypass the standard certificate trust verification +(useful when dealing with self-signed certificates) + +Compatibility notes +------------------- +(1) Please note the HTTP caching module is still considered experimental and +its API may change significantly in the future releases. + +(2) This release eliminates Mime4J as a dependency for the HttpMime module. +HttpMime is no longer binary compatible with the previous releases. +Full API and binary compatibility between minor versions of HttpMime will be +maintained as of 4.1 GA release. + +Changelog +------------------- + +* [HTTPCLIENT-936] Fixed bug causing NPE or an infinite loop in + the authentication code in case of a SPNEGO authentication failure. + Contributed by Oleg Kalnichevski + +* [HTTPCLIENT-427] HTTP caching support + Contributed by Joe Campbell, David Cleaver, David Mays, Jon Moore, Brad Spenla + +* Dropped dependency on Mime4j for HttpMime. + Contributed by Oleg Kalnichevski + +* Extended SSLSocketFactory with a mechanism to bypass the standard certificate + trust verification (primarily to simplify dealing with self-signed + certificates) + Contributed by Oleg Kalnichevski + +* [HTTPCLIENT-898] Improved support for host multihoming + Contributed by Oleg Kalnichevski + +* [HTTPCLIENT-916] UsernamePasswordCredentials, NTUserPrincipal, + BasicClientCookie, BasicClientCookie2 and BasicCookieStore made Serializable. + Contributed by Oleg Kalnichevski + +* [HTTPCLIENT-914] Upgraded Commons Codec dependency to version 1.4 + Contributed by Oleg Kalnichevski + +* [HTTPCLIENT-903] Use ConcurrentHashMap instead of [Linked]HashMap for + thread-safety. Improve performance of AuthSchemeRegistry, CookieSpecRegistry + and SchemeRegistry classes. + Contributed by Sebastian Bazley + +* [HTTPCLIENT-902] HttpRequestRetryHandler not called on I/O exceptions + thrown when opening a new connection. + Contributed by Olivier Lamy and + Oleg Kalnichevski + +Release 4.1 ALPHA1 +------------------- + +HttpClient 4.1 ALPHA1 builds on the stable 4.0 release and adds several +functionality improvements and new features. + +* Simplified configuration of connection managers. + +* Persistence of authentication data between request executions within + the same execution context. + +* Support for SPNEGO/Kerberos authentication scheme + +* Support for transparent content encoding. Please note transparent content + encoding is not enabled per default in order to avoid conflicts with + already existing custom content encoding solutions. + +* 5 to 10% performance increase due to elimination of unnecessary Log object + lookups by short-lived components. + +Please note all methods and classes added in this release and marked as +4.1 are API unstable and can change in the future 4.1 ALPHA releases. + +Changelog +------------------- + +* [HTTPCLIENT-889] 'expect: continue' handshake disabled per default. + Contributed by Oleg Kalnichevski + +* [HTTPCLIENT-862] Extended client's redirect handling interface to allow + control of the content of the redirect. + Contributed by Oleg Kalnichevski + +* [HTTPCLIENT-872] HttpClient can now persist authentication data between request + executions as long as they share the same execution context. It has also become + much easier to make HttpClient authenticate preemptively by pre-populating + authentication data cache. + Contributed by Oleg Kalnichevski + +* [HTTPCLIENT-883] SO_TIMEOUT is not reset on persistent (re-used) connections. + Contributed by Oleg Kalnichevski + +* [HTTPCLIENT-832] Distinguish cookie format errors from violations of + restrictions imposed by a cookie specification. In the latter case + CookieRestrictionViolationException will be thrown. + Contributed by Oleg Kalnichevski + +* [HTTPCLIENT-523] Support for SPNEGO authentication scheme. + Contributed by Matthew Stevenson + +* Simplified configuration of connection managers. Total connection maximum + and maximum connection per route limits can be set using methods of + the class instead of HTTP parameters. + Contributed by Oleg Kalnichevski + +* Added parameters to define the order of preference for supported auth + schemes for target host and proxy authentication. + Contributed by Oleg Kalnichevski + +* [HTTPCLIENT-875] DefaultClientConnectionOperator#openConnection doesn't + update the connection state if the connection socket changed after + the call to SocketFactory#connectSocket(). + Contributed by Oleg Kalnichevski + +* [HTTPCLIENT-834] Transparent content encoding support. + Contributed by James Abley + +Release 4.0.1 +------------------- + +This is a bug fix release that addresses a number of issues discovered since +the previous stable release. None of the fixed bugs is considered critical. +Most notably this release eliminates eliminates dependency on JCIP annotations. + +This release is also expected to improve performance by 5 to 10% due to +elimination of unnecessary Log object lookups by short-lived components. + +Changelog +------------------- + +* [HTTPCLIENT-895] Eliminated Log lookups in short lived objects impairing + performance. + Contributed by Oleg Kalnichevski + +* [HTTPCLIENT-885] URLEncodedUtils now correctly parses form-url-encoded + entities that specify a charset. + Contributed by Oleg Kalnichevski + +* [HTTPCLIENT-884] UrlEncodedFormEntity now sets charset on the Content-Type + header. + Contributed by Jared Jacobs + +* [HTTPCLIENT-883] SO_TIMEOUT is not reset on persistent (re-used) connections. + Contributed by Oleg Kalnichevski + +* [HTTPCLIENT-882] Auth state is now correctly updated if a successful NTLM + authentication results in a redirect. This is a minor bug as HttpClient + manages to recover from the problem automatically. + Contributed by Oleg Kalnichevski + +* [HTTPCLIENT-881] Fixed race condition in AbstractClientConnAdapter that makes + it possible for an aborted connection to be returned to the pool. + Contributed by Tim Boemker and + Oleg Kalnichevski + +* [HTTPCLIENT-866] Removed dependency on jcip-annotations.jar. + Contributed by Oleg Kalnichevski + and Sebastian Bazley + + +Release 4.0 +------------------- + +HttpClient 4.0 represents a complete, ground-up redesign and almost a complete +rewrite of the HttpClient 3.x codeline. This release finally addresses several +design flaws that existed since the 1.0 release and could not be fixed without +a major code overhaul and breaking API compatibility. + + +Architectural changes +--------------------- + +* Redesign of the HttpClient internals addressing all known major + architectural shortcomings of the 3.x codeline. + +* Cleaner, more flexible and expressive API. + +* More modular structure. + +* Better performance and smaller memory footprint due to a more efficient HTTP + transport based on HttpCore. + +* Implementation of cross-cutting HTTP protocol aspects through protocol + interceptors. + +* Improved connection management, better handling of persistent connections, + support for stateful connections + +* Pluggable redirect and authentication handlers. + +* Improved support for sending requests via a proxy or a chain of proxies + +* More flexible SSL context customization + +* Reduced intermediate garbage in the process of generating HTTP requests + and parsing HTTP responses + + +Important notes +------------------- + +* Future releases of HttpMime module may be binary incompatible with this + release due to possible API changes in Apache Mime4J. Apache Mime4J is + still being actively developed and its API is considered unstable. + +* HttpClient 4.0 is not fully binary compatible with 4.0 BETA1 release. + Some protected variables in connection management class have been + made final in order to help ensure their thread safety: + + org.apache.http.conn.BasicEofSensorWatcher#attemptReuse + org.apache.http.conn.BasicEofSensorWatcher#managedConn + org.apache.http.impl.conn.DefaultClientConnectionOperator#schemeRegistry + org.apache.http.impl.conn.DefaultHttpRoutePlanner#schemeRegistry + org.apache.http.impl.conn.ProxySelectorRoutePlanner#schemeRegistry + org.apache.http.impl.conn.SingleClientConnManager#alwaysShutDown + org.apache.http.impl.conn.SingleClientConnManager#connOperator + org.apache.http.impl.conn.SingleClientConnManager#schemeRegistry + org.apache.http.impl.conn.tsccm.ThreadSafeClientConnManager#connOperator + org.apache.http.impl.conn.tsccm.ThreadSafeClientConnManager#schemeRegistry + + +Bug fixes since 4.0 BETA2 release +------------------- + +* [HTTPCLIENT-861] URIUtils#resolve is now compatible with all examples given + in RFC 3986. + Contributed by Johannes Koch + +* [HTTPCLIENT-860] HttpClient no longer converts redirects of PUT/POST to GET + for status codes 301, 302, 307, as required by the HTTP spec. + Contributed by Oleg Kalnichevski + +* [HTTPCLIENT-859] CookieIdentityComparator now takes path attribute into + consideration when comparing cookies. + Contributed by Oleg Kalnichevski + +* HttpClient will no longer send expired cookies back to the origin server. + Contributed by Oleg Kalnichevski + +* [HTTPCLIENT-856] Proxy NTLM authentication no longer fails on a redirect to + a different host. + Contributed by Oleg Kalnichevski + +* [HTTPCLIENT-841] Removed automatic connection release using garbage collection + due to a memory leak. + Contributed by Oleg Kalnichevski + +* [HTTPCLIENT-853] Fixed bug causing invalid cookie origin port to be selected + when the target is accessed on the default port and the connection is + established via a proxy. + Contributed by Oleg Kalnichevski + +* [HTTPCLIENT-852] Fixed bug causing automatically retried redirects fail with + CircularRedirectException. + Contributed by Oleg Kalnichevski + +* Fixed problem with the default HTTP response parser failing to handle garbage + preceding a valid HTTP response. + Contributed by Oleg Kalnichevski + +* NonRepeatableRequestExceptions now include the cause that the original + request failed. + Contributed by Sam Berlin + +* [HTTPCLIENT-837] Fixed problem with the wire log skipping zero byte values + if read one byte at a time. + Contributed by Kirill Safonov + +* [HTTPCLIENT-823] 'http.conn-manager.max-total' parameter can be adjusted + dynamically. However, the size of existing connection pools per route, + once allocated, will not be adjusted. + Contributed by Oleg Kalnichevski + +* [HTTPCLIENT-822] Default socket factories to rethrow SocketTimeoutException + as ConnectTimeoutException in case of connect failure due to a time out. + Contributed by Oleg Kalnichevski + +* [HTTPCLIENT-813] Fixed default port resolution. Invalid ports no longer + get replaced with the default port value. + Contributed by Oleg Kalnichevski + +Release 4.0 beta 2 +------------------- + +BETA2 is a maintenance release, which addresses a number of issues +discovered since the previous release. + +The only significant new feature is an addition of an OSGi compliant +bundle combining HttpClient and HttpMime jars. + +All upstream projects are strongly encouraged to upgrade. + +* Fixed NPE in DefaultRequestDirector thrown when retrying a failed + request over a proxied connection. + Contributed by Oleg Kalnichevski + +* [HTTPCLIENT-803] Fixed bug in SSL host verifier implementations + causing the SSL certificate to be rejected as invalid if the connection + is established using an IP address. + Contributed by Oleg Kalnichevski + +* [HTTPCLIENT-806] DefaultHttpMethodRetryHandler will no longer retry + on ConnectExceptions. + Contributed by Oleg Kalnichevski + +* DigestScheme can use an arbitrary digest algorithm requested by the + target server (such as SHA) as long as this algorithm is supported by + the Java runtime. + Contributed by Oleg Kalnichevski + +* Fixed parsing and validation of RFC2109 compliant Set-Cookie headers + by the Best-Match cookie spec. + Contributed by Oleg Kalnichevski + +* Fixed bug that can cause a managed connection to be returned from the + pool in an inconsistent state. + Contributed by Oleg Kalnichevski + + +4.0 Beta 1 +------------------- + +BETA1 release brings yet another round of API enhancements and +improvements in the area of connection management. Among the most notable +ones is the capability to handle stateful connections such as persistent +NTLM connections and private key authenticated SSL connections. + +This is the first API stable release of HttpClient 4.0. All further +releases in the 4.0 code line will maintain API compatibility with this +release. + +There has been a number of important bug fixes since ALPHA4. All upstream +projects are encouraged to upgrade to the latest release. + +Please note HttpClient currently provides only limited support for NTLM +authentication. For details please see NTLM_SUPPORT.txt. + +------------------- + +Changelog: +------------------- + +* [HTTPCLIENT-790] Protocol interceptors are now correctly invoked when + executing CONNECT methods. + Contributed by Oleg Kalnichevski + +* [HTTPCLIENT-668] Do not use static loggers. + Contributed by Oleg Kalnichevski + +* [HTTPCLIENT-781] Respect Keep-Alive header's timeout value. + Contributed by Sam Berlin + +* [HTTPCLIENT-779] Top-level classes (HttpClient, and HttpGet, HttpPut + and similar HttpMethods) throw fewer checked exceptions. + Contributed by Sam Berlin + +* HttpClient will throw an exception if an attempt is made to retry + a request with a non-repeatable request entity. + Contributed by Oleg Kalnichevski + +* Fixed request re-generation logic when retrying a failed request. + Auto-generated headers will no accumulate. + Contributed by Oleg Kalnichevski + +* [HTTPCLIENT-424] Preemptive authentication no longer limited to BASIC + scheme only. HttpClient can be customized to authenticate preemptively + with DIGEST scheme. + Contributed by Oleg Kalnichevski + +* [HTTPCLIENT-670] Pluggable hostname resolver. + Contributed by Oleg Kalnichevski + +* [HTTPCLIENT-719] Clone support for HTTP request and cookie objects. + Contributed by Oleg Kalnichevski + +* [HTTPCLIENT-776] Fixed concurrency issues with AbstractPoolEntry. + Contributed by Sam Berlin + +* Resolved a long standing problem with HttpClient not taking into account + the user context when pooling / re-using connections. HttpClient now + correctly handles stateful / user specific connections such as persistent + NTLM connections and SSL connections with client side authentication. + Contributed by Oleg Kalnichevski + +* [HTTPCLIENT-773] Improved handling of the 'expires' attribute by the + 'Best Match' cookie spec. + Contributed by Oleg Kalnichevski + +* Partial NTLM support (requires an external NTLM engine). For details see + NTLM_SUPPORT.txt + Contributed by Oleg Kalnichevski + +* Redesigned local execution context management. + Contributed by Oleg Kalnichevski + +-------------------------------------- + +Release 4.0 Alpha 4 +------------------- + +ALPHA4 marks the completion of the overhaul of the connection management +code in HttpClient. All known shortcomings of the old HttpClient 3.x +connection management API have been addressed. + +NTLM authentication remains the only missing major feature in the new +codeline that prevents us from moving awards the API freeze. + +There has been a number of important bug fixes since ALPHA3. All upstream +projects are encouraged to upgrade to the latest release. + +------------------- + +HttpClient 3.x features that have NOT yet been ported: +------------------- + +* NTLM authentication scheme + +------------------- + +Changelog: +------------------- + +* [HTTPCLIENT-765] String.toLowerCase() / toUpperCase() should specify + Locale.ENGLISH + Contributed by Sebastian Bazley + +* [HTTPCLIENT-769] Do not pool connection marked non-reusable. + Contributed by Oleg Kalnichevski + +* [HTTPCLIENT-763] Fixed problem with AbstractClientConnAdapter#abortConnection() + not releasing the connection if called from the main execution thread while + there is no blocking I/O operation. + Contributed by Oleg Kalnichevski + +* [HTTPCLIENT-652] Added optional state attribute to managed client connections. + This enables connection managers to correctly handle stateful connections. + Contributed by Oleg Kalnichevski + +* [HTTPCLIENT-673] Revised max connections per route configuration + Contributed by Oleg Kalnichevski + +* [HTTPCLIENT-753] Class Scheme and related classes moved to a separate package + Contributed by Oleg Kalnichevski + +* [HTTPCLIENT-757] Improved request wrapping in the DefaultClientRequestDirector. + This also fixed the problem with the default proxy set at the client level + having no effect. + Contributed by Oleg Kalnichevski + +* [HTTPCLIENT-734] Request abort will unblock the thread waiting for a connection + Contributed by Sam Berlin + +* [HTTPCLIENT-759] Ensure release of connections back to the connection manager + on exceptions. + Contributed by Sam Berlin + +* [HTTPCLIENT-758] Fixed the use of generics in AbstractHttpClient + #removeRequestInterceptorByClass and #removeResponseInterceptorByClass + Contributed by Johannes Koch + +* [HTTPCLIENT-749] HttpParams beans + Contributed by Stojce Dimski + +* [HTTPCLIENT-755] Workaround for known bugs in java.net.URI.resolve() + Bug ID: 4708535 + Contributed by Johannes Koch + +-------------------------------------- + +Release 4.0 Alpha 3 +------------------- + +ALPHA3 release brings another round of API refinements and improvements in +functionality. As of this release HttpClient requires Java 5 compatible +runtime environment and takes full advantage of generics and new concurrency +primitives. + +This release also introduces new default cookie policy that selects a cookie +specification depending on the format of cookies sent by the target host. +It is no longer necessary to know beforehand what kind of HTTP cookie support +the target host provides. HttpClient is now able to pick up either a lenient +or a strict cookie policy depending on the compliance level of the target host. + +Another notable improvement is a completely reworked support for multipart +entities based on Apache mime4j library. + +------------------- + +HttpClient 3.x features that have NOT yet been ported: +------------------- + +* NTLM authentication scheme + +------------------- + +Changelog: +------------------- + +* [HTTPCLIENT-742] common interface for HttpRoute and RouteTracker + Contributed by Roland Weber + +* [HTTPCLIENT-741] Fixed concurrency issues in AbstractClientConnAdapter. + Contributed by Oleg Kalnichevski + +* [HTTPCLIENT-726] testcase for spurious wakeups in ThreadSafeClientConnManager + Contributed by Roland Weber + +* [HTTPCLIENT-643] Automatic connect fail-over for multi-home remote servers. + Contributed by Oleg Kalnichevski + +* [HTTPCLIENT-735] unsetting of DEFAULT_PROXY and FORCED_ROUTE in hierarchies + Contributed by Roland Weber + +* [HTTPCLIENT-723] route planner based on java.net.ProxySelector + Contributed by Roland Weber + +* [HTTPCLIENT-740] don't start connection GC thread in pool constructor + Contributed by Roland Weber + +* [HTTPCLIENT-736] route planners use SchemeRegistry instead of ConnManager + Contributed by Roland Weber + +* [HTTPCLIENT-730] Fixed rewriting of URIs containing escaped characters + Contributed by Sam Berlin and + Oleg Kalnichevski + +* [HTTPCLIENT-667] Added 'Meta' cookie policy that selects a cookie + specification depending on the format of the cookie(s). + Contributed by Oleg Kalnichevski + +* [HTTPCLIENT-729] Move HttpRoute and related classes to routing package. + Contributed by Roland Weber + +* [HTTPCLIENT-725] Use TimeUnit arguments for timeouts in connection manager. + Contributed by Roland Weber + +* [HTTPCLIENT-677] Connection manager no longer uses Thread.interrupt(). + Contributed by Roland Weber + +* [HTTPCLIENT-716] Allow application-defined routes. + Contributed by Roland Weber + +* [HTTPCLIENT-712] Improve HttpRoute API + Contributed by Roland Weber + +* [HTTPCLIENT-711] Bad route computed for redirected requests + Contributed by Oleg Kalnichevski + +* [HTTPCLIENT-715] Remove RoutedRequest from API + Contributed by Roland Weber + +* [HTTPCLIENT-705] Fixed incorrect handling of URIs with null path component. + Contributed by Oleg Kalnichevski + +* [HTTPCLIENT-688] HttpOptions#getAllowedMethods can now handle multiple + Allow headers. + Contributed by Andrea Selva + +-------------------------------------- + +Release 4.0 Alpha 2 +------------------- + +ALPHA2 release is another milestone in the redesign of HttpClient. It includes +a number of improvements since ALPHA1, among which are improved connection +pooling, support for proxy chains, redesigned HTTP state and authentication +credentials management API, improved RFC 2965 cookie specification. + +------------------- + +HttpClient 3.x features that have NOT yet been ported +------------------- +* NTLM authentication scheme + +* Support for multipart MIME coded entities + +------------------- + +Changelog +------------------- + +* [HTTPCLIENT-698] Resolve non-absolute redirect URIs relative to + the request URI + Contributed by Johannes Koch + +* [HTTPCLIENT-697] Throw a more intelligible exception when connection + to a remote host cannot be established. + Contributed by Oleg Kalnichevski + +* [HTTPCLIENT-689] Caching of SimpleDateFormat in DateUtils + Contributed by Daniel Müller + +* [HTTPCLIENT-689] stackable parameters in AbstractHttpClient + Contributed by Roland Weber + +* [HTTPCLIENT-477] Use distinct instances of the authentication handler + interface for authentication with target and proxy hosts + Contributed by Oleg Kalnichevski + +* [HTTPCLIENT-690] ManagedClientConnection provides access to SSLSession + Contributed by Roland Weber + +* [HTTPCLIENT-692] ClientConnectionManager throws InterruptedException + Contributed by Roland Weber + +* [HTTPCORE-116] moved parameter names to interfaces + Contributed by Roland Weber + +* [HTTPCLIENT-649] support for proxy chains in HttpConn + Contributed by Roland Weber + +* [HTTPCLIENT-636] refactor ThreadSafeClientConnManager in separate package + Contributed by Roland Weber + +* [HTTPCLIENT-669] new HttpRoutePlanner interface and implementation + Contributed by Andrea Selva + +* [HTTPCLIENT-653] detached connection wrapper no longer prevents + garbage collection of ThreadSafeClientConnManager + Contributed by Roland Weber + +* [HTTPCLIENT-674] use org.apache.http.util.VersionInfo instead of a local one + Contributed by Roland Weber + +* [HTTPCLIENT-666] Replaced HttpState with CredentialsProvier and CookieStore interfaces + Contributed by Oleg Kalnichevski + +* [HTTPCORE-100] revised HttpContext hierarchy + Contributed by Roland Weber + +* [HTTPCLIENT-618] eliminate class HostConfiguration + Contributed by Roland Weber + +* [HTTPCLIENT-672] re-sync with API changes in core alpha6-SNAPSHOT + Contributed by Roland Weber + +-------------------------------------- + +Release 4.0 Alpha 1 +------------------- + +HttpClient 4.0 represents a complete, ground-up redesign and almost a complete +rewrite of the HttpClient 3.x codeline. This release finally addresses several +design flaws that existed since the 1.0 release and could not be fixed without +a major code overhaul and breaking API compatibility. + +The HttpClient 4.0 API is still very experimental and is bound to change +during the course of the ALPHA development phase. Several important features +have not yet been ported to the new API. + +Architectural changes +--------------------- + +* Redesign of the HttpClient internals addressing all known + major architectural shortcomings of the 3.x codeline + +* Cleaner, more flexible and expressive API + +* Better performance and smaller memory footprint due to a more + efficient HTTP transport based on HttpCore. HttpClient 4.0 is + expected to be 10% to 25% faster than HttpClient 3.x codeline + +* More modular structure + +* Pluggable redirect and authentication handlers + +* Support for protocol incerceptors + +* Improved connection management + +* Improved support for sending requests via a proxy or a chain of + proxies + +* Improved handling redirects of entity enclosing requests + +* More flexible SSL context customization + +* Reduced intermediate garbage in the process of + generating HTTP requests and parsing HTTP responses + +------------------- + +HttpClient 3.x features that have NOT yet been ported +------------------- +* NTLM authentication scheme + +* RFC2965 cookie policy (Cookie2) + +* Support for multipart MIME coded entities + +------------------- + +Changelog +------------------- + +The following is a list of contributions tracked in JIRA. +Note that this is not a complete list of contributions or changes. +Since the API was redesigned completely, tracking everything outside +of the source code repository would have been too burdensome. + +* [HTTPCLIENT-655] User-Agent string no longer violates RFC + Contributed by Oleg Kalnichevski + +* [HTTPCLIENT-541] Virtual host API redesign + Contributed by Oleg Kalnichevski + +* [HTTPCLIENT-614] Allow for different strategies when checking + CN of x509 certificates + Contributed by Julius Davies + +* [HTTPCLIENT-136] Fixed inadequate proxy support + Long standing architectural problem. Issue opened on 19/Dec/2002. + Contributed by Oleg Kalnichevski + +* [HTTPCLIENT-63] Support for pluggable redirect and authentication handlers + Long standing architectural problem. Issue opened on 15/Jul/2002. + Contributed by Oleg Kalnichevski + +* [HTTPCLIENT-245] Fixed redirect handling. HttpClient can now automatically + handle redirects of entity enclosing requests. + Long standing architectural problem. Issue opened on 14/Jul/2003. + Contributed by Oleg Kalnichevski + +* [HTTPCLIENT-613] HTTPS connections now verify CN of x509 certificates + Contributed by Julius Davies + +* [HTTPCLIENT-497] Wire/header logger names consistent with class loggers + Contributed by Oleg Kalnichevski + +* [HTTPCLIENT-484] AuthSSLProtocolSocketFactory in the main distribution + Contributed by Oleg Kalnichevski + +* [HTTPCLIENT-589] Do not consume the remaining response content if + the connection is to be closed + Contributed by Roland Weber + +* [HTTPCLIENT-475] Support for unconnected sockets. HTTP requests can now be + aborted while network socket is still being connected. + Contributed by Roland Weber + diff --git a/app/build.gradle b/app/build.gradle new file mode 100644 index 0000000..cca1881 --- /dev/null +++ b/app/build.gradle @@ -0,0 +1,33 @@ +apply plugin: 'com.android.application' + +android { + useLibrary 'org.apache.http.legacy' + namespace "net.micode.notes" + compileSdk 34 + buildToolsVersion "34.0.0" + + defaultConfig { + applicationId "net.micode.notes" + minSdkVersion 14 + targetSdkVersion 14 + } + + buildTypes { + release { + minifyEnabled false + proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt' + } + } + packagingOptions { + exclude 'META-INF/DEPENDENCIES' + exclude 'META-INF/NOTICE' + exclude 'META-INF/LICENSE' + exclude 'META-INF/LICENSE.txt' + exclude 'META-INF/NOTICE.txt' + } +} +dependencies { + implementation files('F:\\work\\Notes-master\\lib\\httpcore-4.4.16.jar') + implementation files('F:\\work\\Notes-master\\lib\\httpcore-4.4.16.jar') + implementation files('F:\\work\\Notes-master\\lib\\httpcore-4.4.16.jar') +} \ No newline at end of file diff --git a/app/build/intermediates/annotation_processor_list/debug/annotationProcessors.json b/app/build/intermediates/annotation_processor_list/debug/annotationProcessors.json new file mode 100644 index 0000000..9e26dfe --- /dev/null +++ b/app/build/intermediates/annotation_processor_list/debug/annotationProcessors.json @@ -0,0 +1 @@ +{} \ No newline at end of file diff --git a/app/build/intermediates/annotation_processor_list/debugUnitTest/annotationProcessors.json b/app/build/intermediates/annotation_processor_list/debugUnitTest/annotationProcessors.json new file mode 100644 index 0000000..9e26dfe --- /dev/null +++ b/app/build/intermediates/annotation_processor_list/debugUnitTest/annotationProcessors.json @@ -0,0 +1 @@ +{} \ No newline at end of file diff --git a/app/build/intermediates/annotation_processor_list/release/annotationProcessors.json b/app/build/intermediates/annotation_processor_list/release/annotationProcessors.json new file mode 100644 index 0000000..9e26dfe --- /dev/null +++ b/app/build/intermediates/annotation_processor_list/release/annotationProcessors.json @@ -0,0 +1 @@ +{} \ No newline at end of file diff --git a/app/build/intermediates/annotation_processor_list/releaseUnitTest/annotationProcessors.json b/app/build/intermediates/annotation_processor_list/releaseUnitTest/annotationProcessors.json new file mode 100644 index 0000000..9e26dfe --- /dev/null +++ b/app/build/intermediates/annotation_processor_list/releaseUnitTest/annotationProcessors.json @@ -0,0 +1 @@ +{} \ No newline at end of file diff --git a/app/build/intermediates/apk/debug/app-debug.apk b/app/build/intermediates/apk/debug/app-debug.apk new file mode 100644 index 0000000..3fb701c Binary files /dev/null and b/app/build/intermediates/apk/debug/app-debug.apk differ diff --git a/app/build/intermediates/apk/debug/output-metadata.json b/app/build/intermediates/apk/debug/output-metadata.json new file mode 100644 index 0000000..b2231b9 --- /dev/null +++ b/app/build/intermediates/apk/debug/output-metadata.json @@ -0,0 +1,20 @@ +{ + "version": 3, + "artifactType": { + "type": "APK", + "kind": "Directory" + }, + "applicationId": "net.micode.notes", + "variantName": "debug", + "elements": [ + { + "type": "SINGLE", + "filters": [], + "attributes": [], + "versionCode": 1, + "versionName": "0.1", + "outputFile": "app-debug.apk" + } + ], + "elementType": "File" +} \ No newline at end of file diff --git a/app/build/intermediates/apk_ide_redirect_file/debug/redirect.txt b/app/build/intermediates/apk_ide_redirect_file/debug/redirect.txt new file mode 100644 index 0000000..46dacc6 --- /dev/null +++ b/app/build/intermediates/apk_ide_redirect_file/debug/redirect.txt @@ -0,0 +1,2 @@ +#- File Locator - +listingFile=../../apk/debug/output-metadata.json diff --git a/app/build/intermediates/app_metadata/debug/app-metadata.properties b/app/build/intermediates/app_metadata/debug/app-metadata.properties new file mode 100644 index 0000000..59d2906 --- /dev/null +++ b/app/build/intermediates/app_metadata/debug/app-metadata.properties @@ -0,0 +1,2 @@ +appMetadataVersion=1.1 +androidGradlePluginVersion=8.1.2 diff --git a/app/build/intermediates/app_metadata/release/app-metadata.properties b/app/build/intermediates/app_metadata/release/app-metadata.properties new file mode 100644 index 0000000..59d2906 --- /dev/null +++ b/app/build/intermediates/app_metadata/release/app-metadata.properties @@ -0,0 +1,2 @@ +appMetadataVersion=1.1 +androidGradlePluginVersion=8.1.2 diff --git a/app/build/intermediates/compatible_screen_manifest/debug/output-metadata.json b/app/build/intermediates/compatible_screen_manifest/debug/output-metadata.json new file mode 100644 index 0000000..714f651 --- /dev/null +++ b/app/build/intermediates/compatible_screen_manifest/debug/output-metadata.json @@ -0,0 +1,10 @@ +{ + "version": 3, + "artifactType": { + "type": "COMPATIBLE_SCREEN_MANIFEST", + "kind": "Directory" + }, + "applicationId": "net.micode.notes", + "variantName": "debug", + "elements": [] +} \ No newline at end of file diff --git a/app/build/intermediates/compatible_screen_manifest/release/output-metadata.json b/app/build/intermediates/compatible_screen_manifest/release/output-metadata.json new file mode 100644 index 0000000..53f799b --- /dev/null +++ b/app/build/intermediates/compatible_screen_manifest/release/output-metadata.json @@ -0,0 +1,10 @@ +{ + "version": 3, + "artifactType": { + "type": "COMPATIBLE_SCREEN_MANIFEST", + "kind": "Directory" + }, + "applicationId": "net.micode.notes", + "variantName": "release", + "elements": [] +} \ No newline at end of file diff --git a/app/build/intermediates/compile_and_runtime_not_namespaced_r_class_jar/debug/R.jar b/app/build/intermediates/compile_and_runtime_not_namespaced_r_class_jar/debug/R.jar new file mode 100644 index 0000000..b894c6e Binary files /dev/null and b/app/build/intermediates/compile_and_runtime_not_namespaced_r_class_jar/debug/R.jar differ diff --git a/app/build/intermediates/compile_and_runtime_not_namespaced_r_class_jar/release/R.jar b/app/build/intermediates/compile_and_runtime_not_namespaced_r_class_jar/release/R.jar new file mode 100644 index 0000000..b894c6e Binary files /dev/null and b/app/build/intermediates/compile_and_runtime_not_namespaced_r_class_jar/release/R.jar differ diff --git a/app/build/intermediates/default_proguard_files/global/proguard-android-optimize.txt-8.1.2 b/app/build/intermediates/default_proguard_files/global/proguard-android-optimize.txt-8.1.2 new file mode 100644 index 0000000..de0b268 --- /dev/null +++ b/app/build/intermediates/default_proguard_files/global/proguard-android-optimize.txt-8.1.2 @@ -0,0 +1,117 @@ +# This is a configuration file for ProGuard. +# http://proguard.sourceforge.net/index.html#manual/usage.html +# +# Starting with version 2.2 of the Android plugin for Gradle, this file is distributed together with +# the plugin and unpacked at build-time. The files in $ANDROID_HOME are no longer maintained and +# will be ignored by new version of the Android plugin for Gradle. + +# Optimizations: If you don't want to optimize, use the proguard-android.txt configuration file +# instead of this one, which turns off the optimization flags. +# Adding optimization introduces certain risks, since for example not all optimizations performed by +# ProGuard works on all versions of Dalvik. The following flags turn off various optimizations +# known to have issues, but the list may not be complete or up to date. (The "arithmetic" +# optimization can be used if you are only targeting Android 2.0 or later.) Make sure you test +# thoroughly if you go this route. +-optimizations !code/simplification/arithmetic,!code/simplification/cast,!field/*,!class/merging/* +-optimizationpasses 5 +-allowaccessmodification + +-dontusemixedcaseclassnames +-dontskipnonpubliclibraryclasses +-verbose + +# Preserve some attributes that may be required for reflection. +-keepattributes AnnotationDefault, + EnclosingMethod, + InnerClasses, + RuntimeVisibleAnnotations, + RuntimeVisibleParameterAnnotations, + RuntimeVisibleTypeAnnotations, + Signature + +-keep public class com.google.vending.licensing.ILicensingService +-keep public class com.android.vending.licensing.ILicensingService +-keep public class com.google.android.vending.licensing.ILicensingService +-dontnote com.android.vending.licensing.ILicensingService +-dontnote com.google.vending.licensing.ILicensingService +-dontnote com.google.android.vending.licensing.ILicensingService + +# For native methods, see http://proguard.sourceforge.net/manual/examples.html#native +-keepclasseswithmembernames,includedescriptorclasses class * { + native ; +} + +# Keep setters in Views so that animations can still work. +-keepclassmembers public class * extends android.view.View { + void set*(***); + *** get*(); +} + +# We want to keep methods in Activity that could be used in the XML attribute onClick. +-keepclassmembers class * extends android.app.Activity { + public void *(android.view.View); +} + +# For enumeration classes, see http://proguard.sourceforge.net/manual/examples.html#enumerations +-keepclassmembers enum * { + public static **[] values(); + public static ** valueOf(java.lang.String); +} + +-keepclassmembers class * implements android.os.Parcelable { + public static final ** CREATOR; +} + +# Preserve annotated Javascript interface methods. +-keepclassmembers class * { + @android.webkit.JavascriptInterface ; +} + +# The support libraries contains references to newer platform versions. +# Don't warn about those in case this app is linking against an older +# platform version. We know about them, and they are safe. +-dontnote android.support.** +-dontnote androidx.** +-dontwarn android.support.** +-dontwarn androidx.** + +# This class is deprecated, but remains for backward compatibility. +-dontwarn android.util.FloatMath + +# Understand the @Keep support annotation. +-keep class android.support.annotation.Keep +-keep class androidx.annotation.Keep + +-keep @android.support.annotation.Keep class * {*;} +-keep @androidx.annotation.Keep class * {*;} + +-keepclasseswithmembers class * { + @android.support.annotation.Keep ; +} + +-keepclasseswithmembers class * { + @androidx.annotation.Keep ; +} + +-keepclasseswithmembers class * { + @android.support.annotation.Keep ; +} + +-keepclasseswithmembers class * { + @androidx.annotation.Keep ; +} + +-keepclasseswithmembers class * { + @android.support.annotation.Keep (...); +} + +-keepclasseswithmembers class * { + @androidx.annotation.Keep (...); +} + +# These classes are duplicated between android.jar and org.apache.http.legacy.jar. +-dontnote org.apache.http.** +-dontnote android.net.http.** + +# These classes are duplicated between android.jar and core-lambda-stubs.jar. +-dontnote java.lang.invoke.** diff --git a/app/build/intermediates/default_proguard_files/global/proguard-android.txt-8.1.2 b/app/build/intermediates/default_proguard_files/global/proguard-android.txt-8.1.2 new file mode 100644 index 0000000..3ca0d03 --- /dev/null +++ b/app/build/intermediates/default_proguard_files/global/proguard-android.txt-8.1.2 @@ -0,0 +1,116 @@ +# This is a configuration file for ProGuard. +# http://proguard.sourceforge.net/index.html#manual/usage.html +# +# Starting with version 2.2 of the Android plugin for Gradle, this file is distributed together with +# the plugin and unpacked at build-time. The files in $ANDROID_HOME are no longer maintained and +# will be ignored by new version of the Android plugin for Gradle. + +# Optimization is turned off by default. Dex does not like code run +# through the ProGuard optimize steps (and performs some +# of these optimizations on its own). +# Note that if you want to enable optimization, you cannot just +# include optimization flags in your own project configuration file; +# instead you will need to point to the +# "proguard-android-optimize.txt" file instead of this one from your +# project.properties file. +-dontoptimize + +-dontusemixedcaseclassnames +-dontskipnonpubliclibraryclasses +-verbose + +# Preserve some attributes that may be required for reflection. +-keepattributes AnnotationDefault, + EnclosingMethod, + InnerClasses, + RuntimeVisibleAnnotations, + RuntimeVisibleParameterAnnotations, + RuntimeVisibleTypeAnnotations, + Signature + +-keep public class com.google.vending.licensing.ILicensingService +-keep public class com.android.vending.licensing.ILicensingService +-keep public class com.google.android.vending.licensing.ILicensingService +-dontnote com.android.vending.licensing.ILicensingService +-dontnote com.google.vending.licensing.ILicensingService +-dontnote com.google.android.vending.licensing.ILicensingService + +# For native methods, see http://proguard.sourceforge.net/manual/examples.html#native +-keepclasseswithmembernames,includedescriptorclasses class * { + native ; +} + +# Keep setters in Views so that animations can still work. +-keepclassmembers public class * extends android.view.View { + void set*(***); + *** get*(); +} + +# We want to keep methods in Activity that could be used in the XML attribute onClick. +-keepclassmembers class * extends android.app.Activity { + public void *(android.view.View); +} + +# For enumeration classes, see http://proguard.sourceforge.net/manual/examples.html#enumerations +-keepclassmembers enum * { + public static **[] values(); + public static ** valueOf(java.lang.String); +} + +-keepclassmembers class * implements android.os.Parcelable { + public static final ** CREATOR; +} + +# Preserve annotated Javascript interface methods. +-keepclassmembers class * { + @android.webkit.JavascriptInterface ; +} + +# The support libraries contains references to newer platform versions. +# Don't warn about those in case this app is linking against an older +# platform version. We know about them, and they are safe. +-dontnote android.support.** +-dontnote androidx.** +-dontwarn android.support.** +-dontwarn androidx.** + +# This class is deprecated, but remains for backward compatibility. +-dontwarn android.util.FloatMath + +# Understand the @Keep support annotation. +-keep class android.support.annotation.Keep +-keep class androidx.annotation.Keep + +-keep @android.support.annotation.Keep class * {*;} +-keep @androidx.annotation.Keep class * {*;} + +-keepclasseswithmembers class * { + @android.support.annotation.Keep ; +} + +-keepclasseswithmembers class * { + @androidx.annotation.Keep ; +} + +-keepclasseswithmembers class * { + @android.support.annotation.Keep ; +} + +-keepclasseswithmembers class * { + @androidx.annotation.Keep ; +} + +-keepclasseswithmembers class * { + @android.support.annotation.Keep (...); +} + +-keepclasseswithmembers class * { + @androidx.annotation.Keep (...); +} + +# These classes are duplicated between android.jar and org.apache.http.legacy.jar. +-dontnote org.apache.http.** +-dontnote android.net.http.** + +# These classes are duplicated between android.jar and core-lambda-stubs.jar. +-dontnote java.lang.invoke.** diff --git a/app/build/intermediates/default_proguard_files/global/proguard-defaults.txt-8.1.2 b/app/build/intermediates/default_proguard_files/global/proguard-defaults.txt-8.1.2 new file mode 100644 index 0000000..5fea5b5 --- /dev/null +++ b/app/build/intermediates/default_proguard_files/global/proguard-defaults.txt-8.1.2 @@ -0,0 +1,117 @@ +# This is a configuration file for ProGuard. +# http://proguard.sourceforge.net/index.html#manual/usage.html +# +# Starting with version 2.2 of the Android plugin for Gradle, this file is distributed together with +# the plugin and unpacked at build-time. The files in $ANDROID_HOME are no longer maintained and +# will be ignored by new version of the Android plugin for Gradle. + +# Optimizations can be turned on and off in the 'postProcessing' DSL block. +# The configuration below is applied if optimizations are enabled. +# Adding optimization introduces certain risks, since for example not all optimizations performed by +# ProGuard works on all versions of Dalvik. The following flags turn off various optimizations +# known to have issues, but the list may not be complete or up to date. (The "arithmetic" +# optimization can be used if you are only targeting Android 2.0 or later.) Make sure you test +# thoroughly if you go this route. +-optimizations !code/simplification/arithmetic,!code/simplification/cast,!field/*,!class/merging/* +-optimizationpasses 5 +-allowaccessmodification + +-dontusemixedcaseclassnames +-dontskipnonpubliclibraryclasses +-verbose + +# Preserve some attributes that may be required for reflection. +-keepattributes AnnotationDefault, + EnclosingMethod, + InnerClasses, + RuntimeVisibleAnnotations, + RuntimeVisibleParameterAnnotations, + RuntimeVisibleTypeAnnotations, + Signature + +-keep public class com.google.vending.licensing.ILicensingService +-keep public class com.android.vending.licensing.ILicensingService +-keep public class com.google.android.vending.licensing.ILicensingService +-dontnote com.android.vending.licensing.ILicensingService +-dontnote com.google.vending.licensing.ILicensingService +-dontnote com.google.android.vending.licensing.ILicensingService + +# For native methods, see http://proguard.sourceforge.net/manual/examples.html#native +-keepclasseswithmembernames,includedescriptorclasses class * { + native ; +} + +# Keep setters in Views so that animations can still work. +-keepclassmembers public class * extends android.view.View { + void set*(***); + *** get*(); +} + +# We want to keep methods in Activity that could be used in the XML attribute onClick. +-keepclassmembers class * extends android.app.Activity { + public void *(android.view.View); +} + +# For enumeration classes, see http://proguard.sourceforge.net/manual/examples.html#enumerations +-keepclassmembers enum * { + public static **[] values(); + public static ** valueOf(java.lang.String); +} + +-keepclassmembers class * implements android.os.Parcelable { + public static final ** CREATOR; +} + +# Preserve annotated Javascript interface methods. +-keepclassmembers class * { + @android.webkit.JavascriptInterface ; +} + +# The support libraries contains references to newer platform versions. +# Don't warn about those in case this app is linking against an older +# platform version. We know about them, and they are safe. +-dontnote android.support.** +-dontnote androidx.** +-dontwarn android.support.** +-dontwarn androidx.** + +# This class is deprecated, but remains for backward compatibility. +-dontwarn android.util.FloatMath + +# Understand the @Keep support annotation. +-keep class android.support.annotation.Keep +-keep class androidx.annotation.Keep + +-keep @android.support.annotation.Keep class * {*;} +-keep @androidx.annotation.Keep class * {*;} + +-keepclasseswithmembers class * { + @android.support.annotation.Keep ; +} + +-keepclasseswithmembers class * { + @androidx.annotation.Keep ; +} + +-keepclasseswithmembers class * { + @android.support.annotation.Keep ; +} + +-keepclasseswithmembers class * { + @androidx.annotation.Keep ; +} + +-keepclasseswithmembers class * { + @android.support.annotation.Keep (...); +} + +-keepclasseswithmembers class * { + @androidx.annotation.Keep (...); +} + +# These classes are duplicated between android.jar and org.apache.http.legacy.jar. +-dontnote org.apache.http.** +-dontnote android.net.http.** + +# These classes are duplicated between android.jar and core-lambda-stubs.jar. +-dontnote java.lang.invoke.** diff --git a/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_0/graph.bin b/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_0/graph.bin new file mode 100644 index 0000000..601f245 Binary files /dev/null and b/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_0/graph.bin differ diff --git a/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_1/graph.bin b/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_1/graph.bin new file mode 100644 index 0000000..601f245 Binary files /dev/null and b/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_1/graph.bin differ diff --git a/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_2/graph.bin b/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_2/graph.bin new file mode 100644 index 0000000..601f245 Binary files /dev/null and b/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_2/graph.bin differ diff --git a/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_3/graph.bin b/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_3/graph.bin new file mode 100644 index 0000000..601f245 Binary files /dev/null and b/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_3/graph.bin differ diff --git a/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_4/graph.bin b/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_4/graph.bin new file mode 100644 index 0000000..601f245 Binary files /dev/null and b/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_4/graph.bin differ diff --git a/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_5/graph.bin b/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_5/graph.bin new file mode 100644 index 0000000..601f245 Binary files /dev/null and b/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_5/graph.bin differ diff --git a/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_6/graph.bin b/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_6/graph.bin new file mode 100644 index 0000000..601f245 Binary files /dev/null and b/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_6/graph.bin differ diff --git a/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_7/graph.bin b/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_7/graph.bin new file mode 100644 index 0000000..601f245 Binary files /dev/null and b/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_7/graph.bin differ diff --git a/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_8/graph.bin b/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_8/graph.bin new file mode 100644 index 0000000..601f245 Binary files /dev/null and b/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_8/graph.bin differ diff --git a/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_9/graph.bin b/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_9/graph.bin new file mode 100644 index 0000000..601f245 Binary files /dev/null and b/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_9/graph.bin differ diff --git a/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_16449c1af4ab0725443dd2f06aaf9564260caff2e3f0609b2430626953b6cc8e_bucket_0/graph.bin b/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_16449c1af4ab0725443dd2f06aaf9564260caff2e3f0609b2430626953b6cc8e_bucket_0/graph.bin new file mode 100644 index 0000000..601f245 Binary files /dev/null and b/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_16449c1af4ab0725443dd2f06aaf9564260caff2e3f0609b2430626953b6cc8e_bucket_0/graph.bin differ diff --git a/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_16449c1af4ab0725443dd2f06aaf9564260caff2e3f0609b2430626953b6cc8e_bucket_1/graph.bin b/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_16449c1af4ab0725443dd2f06aaf9564260caff2e3f0609b2430626953b6cc8e_bucket_1/graph.bin new file mode 100644 index 0000000..601f245 Binary files /dev/null and b/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_16449c1af4ab0725443dd2f06aaf9564260caff2e3f0609b2430626953b6cc8e_bucket_1/graph.bin differ diff --git a/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_16449c1af4ab0725443dd2f06aaf9564260caff2e3f0609b2430626953b6cc8e_bucket_2/graph.bin b/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_16449c1af4ab0725443dd2f06aaf9564260caff2e3f0609b2430626953b6cc8e_bucket_2/graph.bin new file mode 100644 index 0000000..601f245 Binary files /dev/null and b/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_16449c1af4ab0725443dd2f06aaf9564260caff2e3f0609b2430626953b6cc8e_bucket_2/graph.bin differ diff --git a/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_16449c1af4ab0725443dd2f06aaf9564260caff2e3f0609b2430626953b6cc8e_bucket_3/graph.bin b/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_16449c1af4ab0725443dd2f06aaf9564260caff2e3f0609b2430626953b6cc8e_bucket_3/graph.bin new file mode 100644 index 0000000..601f245 Binary files /dev/null and b/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_16449c1af4ab0725443dd2f06aaf9564260caff2e3f0609b2430626953b6cc8e_bucket_3/graph.bin differ diff --git a/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_16449c1af4ab0725443dd2f06aaf9564260caff2e3f0609b2430626953b6cc8e_bucket_4/graph.bin b/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_16449c1af4ab0725443dd2f06aaf9564260caff2e3f0609b2430626953b6cc8e_bucket_4/graph.bin new file mode 100644 index 0000000..601f245 Binary files /dev/null and b/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_16449c1af4ab0725443dd2f06aaf9564260caff2e3f0609b2430626953b6cc8e_bucket_4/graph.bin differ diff --git a/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_16449c1af4ab0725443dd2f06aaf9564260caff2e3f0609b2430626953b6cc8e_bucket_5/graph.bin b/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_16449c1af4ab0725443dd2f06aaf9564260caff2e3f0609b2430626953b6cc8e_bucket_5/graph.bin new file mode 100644 index 0000000..601f245 Binary files /dev/null and b/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_16449c1af4ab0725443dd2f06aaf9564260caff2e3f0609b2430626953b6cc8e_bucket_5/graph.bin differ diff --git a/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_16449c1af4ab0725443dd2f06aaf9564260caff2e3f0609b2430626953b6cc8e_bucket_6/graph.bin b/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_16449c1af4ab0725443dd2f06aaf9564260caff2e3f0609b2430626953b6cc8e_bucket_6/graph.bin new file mode 100644 index 0000000..601f245 Binary files /dev/null and b/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_16449c1af4ab0725443dd2f06aaf9564260caff2e3f0609b2430626953b6cc8e_bucket_6/graph.bin differ diff --git a/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_16449c1af4ab0725443dd2f06aaf9564260caff2e3f0609b2430626953b6cc8e_bucket_7/graph.bin b/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_16449c1af4ab0725443dd2f06aaf9564260caff2e3f0609b2430626953b6cc8e_bucket_7/graph.bin new file mode 100644 index 0000000..601f245 Binary files /dev/null and b/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_16449c1af4ab0725443dd2f06aaf9564260caff2e3f0609b2430626953b6cc8e_bucket_7/graph.bin differ diff --git a/app/build/intermediates/dex/debug/mergeDexDebug/classes.dex b/app/build/intermediates/dex/debug/mergeDexDebug/classes.dex new file mode 100644 index 0000000..bcd4940 Binary files /dev/null and b/app/build/intermediates/dex/debug/mergeDexDebug/classes.dex differ diff --git a/app/build/intermediates/dex_archive_input_jar_hashes/debug/out b/app/build/intermediates/dex_archive_input_jar_hashes/debug/out new file mode 100644 index 0000000..dc5d008 Binary files /dev/null and b/app/build/intermediates/dex_archive_input_jar_hashes/debug/out differ diff --git a/app/build/intermediates/dex_number_of_buckets_file/debug/out b/app/build/intermediates/dex_number_of_buckets_file/debug/out new file mode 100644 index 0000000..301160a --- /dev/null +++ b/app/build/intermediates/dex_number_of_buckets_file/debug/out @@ -0,0 +1 @@ +8 \ No newline at end of file diff --git a/app/build/intermediates/external_file_lib_dex_archives/debug/0_httpcore-4.4.16.jar b/app/build/intermediates/external_file_lib_dex_archives/debug/0_httpcore-4.4.16.jar new file mode 100644 index 0000000..a076e0c Binary files /dev/null and b/app/build/intermediates/external_file_lib_dex_archives/debug/0_httpcore-4.4.16.jar differ diff --git a/app/build/intermediates/external_file_lib_dex_archives/release/0_httpclient-osgi-4.5.14.jar b/app/build/intermediates/external_file_lib_dex_archives/release/0_httpclient-osgi-4.5.14.jar new file mode 100644 index 0000000..82ab5ef Binary files /dev/null and b/app/build/intermediates/external_file_lib_dex_archives/release/0_httpclient-osgi-4.5.14.jar differ diff --git a/app/build/intermediates/external_file_lib_dex_archives/release/1_httpclient-win-4.5.14.jar b/app/build/intermediates/external_file_lib_dex_archives/release/1_httpclient-win-4.5.14.jar new file mode 100644 index 0000000..bc21a76 Binary files /dev/null and b/app/build/intermediates/external_file_lib_dex_archives/release/1_httpclient-win-4.5.14.jar differ diff --git a/app/build/intermediates/external_file_lib_dex_archives/release/2_httpcore-4.4.16.jar b/app/build/intermediates/external_file_lib_dex_archives/release/2_httpcore-4.4.16.jar new file mode 100644 index 0000000..73fcf69 Binary files /dev/null and b/app/build/intermediates/external_file_lib_dex_archives/release/2_httpcore-4.4.16.jar differ diff --git a/app/build/intermediates/external_libs_dex/debug/mergeExtDexDebug/classes.dex b/app/build/intermediates/external_libs_dex/debug/mergeExtDexDebug/classes.dex new file mode 100644 index 0000000..3ac6009 Binary files /dev/null and b/app/build/intermediates/external_libs_dex/debug/mergeExtDexDebug/classes.dex differ diff --git a/app/build/intermediates/incremental/debug-mergeJavaRes/merge-state b/app/build/intermediates/incremental/debug-mergeJavaRes/merge-state new file mode 100644 index 0000000..69681c7 Binary files /dev/null and b/app/build/intermediates/incremental/debug-mergeJavaRes/merge-state differ diff --git a/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/ZXQ8g7SAohI4xszm0ywE42Ys8x8= b/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/ZXQ8g7SAohI4xszm0ywE42Ys8x8= new file mode 100644 index 0000000..aed581e Binary files /dev/null and b/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/ZXQ8g7SAohI4xszm0ywE42Ys8x8= differ diff --git a/app/build/intermediates/incremental/debug/mergeDebugResources/compile-file-map.properties b/app/build/intermediates/incremental/debug/mergeDebugResources/compile-file-map.properties new file mode 100644 index 0000000..2e8b614 --- /dev/null +++ b/app/build/intermediates/incremental/debug/mergeDebugResources/compile-file-map.properties @@ -0,0 +1,96 @@ +#Sun Nov 19 20:20:31 CST 2023 +net.micode.notes.app-main-6\:/color/primary_text_dark.xml=F\:\\work\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\color_primary_text_dark.xml.flat +net.micode.notes.app-main-6\:/color/secondary_text_dark.xml=F\:\\work\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\color_secondary_text_dark.xml.flat +net.micode.notes.app-main-6\:/drawable-hdpi/bg_btn_set_color.png=F\:\\work\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_bg_btn_set_color.png.flat +net.micode.notes.app-main-6\:/drawable-hdpi/bg_color_btn_mask.png=F\:\\work\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_bg_color_btn_mask.png.flat +net.micode.notes.app-main-6\:/drawable-hdpi/call_record.png=F\:\\work\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_call_record.png.flat +net.micode.notes.app-main-6\:/drawable-hdpi/clock.png=F\:\\work\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_clock.png.flat +net.micode.notes.app-main-6\:/drawable-hdpi/delete.png=F\:\\work\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_delete.png.flat +net.micode.notes.app-main-6\:/drawable-hdpi/dropdown_icon.9.png=F\:\\work\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_dropdown_icon.9.png.flat +net.micode.notes.app-main-6\:/drawable-hdpi/edit_blue.9.png=F\:\\work\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_blue.9.png.flat +net.micode.notes.app-main-6\:/drawable-hdpi/edit_green.9.png=F\:\\work\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_green.9.png.flat +net.micode.notes.app-main-6\:/drawable-hdpi/edit_red.9.png=F\:\\work\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_red.9.png.flat +net.micode.notes.app-main-6\:/drawable-hdpi/edit_title_blue.9.png=F\:\\work\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_blue.9.png.flat +net.micode.notes.app-main-6\:/drawable-hdpi/edit_title_green.9.png=F\:\\work\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_green.9.png.flat +net.micode.notes.app-main-6\:/drawable-hdpi/edit_title_red.9.png=F\:\\work\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_red.9.png.flat +net.micode.notes.app-main-6\:/drawable-hdpi/edit_title_white.9.png=F\:\\work\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_white.9.png.flat +net.micode.notes.app-main-6\:/drawable-hdpi/edit_title_yellow.9.png=F\:\\work\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_yellow.9.png.flat +net.micode.notes.app-main-6\:/drawable-hdpi/edit_white.9.png=F\:\\work\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_white.9.png.flat +net.micode.notes.app-main-6\:/drawable-hdpi/edit_yellow.9.png=F\:\\work\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_yellow.9.png.flat +net.micode.notes.app-main-6\:/drawable-hdpi/font_large.png=F\:\\work\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_large.png.flat +net.micode.notes.app-main-6\:/drawable-hdpi/font_normal.png=F\:\\work\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_normal.png.flat +net.micode.notes.app-main-6\:/drawable-hdpi/font_size_selector_bg.9.png=F\:\\work\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_size_selector_bg.9.png.flat +net.micode.notes.app-main-6\:/drawable-hdpi/font_small.png=F\:\\work\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_small.png.flat +net.micode.notes.app-main-6\:/drawable-hdpi/font_super.png=F\:\\work\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_super.png.flat +net.micode.notes.app-main-6\:/drawable-hdpi/icon_app.png=F\:\\work\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_icon_app.png.flat +net.micode.notes.app-main-6\:/drawable-hdpi/list_background.png=F\:\\work\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_background.png.flat +net.micode.notes.app-main-6\:/drawable-hdpi/list_blue_down.9.png=F\:\\work\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_blue_down.9.png.flat +net.micode.notes.app-main-6\:/drawable-hdpi/list_blue_middle.9.png=F\:\\work\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_blue_middle.9.png.flat +net.micode.notes.app-main-6\:/drawable-hdpi/list_blue_single.9.png=F\:\\work\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_blue_single.9.png.flat +net.micode.notes.app-main-6\:/drawable-hdpi/list_blue_up.9.png=F\:\\work\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_blue_up.9.png.flat +net.micode.notes.app-main-6\:/drawable-hdpi/list_folder.9.png=F\:\\work\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_folder.9.png.flat +net.micode.notes.app-main-6\:/drawable-hdpi/list_footer_bg.9.png=F\:\\work\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_footer_bg.9.png.flat +net.micode.notes.app-main-6\:/drawable-hdpi/list_green_down.9.png=F\:\\work\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_green_down.9.png.flat +net.micode.notes.app-main-6\:/drawable-hdpi/list_green_middle.9.png=F\:\\work\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_green_middle.9.png.flat +net.micode.notes.app-main-6\:/drawable-hdpi/list_green_single.9.png=F\:\\work\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_green_single.9.png.flat +net.micode.notes.app-main-6\:/drawable-hdpi/list_green_up.9.png=F\:\\work\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_green_up.9.png.flat +net.micode.notes.app-main-6\:/drawable-hdpi/list_red_down.9.png=F\:\\work\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_down.9.png.flat +net.micode.notes.app-main-6\:/drawable-hdpi/list_red_middle.9.png=F\:\\work\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_middle.9.png.flat +net.micode.notes.app-main-6\:/drawable-hdpi/list_red_single.9.png=F\:\\work\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_single.9.png.flat +net.micode.notes.app-main-6\:/drawable-hdpi/list_red_up.9.png=F\:\\work\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_up.9.png.flat +net.micode.notes.app-main-6\:/drawable-hdpi/list_white_down.9.png=F\:\\work\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_down.9.png.flat +net.micode.notes.app-main-6\:/drawable-hdpi/list_white_middle.9.png=F\:\\work\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_middle.9.png.flat +net.micode.notes.app-main-6\:/drawable-hdpi/list_white_single.9.png=F\:\\work\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_single.9.png.flat +net.micode.notes.app-main-6\:/drawable-hdpi/list_white_up.9.png=F\:\\work\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_up.9.png.flat +net.micode.notes.app-main-6\:/drawable-hdpi/list_yellow_down.9.png=F\:\\work\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_down.9.png.flat +net.micode.notes.app-main-6\:/drawable-hdpi/list_yellow_middle.9.png=F\:\\work\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_middle.9.png.flat +net.micode.notes.app-main-6\:/drawable-hdpi/list_yellow_single.9.png=F\:\\work\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_single.9.png.flat +net.micode.notes.app-main-6\:/drawable-hdpi/list_yellow_up.9.png=F\:\\work\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_up.9.png.flat +net.micode.notes.app-main-6\:/drawable-hdpi/menu_delete.png=F\:\\work\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_menu_delete.png.flat +net.micode.notes.app-main-6\:/drawable-hdpi/menu_move.png=F\:\\work\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_menu_move.png.flat +net.micode.notes.app-main-6\:/drawable-hdpi/new_note_normal.png=F\:\\work\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_new_note_normal.png.flat +net.micode.notes.app-main-6\:/drawable-hdpi/new_note_pressed.png=F\:\\work\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_new_note_pressed.png.flat +net.micode.notes.app-main-6\:/drawable-hdpi/note_edit_color_selector_panel.png=F\:\\work\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_note_edit_color_selector_panel.png.flat +net.micode.notes.app-main-6\:/drawable-hdpi/notification.png=F\:\\work\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_notification.png.flat +net.micode.notes.app-main-6\:/drawable-hdpi/search_result.png=F\:\\work\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_search_result.png.flat +net.micode.notes.app-main-6\:/drawable-hdpi/selected.png=F\:\\work\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_selected.png.flat +net.micode.notes.app-main-6\:/drawable-hdpi/title_alert.png=F\:\\work\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_title_alert.png.flat +net.micode.notes.app-main-6\:/drawable-hdpi/title_bar_bg.9.png=F\:\\work\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_title_bar_bg.9.png.flat +net.micode.notes.app-main-6\:/drawable-hdpi/widget_2x_blue.png=F\:\\work\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_blue.png.flat +net.micode.notes.app-main-6\:/drawable-hdpi/widget_2x_green.png=F\:\\work\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_green.png.flat +net.micode.notes.app-main-6\:/drawable-hdpi/widget_2x_red.png=F\:\\work\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_red.png.flat +net.micode.notes.app-main-6\:/drawable-hdpi/widget_2x_white.png=F\:\\work\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_white.png.flat +net.micode.notes.app-main-6\:/drawable-hdpi/widget_2x_yellow.png=F\:\\work\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_yellow.png.flat +net.micode.notes.app-main-6\:/drawable-hdpi/widget_4x_blue.png=F\:\\work\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_blue.png.flat +net.micode.notes.app-main-6\:/drawable-hdpi/widget_4x_green.png=F\:\\work\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_green.png.flat +net.micode.notes.app-main-6\:/drawable-hdpi/widget_4x_red.png=F\:\\work\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_red.png.flat +net.micode.notes.app-main-6\:/drawable-hdpi/widget_4x_white.png=F\:\\work\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_white.png.flat +net.micode.notes.app-main-6\:/drawable-hdpi/widget_4x_yellow.png=F\:\\work\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_yellow.png.flat +net.micode.notes.app-main-6\:/drawable/new_note.xml=F\:\\work\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable_new_note.xml.flat +net.micode.notes.app-main-6\:/layout/account_dialog_title.xml=F\:\\work\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\layout_account_dialog_title.xml.flat +net.micode.notes.app-main-6\:/layout/add_account_text.xml=F\:\\work\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\layout_add_account_text.xml.flat +net.micode.notes.app-main-6\:/layout/datetime_picker.xml=F\:\\work\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\layout_datetime_picker.xml.flat +net.micode.notes.app-main-6\:/layout/dialog_edit_text.xml=F\:\\work\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\layout_dialog_edit_text.xml.flat +net.micode.notes.app-main-6\:/layout/folder_list_item.xml=F\:\\work\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\layout_folder_list_item.xml.flat +net.micode.notes.app-main-6\:/layout/note_edit.xml=F\:\\work\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\layout_note_edit.xml.flat +net.micode.notes.app-main-6\:/layout/note_edit_list_item.xml=F\:\\work\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\layout_note_edit_list_item.xml.flat +net.micode.notes.app-main-6\:/layout/note_item.xml=F\:\\work\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\layout_note_item.xml.flat +net.micode.notes.app-main-6\:/layout/note_list.xml=F\:\\work\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\layout_note_list.xml.flat +net.micode.notes.app-main-6\:/layout/note_list_dropdown_menu.xml=F\:\\work\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\layout_note_list_dropdown_menu.xml.flat +net.micode.notes.app-main-6\:/layout/note_list_footer.xml=F\:\\work\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\layout_note_list_footer.xml.flat +net.micode.notes.app-main-6\:/layout/settings_header.xml=F\:\\work\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\layout_settings_header.xml.flat +net.micode.notes.app-main-6\:/layout/widget_2x.xml=F\:\\work\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\layout_widget_2x.xml.flat +net.micode.notes.app-main-6\:/layout/widget_4x.xml=F\:\\work\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\layout_widget_4x.xml.flat +net.micode.notes.app-main-6\:/menu/call_note_edit.xml=F\:\\work\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\menu_call_note_edit.xml.flat +net.micode.notes.app-main-6\:/menu/call_record_folder.xml=F\:\\work\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\menu_call_record_folder.xml.flat +net.micode.notes.app-main-6\:/menu/note_edit.xml=F\:\\work\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\menu_note_edit.xml.flat +net.micode.notes.app-main-6\:/menu/note_list.xml=F\:\\work\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\menu_note_list.xml.flat +net.micode.notes.app-main-6\:/menu/note_list_dropdown.xml=F\:\\work\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\menu_note_list_dropdown.xml.flat +net.micode.notes.app-main-6\:/menu/note_list_options.xml=F\:\\work\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\menu_note_list_options.xml.flat +net.micode.notes.app-main-6\:/menu/sub_folder.xml=F\:\\work\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\menu_sub_folder.xml.flat +net.micode.notes.app-main-6\:/raw-zh-rCN/introduction=F\:\\work\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\raw-zh-rCN_introduction.flat +net.micode.notes.app-main-6\:/raw/introduction=F\:\\work\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\raw_introduction.flat +net.micode.notes.app-main-6\:/xml/preferences.xml=F\:\\work\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\xml_preferences.xml.flat +net.micode.notes.app-main-6\:/xml/searchable.xml=F\:\\work\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\xml_searchable.xml.flat +net.micode.notes.app-main-6\:/xml/widget_2x_info.xml=F\:\\work\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\xml_widget_2x_info.xml.flat +net.micode.notes.app-main-6\:/xml/widget_4x_info.xml=F\:\\work\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\xml_widget_4x_info.xml.flat diff --git a/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values-zh-rCN/values-zh-rCN.xml b/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values-zh-rCN/values-zh-rCN.xml new file mode 100644 index 0000000..d65e0cc --- /dev/null +++ b/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values-zh-rCN/values-zh-rCN.xml @@ -0,0 +1,108 @@ + + + + 短信 + 邮件 + + + %1$s 条符合“%2$s”的搜索结果 + + 确认删除文件夹及所包含的便签吗？ + 确认要删除该条便签吗? + 确认要删除所选的 %d 条便签吗? + 删除 + 便签 + 便签2x2 + 便签4x4 + 删除 + 通话便签 + 取消 + 设置 + 成功删除提醒 + 不能为空便签设置闹钟提醒 + 不能将空便签发送到桌面 + 要查看的便签不存在 + 导出文本时发生错误，请检查SD卡 + SD卡被占用，不能操作 + 同步已取消 + 同步失败，发生内部错误 + 同步失败，请检查网络和帐号设置 + 导出失败 + 文件夹 %1$s 已存在，请重新命名 + yyyyMMdd + MM月dd日 kk:mm + 已将文本文件(%1$s)输出至SD卡(%2$s)目录 + 已将所选 %1$d 条便签移到 %2$s 文件夹 + 请输入名称 + 已添加到桌面 + 提醒我 + 新建文件夹 + 删除 + 取消全选 + 导出文本 + 修改文件夹名称 + 刪除文件夹 + 查看文件夹 + 大 + 正常 + 文字大小 + 小 + 超大 + 进入清单模式 + 移动到文件夹 + 上一级文件夹 + 退出清单模式 + 删除提醒 + 搜索 + 全选 + 没有选中项，操作无效 + 选中了 %d 项 + 发送到桌面 + 设置 + 分享 + 同步 + 取消同步 + 选择文件夹 + 已过期 + 发送邮件 + 打开地图 + 呼叫电话 + 浏览网页 + 查看 + 知道了 + 新建便签 + ... + 与google task同步便签记录 + 同步账号 + 添加账号 + 新建便签背景颜色随机 + 取消同步 + 立即同步 + 当前帐号 %1$s + 如更换同步帐号，过去的帐号同步信息将被清空，再次切换的同时可能会造成数据重复 + 请选择google帐号，便签将与该帐号的google task内容同步。 + 同步便签 + 上次同步于 %1$s + 取消 + 更换账号 + 删除账号 + 设置 + 正在同步中，不能修改同步帐号 + 同步帐号已设置为%1$s + 便签 + 搜索便签 + 正在搜索便签 + 便签中的文字 + 创建提醒 + 导出成功 + 与%1$s同步成功 + 正在获取服务器便签列表... + 登录%1$s... + 正在同步本地便签... + 同步已取消 + 同步失败 + 同步成功 + 同步便签... + 没有关联内容，点击新建便签。 + 访客模式下，便签内容不可见 + \ No newline at end of file diff --git a/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values-zh-rTW/values-zh-rTW.xml b/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values-zh-rTW/values-zh-rTW.xml new file mode 100644 index 0000000..226b5bc --- /dev/null +++ b/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values-zh-rTW/values-zh-rTW.xml @@ -0,0 +1,108 @@ + + + + 短信 + 郵件 + + + %1$s 條符合”%2$s“的搜尋結果 + + 確認刪除檔夾及所包含的便簽嗎？ + 确认要删除該條便籤嗎? + 确认要刪除所選的 %d 條便籤嗎? + 刪除 + 便簽 + 便簽2x2 + 便簽4x4 + 刪除 + 通話便籤 + 取消 + 設置 + 成功刪除提醒 + 不能爲空便籤設置鬧鐘提醒 + 不能將空便籤發送到桌面 + 要查看的便籤不存在 + 導出TXT時發生錯誤，請檢查SD卡 + SD卡被佔用，不能操作 + 同步已取消 + 同步失敗，發生內部錯誤 + 同步失敗，請檢查網絡和帳號設置 + 導出失敗 + 文件夾 %1$s 已存在，請重新命名 + yyyyMMdd + MM月dd日 kk:mm + 已將文本文件(%1$s)導出至SD(%2$s)目錄 + 已將所選 %1$d 便籤移到 %2$s 文件夾 + 請輸入名稱 + 已添加到桌面 + 提醒我 + 新建文件夾 + 刪除 + 取消全選 + 導出文本 + 修改文件夾名稱 + 刪除文件夾 + 查看文件夾 + 大 + 正常 + 文字大小 + 小 + 超大 + 進入清單模式 + 移動到文件夾 + 上一級文件夾 + 退出清單模式 + 刪除提醒 + 搜尋 + 全選 + 沒有選中項，操作無效 + 選中了 %d 項 + 發送到桌面 + 設置 + 分享 + 同步 + 取消同步 + 選擇文件夾 + 已過期 + 發送郵件 + 打開地圖 + 呼叫電話 + 浏覽網頁 + 查看 + 知道了 + 新建便簽 + ... + 与google task同步便簽記錄 + 同步賬號 + 添加賬號 + 新建便籤背景顏色隨機 + 取消同步 + 立即同步 + 當前帳號 %1$s + 如更換同步帳號，過去的帳號同步信息將被清空，再次切換的同時可能會造成數據重復 + 請選擇google帳號，便簽將與該帳號的google task內容同步。 + 同步便簽 + 上次同步于 %1$s + 取消 + 更換賬號 + 刪除賬號 + 設置 + 正在同步中，不能修改同步帳號 + 同步帳號已設置為%1$s + 便籤 + 搜索便籤 + 正在搜索便籤 + 便籤中的文字 + 創建提醒 + 導出成功 + 與%1$s同步成功 + 正在獲取服務器便籤列表... + 登陸%1$s... + 正在同步本地便籤... + 同步已取消 + 同步失敗 + 同步成功 + 同步便簽... + 沒有關聯內容，點擊新建便簽。 + 訪客模式下，便籤內容不可見 + \ No newline at end of file diff --git a/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values/values.xml b/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values/values.xml new file mode 100644 index 0000000..e49b0c3 --- /dev/null +++ b/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values/values.xml @@ -0,0 +1,169 @@ + + + + -%s + --%s + --%s + --%s + + + Messaging + Email + + #335b5b5b + 26sp + 20sp + 17sp + 14sp + 33sp + + %1$s result for \"%2$s\" + + %1$s results for \"%2$s\" + + Confirm to delete folder and its notes? + Confirm to delete this note? + Confirm to delete the selected %d notes? + Delete selected notes + Notes + Notes 2x2 + Notes 4x4 + Delete + Call notes + cancel + set + Delete reminder successfully + Sorry, can not set clock on empty note + Sorry, can not send and empty note to home + The note is not exist + Export failed, please check SD card + SD card busy, not available now + Sync is canceled + Sync failed, internal error occurs + Sync failed, please check network and account settings + Export fail + notes_%s.txt + /MIUI/notes/ + The folder %1$s exist, please rename + yyyyMMdd + MMMd kk:mm + Export text file (%1$s) to SD (%2$s) directory + (%d) + Have moved selected %1$d notes to %2$s folder + Input name + Note added to home + Remind me + New Folder + Delete + Deselect all + Export text + Change folder name + Delete folder + View folder + Large + Medium + Font size + Small + Super + Enter check list + Move to folder + Parent folder + Leave check list + Delete reminder + Search + Select all + Nothing selected, the operation is invalid + %d selected + Send to home + Settings + Share + Sync + Cancel syncing + Select folder + Expired + Send email + Open map + Call + Browse web + Take a look + Got it + Add note + ... + Sync notes with google task + Sync account + Add account + New note background color random + Cancel syncing + Sync immediately + Current account %1$s + All sync related information will be deleted, which may result in duplicated items sometime + Please select a google account. Local notes will be synced with google task. + Sync notes + Last sync time %1$s + yyyy-MM-dd hh:mm:ss + Cancel + Change sync account + Remove sync account + Settings + Cannot change the account because sync is in progress + %1$s has been set as the sync account + Notes + Search notes + Searching Notes + Text in your notes + Set reminder + Export successful + Sync is successful with account %1$s + Getting remote note list... + Logging into %1$s... + Synchronize local notes with Google Task... + Sync is canceled + Sync is failed + Sync is successful + Syncing notes... + No associated note found, click to create associated note. + Privacy mode，can not see note content + + + + + + + + + + + + \ No newline at end of file diff --git a/app/build/intermediates/incremental/debug/mergeDebugResources/merger.xml b/app/build/intermediates/incremental/debug/mergeDebugResources/merger.xml new file mode 100644 index 0000000..a0a50a1 --- /dev/null +++ b/app/build/intermediates/incremental/debug/mergeDebugResources/merger.xml @@ -0,0 +1,56 @@ + + + -%s + --%s + --%s + --%s + + Messaging + Email + #335b5b5b33sp26sp20sp17sp14spNotesNotes 2x2Notes 4x4No associated note found, click to create associated note.Privacy mode，can not see note content...Add noteDelete reminder successfullySet reminderExpiredyyyyMMddMMMd kk:mmGot itTake a lookCallSend emailBrowse webOpen map/MIUI/notes/notes_%s.txt(%d)New FolderExport textSyncCancel syncingSettingsSearchDeleteMove to folder%d selectedNothing selected, the operation is invalidSelect allDeselect allFont sizeSmallMediumLargeSuperEnter check listLeave check listView folderDelete folderChange folder nameThe folder %1$s exist, please renameShareSend to homeRemind meDelete reminderSelect folderParent folderNote added to homeConfirm to delete folder and its notes?Delete selected notesConfirm to delete the selected %d notes?Confirm to delete this note?Have moved selected %1$d notes to %2$s folderSD card busy, not available nowExport failed, please check SD cardThe note is not existSorry, can not set clock on empty noteSorry, can not send and empty note to homeExport successfulExport failExport text file (%1$s) to SD (%2$s) directorySyncing notes...Sync is successfulSync is failedSync is canceledSync is successful with account %1$sSync failed, please check network and account settingsSync failed, internal error occursSync is canceledLogging into %1$s...Getting remote note list...Synchronize local notes with Google Task...SettingsSync accountSync notes with google taskLast sync time %1$syyyy-MM-dd hh:mm:ssAdd accountChange sync accountRemove sync accountCancelSync immediatelyCancel syncingCurrent account %1$sAll sync related information will be deleted, which may result in duplicated items sometimeSync notesPlease select a google account. Local notes will be synced with google task.Cannot change the account because sync is in progress%1$s has been set as the sync accountNew note background color randomDeleteCall notesInput nameSearching NotesSearch notesText in your notesNotessetcancel + %1$s result for \"%2$s\" + + %1$s results for \"%2$s\" + + 短信 + 邮件 + 便签便签2x2便签4x4没有关联内容，点击新建便签。访客模式下，便签内容不可见...新建便签成功删除提醒创建提醒已过期yyyyMMddMM月dd日 kk:mm知道了查看呼叫电话发送邮件浏览网页打开地图新建文件夹导出文本同步取消同步设置搜索删除移动到文件夹选中了 %d 项没有选中项，操作无效全选取消全选文字大小小正常大超大进入清单模式退出清单模式查看文件夹刪除文件夹修改文件夹名称文件夹 %1$s 已存在，请重新命名分享发送到桌面提醒我删除提醒选择文件夹上一级文件夹已添加到桌面删除确认要删除所选的 %d 条便签吗?确认要删除该条便签吗?确认删除文件夹及所包含的便签吗？已将所选 %1$d 条便签移到 %2$s 文件夹SD卡被占用，不能操作导出文本时发生错误，请检查SD卡要查看的便签不存在不能为空便签设置闹钟提醒不能将空便签发送到桌面导出成功导出失败已将文本文件(%1$s)输出至SD卡(%2$s)目录同步便签...同步成功同步失败同步已取消与%1$s同步成功同步失败，请检查网络和帐号设置同步失败，发生内部错误同步已取消登录%1$s...正在获取服务器便签列表...正在同步本地便签...设置同步账号与google task同步便签记录上次同步于 %1$s添加账号更换账号删除账号取消立即同步取消同步当前帐号 %1$s如更换同步帐号，过去的帐号同步信息将被清空，再次切换的同时可能会造成数据重复同步便签请选择google帐号，便签将与该帐号的google task内容同步。正在同步中，不能修改同步帐号同步帐号已设置为%1$s新建便签背景颜色随机删除通话便签请输入名称正在搜索便签搜索便签便签中的文字便签设置取消 + %1$s 条符合“%2$s”的搜索结果 + + 短信 + 郵件 + 便簽便簽2x2便簽4x4沒有關聯內容，點擊新建便簽。訪客模式下，便籤內容不可見...新建便簽成功刪除提醒創建提醒已過期yyyyMMddMM月dd日 kk:mm知道了查看呼叫電話發送郵件浏覽網頁打開地圖已將所選 %1$d 便籤移到 %2$s 文件夾新建文件夾導出文本同步取消同步設置搜尋刪除移動到文件夾選中了 %d 項沒有選中項，操作無效全選取消全選文字大小小正常大超大進入清單模式退出清單模式查看文件夾刪除文件夾修改文件夾名稱文件夾 %1$s 已存在，請重新命名分享發送到桌面提醒我刪除提醒選擇文件夾上一級文件夾已添加到桌面刪除确认要刪除所選的 %d 條便籤嗎?确认要删除該條便籤嗎?確認刪除檔夾及所包含的便簽嗎？SD卡被佔用，不能操作導出TXT時發生錯誤，請檢查SD卡要查看的便籤不存在不能爲空便籤設置鬧鐘提醒不能將空便籤發送到桌面導出成功導出失敗已將文本文件(%1$s)導出至SD(%2$s)目錄同步便簽...同步成功同步失敗同步已取消與%1$s同步成功同步失敗，請檢查網絡和帳號設置同步失敗，發生內部錯誤同步已取消登陸%1$s...正在獲取服務器便籤列表...正在同步本地便籤...設置同步賬號与google task同步便簽記錄上次同步于 %1$s添加賬號更換賬號刪除賬號取消立即同步取消同步當前帳號 %1$s如更換同步帳號，過去的帳號同步信息將被清空，再次切換的同時可能會造成數據重復同步便簽請選擇google帳號，便簽將與該帳號的google task內容同步。正在同步中，不能修改同步帳號同步帳號已設置為%1$s新建便籤背景顏色隨機刪除通話便籤請輸入名稱正在搜索便籤搜索便籤便籤中的文字便籤設置取消 + %1$s 條符合”%2$s“的搜尋結果 + \ No newline at end of file diff --git a/app/build/intermediates/incremental/debug/packageDebugResources/compile-file-map.properties b/app/build/intermediates/incremental/debug/packageDebugResources/compile-file-map.properties new file mode 100644 index 0000000..1d5204b --- /dev/null +++ b/app/build/intermediates/incremental/debug/packageDebugResources/compile-file-map.properties @@ -0,0 +1,96 @@ +#Sun Nov 19 20:20:32 CST 2023 +net.micode.notes.app-main-5\:/color/primary_text_dark.xml=F\:\\work\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\color\\primary_text_dark.xml +net.micode.notes.app-main-5\:/color/secondary_text_dark.xml=F\:\\work\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\color\\secondary_text_dark.xml +net.micode.notes.app-main-5\:/drawable-hdpi/bg_btn_set_color.png=F\:\\work\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\bg_btn_set_color.png +net.micode.notes.app-main-5\:/drawable-hdpi/bg_color_btn_mask.png=F\:\\work\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\bg_color_btn_mask.png +net.micode.notes.app-main-5\:/drawable-hdpi/call_record.png=F\:\\work\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\call_record.png +net.micode.notes.app-main-5\:/drawable-hdpi/clock.png=F\:\\work\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\clock.png +net.micode.notes.app-main-5\:/drawable-hdpi/delete.png=F\:\\work\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\delete.png +net.micode.notes.app-main-5\:/drawable-hdpi/dropdown_icon.9.png=F\:\\work\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\dropdown_icon.9.png +net.micode.notes.app-main-5\:/drawable-hdpi/edit_blue.9.png=F\:\\work\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\edit_blue.9.png +net.micode.notes.app-main-5\:/drawable-hdpi/edit_green.9.png=F\:\\work\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\edit_green.9.png +net.micode.notes.app-main-5\:/drawable-hdpi/edit_red.9.png=F\:\\work\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\edit_red.9.png +net.micode.notes.app-main-5\:/drawable-hdpi/edit_title_blue.9.png=F\:\\work\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\edit_title_blue.9.png +net.micode.notes.app-main-5\:/drawable-hdpi/edit_title_green.9.png=F\:\\work\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\edit_title_green.9.png +net.micode.notes.app-main-5\:/drawable-hdpi/edit_title_red.9.png=F\:\\work\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\edit_title_red.9.png +net.micode.notes.app-main-5\:/drawable-hdpi/edit_title_white.9.png=F\:\\work\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\edit_title_white.9.png +net.micode.notes.app-main-5\:/drawable-hdpi/edit_title_yellow.9.png=F\:\\work\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\edit_title_yellow.9.png +net.micode.notes.app-main-5\:/drawable-hdpi/edit_white.9.png=F\:\\work\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\edit_white.9.png +net.micode.notes.app-main-5\:/drawable-hdpi/edit_yellow.9.png=F\:\\work\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\edit_yellow.9.png +net.micode.notes.app-main-5\:/drawable-hdpi/font_large.png=F\:\\work\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\font_large.png +net.micode.notes.app-main-5\:/drawable-hdpi/font_normal.png=F\:\\work\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\font_normal.png +net.micode.notes.app-main-5\:/drawable-hdpi/font_size_selector_bg.9.png=F\:\\work\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\font_size_selector_bg.9.png +net.micode.notes.app-main-5\:/drawable-hdpi/font_small.png=F\:\\work\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\font_small.png +net.micode.notes.app-main-5\:/drawable-hdpi/font_super.png=F\:\\work\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\font_super.png +net.micode.notes.app-main-5\:/drawable-hdpi/icon_app.png=F\:\\work\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\icon_app.png +net.micode.notes.app-main-5\:/drawable-hdpi/list_background.png=F\:\\work\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_background.png +net.micode.notes.app-main-5\:/drawable-hdpi/list_blue_down.9.png=F\:\\work\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_blue_down.9.png +net.micode.notes.app-main-5\:/drawable-hdpi/list_blue_middle.9.png=F\:\\work\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_blue_middle.9.png +net.micode.notes.app-main-5\:/drawable-hdpi/list_blue_single.9.png=F\:\\work\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_blue_single.9.png +net.micode.notes.app-main-5\:/drawable-hdpi/list_blue_up.9.png=F\:\\work\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_blue_up.9.png +net.micode.notes.app-main-5\:/drawable-hdpi/list_folder.9.png=F\:\\work\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_folder.9.png +net.micode.notes.app-main-5\:/drawable-hdpi/list_footer_bg.9.png=F\:\\work\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_footer_bg.9.png +net.micode.notes.app-main-5\:/drawable-hdpi/list_green_down.9.png=F\:\\work\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_green_down.9.png +net.micode.notes.app-main-5\:/drawable-hdpi/list_green_middle.9.png=F\:\\work\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_green_middle.9.png +net.micode.notes.app-main-5\:/drawable-hdpi/list_green_single.9.png=F\:\\work\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_green_single.9.png +net.micode.notes.app-main-5\:/drawable-hdpi/list_green_up.9.png=F\:\\work\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_green_up.9.png +net.micode.notes.app-main-5\:/drawable-hdpi/list_red_down.9.png=F\:\\work\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_red_down.9.png +net.micode.notes.app-main-5\:/drawable-hdpi/list_red_middle.9.png=F\:\\work\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_red_middle.9.png +net.micode.notes.app-main-5\:/drawable-hdpi/list_red_single.9.png=F\:\\work\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_red_single.9.png +net.micode.notes.app-main-5\:/drawable-hdpi/list_red_up.9.png=F\:\\work\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_red_up.9.png +net.micode.notes.app-main-5\:/drawable-hdpi/list_white_down.9.png=F\:\\work\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_white_down.9.png +net.micode.notes.app-main-5\:/drawable-hdpi/list_white_middle.9.png=F\:\\work\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_white_middle.9.png +net.micode.notes.app-main-5\:/drawable-hdpi/list_white_single.9.png=F\:\\work\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_white_single.9.png +net.micode.notes.app-main-5\:/drawable-hdpi/list_white_up.9.png=F\:\\work\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_white_up.9.png +net.micode.notes.app-main-5\:/drawable-hdpi/list_yellow_down.9.png=F\:\\work\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_yellow_down.9.png +net.micode.notes.app-main-5\:/drawable-hdpi/list_yellow_middle.9.png=F\:\\work\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_yellow_middle.9.png +net.micode.notes.app-main-5\:/drawable-hdpi/list_yellow_single.9.png=F\:\\work\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_yellow_single.9.png +net.micode.notes.app-main-5\:/drawable-hdpi/list_yellow_up.9.png=F\:\\work\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_yellow_up.9.png +net.micode.notes.app-main-5\:/drawable-hdpi/menu_delete.png=F\:\\work\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\menu_delete.png +net.micode.notes.app-main-5\:/drawable-hdpi/menu_move.png=F\:\\work\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\menu_move.png +net.micode.notes.app-main-5\:/drawable-hdpi/new_note_normal.png=F\:\\work\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\new_note_normal.png +net.micode.notes.app-main-5\:/drawable-hdpi/new_note_pressed.png=F\:\\work\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\new_note_pressed.png +net.micode.notes.app-main-5\:/drawable-hdpi/note_edit_color_selector_panel.png=F\:\\work\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\note_edit_color_selector_panel.png +net.micode.notes.app-main-5\:/drawable-hdpi/notification.png=F\:\\work\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\notification.png +net.micode.notes.app-main-5\:/drawable-hdpi/search_result.png=F\:\\work\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\search_result.png +net.micode.notes.app-main-5\:/drawable-hdpi/selected.png=F\:\\work\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\selected.png +net.micode.notes.app-main-5\:/drawable-hdpi/title_alert.png=F\:\\work\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\title_alert.png +net.micode.notes.app-main-5\:/drawable-hdpi/title_bar_bg.9.png=F\:\\work\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\title_bar_bg.9.png +net.micode.notes.app-main-5\:/drawable-hdpi/widget_2x_blue.png=F\:\\work\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\widget_2x_blue.png +net.micode.notes.app-main-5\:/drawable-hdpi/widget_2x_green.png=F\:\\work\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\widget_2x_green.png +net.micode.notes.app-main-5\:/drawable-hdpi/widget_2x_red.png=F\:\\work\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\widget_2x_red.png +net.micode.notes.app-main-5\:/drawable-hdpi/widget_2x_white.png=F\:\\work\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\widget_2x_white.png +net.micode.notes.app-main-5\:/drawable-hdpi/widget_2x_yellow.png=F\:\\work\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\widget_2x_yellow.png +net.micode.notes.app-main-5\:/drawable-hdpi/widget_4x_blue.png=F\:\\work\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\widget_4x_blue.png +net.micode.notes.app-main-5\:/drawable-hdpi/widget_4x_green.png=F\:\\work\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\widget_4x_green.png +net.micode.notes.app-main-5\:/drawable-hdpi/widget_4x_red.png=F\:\\work\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\widget_4x_red.png +net.micode.notes.app-main-5\:/drawable-hdpi/widget_4x_white.png=F\:\\work\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\widget_4x_white.png +net.micode.notes.app-main-5\:/drawable-hdpi/widget_4x_yellow.png=F\:\\work\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\widget_4x_yellow.png +net.micode.notes.app-main-5\:/drawable/new_note.xml=F\:\\work\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable\\new_note.xml +net.micode.notes.app-main-5\:/layout/account_dialog_title.xml=F\:\\work\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\layout\\account_dialog_title.xml +net.micode.notes.app-main-5\:/layout/add_account_text.xml=F\:\\work\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\layout\\add_account_text.xml +net.micode.notes.app-main-5\:/layout/datetime_picker.xml=F\:\\work\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\layout\\datetime_picker.xml +net.micode.notes.app-main-5\:/layout/dialog_edit_text.xml=F\:\\work\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\layout\\dialog_edit_text.xml +net.micode.notes.app-main-5\:/layout/folder_list_item.xml=F\:\\work\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\layout\\folder_list_item.xml +net.micode.notes.app-main-5\:/layout/note_edit.xml=F\:\\work\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\layout\\note_edit.xml +net.micode.notes.app-main-5\:/layout/note_edit_list_item.xml=F\:\\work\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\layout\\note_edit_list_item.xml +net.micode.notes.app-main-5\:/layout/note_item.xml=F\:\\work\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\layout\\note_item.xml +net.micode.notes.app-main-5\:/layout/note_list.xml=F\:\\work\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\layout\\note_list.xml +net.micode.notes.app-main-5\:/layout/note_list_dropdown_menu.xml=F\:\\work\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\layout\\note_list_dropdown_menu.xml +net.micode.notes.app-main-5\:/layout/note_list_footer.xml=F\:\\work\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\layout\\note_list_footer.xml +net.micode.notes.app-main-5\:/layout/settings_header.xml=F\:\\work\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\layout\\settings_header.xml +net.micode.notes.app-main-5\:/layout/widget_2x.xml=F\:\\work\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\layout\\widget_2x.xml +net.micode.notes.app-main-5\:/layout/widget_4x.xml=F\:\\work\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\layout\\widget_4x.xml +net.micode.notes.app-main-5\:/menu/call_note_edit.xml=F\:\\work\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\menu\\call_note_edit.xml +net.micode.notes.app-main-5\:/menu/call_record_folder.xml=F\:\\work\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\menu\\call_record_folder.xml +net.micode.notes.app-main-5\:/menu/note_edit.xml=F\:\\work\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\menu\\note_edit.xml +net.micode.notes.app-main-5\:/menu/note_list.xml=F\:\\work\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\menu\\note_list.xml +net.micode.notes.app-main-5\:/menu/note_list_dropdown.xml=F\:\\work\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\menu\\note_list_dropdown.xml +net.micode.notes.app-main-5\:/menu/note_list_options.xml=F\:\\work\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\menu\\note_list_options.xml +net.micode.notes.app-main-5\:/menu/sub_folder.xml=F\:\\work\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\menu\\sub_folder.xml +net.micode.notes.app-main-5\:/raw-zh-rCN/introduction=F\:\\work\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\raw-zh-rCN\\introduction +net.micode.notes.app-main-5\:/raw/introduction=F\:\\work\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\raw\\introduction +net.micode.notes.app-main-5\:/xml/preferences.xml=F\:\\work\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\xml\\preferences.xml +net.micode.notes.app-main-5\:/xml/searchable.xml=F\:\\work\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\xml\\searchable.xml +net.micode.notes.app-main-5\:/xml/widget_2x_info.xml=F\:\\work\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\xml\\widget_2x_info.xml +net.micode.notes.app-main-5\:/xml/widget_4x_info.xml=F\:\\work\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\xml\\widget_4x_info.xml diff --git a/app/build/intermediates/incremental/debug/packageDebugResources/merged.dir/values-zh-rCN/values-zh-rCN.xml b/app/build/intermediates/incremental/debug/packageDebugResources/merged.dir/values-zh-rCN/values-zh-rCN.xml new file mode 100644 index 0000000..d65e0cc --- /dev/null +++ b/app/build/intermediates/incremental/debug/packageDebugResources/merged.dir/values-zh-rCN/values-zh-rCN.xml @@ -0,0 +1,108 @@ + + + + 短信 + 邮件 + + + %1$s 条符合“%2$s”的搜索结果 + + 确认删除文件夹及所包含的便签吗？ + 确认要删除该条便签吗? + 确认要删除所选的 %d 条便签吗? + 删除 + 便签 + 便签2x2 + 便签4x4 + 删除 + 通话便签 + 取消 + 设置 + 成功删除提醒 + 不能为空便签设置闹钟提醒 + 不能将空便签发送到桌面 + 要查看的便签不存在 + 导出文本时发生错误，请检查SD卡 + SD卡被占用，不能操作 + 同步已取消 + 同步失败，发生内部错误 + 同步失败，请检查网络和帐号设置 + 导出失败 + 文件夹 %1$s 已存在，请重新命名 + yyyyMMdd + MM月dd日 kk:mm + 已将文本文件(%1$s)输出至SD卡(%2$s)目录 + 已将所选 %1$d 条便签移到 %2$s 文件夹 + 请输入名称 + 已添加到桌面 + 提醒我 + 新建文件夹 + 删除 + 取消全选 + 导出文本 + 修改文件夹名称 + 刪除文件夹 + 查看文件夹 + 大 + 正常 + 文字大小 + 小 + 超大 + 进入清单模式 + 移动到文件夹 + 上一级文件夹 + 退出清单模式 + 删除提醒 + 搜索 + 全选 + 没有选中项，操作无效 + 选中了 %d 项 + 发送到桌面 + 设置 + 分享 + 同步 + 取消同步 + 选择文件夹 + 已过期 + 发送邮件 + 打开地图 + 呼叫电话 + 浏览网页 + 查看 + 知道了 + 新建便签 + ... + 与google task同步便签记录 + 同步账号 + 添加账号 + 新建便签背景颜色随机 + 取消同步 + 立即同步 + 当前帐号 %1$s + 如更换同步帐号，过去的帐号同步信息将被清空，再次切换的同时可能会造成数据重复 + 请选择google帐号，便签将与该帐号的google task内容同步。 + 同步便签 + 上次同步于 %1$s + 取消 + 更换账号 + 删除账号 + 设置 + 正在同步中，不能修改同步帐号 + 同步帐号已设置为%1$s + 便签 + 搜索便签 + 正在搜索便签 + 便签中的文字 + 创建提醒 + 导出成功 + 与%1$s同步成功 + 正在获取服务器便签列表... + 登录%1$s... + 正在同步本地便签... + 同步已取消 + 同步失败 + 同步成功 + 同步便签... + 没有关联内容，点击新建便签。 + 访客模式下，便签内容不可见 + \ No newline at end of file diff --git a/app/build/intermediates/incremental/debug/packageDebugResources/merged.dir/values-zh-rTW/values-zh-rTW.xml b/app/build/intermediates/incremental/debug/packageDebugResources/merged.dir/values-zh-rTW/values-zh-rTW.xml new file mode 100644 index 0000000..226b5bc --- /dev/null +++ b/app/build/intermediates/incremental/debug/packageDebugResources/merged.dir/values-zh-rTW/values-zh-rTW.xml @@ -0,0 +1,108 @@ + + + + 短信 + 郵件 + + + %1$s 條符合”%2$s“的搜尋結果 + + 確認刪除檔夾及所包含的便簽嗎？ + 确认要删除該條便籤嗎? + 确认要刪除所選的 %d 條便籤嗎? + 刪除 + 便簽 + 便簽2x2 + 便簽4x4 + 刪除 + 通話便籤 + 取消 + 設置 + 成功刪除提醒 + 不能爲空便籤設置鬧鐘提醒 + 不能將空便籤發送到桌面 + 要查看的便籤不存在 + 導出TXT時發生錯誤，請檢查SD卡 + SD卡被佔用，不能操作 + 同步已取消 + 同步失敗，發生內部錯誤 + 同步失敗，請檢查網絡和帳號設置 + 導出失敗 + 文件夾 %1$s 已存在，請重新命名 + yyyyMMdd + MM月dd日 kk:mm + 已將文本文件(%1$s)導出至SD(%2$s)目錄 + 已將所選 %1$d 便籤移到 %2$s 文件夾 + 請輸入名稱 + 已添加到桌面 + 提醒我 + 新建文件夾 + 刪除 + 取消全選 + 導出文本 + 修改文件夾名稱 + 刪除文件夾 + 查看文件夾 + 大 + 正常 + 文字大小 + 小 + 超大 + 進入清單模式 + 移動到文件夾 + 上一級文件夾 + 退出清單模式 + 刪除提醒 + 搜尋 + 全選 + 沒有選中項，操作無效 + 選中了 %d 項 + 發送到桌面 + 設置 + 分享 + 同步 + 取消同步 + 選擇文件夾 + 已過期 + 發送郵件 + 打開地圖 + 呼叫電話 + 浏覽網頁 + 查看 + 知道了 + 新建便簽 + ... + 与google task同步便簽記錄 + 同步賬號 + 添加賬號 + 新建便籤背景顏色隨機 + 取消同步 + 立即同步 + 當前帳號 %1$s + 如更換同步帳號，過去的帳號同步信息將被清空，再次切換的同時可能會造成數據重復 + 請選擇google帳號，便簽將與該帳號的google task內容同步。 + 同步便簽 + 上次同步于 %1$s + 取消 + 更換賬號 + 刪除賬號 + 設置 + 正在同步中，不能修改同步帳號 + 同步帳號已設置為%1$s + 便籤 + 搜索便籤 + 正在搜索便籤 + 便籤中的文字 + 創建提醒 + 導出成功 + 與%1$s同步成功 + 正在獲取服務器便籤列表... + 登陸%1$s... + 正在同步本地便籤... + 同步已取消 + 同步失敗 + 同步成功 + 同步便簽... + 沒有關聯內容，點擊新建便簽。 + 訪客模式下，便籤內容不可見 + \ No newline at end of file diff --git a/app/build/intermediates/incremental/debug/packageDebugResources/merged.dir/values/values.xml b/app/build/intermediates/incremental/debug/packageDebugResources/merged.dir/values/values.xml new file mode 100644 index 0000000..e49b0c3 --- /dev/null +++ b/app/build/intermediates/incremental/debug/packageDebugResources/merged.dir/values/values.xml @@ -0,0 +1,169 @@ + + + + -%s + --%s + --%s + --%s + + + Messaging + Email + + #335b5b5b + 26sp + 20sp + 17sp + 14sp + 33sp + + %1$s result for \"%2$s\" + + %1$s results for \"%2$s\" + + Confirm to delete folder and its notes? + Confirm to delete this note? + Confirm to delete the selected %d notes? + Delete selected notes + Notes + Notes 2x2 + Notes 4x4 + Delete + Call notes + cancel + set + Delete reminder successfully + Sorry, can not set clock on empty note + Sorry, can not send and empty note to home + The note is not exist + Export failed, please check SD card + SD card busy, not available now + Sync is canceled + Sync failed, internal error occurs + Sync failed, please check network and account settings + Export fail + notes_%s.txt + /MIUI/notes/ + The folder %1$s exist, please rename + yyyyMMdd + MMMd kk:mm + Export text file (%1$s) to SD (%2$s) directory + (%d) + Have moved selected %1$d notes to %2$s folder + Input name + Note added to home + Remind me + New Folder + Delete + Deselect all + Export text + Change folder name + Delete folder + View folder + Large + Medium + Font size + Small + Super + Enter check list + Move to folder + Parent folder + Leave check list + Delete reminder + Search + Select all + Nothing selected, the operation is invalid + %d selected + Send to home + Settings + Share + Sync + Cancel syncing + Select folder + Expired + Send email + Open map + Call + Browse web + Take a look + Got it + Add note + ... + Sync notes with google task + Sync account + Add account + New note background color random + Cancel syncing + Sync immediately + Current account %1$s + All sync related information will be deleted, which may result in duplicated items sometime + Please select a google account. Local notes will be synced with google task. + Sync notes + Last sync time %1$s + yyyy-MM-dd hh:mm:ss + Cancel + Change sync account + Remove sync account + Settings + Cannot change the account because sync is in progress + %1$s has been set as the sync account + Notes + Search notes + Searching Notes + Text in your notes + Set reminder + Export successful + Sync is successful with account %1$s + Getting remote note list... + Logging into %1$s... + Synchronize local notes with Google Task... + Sync is canceled + Sync is failed + Sync is successful + Syncing notes... + No associated note found, click to create associated note. + Privacy mode，can not see note content + + + + + + + + + + + + \ No newline at end of file diff --git a/app/build/intermediates/incremental/debug/packageDebugResources/merger.xml b/app/build/intermediates/incremental/debug/packageDebugResources/merger.xml new file mode 100644 index 0000000..a0a50a1 --- /dev/null +++ b/app/build/intermediates/incremental/debug/packageDebugResources/merger.xml @@ -0,0 +1,56 @@ + + + -%s + --%s + --%s + --%s + + Messaging + Email + #335b5b5b33sp26sp20sp17sp14spNotesNotes 2x2Notes 4x4No associated note found, click to create associated note.Privacy mode，can not see note content...Add noteDelete reminder successfullySet reminderExpiredyyyyMMddMMMd kk:mmGot itTake a lookCallSend emailBrowse webOpen map/MIUI/notes/notes_%s.txt(%d)New FolderExport textSyncCancel syncingSettingsSearchDeleteMove to folder%d selectedNothing selected, the operation is invalidSelect allDeselect allFont sizeSmallMediumLargeSuperEnter check listLeave check listView folderDelete folderChange folder nameThe folder %1$s exist, please renameShareSend to homeRemind meDelete reminderSelect folderParent folderNote added to homeConfirm to delete folder and its notes?Delete selected notesConfirm to delete the selected %d notes?Confirm to delete this note?Have moved selected %1$d notes to %2$s folderSD card busy, not available nowExport failed, please check SD cardThe note is not existSorry, can not set clock on empty noteSorry, can not send and empty note to homeExport successfulExport failExport text file (%1$s) to SD (%2$s) directorySyncing notes...Sync is successfulSync is failedSync is canceledSync is successful with account %1$sSync failed, please check network and account settingsSync failed, internal error occursSync is canceledLogging into %1$s...Getting remote note list...Synchronize local notes with Google Task...SettingsSync accountSync notes with google taskLast sync time %1$syyyy-MM-dd hh:mm:ssAdd accountChange sync accountRemove sync accountCancelSync immediatelyCancel syncingCurrent account %1$sAll sync related information will be deleted, which may result in duplicated items sometimeSync notesPlease select a google account. Local notes will be synced with google task.Cannot change the account because sync is in progress%1$s has been set as the sync accountNew note background color randomDeleteCall notesInput nameSearching NotesSearch notesText in your notesNotessetcancel + %1$s result for \"%2$s\" + + %1$s results for \"%2$s\" + + 短信 + 邮件 + 便签便签2x2便签4x4没有关联内容，点击新建便签。访客模式下，便签内容不可见...新建便签成功删除提醒创建提醒已过期yyyyMMddMM月dd日 kk:mm知道了查看呼叫电话发送邮件浏览网页打开地图新建文件夹导出文本同步取消同步设置搜索删除移动到文件夹选中了 %d 项没有选中项，操作无效全选取消全选文字大小小正常大超大进入清单模式退出清单模式查看文件夹刪除文件夹修改文件夹名称文件夹 %1$s 已存在，请重新命名分享发送到桌面提醒我删除提醒选择文件夹上一级文件夹已添加到桌面删除确认要删除所选的 %d 条便签吗?确认要删除该条便签吗?确认删除文件夹及所包含的便签吗？已将所选 %1$d 条便签移到 %2$s 文件夹SD卡被占用，不能操作导出文本时发生错误，请检查SD卡要查看的便签不存在不能为空便签设置闹钟提醒不能将空便签发送到桌面导出成功导出失败已将文本文件(%1$s)输出至SD卡(%2$s)目录同步便签...同步成功同步失败同步已取消与%1$s同步成功同步失败，请检查网络和帐号设置同步失败，发生内部错误同步已取消登录%1$s...正在获取服务器便签列表...正在同步本地便签...设置同步账号与google task同步便签记录上次同步于 %1$s添加账号更换账号删除账号取消立即同步取消同步当前帐号 %1$s如更换同步帐号，过去的帐号同步信息将被清空，再次切换的同时可能会造成数据重复同步便签请选择google帐号，便签将与该帐号的google task内容同步。正在同步中，不能修改同步帐号同步帐号已设置为%1$s新建便签背景颜色随机删除通话便签请输入名称正在搜索便签搜索便签便签中的文字便签设置取消 + %1$s 条符合“%2$s”的搜索结果 + + 短信 + 郵件 + 便簽便簽2x2便簽4x4沒有關聯內容，點擊新建便簽。訪客模式下，便籤內容不可見...新建便簽成功刪除提醒創建提醒已過期yyyyMMddMM月dd日 kk:mm知道了查看呼叫電話發送郵件浏覽網頁打開地圖已將所選 %1$d 便籤移到 %2$s 文件夾新建文件夾導出文本同步取消同步設置搜尋刪除移動到文件夾選中了 %d 項沒有選中項，操作無效全選取消全選文字大小小正常大超大進入清單模式退出清單模式查看文件夾刪除文件夾修改文件夾名稱文件夾 %1$s 已存在，請重新命名分享發送到桌面提醒我刪除提醒選擇文件夾上一級文件夾已添加到桌面刪除确认要刪除所選的 %d 條便籤嗎?确认要删除該條便籤嗎?確認刪除檔夾及所包含的便簽嗎？SD卡被佔用，不能操作導出TXT時發生錯誤，請檢查SD卡要查看的便籤不存在不能爲空便籤設置鬧鐘提醒不能將空便籤發送到桌面導出成功導出失敗已將文本文件(%1$s)導出至SD(%2$s)目錄同步便簽...同步成功同步失敗同步已取消與%1$s同步成功同步失敗，請檢查網絡和帳號設置同步失敗，發生內部錯誤同步已取消登陸%1$s...正在獲取服務器便籤列表...正在同步本地便籤...設置同步賬號与google task同步便簽記錄上次同步于 %1$s添加賬號更換賬號刪除賬號取消立即同步取消同步當前帳號 %1$s如更換同步帳號，過去的帳號同步信息將被清空，再次切換的同時可能會造成數據重復同步便簽請選擇google帳號，便簽將與該帳號的google task內容同步。正在同步中，不能修改同步帳號同步帳號已設置為%1$s新建便籤背景顏色隨機刪除通話便籤請輸入名稱正在搜索便籤搜索便籤便籤中的文字便籤設置取消 + %1$s 條符合”%2$s“的搜尋結果 + \ No newline at end of file diff --git a/app/build/intermediates/incremental/mergeDebugAssets/merger.xml b/app/build/intermediates/incremental/mergeDebugAssets/merger.xml new file mode 100644 index 0000000..676de54 --- /dev/null +++ b/app/build/intermediates/incremental/mergeDebugAssets/merger.xml @@ -0,0 +1,2 @@ + + \ No newline at end of file diff --git a/app/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml b/app/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml new file mode 100644 index 0000000..01ffdb0 --- /dev/null +++ b/app/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml @@ -0,0 +1,2 @@ + + \ No newline at end of file diff --git a/app/build/intermediates/incremental/mergeDebugShaders/merger.xml b/app/build/intermediates/incremental/mergeDebugShaders/merger.xml new file mode 100644 index 0000000..c72a8b1 --- /dev/null +++ b/app/build/intermediates/incremental/mergeDebugShaders/merger.xml @@ -0,0 +1,2 @@ + + \ No newline at end of file diff --git a/app/build/intermediates/incremental/mergeReleaseAssets/merger.xml b/app/build/intermediates/incremental/mergeReleaseAssets/merger.xml new file mode 100644 index 0000000..7069aba --- /dev/null +++ b/app/build/intermediates/incremental/mergeReleaseAssets/merger.xml @@ -0,0 +1,2 @@ + + \ No newline at end of file diff --git a/app/build/intermediates/incremental/mergeReleaseJniLibFolders/merger.xml b/app/build/intermediates/incremental/mergeReleaseJniLibFolders/merger.xml new file mode 100644 index 0000000..6b22079 --- /dev/null +++ b/app/build/intermediates/incremental/mergeReleaseJniLibFolders/merger.xml @@ -0,0 +1,2 @@ + + \ No newline at end of file diff --git a/app/build/intermediates/incremental/mergeReleaseShaders/merger.xml b/app/build/intermediates/incremental/mergeReleaseShaders/merger.xml new file mode 100644 index 0000000..d5cde32 --- /dev/null +++ b/app/build/intermediates/incremental/mergeReleaseShaders/merger.xml @@ -0,0 +1,2 @@ + + \ No newline at end of file diff --git a/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt b/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt new file mode 100644 index 0000000..60c64da --- /dev/null +++ b/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt @@ -0,0 +1,4 @@ +#Sun Nov 19 21:06:32 CST 2023 +base.0=F\:\\work\\Notes-master\\app\\build\\intermediates\\dex\\debug\\mergeDexDebug\\classes.dex +path.0=classes.dex +renamed.0=classes.dex diff --git a/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/androidResources b/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/androidResources new file mode 100644 index 0000000..d928427 Binary files /dev/null and b/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/androidResources differ diff --git a/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/javaResources0 b/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/javaResources0 new file mode 100644 index 0000000..81943c1 Binary files /dev/null and b/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/javaResources0 differ diff --git a/app/build/intermediates/incremental/release-mergeJavaRes/merge-state b/app/build/intermediates/incremental/release-mergeJavaRes/merge-state new file mode 100644 index 0000000..8d6b3ed Binary files /dev/null and b/app/build/intermediates/incremental/release-mergeJavaRes/merge-state differ diff --git a/app/build/intermediates/incremental/release-mergeJavaRes/zip-cache/11GIricX1ENtpX9_CpD21mAeo_0= b/app/build/intermediates/incremental/release-mergeJavaRes/zip-cache/11GIricX1ENtpX9_CpD21mAeo_0= new file mode 100644 index 0000000..66c75aa Binary files /dev/null and b/app/build/intermediates/incremental/release-mergeJavaRes/zip-cache/11GIricX1ENtpX9_CpD21mAeo_0= differ diff --git a/app/build/intermediates/incremental/release-mergeJavaRes/zip-cache/GibvGU0gdUrzswCWLqeHywrxvas= b/app/build/intermediates/incremental/release-mergeJavaRes/zip-cache/GibvGU0gdUrzswCWLqeHywrxvas= new file mode 100644 index 0000000..270124f Binary files /dev/null and b/app/build/intermediates/incremental/release-mergeJavaRes/zip-cache/GibvGU0gdUrzswCWLqeHywrxvas= differ diff --git a/app/build/intermediates/incremental/release-mergeJavaRes/zip-cache/Y7Qxu31H_Fn47ranC0vHE_98QMw= b/app/build/intermediates/incremental/release-mergeJavaRes/zip-cache/Y7Qxu31H_Fn47ranC0vHE_98QMw= new file mode 100644 index 0000000..aed581e Binary files /dev/null and b/app/build/intermediates/incremental/release-mergeJavaRes/zip-cache/Y7Qxu31H_Fn47ranC0vHE_98QMw= differ diff --git a/app/build/intermediates/incremental/release/mergeReleaseResources/compile-file-map.properties b/app/build/intermediates/incremental/release/mergeReleaseResources/compile-file-map.properties new file mode 100644 index 0000000..47f1d3e --- /dev/null +++ b/app/build/intermediates/incremental/release/mergeReleaseResources/compile-file-map.properties @@ -0,0 +1,96 @@ +#Tue Nov 07 23:36:47 CST 2023 +net.micode.notes.app-main-5\:/color/primary_text_dark.xml=C\:\\Users\\alineware\\StudioProjects\\Notes-master\\app\\build\\intermediates\\merged_res\\release\\color_primary_text_dark.xml.flat +net.micode.notes.app-main-5\:/color/secondary_text_dark.xml=C\:\\Users\\alineware\\StudioProjects\\Notes-master\\app\\build\\intermediates\\merged_res\\release\\color_secondary_text_dark.xml.flat +net.micode.notes.app-main-5\:/drawable-hdpi/bg_btn_set_color.png=C\:\\Users\\alineware\\StudioProjects\\Notes-master\\app\\build\\intermediates\\merged_res\\release\\drawable-hdpi_bg_btn_set_color.png.flat +net.micode.notes.app-main-5\:/drawable-hdpi/bg_color_btn_mask.png=C\:\\Users\\alineware\\StudioProjects\\Notes-master\\app\\build\\intermediates\\merged_res\\release\\drawable-hdpi_bg_color_btn_mask.png.flat +net.micode.notes.app-main-5\:/drawable-hdpi/call_record.png=C\:\\Users\\alineware\\StudioProjects\\Notes-master\\app\\build\\intermediates\\merged_res\\release\\drawable-hdpi_call_record.png.flat +net.micode.notes.app-main-5\:/drawable-hdpi/clock.png=C\:\\Users\\alineware\\StudioProjects\\Notes-master\\app\\build\\intermediates\\merged_res\\release\\drawable-hdpi_clock.png.flat +net.micode.notes.app-main-5\:/drawable-hdpi/delete.png=C\:\\Users\\alineware\\StudioProjects\\Notes-master\\app\\build\\intermediates\\merged_res\\release\\drawable-hdpi_delete.png.flat +net.micode.notes.app-main-5\:/drawable-hdpi/dropdown_icon.9.png=C\:\\Users\\alineware\\StudioProjects\\Notes-master\\app\\build\\intermediates\\merged_res\\release\\drawable-hdpi_dropdown_icon.9.png.flat +net.micode.notes.app-main-5\:/drawable-hdpi/edit_blue.9.png=C\:\\Users\\alineware\\StudioProjects\\Notes-master\\app\\build\\intermediates\\merged_res\\release\\drawable-hdpi_edit_blue.9.png.flat +net.micode.notes.app-main-5\:/drawable-hdpi/edit_green.9.png=C\:\\Users\\alineware\\StudioProjects\\Notes-master\\app\\build\\intermediates\\merged_res\\release\\drawable-hdpi_edit_green.9.png.flat +net.micode.notes.app-main-5\:/drawable-hdpi/edit_red.9.png=C\:\\Users\\alineware\\StudioProjects\\Notes-master\\app\\build\\intermediates\\merged_res\\release\\drawable-hdpi_edit_red.9.png.flat +net.micode.notes.app-main-5\:/drawable-hdpi/edit_title_blue.9.png=C\:\\Users\\alineware\\StudioProjects\\Notes-master\\app\\build\\intermediates\\merged_res\\release\\drawable-hdpi_edit_title_blue.9.png.flat +net.micode.notes.app-main-5\:/drawable-hdpi/edit_title_green.9.png=C\:\\Users\\alineware\\StudioProjects\\Notes-master\\app\\build\\intermediates\\merged_res\\release\\drawable-hdpi_edit_title_green.9.png.flat +net.micode.notes.app-main-5\:/drawable-hdpi/edit_title_red.9.png=C\:\\Users\\alineware\\StudioProjects\\Notes-master\\app\\build\\intermediates\\merged_res\\release\\drawable-hdpi_edit_title_red.9.png.flat +net.micode.notes.app-main-5\:/drawable-hdpi/edit_title_white.9.png=C\:\\Users\\alineware\\StudioProjects\\Notes-master\\app\\build\\intermediates\\merged_res\\release\\drawable-hdpi_edit_title_white.9.png.flat +net.micode.notes.app-main-5\:/drawable-hdpi/edit_title_yellow.9.png=C\:\\Users\\alineware\\StudioProjects\\Notes-master\\app\\build\\intermediates\\merged_res\\release\\drawable-hdpi_edit_title_yellow.9.png.flat +net.micode.notes.app-main-5\:/drawable-hdpi/edit_white.9.png=C\:\\Users\\alineware\\StudioProjects\\Notes-master\\app\\build\\intermediates\\merged_res\\release\\drawable-hdpi_edit_white.9.png.flat +net.micode.notes.app-main-5\:/drawable-hdpi/edit_yellow.9.png=C\:\\Users\\alineware\\StudioProjects\\Notes-master\\app\\build\\intermediates\\merged_res\\release\\drawable-hdpi_edit_yellow.9.png.flat +net.micode.notes.app-main-5\:/drawable-hdpi/font_large.png=C\:\\Users\\alineware\\StudioProjects\\Notes-master\\app\\build\\intermediates\\merged_res\\release\\drawable-hdpi_font_large.png.flat +net.micode.notes.app-main-5\:/drawable-hdpi/font_normal.png=C\:\\Users\\alineware\\StudioProjects\\Notes-master\\app\\build\\intermediates\\merged_res\\release\\drawable-hdpi_font_normal.png.flat +net.micode.notes.app-main-5\:/drawable-hdpi/font_size_selector_bg.9.png=C\:\\Users\\alineware\\StudioProjects\\Notes-master\\app\\build\\intermediates\\merged_res\\release\\drawable-hdpi_font_size_selector_bg.9.png.flat +net.micode.notes.app-main-5\:/drawable-hdpi/font_small.png=C\:\\Users\\alineware\\StudioProjects\\Notes-master\\app\\build\\intermediates\\merged_res\\release\\drawable-hdpi_font_small.png.flat +net.micode.notes.app-main-5\:/drawable-hdpi/font_super.png=C\:\\Users\\alineware\\StudioProjects\\Notes-master\\app\\build\\intermediates\\merged_res\\release\\drawable-hdpi_font_super.png.flat +net.micode.notes.app-main-5\:/drawable-hdpi/icon_app.png=C\:\\Users\\alineware\\StudioProjects\\Notes-master\\app\\build\\intermediates\\merged_res\\release\\drawable-hdpi_icon_app.png.flat +net.micode.notes.app-main-5\:/drawable-hdpi/list_background.png=C\:\\Users\\alineware\\StudioProjects\\Notes-master\\app\\build\\intermediates\\merged_res\\release\\drawable-hdpi_list_background.png.flat +net.micode.notes.app-main-5\:/drawable-hdpi/list_blue_down.9.png=C\:\\Users\\alineware\\StudioProjects\\Notes-master\\app\\build\\intermediates\\merged_res\\release\\drawable-hdpi_list_blue_down.9.png.flat +net.micode.notes.app-main-5\:/drawable-hdpi/list_blue_middle.9.png=C\:\\Users\\alineware\\StudioProjects\\Notes-master\\app\\build\\intermediates\\merged_res\\release\\drawable-hdpi_list_blue_middle.9.png.flat +net.micode.notes.app-main-5\:/drawable-hdpi/list_blue_single.9.png=C\:\\Users\\alineware\\StudioProjects\\Notes-master\\app\\build\\intermediates\\merged_res\\release\\drawable-hdpi_list_blue_single.9.png.flat +net.micode.notes.app-main-5\:/drawable-hdpi/list_blue_up.9.png=C\:\\Users\\alineware\\StudioProjects\\Notes-master\\app\\build\\intermediates\\merged_res\\release\\drawable-hdpi_list_blue_up.9.png.flat +net.micode.notes.app-main-5\:/drawable-hdpi/list_folder.9.png=C\:\\Users\\alineware\\StudioProjects\\Notes-master\\app\\build\\intermediates\\merged_res\\release\\drawable-hdpi_list_folder.9.png.flat +net.micode.notes.app-main-5\:/drawable-hdpi/list_footer_bg.9.png=C\:\\Users\\alineware\\StudioProjects\\Notes-master\\app\\build\\intermediates\\merged_res\\release\\drawable-hdpi_list_footer_bg.9.png.flat +net.micode.notes.app-main-5\:/drawable-hdpi/list_green_down.9.png=C\:\\Users\\alineware\\StudioProjects\\Notes-master\\app\\build\\intermediates\\merged_res\\release\\drawable-hdpi_list_green_down.9.png.flat +net.micode.notes.app-main-5\:/drawable-hdpi/list_green_middle.9.png=C\:\\Users\\alineware\\StudioProjects\\Notes-master\\app\\build\\intermediates\\merged_res\\release\\drawable-hdpi_list_green_middle.9.png.flat +net.micode.notes.app-main-5\:/drawable-hdpi/list_green_single.9.png=C\:\\Users\\alineware\\StudioProjects\\Notes-master\\app\\build\\intermediates\\merged_res\\release\\drawable-hdpi_list_green_single.9.png.flat +net.micode.notes.app-main-5\:/drawable-hdpi/list_green_up.9.png=C\:\\Users\\alineware\\StudioProjects\\Notes-master\\app\\build\\intermediates\\merged_res\\release\\drawable-hdpi_list_green_up.9.png.flat +net.micode.notes.app-main-5\:/drawable-hdpi/list_red_down.9.png=C\:\\Users\\alineware\\StudioProjects\\Notes-master\\app\\build\\intermediates\\merged_res\\release\\drawable-hdpi_list_red_down.9.png.flat +net.micode.notes.app-main-5\:/drawable-hdpi/list_red_middle.9.png=C\:\\Users\\alineware\\StudioProjects\\Notes-master\\app\\build\\intermediates\\merged_res\\release\\drawable-hdpi_list_red_middle.9.png.flat +net.micode.notes.app-main-5\:/drawable-hdpi/list_red_single.9.png=C\:\\Users\\alineware\\StudioProjects\\Notes-master\\app\\build\\intermediates\\merged_res\\release\\drawable-hdpi_list_red_single.9.png.flat +net.micode.notes.app-main-5\:/drawable-hdpi/list_red_up.9.png=C\:\\Users\\alineware\\StudioProjects\\Notes-master\\app\\build\\intermediates\\merged_res\\release\\drawable-hdpi_list_red_up.9.png.flat +net.micode.notes.app-main-5\:/drawable-hdpi/list_white_down.9.png=C\:\\Users\\alineware\\StudioProjects\\Notes-master\\app\\build\\intermediates\\merged_res\\release\\drawable-hdpi_list_white_down.9.png.flat +net.micode.notes.app-main-5\:/drawable-hdpi/list_white_middle.9.png=C\:\\Users\\alineware\\StudioProjects\\Notes-master\\app\\build\\intermediates\\merged_res\\release\\drawable-hdpi_list_white_middle.9.png.flat +net.micode.notes.app-main-5\:/drawable-hdpi/list_white_single.9.png=C\:\\Users\\alineware\\StudioProjects\\Notes-master\\app\\build\\intermediates\\merged_res\\release\\drawable-hdpi_list_white_single.9.png.flat +net.micode.notes.app-main-5\:/drawable-hdpi/list_white_up.9.png=C\:\\Users\\alineware\\StudioProjects\\Notes-master\\app\\build\\intermediates\\merged_res\\release\\drawable-hdpi_list_white_up.9.png.flat +net.micode.notes.app-main-5\:/drawable-hdpi/list_yellow_down.9.png=C\:\\Users\\alineware\\StudioProjects\\Notes-master\\app\\build\\intermediates\\merged_res\\release\\drawable-hdpi_list_yellow_down.9.png.flat +net.micode.notes.app-main-5\:/drawable-hdpi/list_yellow_middle.9.png=C\:\\Users\\alineware\\StudioProjects\\Notes-master\\app\\build\\intermediates\\merged_res\\release\\drawable-hdpi_list_yellow_middle.9.png.flat +net.micode.notes.app-main-5\:/drawable-hdpi/list_yellow_single.9.png=C\:\\Users\\alineware\\StudioProjects\\Notes-master\\app\\build\\intermediates\\merged_res\\release\\drawable-hdpi_list_yellow_single.9.png.flat +net.micode.notes.app-main-5\:/drawable-hdpi/list_yellow_up.9.png=C\:\\Users\\alineware\\StudioProjects\\Notes-master\\app\\build\\intermediates\\merged_res\\release\\drawable-hdpi_list_yellow_up.9.png.flat +net.micode.notes.app-main-5\:/drawable-hdpi/menu_delete.png=C\:\\Users\\alineware\\StudioProjects\\Notes-master\\app\\build\\intermediates\\merged_res\\release\\drawable-hdpi_menu_delete.png.flat +net.micode.notes.app-main-5\:/drawable-hdpi/menu_move.png=C\:\\Users\\alineware\\StudioProjects\\Notes-master\\app\\build\\intermediates\\merged_res\\release\\drawable-hdpi_menu_move.png.flat +net.micode.notes.app-main-5\:/drawable-hdpi/new_note_normal.png=C\:\\Users\\alineware\\StudioProjects\\Notes-master\\app\\build\\intermediates\\merged_res\\release\\drawable-hdpi_new_note_normal.png.flat +net.micode.notes.app-main-5\:/drawable-hdpi/new_note_pressed.png=C\:\\Users\\alineware\\StudioProjects\\Notes-master\\app\\build\\intermediates\\merged_res\\release\\drawable-hdpi_new_note_pressed.png.flat +net.micode.notes.app-main-5\:/drawable-hdpi/note_edit_color_selector_panel.png=C\:\\Users\\alineware\\StudioProjects\\Notes-master\\app\\build\\intermediates\\merged_res\\release\\drawable-hdpi_note_edit_color_selector_panel.png.flat +net.micode.notes.app-main-5\:/drawable-hdpi/notification.png=C\:\\Users\\alineware\\StudioProjects\\Notes-master\\app\\build\\intermediates\\merged_res\\release\\drawable-hdpi_notification.png.flat +net.micode.notes.app-main-5\:/drawable-hdpi/search_result.png=C\:\\Users\\alineware\\StudioProjects\\Notes-master\\app\\build\\intermediates\\merged_res\\release\\drawable-hdpi_search_result.png.flat +net.micode.notes.app-main-5\:/drawable-hdpi/selected.png=C\:\\Users\\alineware\\StudioProjects\\Notes-master\\app\\build\\intermediates\\merged_res\\release\\drawable-hdpi_selected.png.flat +net.micode.notes.app-main-5\:/drawable-hdpi/title_alert.png=C\:\\Users\\alineware\\StudioProjects\\Notes-master\\app\\build\\intermediates\\merged_res\\release\\drawable-hdpi_title_alert.png.flat +net.micode.notes.app-main-5\:/drawable-hdpi/title_bar_bg.9.png=C\:\\Users\\alineware\\StudioProjects\\Notes-master\\app\\build\\intermediates\\merged_res\\release\\drawable-hdpi_title_bar_bg.9.png.flat +net.micode.notes.app-main-5\:/drawable-hdpi/widget_2x_blue.png=C\:\\Users\\alineware\\StudioProjects\\Notes-master\\app\\build\\intermediates\\merged_res\\release\\drawable-hdpi_widget_2x_blue.png.flat +net.micode.notes.app-main-5\:/drawable-hdpi/widget_2x_green.png=C\:\\Users\\alineware\\StudioProjects\\Notes-master\\app\\build\\intermediates\\merged_res\\release\\drawable-hdpi_widget_2x_green.png.flat +net.micode.notes.app-main-5\:/drawable-hdpi/widget_2x_red.png=C\:\\Users\\alineware\\StudioProjects\\Notes-master\\app\\build\\intermediates\\merged_res\\release\\drawable-hdpi_widget_2x_red.png.flat +net.micode.notes.app-main-5\:/drawable-hdpi/widget_2x_white.png=C\:\\Users\\alineware\\StudioProjects\\Notes-master\\app\\build\\intermediates\\merged_res\\release\\drawable-hdpi_widget_2x_white.png.flat +net.micode.notes.app-main-5\:/drawable-hdpi/widget_2x_yellow.png=C\:\\Users\\alineware\\StudioProjects\\Notes-master\\app\\build\\intermediates\\merged_res\\release\\drawable-hdpi_widget_2x_yellow.png.flat +net.micode.notes.app-main-5\:/drawable-hdpi/widget_4x_blue.png=C\:\\Users\\alineware\\StudioProjects\\Notes-master\\app\\build\\intermediates\\merged_res\\release\\drawable-hdpi_widget_4x_blue.png.flat +net.micode.notes.app-main-5\:/drawable-hdpi/widget_4x_green.png=C\:\\Users\\alineware\\StudioProjects\\Notes-master\\app\\build\\intermediates\\merged_res\\release\\drawable-hdpi_widget_4x_green.png.flat +net.micode.notes.app-main-5\:/drawable-hdpi/widget_4x_red.png=C\:\\Users\\alineware\\StudioProjects\\Notes-master\\app\\build\\intermediates\\merged_res\\release\\drawable-hdpi_widget_4x_red.png.flat +net.micode.notes.app-main-5\:/drawable-hdpi/widget_4x_white.png=C\:\\Users\\alineware\\StudioProjects\\Notes-master\\app\\build\\intermediates\\merged_res\\release\\drawable-hdpi_widget_4x_white.png.flat +net.micode.notes.app-main-5\:/drawable-hdpi/widget_4x_yellow.png=C\:\\Users\\alineware\\StudioProjects\\Notes-master\\app\\build\\intermediates\\merged_res\\release\\drawable-hdpi_widget_4x_yellow.png.flat +net.micode.notes.app-main-5\:/drawable/new_note.xml=C\:\\Users\\alineware\\StudioProjects\\Notes-master\\app\\build\\intermediates\\merged_res\\release\\drawable_new_note.xml.flat +net.micode.notes.app-main-5\:/layout/account_dialog_title.xml=C\:\\Users\\alineware\\StudioProjects\\Notes-master\\app\\build\\intermediates\\merged_res\\release\\layout_account_dialog_title.xml.flat +net.micode.notes.app-main-5\:/layout/add_account_text.xml=C\:\\Users\\alineware\\StudioProjects\\Notes-master\\app\\build\\intermediates\\merged_res\\release\\layout_add_account_text.xml.flat +net.micode.notes.app-main-5\:/layout/datetime_picker.xml=C\:\\Users\\alineware\\StudioProjects\\Notes-master\\app\\build\\intermediates\\merged_res\\release\\layout_datetime_picker.xml.flat +net.micode.notes.app-main-5\:/layout/dialog_edit_text.xml=C\:\\Users\\alineware\\StudioProjects\\Notes-master\\app\\build\\intermediates\\merged_res\\release\\layout_dialog_edit_text.xml.flat +net.micode.notes.app-main-5\:/layout/folder_list_item.xml=C\:\\Users\\alineware\\StudioProjects\\Notes-master\\app\\build\\intermediates\\merged_res\\release\\layout_folder_list_item.xml.flat +net.micode.notes.app-main-5\:/layout/note_edit.xml=C\:\\Users\\alineware\\StudioProjects\\Notes-master\\app\\build\\intermediates\\merged_res\\release\\layout_note_edit.xml.flat +net.micode.notes.app-main-5\:/layout/note_edit_list_item.xml=C\:\\Users\\alineware\\StudioProjects\\Notes-master\\app\\build\\intermediates\\merged_res\\release\\layout_note_edit_list_item.xml.flat +net.micode.notes.app-main-5\:/layout/note_item.xml=C\:\\Users\\alineware\\StudioProjects\\Notes-master\\app\\build\\intermediates\\merged_res\\release\\layout_note_item.xml.flat +net.micode.notes.app-main-5\:/layout/note_list.xml=C\:\\Users\\alineware\\StudioProjects\\Notes-master\\app\\build\\intermediates\\merged_res\\release\\layout_note_list.xml.flat +net.micode.notes.app-main-5\:/layout/note_list_dropdown_menu.xml=C\:\\Users\\alineware\\StudioProjects\\Notes-master\\app\\build\\intermediates\\merged_res\\release\\layout_note_list_dropdown_menu.xml.flat +net.micode.notes.app-main-5\:/layout/note_list_footer.xml=C\:\\Users\\alineware\\StudioProjects\\Notes-master\\app\\build\\intermediates\\merged_res\\release\\layout_note_list_footer.xml.flat +net.micode.notes.app-main-5\:/layout/settings_header.xml=C\:\\Users\\alineware\\StudioProjects\\Notes-master\\app\\build\\intermediates\\merged_res\\release\\layout_settings_header.xml.flat +net.micode.notes.app-main-5\:/layout/widget_2x.xml=C\:\\Users\\alineware\\StudioProjects\\Notes-master\\app\\build\\intermediates\\merged_res\\release\\layout_widget_2x.xml.flat +net.micode.notes.app-main-5\:/layout/widget_4x.xml=C\:\\Users\\alineware\\StudioProjects\\Notes-master\\app\\build\\intermediates\\merged_res\\release\\layout_widget_4x.xml.flat +net.micode.notes.app-main-5\:/menu/call_note_edit.xml=C\:\\Users\\alineware\\StudioProjects\\Notes-master\\app\\build\\intermediates\\merged_res\\release\\menu_call_note_edit.xml.flat +net.micode.notes.app-main-5\:/menu/call_record_folder.xml=C\:\\Users\\alineware\\StudioProjects\\Notes-master\\app\\build\\intermediates\\merged_res\\release\\menu_call_record_folder.xml.flat +net.micode.notes.app-main-5\:/menu/note_edit.xml=C\:\\Users\\alineware\\StudioProjects\\Notes-master\\app\\build\\intermediates\\merged_res\\release\\menu_note_edit.xml.flat +net.micode.notes.app-main-5\:/menu/note_list.xml=C\:\\Users\\alineware\\StudioProjects\\Notes-master\\app\\build\\intermediates\\merged_res\\release\\menu_note_list.xml.flat +net.micode.notes.app-main-5\:/menu/note_list_dropdown.xml=C\:\\Users\\alineware\\StudioProjects\\Notes-master\\app\\build\\intermediates\\merged_res\\release\\menu_note_list_dropdown.xml.flat +net.micode.notes.app-main-5\:/menu/note_list_options.xml=C\:\\Users\\alineware\\StudioProjects\\Notes-master\\app\\build\\intermediates\\merged_res\\release\\menu_note_list_options.xml.flat +net.micode.notes.app-main-5\:/menu/sub_folder.xml=C\:\\Users\\alineware\\StudioProjects\\Notes-master\\app\\build\\intermediates\\merged_res\\release\\menu_sub_folder.xml.flat +net.micode.notes.app-main-5\:/raw-zh-rCN/introduction=C\:\\Users\\alineware\\StudioProjects\\Notes-master\\app\\build\\intermediates\\merged_res\\release\\raw-zh-rCN_introduction.flat +net.micode.notes.app-main-5\:/raw/introduction=C\:\\Users\\alineware\\StudioProjects\\Notes-master\\app\\build\\intermediates\\merged_res\\release\\raw_introduction.flat +net.micode.notes.app-main-5\:/xml/preferences.xml=C\:\\Users\\alineware\\StudioProjects\\Notes-master\\app\\build\\intermediates\\merged_res\\release\\xml_preferences.xml.flat +net.micode.notes.app-main-5\:/xml/searchable.xml=C\:\\Users\\alineware\\StudioProjects\\Notes-master\\app\\build\\intermediates\\merged_res\\release\\xml_searchable.xml.flat +net.micode.notes.app-main-5\:/xml/widget_2x_info.xml=C\:\\Users\\alineware\\StudioProjects\\Notes-master\\app\\build\\intermediates\\merged_res\\release\\xml_widget_2x_info.xml.flat +net.micode.notes.app-main-5\:/xml/widget_4x_info.xml=C\:\\Users\\alineware\\StudioProjects\\Notes-master\\app\\build\\intermediates\\merged_res\\release\\xml_widget_4x_info.xml.flat diff --git a/app/build/intermediates/incremental/release/mergeReleaseResources/merged.dir/values-zh-rCN/values-zh-rCN.xml b/app/build/intermediates/incremental/release/mergeReleaseResources/merged.dir/values-zh-rCN/values-zh-rCN.xml new file mode 100644 index 0000000..d65e0cc --- /dev/null +++ b/app/build/intermediates/incremental/release/mergeReleaseResources/merged.dir/values-zh-rCN/values-zh-rCN.xml @@ -0,0 +1,108 @@ + + + + 短信 + 邮件 + + + %1$s 条符合“%2$s”的搜索结果 + + 确认删除文件夹及所包含的便签吗？ + 确认要删除该条便签吗? + 确认要删除所选的 %d 条便签吗? + 删除 + 便签 + 便签2x2 + 便签4x4 + 删除 + 通话便签 + 取消 + 设置 + 成功删除提醒 + 不能为空便签设置闹钟提醒 + 不能将空便签发送到桌面 + 要查看的便签不存在 + 导出文本时发生错误，请检查SD卡 + SD卡被占用，不能操作 + 同步已取消 + 同步失败，发生内部错误 + 同步失败，请检查网络和帐号设置 + 导出失败 + 文件夹 %1$s 已存在，请重新命名 + yyyyMMdd + MM月dd日 kk:mm + 已将文本文件(%1$s)输出至SD卡(%2$s)目录 + 已将所选 %1$d 条便签移到 %2$s 文件夹 + 请输入名称 + 已添加到桌面 + 提醒我 + 新建文件夹 + 删除 + 取消全选 + 导出文本 + 修改文件夹名称 + 刪除文件夹 + 查看文件夹 + 大 + 正常 + 文字大小 + 小 + 超大 + 进入清单模式 + 移动到文件夹 + 上一级文件夹 + 退出清单模式 + 删除提醒 + 搜索 + 全选 + 没有选中项，操作无效 + 选中了 %d 项 + 发送到桌面 + 设置 + 分享 + 同步 + 取消同步 + 选择文件夹 + 已过期 + 发送邮件 + 打开地图 + 呼叫电话 + 浏览网页 + 查看 + 知道了 + 新建便签 + ... + 与google task同步便签记录 + 同步账号 + 添加账号 + 新建便签背景颜色随机 + 取消同步 + 立即同步 + 当前帐号 %1$s + 如更换同步帐号，过去的帐号同步信息将被清空，再次切换的同时可能会造成数据重复 + 请选择google帐号，便签将与该帐号的google task内容同步。 + 同步便签 + 上次同步于 %1$s + 取消 + 更换账号 + 删除账号 + 设置 + 正在同步中，不能修改同步帐号 + 同步帐号已设置为%1$s + 便签 + 搜索便签 + 正在搜索便签 + 便签中的文字 + 创建提醒 + 导出成功 + 与%1$s同步成功 + 正在获取服务器便签列表... + 登录%1$s... + 正在同步本地便签... + 同步已取消 + 同步失败 + 同步成功 + 同步便签... + 没有关联内容，点击新建便签。 + 访客模式下，便签内容不可见 + \ No newline at end of file diff --git a/app/build/intermediates/incremental/release/mergeReleaseResources/merged.dir/values-zh-rTW/values-zh-rTW.xml b/app/build/intermediates/incremental/release/mergeReleaseResources/merged.dir/values-zh-rTW/values-zh-rTW.xml new file mode 100644 index 0000000..226b5bc --- /dev/null +++ b/app/build/intermediates/incremental/release/mergeReleaseResources/merged.dir/values-zh-rTW/values-zh-rTW.xml @@ -0,0 +1,108 @@ + + + + 短信 + 郵件 + + + %1$s 條符合”%2$s“的搜尋結果 + + 確認刪除檔夾及所包含的便簽嗎？ + 确认要删除該條便籤嗎? + 确认要刪除所選的 %d 條便籤嗎? + 刪除 + 便簽 + 便簽2x2 + 便簽4x4 + 刪除 + 通話便籤 + 取消 + 設置 + 成功刪除提醒 + 不能爲空便籤設置鬧鐘提醒 + 不能將空便籤發送到桌面 + 要查看的便籤不存在 + 導出TXT時發生錯誤，請檢查SD卡 + SD卡被佔用，不能操作 + 同步已取消 + 同步失敗，發生內部錯誤 + 同步失敗，請檢查網絡和帳號設置 + 導出失敗 + 文件夾 %1$s 已存在，請重新命名 + yyyyMMdd + MM月dd日 kk:mm + 已將文本文件(%1$s)導出至SD(%2$s)目錄 + 已將所選 %1$d 便籤移到 %2$s 文件夾 + 請輸入名稱 + 已添加到桌面 + 提醒我 + 新建文件夾 + 刪除 + 取消全選 + 導出文本 + 修改文件夾名稱 + 刪除文件夾 + 查看文件夾 + 大 + 正常 + 文字大小 + 小 + 超大 + 進入清單模式 + 移動到文件夾 + 上一級文件夾 + 退出清單模式 + 刪除提醒 + 搜尋 + 全選 + 沒有選中項，操作無效 + 選中了 %d 項 + 發送到桌面 + 設置 + 分享 + 同步 + 取消同步 + 選擇文件夾 + 已過期 + 發送郵件 + 打開地圖 + 呼叫電話 + 浏覽網頁 + 查看 + 知道了 + 新建便簽 + ... + 与google task同步便簽記錄 + 同步賬號 + 添加賬號 + 新建便籤背景顏色隨機 + 取消同步 + 立即同步 + 當前帳號 %1$s + 如更換同步帳號，過去的帳號同步信息將被清空，再次切換的同時可能會造成數據重復 + 請選擇google帳號，便簽將與該帳號的google task內容同步。 + 同步便簽 + 上次同步于 %1$s + 取消 + 更換賬號 + 刪除賬號 + 設置 + 正在同步中，不能修改同步帳號 + 同步帳號已設置為%1$s + 便籤 + 搜索便籤 + 正在搜索便籤 + 便籤中的文字 + 創建提醒 + 導出成功 + 與%1$s同步成功 + 正在獲取服務器便籤列表... + 登陸%1$s... + 正在同步本地便籤... + 同步已取消 + 同步失敗 + 同步成功 + 同步便簽... + 沒有關聯內容，點擊新建便簽。 + 訪客模式下，便籤內容不可見 + \ No newline at end of file diff --git a/app/build/intermediates/incremental/release/mergeReleaseResources/merged.dir/values/values.xml b/app/build/intermediates/incremental/release/mergeReleaseResources/merged.dir/values/values.xml new file mode 100644 index 0000000..e49b0c3 --- /dev/null +++ b/app/build/intermediates/incremental/release/mergeReleaseResources/merged.dir/values/values.xml @@ -0,0 +1,169 @@ + + + + -%s + --%s + --%s + --%s + + + Messaging + Email + + #335b5b5b + 26sp + 20sp + 17sp + 14sp + 33sp + + %1$s result for \"%2$s\" + + %1$s results for \"%2$s\" + + Confirm to delete folder and its notes? + Confirm to delete this note? + Confirm to delete the selected %d notes? + Delete selected notes + Notes + Notes 2x2 + Notes 4x4 + Delete + Call notes + cancel + set + Delete reminder successfully + Sorry, can not set clock on empty note + Sorry, can not send and empty note to home + The note is not exist + Export failed, please check SD card + SD card busy, not available now + Sync is canceled + Sync failed, internal error occurs + Sync failed, please check network and account settings + Export fail + notes_%s.txt + /MIUI/notes/ + The folder %1$s exist, please rename + yyyyMMdd + MMMd kk:mm + Export text file (%1$s) to SD (%2$s) directory + (%d) + Have moved selected %1$d notes to %2$s folder + Input name + Note added to home + Remind me + New Folder + Delete + Deselect all + Export text + Change folder name + Delete folder + View folder + Large + Medium + Font size + Small + Super + Enter check list + Move to folder + Parent folder + Leave check list + Delete reminder + Search + Select all + Nothing selected, the operation is invalid + %d selected + Send to home + Settings + Share + Sync + Cancel syncing + Select folder + Expired + Send email + Open map + Call + Browse web + Take a look + Got it + Add note + ... + Sync notes with google task + Sync account + Add account + New note background color random + Cancel syncing + Sync immediately + Current account %1$s + All sync related information will be deleted, which may result in duplicated items sometime + Please select a google account. Local notes will be synced with google task. + Sync notes + Last sync time %1$s + yyyy-MM-dd hh:mm:ss + Cancel + Change sync account + Remove sync account + Settings + Cannot change the account because sync is in progress + %1$s has been set as the sync account + Notes + Search notes + Searching Notes + Text in your notes + Set reminder + Export successful + Sync is successful with account %1$s + Getting remote note list... + Logging into %1$s... + Synchronize local notes with Google Task... + Sync is canceled + Sync is failed + Sync is successful + Syncing notes... + No associated note found, click to create associated note. + Privacy mode，can not see note content + + + + + + + + + + + + \ No newline at end of file diff --git a/app/build/intermediates/incremental/release/mergeReleaseResources/merger.xml b/app/build/intermediates/incremental/release/mergeReleaseResources/merger.xml new file mode 100644 index 0000000..f88e8fb --- /dev/null +++ b/app/build/intermediates/incremental/release/mergeReleaseResources/merger.xml @@ -0,0 +1,56 @@ + + + -%s + --%s + --%s + --%s + + Messaging + Email + #335b5b5b33sp26sp20sp17sp14spNotesNotes 2x2Notes 4x4No associated note found, click to create associated note.Privacy mode，can not see note content...Add noteDelete reminder successfullySet reminderExpiredyyyyMMddMMMd kk:mmGot itTake a lookCallSend emailBrowse webOpen map/MIUI/notes/notes_%s.txt(%d)New FolderExport textSyncCancel syncingSettingsSearchDeleteMove to folder%d selectedNothing selected, the operation is invalidSelect allDeselect allFont sizeSmallMediumLargeSuperEnter check listLeave check listView folderDelete folderChange folder nameThe folder %1$s exist, please renameShareSend to homeRemind meDelete reminderSelect folderParent folderNote added to homeConfirm to delete folder and its notes?Delete selected notesConfirm to delete the selected %d notes?Confirm to delete this note?Have moved selected %1$d notes to %2$s folderSD card busy, not available nowExport failed, please check SD cardThe note is not existSorry, can not set clock on empty noteSorry, can not send and empty note to homeExport successfulExport failExport text file (%1$s) to SD (%2$s) directorySyncing notes...Sync is successfulSync is failedSync is canceledSync is successful with account %1$sSync failed, please check network and account settingsSync failed, internal error occursSync is canceledLogging into %1$s...Getting remote note list...Synchronize local notes with Google Task...SettingsSync accountSync notes with google taskLast sync time %1$syyyy-MM-dd hh:mm:ssAdd accountChange sync accountRemove sync accountCancelSync immediatelyCancel syncingCurrent account %1$sAll sync related information will be deleted, which may result in duplicated items sometimeSync notesPlease select a google account. Local notes will be synced with google task.Cannot change the account because sync is in progress%1$s has been set as the sync accountNew note background color randomDeleteCall notesInput nameSearching NotesSearch notesText in your notesNotessetcancel + %1$s result for \"%2$s\" + + %1$s results for \"%2$s\" + + 短信 + 邮件 + 便签便签2x2便签4x4没有关联内容，点击新建便签。访客模式下，便签内容不可见...新建便签成功删除提醒创建提醒已过期yyyyMMddMM月dd日 kk:mm知道了查看呼叫电话发送邮件浏览网页打开地图新建文件夹导出文本同步取消同步设置搜索删除移动到文件夹选中了 %d 项没有选中项，操作无效全选取消全选文字大小小正常大超大进入清单模式退出清单模式查看文件夹刪除文件夹修改文件夹名称文件夹 %1$s 已存在，请重新命名分享发送到桌面提醒我删除提醒选择文件夹上一级文件夹已添加到桌面删除确认要删除所选的 %d 条便签吗?确认要删除该条便签吗?确认删除文件夹及所包含的便签吗？已将所选 %1$d 条便签移到 %2$s 文件夹SD卡被占用，不能操作导出文本时发生错误，请检查SD卡要查看的便签不存在不能为空便签设置闹钟提醒不能将空便签发送到桌面导出成功导出失败已将文本文件(%1$s)输出至SD卡(%2$s)目录同步便签...同步成功同步失败同步已取消与%1$s同步成功同步失败，请检查网络和帐号设置同步失败，发生内部错误同步已取消登录%1$s...正在获取服务器便签列表...正在同步本地便签...设置同步账号与google task同步便签记录上次同步于 %1$s添加账号更换账号删除账号取消立即同步取消同步当前帐号 %1$s如更换同步帐号，过去的帐号同步信息将被清空，再次切换的同时可能会造成数据重复同步便签请选择google帐号，便签将与该帐号的google task内容同步。正在同步中，不能修改同步帐号同步帐号已设置为%1$s新建便签背景颜色随机删除通话便签请输入名称正在搜索便签搜索便签便签中的文字便签设置取消 + %1$s 条符合“%2$s”的搜索结果 + + 短信 + 郵件 + 便簽便簽2x2便簽4x4沒有關聯內容，點擊新建便簽。訪客模式下，便籤內容不可見...新建便簽成功刪除提醒創建提醒已過期yyyyMMddMM月dd日 kk:mm知道了查看呼叫電話發送郵件浏覽網頁打開地圖已將所選 %1$d 便籤移到 %2$s 文件夾新建文件夾導出文本同步取消同步設置搜尋刪除移動到文件夾選中了 %d 項沒有選中項，操作無效全選取消全選文字大小小正常大超大進入清單模式退出清單模式查看文件夾刪除文件夾修改文件夾名稱文件夾 %1$s 已存在，請重新命名分享發送到桌面提醒我刪除提醒選擇文件夾上一級文件夾已添加到桌面刪除确认要刪除所選的 %d 條便籤嗎?确认要删除該條便籤嗎?確認刪除檔夾及所包含的便簽嗎？SD卡被佔用，不能操作導出TXT時發生錯誤，請檢查SD卡要查看的便籤不存在不能爲空便籤設置鬧鐘提醒不能將空便籤發送到桌面導出成功導出失敗已將文本文件(%1$s)導出至SD(%2$s)目錄同步便簽...同步成功同步失敗同步已取消與%1$s同步成功同步失敗，請檢查網絡和帳號設置同步失敗，發生內部錯誤同步已取消登陸%1$s...正在獲取服務器便籤列表...正在同步本地便籤...設置同步賬號与google task同步便簽記錄上次同步于 %1$s添加賬號更換賬號刪除賬號取消立即同步取消同步當前帳號 %1$s如更換同步帳號，過去的帳號同步信息將被清空，再次切換的同時可能會造成數據重復同步便簽請選擇google帳號，便簽將與該帳號的google task內容同步。正在同步中，不能修改同步帳號同步帳號已設置為%1$s新建便籤背景顏色隨機刪除通話便籤請輸入名稱正在搜索便籤搜索便籤便籤中的文字便籤設置取消 + %1$s 條符合”%2$s“的搜尋結果 + \ No newline at end of file diff --git a/app/build/intermediates/incremental/release/packageReleaseResources/compile-file-map.properties b/app/build/intermediates/incremental/release/packageReleaseResources/compile-file-map.properties new file mode 100644 index 0000000..d07d084 --- /dev/null +++ b/app/build/intermediates/incremental/release/packageReleaseResources/compile-file-map.properties @@ -0,0 +1,96 @@ +#Tue Nov 07 23:36:47 CST 2023 +net.micode.notes.app-main-4\:/color/primary_text_dark.xml=C\:\\Users\\alineware\\StudioProjects\\Notes-master\\app\\build\\intermediates\\packaged_res\\release\\color\\primary_text_dark.xml +net.micode.notes.app-main-4\:/color/secondary_text_dark.xml=C\:\\Users\\alineware\\StudioProjects\\Notes-master\\app\\build\\intermediates\\packaged_res\\release\\color\\secondary_text_dark.xml +net.micode.notes.app-main-4\:/drawable-hdpi/bg_btn_set_color.png=C\:\\Users\\alineware\\StudioProjects\\Notes-master\\app\\build\\intermediates\\packaged_res\\release\\drawable-hdpi-v4\\bg_btn_set_color.png +net.micode.notes.app-main-4\:/drawable-hdpi/bg_color_btn_mask.png=C\:\\Users\\alineware\\StudioProjects\\Notes-master\\app\\build\\intermediates\\packaged_res\\release\\drawable-hdpi-v4\\bg_color_btn_mask.png +net.micode.notes.app-main-4\:/drawable-hdpi/call_record.png=C\:\\Users\\alineware\\StudioProjects\\Notes-master\\app\\build\\intermediates\\packaged_res\\release\\drawable-hdpi-v4\\call_record.png +net.micode.notes.app-main-4\:/drawable-hdpi/clock.png=C\:\\Users\\alineware\\StudioProjects\\Notes-master\\app\\build\\intermediates\\packaged_res\\release\\drawable-hdpi-v4\\clock.png +net.micode.notes.app-main-4\:/drawable-hdpi/delete.png=C\:\\Users\\alineware\\StudioProjects\\Notes-master\\app\\build\\intermediates\\packaged_res\\release\\drawable-hdpi-v4\\delete.png +net.micode.notes.app-main-4\:/drawable-hdpi/dropdown_icon.9.png=C\:\\Users\\alineware\\StudioProjects\\Notes-master\\app\\build\\intermediates\\packaged_res\\release\\drawable-hdpi-v4\\dropdown_icon.9.png +net.micode.notes.app-main-4\:/drawable-hdpi/edit_blue.9.png=C\:\\Users\\alineware\\StudioProjects\\Notes-master\\app\\build\\intermediates\\packaged_res\\release\\drawable-hdpi-v4\\edit_blue.9.png +net.micode.notes.app-main-4\:/drawable-hdpi/edit_green.9.png=C\:\\Users\\alineware\\StudioProjects\\Notes-master\\app\\build\\intermediates\\packaged_res\\release\\drawable-hdpi-v4\\edit_green.9.png +net.micode.notes.app-main-4\:/drawable-hdpi/edit_red.9.png=C\:\\Users\\alineware\\StudioProjects\\Notes-master\\app\\build\\intermediates\\packaged_res\\release\\drawable-hdpi-v4\\edit_red.9.png +net.micode.notes.app-main-4\:/drawable-hdpi/edit_title_blue.9.png=C\:\\Users\\alineware\\StudioProjects\\Notes-master\\app\\build\\intermediates\\packaged_res\\release\\drawable-hdpi-v4\\edit_title_blue.9.png +net.micode.notes.app-main-4\:/drawable-hdpi/edit_title_green.9.png=C\:\\Users\\alineware\\StudioProjects\\Notes-master\\app\\build\\intermediates\\packaged_res\\release\\drawable-hdpi-v4\\edit_title_green.9.png +net.micode.notes.app-main-4\:/drawable-hdpi/edit_title_red.9.png=C\:\\Users\\alineware\\StudioProjects\\Notes-master\\app\\build\\intermediates\\packaged_res\\release\\drawable-hdpi-v4\\edit_title_red.9.png +net.micode.notes.app-main-4\:/drawable-hdpi/edit_title_white.9.png=C\:\\Users\\alineware\\StudioProjects\\Notes-master\\app\\build\\intermediates\\packaged_res\\release\\drawable-hdpi-v4\\edit_title_white.9.png +net.micode.notes.app-main-4\:/drawable-hdpi/edit_title_yellow.9.png=C\:\\Users\\alineware\\StudioProjects\\Notes-master\\app\\build\\intermediates\\packaged_res\\release\\drawable-hdpi-v4\\edit_title_yellow.9.png +net.micode.notes.app-main-4\:/drawable-hdpi/edit_white.9.png=C\:\\Users\\alineware\\StudioProjects\\Notes-master\\app\\build\\intermediates\\packaged_res\\release\\drawable-hdpi-v4\\edit_white.9.png +net.micode.notes.app-main-4\:/drawable-hdpi/edit_yellow.9.png=C\:\\Users\\alineware\\StudioProjects\\Notes-master\\app\\build\\intermediates\\packaged_res\\release\\drawable-hdpi-v4\\edit_yellow.9.png +net.micode.notes.app-main-4\:/drawable-hdpi/font_large.png=C\:\\Users\\alineware\\StudioProjects\\Notes-master\\app\\build\\intermediates\\packaged_res\\release\\drawable-hdpi-v4\\font_large.png +net.micode.notes.app-main-4\:/drawable-hdpi/font_normal.png=C\:\\Users\\alineware\\StudioProjects\\Notes-master\\app\\build\\intermediates\\packaged_res\\release\\drawable-hdpi-v4\\font_normal.png +net.micode.notes.app-main-4\:/drawable-hdpi/font_size_selector_bg.9.png=C\:\\Users\\alineware\\StudioProjects\\Notes-master\\app\\build\\intermediates\\packaged_res\\release\\drawable-hdpi-v4\\font_size_selector_bg.9.png +net.micode.notes.app-main-4\:/drawable-hdpi/font_small.png=C\:\\Users\\alineware\\StudioProjects\\Notes-master\\app\\build\\intermediates\\packaged_res\\release\\drawable-hdpi-v4\\font_small.png +net.micode.notes.app-main-4\:/drawable-hdpi/font_super.png=C\:\\Users\\alineware\\StudioProjects\\Notes-master\\app\\build\\intermediates\\packaged_res\\release\\drawable-hdpi-v4\\font_super.png +net.micode.notes.app-main-4\:/drawable-hdpi/icon_app.png=C\:\\Users\\alineware\\StudioProjects\\Notes-master\\app\\build\\intermediates\\packaged_res\\release\\drawable-hdpi-v4\\icon_app.png +net.micode.notes.app-main-4\:/drawable-hdpi/list_background.png=C\:\\Users\\alineware\\StudioProjects\\Notes-master\\app\\build\\intermediates\\packaged_res\\release\\drawable-hdpi-v4\\list_background.png +net.micode.notes.app-main-4\:/drawable-hdpi/list_blue_down.9.png=C\:\\Users\\alineware\\StudioProjects\\Notes-master\\app\\build\\intermediates\\packaged_res\\release\\drawable-hdpi-v4\\list_blue_down.9.png +net.micode.notes.app-main-4\:/drawable-hdpi/list_blue_middle.9.png=C\:\\Users\\alineware\\StudioProjects\\Notes-master\\app\\build\\intermediates\\packaged_res\\release\\drawable-hdpi-v4\\list_blue_middle.9.png +net.micode.notes.app-main-4\:/drawable-hdpi/list_blue_single.9.png=C\:\\Users\\alineware\\StudioProjects\\Notes-master\\app\\build\\intermediates\\packaged_res\\release\\drawable-hdpi-v4\\list_blue_single.9.png +net.micode.notes.app-main-4\:/drawable-hdpi/list_blue_up.9.png=C\:\\Users\\alineware\\StudioProjects\\Notes-master\\app\\build\\intermediates\\packaged_res\\release\\drawable-hdpi-v4\\list_blue_up.9.png +net.micode.notes.app-main-4\:/drawable-hdpi/list_folder.9.png=C\:\\Users\\alineware\\StudioProjects\\Notes-master\\app\\build\\intermediates\\packaged_res\\release\\drawable-hdpi-v4\\list_folder.9.png +net.micode.notes.app-main-4\:/drawable-hdpi/list_footer_bg.9.png=C\:\\Users\\alineware\\StudioProjects\\Notes-master\\app\\build\\intermediates\\packaged_res\\release\\drawable-hdpi-v4\\list_footer_bg.9.png +net.micode.notes.app-main-4\:/drawable-hdpi/list_green_down.9.png=C\:\\Users\\alineware\\StudioProjects\\Notes-master\\app\\build\\intermediates\\packaged_res\\release\\drawable-hdpi-v4\\list_green_down.9.png +net.micode.notes.app-main-4\:/drawable-hdpi/list_green_middle.9.png=C\:\\Users\\alineware\\StudioProjects\\Notes-master\\app\\build\\intermediates\\packaged_res\\release\\drawable-hdpi-v4\\list_green_middle.9.png +net.micode.notes.app-main-4\:/drawable-hdpi/list_green_single.9.png=C\:\\Users\\alineware\\StudioProjects\\Notes-master\\app\\build\\intermediates\\packaged_res\\release\\drawable-hdpi-v4\\list_green_single.9.png +net.micode.notes.app-main-4\:/drawable-hdpi/list_green_up.9.png=C\:\\Users\\alineware\\StudioProjects\\Notes-master\\app\\build\\intermediates\\packaged_res\\release\\drawable-hdpi-v4\\list_green_up.9.png +net.micode.notes.app-main-4\:/drawable-hdpi/list_red_down.9.png=C\:\\Users\\alineware\\StudioProjects\\Notes-master\\app\\build\\intermediates\\packaged_res\\release\\drawable-hdpi-v4\\list_red_down.9.png +net.micode.notes.app-main-4\:/drawable-hdpi/list_red_middle.9.png=C\:\\Users\\alineware\\StudioProjects\\Notes-master\\app\\build\\intermediates\\packaged_res\\release\\drawable-hdpi-v4\\list_red_middle.9.png +net.micode.notes.app-main-4\:/drawable-hdpi/list_red_single.9.png=C\:\\Users\\alineware\\StudioProjects\\Notes-master\\app\\build\\intermediates\\packaged_res\\release\\drawable-hdpi-v4\\list_red_single.9.png +net.micode.notes.app-main-4\:/drawable-hdpi/list_red_up.9.png=C\:\\Users\\alineware\\StudioProjects\\Notes-master\\app\\build\\intermediates\\packaged_res\\release\\drawable-hdpi-v4\\list_red_up.9.png +net.micode.notes.app-main-4\:/drawable-hdpi/list_white_down.9.png=C\:\\Users\\alineware\\StudioProjects\\Notes-master\\app\\build\\intermediates\\packaged_res\\release\\drawable-hdpi-v4\\list_white_down.9.png +net.micode.notes.app-main-4\:/drawable-hdpi/list_white_middle.9.png=C\:\\Users\\alineware\\StudioProjects\\Notes-master\\app\\build\\intermediates\\packaged_res\\release\\drawable-hdpi-v4\\list_white_middle.9.png +net.micode.notes.app-main-4\:/drawable-hdpi/list_white_single.9.png=C\:\\Users\\alineware\\StudioProjects\\Notes-master\\app\\build\\intermediates\\packaged_res\\release\\drawable-hdpi-v4\\list_white_single.9.png +net.micode.notes.app-main-4\:/drawable-hdpi/list_white_up.9.png=C\:\\Users\\alineware\\StudioProjects\\Notes-master\\app\\build\\intermediates\\packaged_res\\release\\drawable-hdpi-v4\\list_white_up.9.png +net.micode.notes.app-main-4\:/drawable-hdpi/list_yellow_down.9.png=C\:\\Users\\alineware\\StudioProjects\\Notes-master\\app\\build\\intermediates\\packaged_res\\release\\drawable-hdpi-v4\\list_yellow_down.9.png +net.micode.notes.app-main-4\:/drawable-hdpi/list_yellow_middle.9.png=C\:\\Users\\alineware\\StudioProjects\\Notes-master\\app\\build\\intermediates\\packaged_res\\release\\drawable-hdpi-v4\\list_yellow_middle.9.png +net.micode.notes.app-main-4\:/drawable-hdpi/list_yellow_single.9.png=C\:\\Users\\alineware\\StudioProjects\\Notes-master\\app\\build\\intermediates\\packaged_res\\release\\drawable-hdpi-v4\\list_yellow_single.9.png +net.micode.notes.app-main-4\:/drawable-hdpi/list_yellow_up.9.png=C\:\\Users\\alineware\\StudioProjects\\Notes-master\\app\\build\\intermediates\\packaged_res\\release\\drawable-hdpi-v4\\list_yellow_up.9.png +net.micode.notes.app-main-4\:/drawable-hdpi/menu_delete.png=C\:\\Users\\alineware\\StudioProjects\\Notes-master\\app\\build\\intermediates\\packaged_res\\release\\drawable-hdpi-v4\\menu_delete.png +net.micode.notes.app-main-4\:/drawable-hdpi/menu_move.png=C\:\\Users\\alineware\\StudioProjects\\Notes-master\\app\\build\\intermediates\\packaged_res\\release\\drawable-hdpi-v4\\menu_move.png +net.micode.notes.app-main-4\:/drawable-hdpi/new_note_normal.png=C\:\\Users\\alineware\\StudioProjects\\Notes-master\\app\\build\\intermediates\\packaged_res\\release\\drawable-hdpi-v4\\new_note_normal.png +net.micode.notes.app-main-4\:/drawable-hdpi/new_note_pressed.png=C\:\\Users\\alineware\\StudioProjects\\Notes-master\\app\\build\\intermediates\\packaged_res\\release\\drawable-hdpi-v4\\new_note_pressed.png +net.micode.notes.app-main-4\:/drawable-hdpi/note_edit_color_selector_panel.png=C\:\\Users\\alineware\\StudioProjects\\Notes-master\\app\\build\\intermediates\\packaged_res\\release\\drawable-hdpi-v4\\note_edit_color_selector_panel.png +net.micode.notes.app-main-4\:/drawable-hdpi/notification.png=C\:\\Users\\alineware\\StudioProjects\\Notes-master\\app\\build\\intermediates\\packaged_res\\release\\drawable-hdpi-v4\\notification.png +net.micode.notes.app-main-4\:/drawable-hdpi/search_result.png=C\:\\Users\\alineware\\StudioProjects\\Notes-master\\app\\build\\intermediates\\packaged_res\\release\\drawable-hdpi-v4\\search_result.png +net.micode.notes.app-main-4\:/drawable-hdpi/selected.png=C\:\\Users\\alineware\\StudioProjects\\Notes-master\\app\\build\\intermediates\\packaged_res\\release\\drawable-hdpi-v4\\selected.png +net.micode.notes.app-main-4\:/drawable-hdpi/title_alert.png=C\:\\Users\\alineware\\StudioProjects\\Notes-master\\app\\build\\intermediates\\packaged_res\\release\\drawable-hdpi-v4\\title_alert.png +net.micode.notes.app-main-4\:/drawable-hdpi/title_bar_bg.9.png=C\:\\Users\\alineware\\StudioProjects\\Notes-master\\app\\build\\intermediates\\packaged_res\\release\\drawable-hdpi-v4\\title_bar_bg.9.png +net.micode.notes.app-main-4\:/drawable-hdpi/widget_2x_blue.png=C\:\\Users\\alineware\\StudioProjects\\Notes-master\\app\\build\\intermediates\\packaged_res\\release\\drawable-hdpi-v4\\widget_2x_blue.png +net.micode.notes.app-main-4\:/drawable-hdpi/widget_2x_green.png=C\:\\Users\\alineware\\StudioProjects\\Notes-master\\app\\build\\intermediates\\packaged_res\\release\\drawable-hdpi-v4\\widget_2x_green.png +net.micode.notes.app-main-4\:/drawable-hdpi/widget_2x_red.png=C\:\\Users\\alineware\\StudioProjects\\Notes-master\\app\\build\\intermediates\\packaged_res\\release\\drawable-hdpi-v4\\widget_2x_red.png +net.micode.notes.app-main-4\:/drawable-hdpi/widget_2x_white.png=C\:\\Users\\alineware\\StudioProjects\\Notes-master\\app\\build\\intermediates\\packaged_res\\release\\drawable-hdpi-v4\\widget_2x_white.png +net.micode.notes.app-main-4\:/drawable-hdpi/widget_2x_yellow.png=C\:\\Users\\alineware\\StudioProjects\\Notes-master\\app\\build\\intermediates\\packaged_res\\release\\drawable-hdpi-v4\\widget_2x_yellow.png +net.micode.notes.app-main-4\:/drawable-hdpi/widget_4x_blue.png=C\:\\Users\\alineware\\StudioProjects\\Notes-master\\app\\build\\intermediates\\packaged_res\\release\\drawable-hdpi-v4\\widget_4x_blue.png +net.micode.notes.app-main-4\:/drawable-hdpi/widget_4x_green.png=C\:\\Users\\alineware\\StudioProjects\\Notes-master\\app\\build\\intermediates\\packaged_res\\release\\drawable-hdpi-v4\\widget_4x_green.png +net.micode.notes.app-main-4\:/drawable-hdpi/widget_4x_red.png=C\:\\Users\\alineware\\StudioProjects\\Notes-master\\app\\build\\intermediates\\packaged_res\\release\\drawable-hdpi-v4\\widget_4x_red.png +net.micode.notes.app-main-4\:/drawable-hdpi/widget_4x_white.png=C\:\\Users\\alineware\\StudioProjects\\Notes-master\\app\\build\\intermediates\\packaged_res\\release\\drawable-hdpi-v4\\widget_4x_white.png +net.micode.notes.app-main-4\:/drawable-hdpi/widget_4x_yellow.png=C\:\\Users\\alineware\\StudioProjects\\Notes-master\\app\\build\\intermediates\\packaged_res\\release\\drawable-hdpi-v4\\widget_4x_yellow.png +net.micode.notes.app-main-4\:/drawable/new_note.xml=C\:\\Users\\alineware\\StudioProjects\\Notes-master\\app\\build\\intermediates\\packaged_res\\release\\drawable\\new_note.xml +net.micode.notes.app-main-4\:/layout/account_dialog_title.xml=C\:\\Users\\alineware\\StudioProjects\\Notes-master\\app\\build\\intermediates\\packaged_res\\release\\layout\\account_dialog_title.xml +net.micode.notes.app-main-4\:/layout/add_account_text.xml=C\:\\Users\\alineware\\StudioProjects\\Notes-master\\app\\build\\intermediates\\packaged_res\\release\\layout\\add_account_text.xml +net.micode.notes.app-main-4\:/layout/datetime_picker.xml=C\:\\Users\\alineware\\StudioProjects\\Notes-master\\app\\build\\intermediates\\packaged_res\\release\\layout\\datetime_picker.xml +net.micode.notes.app-main-4\:/layout/dialog_edit_text.xml=C\:\\Users\\alineware\\StudioProjects\\Notes-master\\app\\build\\intermediates\\packaged_res\\release\\layout\\dialog_edit_text.xml +net.micode.notes.app-main-4\:/layout/folder_list_item.xml=C\:\\Users\\alineware\\StudioProjects\\Notes-master\\app\\build\\intermediates\\packaged_res\\release\\layout\\folder_list_item.xml +net.micode.notes.app-main-4\:/layout/note_edit.xml=C\:\\Users\\alineware\\StudioProjects\\Notes-master\\app\\build\\intermediates\\packaged_res\\release\\layout\\note_edit.xml +net.micode.notes.app-main-4\:/layout/note_edit_list_item.xml=C\:\\Users\\alineware\\StudioProjects\\Notes-master\\app\\build\\intermediates\\packaged_res\\release\\layout\\note_edit_list_item.xml +net.micode.notes.app-main-4\:/layout/note_item.xml=C\:\\Users\\alineware\\StudioProjects\\Notes-master\\app\\build\\intermediates\\packaged_res\\release\\layout\\note_item.xml +net.micode.notes.app-main-4\:/layout/note_list.xml=C\:\\Users\\alineware\\StudioProjects\\Notes-master\\app\\build\\intermediates\\packaged_res\\release\\layout\\note_list.xml +net.micode.notes.app-main-4\:/layout/note_list_dropdown_menu.xml=C\:\\Users\\alineware\\StudioProjects\\Notes-master\\app\\build\\intermediates\\packaged_res\\release\\layout\\note_list_dropdown_menu.xml +net.micode.notes.app-main-4\:/layout/note_list_footer.xml=C\:\\Users\\alineware\\StudioProjects\\Notes-master\\app\\build\\intermediates\\packaged_res\\release\\layout\\note_list_footer.xml +net.micode.notes.app-main-4\:/layout/settings_header.xml=C\:\\Users\\alineware\\StudioProjects\\Notes-master\\app\\build\\intermediates\\packaged_res\\release\\layout\\settings_header.xml +net.micode.notes.app-main-4\:/layout/widget_2x.xml=C\:\\Users\\alineware\\StudioProjects\\Notes-master\\app\\build\\intermediates\\packaged_res\\release\\layout\\widget_2x.xml +net.micode.notes.app-main-4\:/layout/widget_4x.xml=C\:\\Users\\alineware\\StudioProjects\\Notes-master\\app\\build\\intermediates\\packaged_res\\release\\layout\\widget_4x.xml +net.micode.notes.app-main-4\:/menu/call_note_edit.xml=C\:\\Users\\alineware\\StudioProjects\\Notes-master\\app\\build\\intermediates\\packaged_res\\release\\menu\\call_note_edit.xml +net.micode.notes.app-main-4\:/menu/call_record_folder.xml=C\:\\Users\\alineware\\StudioProjects\\Notes-master\\app\\build\\intermediates\\packaged_res\\release\\menu\\call_record_folder.xml +net.micode.notes.app-main-4\:/menu/note_edit.xml=C\:\\Users\\alineware\\StudioProjects\\Notes-master\\app\\build\\intermediates\\packaged_res\\release\\menu\\note_edit.xml +net.micode.notes.app-main-4\:/menu/note_list.xml=C\:\\Users\\alineware\\StudioProjects\\Notes-master\\app\\build\\intermediates\\packaged_res\\release\\menu\\note_list.xml +net.micode.notes.app-main-4\:/menu/note_list_dropdown.xml=C\:\\Users\\alineware\\StudioProjects\\Notes-master\\app\\build\\intermediates\\packaged_res\\release\\menu\\note_list_dropdown.xml +net.micode.notes.app-main-4\:/menu/note_list_options.xml=C\:\\Users\\alineware\\StudioProjects\\Notes-master\\app\\build\\intermediates\\packaged_res\\release\\menu\\note_list_options.xml +net.micode.notes.app-main-4\:/menu/sub_folder.xml=C\:\\Users\\alineware\\StudioProjects\\Notes-master\\app\\build\\intermediates\\packaged_res\\release\\menu\\sub_folder.xml +net.micode.notes.app-main-4\:/raw-zh-rCN/introduction=C\:\\Users\\alineware\\StudioProjects\\Notes-master\\app\\build\\intermediates\\packaged_res\\release\\raw-zh-rCN\\introduction +net.micode.notes.app-main-4\:/raw/introduction=C\:\\Users\\alineware\\StudioProjects\\Notes-master\\app\\build\\intermediates\\packaged_res\\release\\raw\\introduction +net.micode.notes.app-main-4\:/xml/preferences.xml=C\:\\Users\\alineware\\StudioProjects\\Notes-master\\app\\build\\intermediates\\packaged_res\\release\\xml\\preferences.xml +net.micode.notes.app-main-4\:/xml/searchable.xml=C\:\\Users\\alineware\\StudioProjects\\Notes-master\\app\\build\\intermediates\\packaged_res\\release\\xml\\searchable.xml +net.micode.notes.app-main-4\:/xml/widget_2x_info.xml=C\:\\Users\\alineware\\StudioProjects\\Notes-master\\app\\build\\intermediates\\packaged_res\\release\\xml\\widget_2x_info.xml +net.micode.notes.app-main-4\:/xml/widget_4x_info.xml=C\:\\Users\\alineware\\StudioProjects\\Notes-master\\app\\build\\intermediates\\packaged_res\\release\\xml\\widget_4x_info.xml diff --git a/app/build/intermediates/incremental/release/packageReleaseResources/merged.dir/values-zh-rCN/values-zh-rCN.xml b/app/build/intermediates/incremental/release/packageReleaseResources/merged.dir/values-zh-rCN/values-zh-rCN.xml new file mode 100644 index 0000000..d65e0cc --- /dev/null +++ b/app/build/intermediates/incremental/release/packageReleaseResources/merged.dir/values-zh-rCN/values-zh-rCN.xml @@ -0,0 +1,108 @@ + + + + 短信 + 邮件 + + + %1$s 条符合“%2$s”的搜索结果 + + 确认删除文件夹及所包含的便签吗？ + 确认要删除该条便签吗? + 确认要删除所选的 %d 条便签吗? + 删除 + 便签 + 便签2x2 + 便签4x4 + 删除 + 通话便签 + 取消 + 设置 + 成功删除提醒 + 不能为空便签设置闹钟提醒 + 不能将空便签发送到桌面 + 要查看的便签不存在 + 导出文本时发生错误，请检查SD卡 + SD卡被占用，不能操作 + 同步已取消 + 同步失败，发生内部错误 + 同步失败，请检查网络和帐号设置 + 导出失败 + 文件夹 %1$s 已存在，请重新命名 + yyyyMMdd + MM月dd日 kk:mm + 已将文本文件(%1$s)输出至SD卡(%2$s)目录 + 已将所选 %1$d 条便签移到 %2$s 文件夹 + 请输入名称 + 已添加到桌面 + 提醒我 + 新建文件夹 + 删除 + 取消全选 + 导出文本 + 修改文件夹名称 + 刪除文件夹 + 查看文件夹 + 大 + 正常 + 文字大小 + 小 + 超大 + 进入清单模式 + 移动到文件夹 + 上一级文件夹 + 退出清单模式 + 删除提醒 + 搜索 + 全选 + 没有选中项，操作无效 + 选中了 %d 项 + 发送到桌面 + 设置 + 分享 + 同步 + 取消同步 + 选择文件夹 + 已过期 + 发送邮件 + 打开地图 + 呼叫电话 + 浏览网页 + 查看 + 知道了 + 新建便签 + ... + 与google task同步便签记录 + 同步账号 + 添加账号 + 新建便签背景颜色随机 + 取消同步 + 立即同步 + 当前帐号 %1$s + 如更换同步帐号，过去的帐号同步信息将被清空，再次切换的同时可能会造成数据重复 + 请选择google帐号，便签将与该帐号的google task内容同步。 + 同步便签 + 上次同步于 %1$s + 取消 + 更换账号 + 删除账号 + 设置 + 正在同步中，不能修改同步帐号 + 同步帐号已设置为%1$s + 便签 + 搜索便签 + 正在搜索便签 + 便签中的文字 + 创建提醒 + 导出成功 + 与%1$s同步成功 + 正在获取服务器便签列表... + 登录%1$s... + 正在同步本地便签... + 同步已取消 + 同步失败 + 同步成功 + 同步便签... + 没有关联内容，点击新建便签。 + 访客模式下，便签内容不可见 + \ No newline at end of file diff --git a/app/build/intermediates/incremental/release/packageReleaseResources/merged.dir/values-zh-rTW/values-zh-rTW.xml b/app/build/intermediates/incremental/release/packageReleaseResources/merged.dir/values-zh-rTW/values-zh-rTW.xml new file mode 100644 index 0000000..226b5bc --- /dev/null +++ b/app/build/intermediates/incremental/release/packageReleaseResources/merged.dir/values-zh-rTW/values-zh-rTW.xml @@ -0,0 +1,108 @@ + + + + 短信 + 郵件 + + + %1$s 條符合”%2$s“的搜尋結果 + + 確認刪除檔夾及所包含的便簽嗎？ + 确认要删除該條便籤嗎? + 确认要刪除所選的 %d 條便籤嗎? + 刪除 + 便簽 + 便簽2x2 + 便簽4x4 + 刪除 + 通話便籤 + 取消 + 設置 + 成功刪除提醒 + 不能爲空便籤設置鬧鐘提醒 + 不能將空便籤發送到桌面 + 要查看的便籤不存在 + 導出TXT時發生錯誤，請檢查SD卡 + SD卡被佔用，不能操作 + 同步已取消 + 同步失敗，發生內部錯誤 + 同步失敗，請檢查網絡和帳號設置 + 導出失敗 + 文件夾 %1$s 已存在，請重新命名 + yyyyMMdd + MM月dd日 kk:mm + 已將文本文件(%1$s)導出至SD(%2$s)目錄 + 已將所選 %1$d 便籤移到 %2$s 文件夾 + 請輸入名稱 + 已添加到桌面 + 提醒我 + 新建文件夾 + 刪除 + 取消全選 + 導出文本 + 修改文件夾名稱 + 刪除文件夾 + 查看文件夾 + 大 + 正常 + 文字大小 + 小 + 超大 + 進入清單模式 + 移動到文件夾 + 上一級文件夾 + 退出清單模式 + 刪除提醒 + 搜尋 + 全選 + 沒有選中項，操作無效 + 選中了 %d 項 + 發送到桌面 + 設置 + 分享 + 同步 + 取消同步 + 選擇文件夾 + 已過期 + 發送郵件 + 打開地圖 + 呼叫電話 + 浏覽網頁 + 查看 + 知道了 + 新建便簽 + ... + 与google task同步便簽記錄 + 同步賬號 + 添加賬號 + 新建便籤背景顏色隨機 + 取消同步 + 立即同步 + 當前帳號 %1$s + 如更換同步帳號，過去的帳號同步信息將被清空，再次切換的同時可能會造成數據重復 + 請選擇google帳號，便簽將與該帳號的google task內容同步。 + 同步便簽 + 上次同步于 %1$s + 取消 + 更換賬號 + 刪除賬號 + 設置 + 正在同步中，不能修改同步帳號 + 同步帳號已設置為%1$s + 便籤 + 搜索便籤 + 正在搜索便籤 + 便籤中的文字 + 創建提醒 + 導出成功 + 與%1$s同步成功 + 正在獲取服務器便籤列表... + 登陸%1$s... + 正在同步本地便籤... + 同步已取消 + 同步失敗 + 同步成功 + 同步便簽... + 沒有關聯內容，點擊新建便簽。 + 訪客模式下，便籤內容不可見 + \ No newline at end of file diff --git a/app/build/intermediates/incremental/release/packageReleaseResources/merged.dir/values/values.xml b/app/build/intermediates/incremental/release/packageReleaseResources/merged.dir/values/values.xml new file mode 100644 index 0000000..e49b0c3 --- /dev/null +++ b/app/build/intermediates/incremental/release/packageReleaseResources/merged.dir/values/values.xml @@ -0,0 +1,169 @@ + + + + -%s + --%s + --%s + --%s + + + Messaging + Email + + #335b5b5b + 26sp + 20sp + 17sp + 14sp + 33sp + + %1$s result for \"%2$s\" + + %1$s results for \"%2$s\" + + Confirm to delete folder and its notes? + Confirm to delete this note? + Confirm to delete the selected %d notes? + Delete selected notes + Notes + Notes 2x2 + Notes 4x4 + Delete + Call notes + cancel + set + Delete reminder successfully + Sorry, can not set clock on empty note + Sorry, can not send and empty note to home + The note is not exist + Export failed, please check SD card + SD card busy, not available now + Sync is canceled + Sync failed, internal error occurs + Sync failed, please check network and account settings + Export fail + notes_%s.txt + /MIUI/notes/ + The folder %1$s exist, please rename + yyyyMMdd + MMMd kk:mm + Export text file (%1$s) to SD (%2$s) directory + (%d) + Have moved selected %1$d notes to %2$s folder + Input name + Note added to home + Remind me + New Folder + Delete + Deselect all + Export text + Change folder name + Delete folder + View folder + Large + Medium + Font size + Small + Super + Enter check list + Move to folder + Parent folder + Leave check list + Delete reminder + Search + Select all + Nothing selected, the operation is invalid + %d selected + Send to home + Settings + Share + Sync + Cancel syncing + Select folder + Expired + Send email + Open map + Call + Browse web + Take a look + Got it + Add note + ... + Sync notes with google task + Sync account + Add account + New note background color random + Cancel syncing + Sync immediately + Current account %1$s + All sync related information will be deleted, which may result in duplicated items sometime + Please select a google account. Local notes will be synced with google task. + Sync notes + Last sync time %1$s + yyyy-MM-dd hh:mm:ss + Cancel + Change sync account + Remove sync account + Settings + Cannot change the account because sync is in progress + %1$s has been set as the sync account + Notes + Search notes + Searching Notes + Text in your notes + Set reminder + Export successful + Sync is successful with account %1$s + Getting remote note list... + Logging into %1$s... + Synchronize local notes with Google Task... + Sync is canceled + Sync is failed + Sync is successful + Syncing notes... + No associated note found, click to create associated note. + Privacy mode，can not see note content + + + + + + + + + + + + \ No newline at end of file diff --git a/app/build/intermediates/incremental/release/packageReleaseResources/merger.xml b/app/build/intermediates/incremental/release/packageReleaseResources/merger.xml new file mode 100644 index 0000000..f88e8fb --- /dev/null +++ b/app/build/intermediates/incremental/release/packageReleaseResources/merger.xml @@ -0,0 +1,56 @@ + + + -%s + --%s + --%s + --%s + + Messaging + Email + #335b5b5b33sp26sp20sp17sp14spNotesNotes 2x2Notes 4x4No associated note found, click to create associated note.Privacy mode，can not see note content...Add noteDelete reminder successfullySet reminderExpiredyyyyMMddMMMd kk:mmGot itTake a lookCallSend emailBrowse webOpen map/MIUI/notes/notes_%s.txt(%d)New FolderExport textSyncCancel syncingSettingsSearchDeleteMove to folder%d selectedNothing selected, the operation is invalidSelect allDeselect allFont sizeSmallMediumLargeSuperEnter check listLeave check listView folderDelete folderChange folder nameThe folder %1$s exist, please renameShareSend to homeRemind meDelete reminderSelect folderParent folderNote added to homeConfirm to delete folder and its notes?Delete selected notesConfirm to delete the selected %d notes?Confirm to delete this note?Have moved selected %1$d notes to %2$s folderSD card busy, not available nowExport failed, please check SD cardThe note is not existSorry, can not set clock on empty noteSorry, can not send and empty note to homeExport successfulExport failExport text file (%1$s) to SD (%2$s) directorySyncing notes...Sync is successfulSync is failedSync is canceledSync is successful with account %1$sSync failed, please check network and account settingsSync failed, internal error occursSync is canceledLogging into %1$s...Getting remote note list...Synchronize local notes with Google Task...SettingsSync accountSync notes with google taskLast sync time %1$syyyy-MM-dd hh:mm:ssAdd accountChange sync accountRemove sync accountCancelSync immediatelyCancel syncingCurrent account %1$sAll sync related information will be deleted, which may result in duplicated items sometimeSync notesPlease select a google account. Local notes will be synced with google task.Cannot change the account because sync is in progress%1$s has been set as the sync accountNew note background color randomDeleteCall notesInput nameSearching NotesSearch notesText in your notesNotessetcancel + %1$s result for \"%2$s\" + + %1$s results for \"%2$s\" + + 短信 + 邮件 + 便签便签2x2便签4x4没有关联内容，点击新建便签。访客模式下，便签内容不可见...新建便签成功删除提醒创建提醒已过期yyyyMMddMM月dd日 kk:mm知道了查看呼叫电话发送邮件浏览网页打开地图新建文件夹导出文本同步取消同步设置搜索删除移动到文件夹选中了 %d 项没有选中项，操作无效全选取消全选文字大小小正常大超大进入清单模式退出清单模式查看文件夹刪除文件夹修改文件夹名称文件夹 %1$s 已存在，请重新命名分享发送到桌面提醒我删除提醒选择文件夹上一级文件夹已添加到桌面删除确认要删除所选的 %d 条便签吗?确认要删除该条便签吗?确认删除文件夹及所包含的便签吗？已将所选 %1$d 条便签移到 %2$s 文件夹SD卡被占用，不能操作导出文本时发生错误，请检查SD卡要查看的便签不存在不能为空便签设置闹钟提醒不能将空便签发送到桌面导出成功导出失败已将文本文件(%1$s)输出至SD卡(%2$s)目录同步便签...同步成功同步失败同步已取消与%1$s同步成功同步失败，请检查网络和帐号设置同步失败，发生内部错误同步已取消登录%1$s...正在获取服务器便签列表...正在同步本地便签...设置同步账号与google task同步便签记录上次同步于 %1$s添加账号更换账号删除账号取消立即同步取消同步当前帐号 %1$s如更换同步帐号，过去的帐号同步信息将被清空，再次切换的同时可能会造成数据重复同步便签请选择google帐号，便签将与该帐号的google task内容同步。正在同步中，不能修改同步帐号同步帐号已设置为%1$s新建便签背景颜色随机删除通话便签请输入名称正在搜索便签搜索便签便签中的文字便签设置取消 + %1$s 条符合“%2$s”的搜索结果 + + 短信 + 郵件 + 便簽便簽2x2便簽4x4沒有關聯內容，點擊新建便簽。訪客模式下，便籤內容不可見...新建便簽成功刪除提醒創建提醒已過期yyyyMMddMM月dd日 kk:mm知道了查看呼叫電話發送郵件浏覽網頁打開地圖已將所選 %1$d 便籤移到 %2$s 文件夾新建文件夾導出文本同步取消同步設置搜尋刪除移動到文件夾選中了 %d 項沒有選中項，操作無效全選取消全選文字大小小正常大超大進入清單模式退出清單模式查看文件夾刪除文件夾修改文件夾名稱文件夾 %1$s 已存在，請重新命名分享發送到桌面提醒我刪除提醒選擇文件夾上一級文件夾已添加到桌面刪除确认要刪除所選的 %d 條便籤嗎?确认要删除該條便籤嗎?確認刪除檔夾及所包含的便簽嗎？SD卡被佔用，不能操作導出TXT時發生錯誤，請檢查SD卡要查看的便籤不存在不能爲空便籤設置鬧鐘提醒不能將空便籤發送到桌面導出成功導出失敗已將文本文件(%1$s)導出至SD(%2$s)目錄同步便簽...同步成功同步失敗同步已取消與%1$s同步成功同步失敗，請檢查網絡和帳號設置同步失敗，發生內部錯誤同步已取消登陸%1$s...正在獲取服務器便籤列表...正在同步本地便籤...設置同步賬號与google task同步便簽記錄上次同步于 %1$s添加賬號更換賬號刪除賬號取消立即同步取消同步當前帳號 %1$s如更換同步帳號，過去的帳號同步信息將被清空，再次切換的同時可能會造成數據重復同步便簽請選擇google帳號，便簽將與該帳號的google task內容同步。正在同步中，不能修改同步帳號同步帳號已設置為%1$s新建便籤背景顏色隨機刪除通話便籤請輸入名稱正在搜索便籤搜索便籤便籤中的文字便籤設置取消 + %1$s 條符合”%2$s“的搜尋結果 + \ No newline at end of file diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Contact.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Contact.class new file mode 100644 index 0000000..a7948fd Binary files /dev/null and b/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Contact.class differ diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$CallNote.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$CallNote.class new file mode 100644 index 0000000..42394b7 Binary files /dev/null and b/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$CallNote.class differ diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$DataColumns.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$DataColumns.class new file mode 100644 index 0000000..569dbdc Binary files /dev/null and b/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$DataColumns.class differ diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$DataConstants.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$DataConstants.class new file mode 100644 index 0000000..76ef96e Binary files /dev/null and b/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$DataConstants.class differ diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$NoteColumns.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$NoteColumns.class new file mode 100644 index 0000000..36c8d49 Binary files /dev/null and b/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$NoteColumns.class differ diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$TextNote.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$TextNote.class new file mode 100644 index 0000000..42461a2 Binary files /dev/null and b/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$TextNote.class differ diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes.class new file mode 100644 index 0000000..413745e Binary files /dev/null and b/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes.class differ diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/data/NotesDatabaseHelper$TABLE.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/data/NotesDatabaseHelper$TABLE.class new file mode 100644 index 0000000..64fe9eb Binary files /dev/null and b/app/build/intermediates/javac/debug/classes/net/micode/notes/data/NotesDatabaseHelper$TABLE.class differ diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/data/NotesDatabaseHelper.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/data/NotesDatabaseHelper.class new file mode 100644 index 0000000..0b075b4 Binary files /dev/null and b/app/build/intermediates/javac/debug/classes/net/micode/notes/data/NotesDatabaseHelper.class differ diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/data/NotesProvider.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/data/NotesProvider.class new file mode 100644 index 0000000..1d3de0e Binary files /dev/null and b/app/build/intermediates/javac/debug/classes/net/micode/notes/data/NotesProvider.class differ diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/MetaData.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/MetaData.class new file mode 100644 index 0000000..20ff3f7 Binary files /dev/null and b/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/MetaData.class differ diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/Node.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/Node.class new file mode 100644 index 0000000..5236c5e Binary files /dev/null and b/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/Node.class differ diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/SqlData.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/SqlData.class new file mode 100644 index 0000000..099f3ba Binary files /dev/null and b/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/SqlData.class differ diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/SqlNote.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/SqlNote.class new file mode 100644 index 0000000..2783ae3 Binary files /dev/null and b/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/SqlNote.class differ diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/Task.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/Task.class new file mode 100644 index 0000000..5aaf1d4 Binary files /dev/null and b/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/Task.class differ diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/TaskList.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/TaskList.class new file mode 100644 index 0000000..359609e Binary files /dev/null and b/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/TaskList.class differ diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/exception/ActionFailureException.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/exception/ActionFailureException.class new file mode 100644 index 0000000..1a059ce Binary files /dev/null and b/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/exception/ActionFailureException.class differ diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/exception/NetworkFailureException.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/exception/NetworkFailureException.class new file mode 100644 index 0000000..75665c2 Binary files /dev/null and b/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/exception/NetworkFailureException.class differ diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskASyncTask$1.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskASyncTask$1.class new file mode 100644 index 0000000..6f45159 Binary files /dev/null and b/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskASyncTask$1.class differ diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskASyncTask$OnCompleteListener.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskASyncTask$OnCompleteListener.class new file mode 100644 index 0000000..f73069c Binary files /dev/null and b/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskASyncTask$OnCompleteListener.class differ diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskASyncTask.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskASyncTask.class new file mode 100644 index 0000000..3a6197e Binary files /dev/null and b/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskASyncTask.class differ diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskClient.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskClient.class new file mode 100644 index 0000000..7be3b8a Binary files /dev/null and b/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskClient.class differ diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskManager.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskManager.class new file mode 100644 index 0000000..ac1834c Binary files /dev/null and b/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskManager.class differ diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskSyncService$1.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskSyncService$1.class new file mode 100644 index 0000000..f246eb8 Binary files /dev/null and b/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskSyncService$1.class differ diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskSyncService.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskSyncService.class new file mode 100644 index 0000000..18da491 Binary files /dev/null and b/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskSyncService.class differ diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/model/Note$NoteData.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/model/Note$NoteData.class new file mode 100644 index 0000000..c40e945 Binary files /dev/null and b/app/build/intermediates/javac/debug/classes/net/micode/notes/model/Note$NoteData.class differ diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/model/Note.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/model/Note.class new file mode 100644 index 0000000..d2041cc Binary files /dev/null and b/app/build/intermediates/javac/debug/classes/net/micode/notes/model/Note.class differ diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/model/WorkingNote$NoteSettingChangedListener.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/model/WorkingNote$NoteSettingChangedListener.class new file mode 100644 index 0000000..15f1f77 Binary files /dev/null and b/app/build/intermediates/javac/debug/classes/net/micode/notes/model/WorkingNote$NoteSettingChangedListener.class differ diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/model/WorkingNote.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/model/WorkingNote.class new file mode 100644 index 0000000..df71afc Binary files /dev/null and b/app/build/intermediates/javac/debug/classes/net/micode/notes/model/WorkingNote.class differ diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/BackupUtils$TextExport.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/BackupUtils$TextExport.class new file mode 100644 index 0000000..63e7f9c Binary files /dev/null and b/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/BackupUtils$TextExport.class differ diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/BackupUtils.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/BackupUtils.class new file mode 100644 index 0000000..6a86737 Binary files /dev/null and b/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/BackupUtils.class differ diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/DataUtils.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/DataUtils.class new file mode 100644 index 0000000..6af3200 Binary files /dev/null and b/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/DataUtils.class differ diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/GTaskStringUtils.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/GTaskStringUtils.class new file mode 100644 index 0000000..d320e3e Binary files /dev/null and b/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/GTaskStringUtils.class differ diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$NoteBgResources.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$NoteBgResources.class new file mode 100644 index 0000000..84e57a4 Binary files /dev/null and b/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$NoteBgResources.class differ diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$NoteItemBgResources.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$NoteItemBgResources.class new file mode 100644 index 0000000..8805a06 Binary files /dev/null and b/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$NoteItemBgResources.class differ diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$TextAppearanceResources.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$TextAppearanceResources.class new file mode 100644 index 0000000..7f2eb75 Binary files /dev/null and b/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$TextAppearanceResources.class differ diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$WidgetBgResources.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$WidgetBgResources.class new file mode 100644 index 0000000..b4ec3ba Binary files /dev/null and b/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$WidgetBgResources.class differ diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser.class new file mode 100644 index 0000000..f2e1b62 Binary files /dev/null and b/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser.class differ diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/AlarmAlertActivity.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/AlarmAlertActivity.class new file mode 100644 index 0000000..98353eb Binary files /dev/null and b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/AlarmAlertActivity.class differ diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/AlarmInitReceiver.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/AlarmInitReceiver.class new file mode 100644 index 0000000..a1d202d Binary files /dev/null and b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/AlarmInitReceiver.class differ diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/AlarmReceiver.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/AlarmReceiver.class new file mode 100644 index 0000000..a41b775 Binary files /dev/null and b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/AlarmReceiver.class differ diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$1.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$1.class new file mode 100644 index 0000000..029286f Binary files /dev/null and b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$1.class differ diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$2.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$2.class new file mode 100644 index 0000000..e65c35c Binary files /dev/null and b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$2.class differ diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$3.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$3.class new file mode 100644 index 0000000..de51bad Binary files /dev/null and b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$3.class differ diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$4.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$4.class new file mode 100644 index 0000000..d04cbe7 Binary files /dev/null and b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$4.class differ diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$OnDateTimeChangedListener.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$OnDateTimeChangedListener.class new file mode 100644 index 0000000..255a4e6 Binary files /dev/null and b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$OnDateTimeChangedListener.class differ diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker.class new file mode 100644 index 0000000..400d289 Binary files /dev/null and b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker.class differ diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePickerDialog$1.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePickerDialog$1.class new file mode 100644 index 0000000..415e755 Binary files /dev/null and b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePickerDialog$1.class differ diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePickerDialog$OnDateTimeSetListener.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePickerDialog$OnDateTimeSetListener.class new file mode 100644 index 0000000..70481dd Binary files /dev/null and b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePickerDialog$OnDateTimeSetListener.class differ diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePickerDialog.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePickerDialog.class new file mode 100644 index 0000000..71e5215 Binary files /dev/null and b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePickerDialog.class differ diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DropdownMenu$1.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DropdownMenu$1.class new file mode 100644 index 0000000..ddd74fd Binary files /dev/null and b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DropdownMenu$1.class differ diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DropdownMenu.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DropdownMenu.class new file mode 100644 index 0000000..54e7df6 Binary files /dev/null and b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DropdownMenu.class differ diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/FoldersListAdapter$FolderListItem.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/FoldersListAdapter$FolderListItem.class new file mode 100644 index 0000000..fad3442 Binary files /dev/null and b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/FoldersListAdapter$FolderListItem.class differ diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/FoldersListAdapter.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/FoldersListAdapter.class new file mode 100644 index 0000000..023f716 Binary files /dev/null and b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/FoldersListAdapter.class differ diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$1.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$1.class new file mode 100644 index 0000000..4a88fe8 Binary files /dev/null and b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$1.class differ diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$2.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$2.class new file mode 100644 index 0000000..c186141 Binary files /dev/null and b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$2.class differ diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$3.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$3.class new file mode 100644 index 0000000..363d679 Binary files /dev/null and b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$3.class differ diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$HeadViewHolder.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$HeadViewHolder.class new file mode 100644 index 0000000..8e1f0bf Binary files /dev/null and b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$HeadViewHolder.class differ diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity.class new file mode 100644 index 0000000..4e64816 Binary files /dev/null and b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity.class differ diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditText$1.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditText$1.class new file mode 100644 index 0000000..2040186 Binary files /dev/null and b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditText$1.class differ diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditText$OnTextViewChangeListener.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditText$OnTextViewChangeListener.class new file mode 100644 index 0000000..9874f47 Binary files /dev/null and b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditText$OnTextViewChangeListener.class differ diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditText.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditText.class new file mode 100644 index 0000000..3a19d3b Binary files /dev/null and b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditText.class differ diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteItemData.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteItemData.class new file mode 100644 index 0000000..771aa91 Binary files /dev/null and b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteItemData.class differ diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$1.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$1.class new file mode 100644 index 0000000..14805a4 Binary files /dev/null and b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$1.class differ diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$2.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$2.class new file mode 100644 index 0000000..f452595 Binary files /dev/null and b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$2.class differ diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$3.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$3.class new file mode 100644 index 0000000..9c2f2cf Binary files /dev/null and b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$3.class differ diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$4.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$4.class new file mode 100644 index 0000000..be9ac38 Binary files /dev/null and b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$4.class differ diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$5.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$5.class new file mode 100644 index 0000000..aff2a66 Binary files /dev/null and b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$5.class differ diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$6.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$6.class new file mode 100644 index 0000000..68d83cc Binary files /dev/null and b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$6.class differ diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$7.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$7.class new file mode 100644 index 0000000..6ef2281 Binary files /dev/null and b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$7.class differ diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$8.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$8.class new file mode 100644 index 0000000..da2c985 Binary files /dev/null and b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$8.class differ diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$9.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$9.class new file mode 100644 index 0000000..ac32541 Binary files /dev/null and b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$9.class differ diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$BackgroundQueryHandler.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$BackgroundQueryHandler.class new file mode 100644 index 0000000..d7a4585 Binary files /dev/null and b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$BackgroundQueryHandler.class differ diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ListEditState.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ListEditState.class new file mode 100644 index 0000000..2edab7b Binary files /dev/null and b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ListEditState.class differ diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback$1.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback$1.class new file mode 100644 index 0000000..3981f16 Binary files /dev/null and b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback$1.class differ diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback$2.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback$2.class new file mode 100644 index 0000000..8c00146 Binary files /dev/null and b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback$2.class differ diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback.class new file mode 100644 index 0000000..0815ad6 Binary files /dev/null and b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback.class differ diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$NewNoteOnTouchListener.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$NewNoteOnTouchListener.class new file mode 100644 index 0000000..4bc3a45 Binary files /dev/null and b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$NewNoteOnTouchListener.class differ diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.class new file mode 100644 index 0000000..cf89437 Binary files /dev/null and b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.class differ diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity.class new file mode 100644 index 0000000..9b84613 Binary files /dev/null and b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity.class differ diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListAdapter$AppWidgetAttribute.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListAdapter$AppWidgetAttribute.class new file mode 100644 index 0000000..2bdb58b Binary files /dev/null and b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListAdapter$AppWidgetAttribute.class differ diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListAdapter.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListAdapter.class new file mode 100644 index 0000000..5e432e9 Binary files /dev/null and b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListAdapter.class differ diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListItem.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListItem.class new file mode 100644 index 0000000..4596834 Binary files /dev/null and b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListItem.class differ diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$1.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$1.class new file mode 100644 index 0000000..362fa05 Binary files /dev/null and b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$1.class differ diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$2.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$2.class new file mode 100644 index 0000000..8523228 Binary files /dev/null and b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$2.class differ diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$3.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$3.class new file mode 100644 index 0000000..d91bc85 Binary files /dev/null and b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$3.class differ diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$4.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$4.class new file mode 100644 index 0000000..99c7a64 Binary files /dev/null and b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$4.class differ diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$5.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$5.class new file mode 100644 index 0000000..17e4d3b Binary files /dev/null and b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$5.class differ diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$6.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$6.class new file mode 100644 index 0000000..7b80036 Binary files /dev/null and b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$6.class differ diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$7.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$7.class new file mode 100644 index 0000000..d9abeb9 Binary files /dev/null and b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$7.class differ diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$8.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$8.class new file mode 100644 index 0000000..39e534a Binary files /dev/null and b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$8.class differ diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$GTaskReceiver.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$GTaskReceiver.class new file mode 100644 index 0000000..eb938cf Binary files /dev/null and b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$GTaskReceiver.class differ diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity.class new file mode 100644 index 0000000..0937be2 Binary files /dev/null and b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity.class differ diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider.class new file mode 100644 index 0000000..a00281f Binary files /dev/null and b/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider.class differ diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider_2x.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider_2x.class new file mode 100644 index 0000000..043e410 Binary files /dev/null and b/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider_2x.class differ diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider_4x.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider_4x.class new file mode 100644 index 0000000..ee3fd40 Binary files /dev/null and b/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider_4x.class differ diff --git a/app/build/intermediates/javac/release/classes/net/micode/notes/data/Contact.class b/app/build/intermediates/javac/release/classes/net/micode/notes/data/Contact.class new file mode 100644 index 0000000..a7948fd Binary files /dev/null and b/app/build/intermediates/javac/release/classes/net/micode/notes/data/Contact.class differ diff --git a/app/build/intermediates/javac/release/classes/net/micode/notes/data/Notes$CallNote.class b/app/build/intermediates/javac/release/classes/net/micode/notes/data/Notes$CallNote.class new file mode 100644 index 0000000..42394b7 Binary files /dev/null and b/app/build/intermediates/javac/release/classes/net/micode/notes/data/Notes$CallNote.class differ diff --git a/app/build/intermediates/javac/release/classes/net/micode/notes/data/Notes$DataColumns.class b/app/build/intermediates/javac/release/classes/net/micode/notes/data/Notes$DataColumns.class new file mode 100644 index 0000000..569dbdc Binary files /dev/null and b/app/build/intermediates/javac/release/classes/net/micode/notes/data/Notes$DataColumns.class differ diff --git a/app/build/intermediates/javac/release/classes/net/micode/notes/data/Notes$DataConstants.class b/app/build/intermediates/javac/release/classes/net/micode/notes/data/Notes$DataConstants.class new file mode 100644 index 0000000..76ef96e Binary files /dev/null and b/app/build/intermediates/javac/release/classes/net/micode/notes/data/Notes$DataConstants.class differ diff --git a/app/build/intermediates/javac/release/classes/net/micode/notes/data/Notes$NoteColumns.class b/app/build/intermediates/javac/release/classes/net/micode/notes/data/Notes$NoteColumns.class new file mode 100644 index 0000000..36c8d49 Binary files /dev/null and b/app/build/intermediates/javac/release/classes/net/micode/notes/data/Notes$NoteColumns.class differ diff --git a/app/build/intermediates/javac/release/classes/net/micode/notes/data/Notes$TextNote.class b/app/build/intermediates/javac/release/classes/net/micode/notes/data/Notes$TextNote.class new file mode 100644 index 0000000..42461a2 Binary files /dev/null and b/app/build/intermediates/javac/release/classes/net/micode/notes/data/Notes$TextNote.class differ diff --git a/app/build/intermediates/javac/release/classes/net/micode/notes/data/Notes.class b/app/build/intermediates/javac/release/classes/net/micode/notes/data/Notes.class new file mode 100644 index 0000000..413745e Binary files /dev/null and b/app/build/intermediates/javac/release/classes/net/micode/notes/data/Notes.class differ diff --git a/app/build/intermediates/javac/release/classes/net/micode/notes/data/NotesDatabaseHelper$TABLE.class b/app/build/intermediates/javac/release/classes/net/micode/notes/data/NotesDatabaseHelper$TABLE.class new file mode 100644 index 0000000..64fe9eb Binary files /dev/null and b/app/build/intermediates/javac/release/classes/net/micode/notes/data/NotesDatabaseHelper$TABLE.class differ diff --git a/app/build/intermediates/javac/release/classes/net/micode/notes/data/NotesDatabaseHelper.class b/app/build/intermediates/javac/release/classes/net/micode/notes/data/NotesDatabaseHelper.class new file mode 100644 index 0000000..0b075b4 Binary files /dev/null and b/app/build/intermediates/javac/release/classes/net/micode/notes/data/NotesDatabaseHelper.class differ diff --git a/app/build/intermediates/javac/release/classes/net/micode/notes/data/NotesProvider.class b/app/build/intermediates/javac/release/classes/net/micode/notes/data/NotesProvider.class new file mode 100644 index 0000000..1d3de0e Binary files /dev/null and b/app/build/intermediates/javac/release/classes/net/micode/notes/data/NotesProvider.class differ diff --git a/app/build/intermediates/javac/release/classes/net/micode/notes/gtask/data/MetaData.class b/app/build/intermediates/javac/release/classes/net/micode/notes/gtask/data/MetaData.class new file mode 100644 index 0000000..20ff3f7 Binary files /dev/null and b/app/build/intermediates/javac/release/classes/net/micode/notes/gtask/data/MetaData.class differ diff --git a/app/build/intermediates/javac/release/classes/net/micode/notes/gtask/data/Node.class b/app/build/intermediates/javac/release/classes/net/micode/notes/gtask/data/Node.class new file mode 100644 index 0000000..5236c5e Binary files /dev/null and b/app/build/intermediates/javac/release/classes/net/micode/notes/gtask/data/Node.class differ diff --git a/app/build/intermediates/javac/release/classes/net/micode/notes/gtask/data/SqlData.class b/app/build/intermediates/javac/release/classes/net/micode/notes/gtask/data/SqlData.class new file mode 100644 index 0000000..099f3ba Binary files /dev/null and b/app/build/intermediates/javac/release/classes/net/micode/notes/gtask/data/SqlData.class differ diff --git a/app/build/intermediates/javac/release/classes/net/micode/notes/gtask/data/SqlNote.class b/app/build/intermediates/javac/release/classes/net/micode/notes/gtask/data/SqlNote.class new file mode 100644 index 0000000..2783ae3 Binary files /dev/null and b/app/build/intermediates/javac/release/classes/net/micode/notes/gtask/data/SqlNote.class differ diff --git a/app/build/intermediates/javac/release/classes/net/micode/notes/gtask/data/Task.class b/app/build/intermediates/javac/release/classes/net/micode/notes/gtask/data/Task.class new file mode 100644 index 0000000..5aaf1d4 Binary files /dev/null and b/app/build/intermediates/javac/release/classes/net/micode/notes/gtask/data/Task.class differ diff --git a/app/build/intermediates/javac/release/classes/net/micode/notes/gtask/data/TaskList.class b/app/build/intermediates/javac/release/classes/net/micode/notes/gtask/data/TaskList.class new file mode 100644 index 0000000..359609e Binary files /dev/null and b/app/build/intermediates/javac/release/classes/net/micode/notes/gtask/data/TaskList.class differ diff --git a/app/build/intermediates/javac/release/classes/net/micode/notes/gtask/exception/ActionFailureException.class b/app/build/intermediates/javac/release/classes/net/micode/notes/gtask/exception/ActionFailureException.class new file mode 100644 index 0000000..1a059ce Binary files /dev/null and b/app/build/intermediates/javac/release/classes/net/micode/notes/gtask/exception/ActionFailureException.class differ diff --git a/app/build/intermediates/javac/release/classes/net/micode/notes/gtask/exception/NetworkFailureException.class b/app/build/intermediates/javac/release/classes/net/micode/notes/gtask/exception/NetworkFailureException.class new file mode 100644 index 0000000..75665c2 Binary files /dev/null and b/app/build/intermediates/javac/release/classes/net/micode/notes/gtask/exception/NetworkFailureException.class differ diff --git a/app/build/intermediates/javac/release/classes/net/micode/notes/gtask/remote/GTaskASyncTask$1.class b/app/build/intermediates/javac/release/classes/net/micode/notes/gtask/remote/GTaskASyncTask$1.class new file mode 100644 index 0000000..b5d3ce6 Binary files /dev/null and b/app/build/intermediates/javac/release/classes/net/micode/notes/gtask/remote/GTaskASyncTask$1.class differ diff --git a/app/build/intermediates/javac/release/classes/net/micode/notes/gtask/remote/GTaskASyncTask$OnCompleteListener.class b/app/build/intermediates/javac/release/classes/net/micode/notes/gtask/remote/GTaskASyncTask$OnCompleteListener.class new file mode 100644 index 0000000..f73069c Binary files /dev/null and b/app/build/intermediates/javac/release/classes/net/micode/notes/gtask/remote/GTaskASyncTask$OnCompleteListener.class differ diff --git a/app/build/intermediates/javac/release/classes/net/micode/notes/gtask/remote/GTaskASyncTask.class b/app/build/intermediates/javac/release/classes/net/micode/notes/gtask/remote/GTaskASyncTask.class new file mode 100644 index 0000000..2836b27 Binary files /dev/null and b/app/build/intermediates/javac/release/classes/net/micode/notes/gtask/remote/GTaskASyncTask.class differ diff --git a/app/build/intermediates/javac/release/classes/net/micode/notes/gtask/remote/GTaskClient.class b/app/build/intermediates/javac/release/classes/net/micode/notes/gtask/remote/GTaskClient.class new file mode 100644 index 0000000..afe7a57 Binary files /dev/null and b/app/build/intermediates/javac/release/classes/net/micode/notes/gtask/remote/GTaskClient.class differ diff --git a/app/build/intermediates/javac/release/classes/net/micode/notes/gtask/remote/GTaskManager.class b/app/build/intermediates/javac/release/classes/net/micode/notes/gtask/remote/GTaskManager.class new file mode 100644 index 0000000..ac1834c Binary files /dev/null and b/app/build/intermediates/javac/release/classes/net/micode/notes/gtask/remote/GTaskManager.class differ diff --git a/app/build/intermediates/javac/release/classes/net/micode/notes/gtask/remote/GTaskSyncService$1.class b/app/build/intermediates/javac/release/classes/net/micode/notes/gtask/remote/GTaskSyncService$1.class new file mode 100644 index 0000000..d28a29a Binary files /dev/null and b/app/build/intermediates/javac/release/classes/net/micode/notes/gtask/remote/GTaskSyncService$1.class differ diff --git a/app/build/intermediates/javac/release/classes/net/micode/notes/gtask/remote/GTaskSyncService.class b/app/build/intermediates/javac/release/classes/net/micode/notes/gtask/remote/GTaskSyncService.class new file mode 100644 index 0000000..18da491 Binary files /dev/null and b/app/build/intermediates/javac/release/classes/net/micode/notes/gtask/remote/GTaskSyncService.class differ diff --git a/app/build/intermediates/javac/release/classes/net/micode/notes/model/Note$NoteData.class b/app/build/intermediates/javac/release/classes/net/micode/notes/model/Note$NoteData.class new file mode 100644 index 0000000..6519148 Binary files /dev/null and b/app/build/intermediates/javac/release/classes/net/micode/notes/model/Note$NoteData.class differ diff --git a/app/build/intermediates/javac/release/classes/net/micode/notes/model/Note.class b/app/build/intermediates/javac/release/classes/net/micode/notes/model/Note.class new file mode 100644 index 0000000..d2041cc Binary files /dev/null and b/app/build/intermediates/javac/release/classes/net/micode/notes/model/Note.class differ diff --git a/app/build/intermediates/javac/release/classes/net/micode/notes/model/WorkingNote$NoteSettingChangedListener.class b/app/build/intermediates/javac/release/classes/net/micode/notes/model/WorkingNote$NoteSettingChangedListener.class new file mode 100644 index 0000000..15f1f77 Binary files /dev/null and b/app/build/intermediates/javac/release/classes/net/micode/notes/model/WorkingNote$NoteSettingChangedListener.class differ diff --git a/app/build/intermediates/javac/release/classes/net/micode/notes/model/WorkingNote.class b/app/build/intermediates/javac/release/classes/net/micode/notes/model/WorkingNote.class new file mode 100644 index 0000000..df71afc Binary files /dev/null and b/app/build/intermediates/javac/release/classes/net/micode/notes/model/WorkingNote.class differ diff --git a/app/build/intermediates/javac/release/classes/net/micode/notes/tool/BackupUtils$TextExport.class b/app/build/intermediates/javac/release/classes/net/micode/notes/tool/BackupUtils$TextExport.class new file mode 100644 index 0000000..63e7f9c Binary files /dev/null and b/app/build/intermediates/javac/release/classes/net/micode/notes/tool/BackupUtils$TextExport.class differ diff --git a/app/build/intermediates/javac/release/classes/net/micode/notes/tool/BackupUtils.class b/app/build/intermediates/javac/release/classes/net/micode/notes/tool/BackupUtils.class new file mode 100644 index 0000000..6a86737 Binary files /dev/null and b/app/build/intermediates/javac/release/classes/net/micode/notes/tool/BackupUtils.class differ diff --git a/app/build/intermediates/javac/release/classes/net/micode/notes/tool/DataUtils.class b/app/build/intermediates/javac/release/classes/net/micode/notes/tool/DataUtils.class new file mode 100644 index 0000000..6af3200 Binary files /dev/null and b/app/build/intermediates/javac/release/classes/net/micode/notes/tool/DataUtils.class differ diff --git a/app/build/intermediates/javac/release/classes/net/micode/notes/tool/GTaskStringUtils.class b/app/build/intermediates/javac/release/classes/net/micode/notes/tool/GTaskStringUtils.class new file mode 100644 index 0000000..d320e3e Binary files /dev/null and b/app/build/intermediates/javac/release/classes/net/micode/notes/tool/GTaskStringUtils.class differ diff --git a/app/build/intermediates/javac/release/classes/net/micode/notes/tool/ResourceParser$NoteBgResources.class b/app/build/intermediates/javac/release/classes/net/micode/notes/tool/ResourceParser$NoteBgResources.class new file mode 100644 index 0000000..84e57a4 Binary files /dev/null and b/app/build/intermediates/javac/release/classes/net/micode/notes/tool/ResourceParser$NoteBgResources.class differ diff --git a/app/build/intermediates/javac/release/classes/net/micode/notes/tool/ResourceParser$NoteItemBgResources.class b/app/build/intermediates/javac/release/classes/net/micode/notes/tool/ResourceParser$NoteItemBgResources.class new file mode 100644 index 0000000..8805a06 Binary files /dev/null and b/app/build/intermediates/javac/release/classes/net/micode/notes/tool/ResourceParser$NoteItemBgResources.class differ diff --git a/app/build/intermediates/javac/release/classes/net/micode/notes/tool/ResourceParser$TextAppearanceResources.class b/app/build/intermediates/javac/release/classes/net/micode/notes/tool/ResourceParser$TextAppearanceResources.class new file mode 100644 index 0000000..7f2eb75 Binary files /dev/null and b/app/build/intermediates/javac/release/classes/net/micode/notes/tool/ResourceParser$TextAppearanceResources.class differ diff --git a/app/build/intermediates/javac/release/classes/net/micode/notes/tool/ResourceParser$WidgetBgResources.class b/app/build/intermediates/javac/release/classes/net/micode/notes/tool/ResourceParser$WidgetBgResources.class new file mode 100644 index 0000000..b4ec3ba Binary files /dev/null and b/app/build/intermediates/javac/release/classes/net/micode/notes/tool/ResourceParser$WidgetBgResources.class differ diff --git a/app/build/intermediates/javac/release/classes/net/micode/notes/tool/ResourceParser.class b/app/build/intermediates/javac/release/classes/net/micode/notes/tool/ResourceParser.class new file mode 100644 index 0000000..f2e1b62 Binary files /dev/null and b/app/build/intermediates/javac/release/classes/net/micode/notes/tool/ResourceParser.class differ diff --git a/app/build/intermediates/javac/release/classes/net/micode/notes/ui/AlarmAlertActivity.class b/app/build/intermediates/javac/release/classes/net/micode/notes/ui/AlarmAlertActivity.class new file mode 100644 index 0000000..98353eb Binary files /dev/null and b/app/build/intermediates/javac/release/classes/net/micode/notes/ui/AlarmAlertActivity.class differ diff --git a/app/build/intermediates/javac/release/classes/net/micode/notes/ui/AlarmInitReceiver.class b/app/build/intermediates/javac/release/classes/net/micode/notes/ui/AlarmInitReceiver.class new file mode 100644 index 0000000..a1d202d Binary files /dev/null and b/app/build/intermediates/javac/release/classes/net/micode/notes/ui/AlarmInitReceiver.class differ diff --git a/app/build/intermediates/javac/release/classes/net/micode/notes/ui/AlarmReceiver.class b/app/build/intermediates/javac/release/classes/net/micode/notes/ui/AlarmReceiver.class new file mode 100644 index 0000000..a41b775 Binary files /dev/null and b/app/build/intermediates/javac/release/classes/net/micode/notes/ui/AlarmReceiver.class differ diff --git a/app/build/intermediates/javac/release/classes/net/micode/notes/ui/DateTimePicker$1.class b/app/build/intermediates/javac/release/classes/net/micode/notes/ui/DateTimePicker$1.class new file mode 100644 index 0000000..ec0a9b8 Binary files /dev/null and b/app/build/intermediates/javac/release/classes/net/micode/notes/ui/DateTimePicker$1.class differ diff --git a/app/build/intermediates/javac/release/classes/net/micode/notes/ui/DateTimePicker$2.class b/app/build/intermediates/javac/release/classes/net/micode/notes/ui/DateTimePicker$2.class new file mode 100644 index 0000000..85dd995 Binary files /dev/null and b/app/build/intermediates/javac/release/classes/net/micode/notes/ui/DateTimePicker$2.class differ diff --git a/app/build/intermediates/javac/release/classes/net/micode/notes/ui/DateTimePicker$3.class b/app/build/intermediates/javac/release/classes/net/micode/notes/ui/DateTimePicker$3.class new file mode 100644 index 0000000..35a5001 Binary files /dev/null and b/app/build/intermediates/javac/release/classes/net/micode/notes/ui/DateTimePicker$3.class differ diff --git a/app/build/intermediates/javac/release/classes/net/micode/notes/ui/DateTimePicker$4.class b/app/build/intermediates/javac/release/classes/net/micode/notes/ui/DateTimePicker$4.class new file mode 100644 index 0000000..0c14881 Binary files /dev/null and b/app/build/intermediates/javac/release/classes/net/micode/notes/ui/DateTimePicker$4.class differ diff --git a/app/build/intermediates/javac/release/classes/net/micode/notes/ui/DateTimePicker$OnDateTimeChangedListener.class b/app/build/intermediates/javac/release/classes/net/micode/notes/ui/DateTimePicker$OnDateTimeChangedListener.class new file mode 100644 index 0000000..255a4e6 Binary files /dev/null and b/app/build/intermediates/javac/release/classes/net/micode/notes/ui/DateTimePicker$OnDateTimeChangedListener.class differ diff --git a/app/build/intermediates/javac/release/classes/net/micode/notes/ui/DateTimePicker.class b/app/build/intermediates/javac/release/classes/net/micode/notes/ui/DateTimePicker.class new file mode 100644 index 0000000..400d289 Binary files /dev/null and b/app/build/intermediates/javac/release/classes/net/micode/notes/ui/DateTimePicker.class differ diff --git a/app/build/intermediates/javac/release/classes/net/micode/notes/ui/DateTimePickerDialog$1.class b/app/build/intermediates/javac/release/classes/net/micode/notes/ui/DateTimePickerDialog$1.class new file mode 100644 index 0000000..f8e39a8 Binary files /dev/null and b/app/build/intermediates/javac/release/classes/net/micode/notes/ui/DateTimePickerDialog$1.class differ diff --git a/app/build/intermediates/javac/release/classes/net/micode/notes/ui/DateTimePickerDialog$OnDateTimeSetListener.class b/app/build/intermediates/javac/release/classes/net/micode/notes/ui/DateTimePickerDialog$OnDateTimeSetListener.class new file mode 100644 index 0000000..70481dd Binary files /dev/null and b/app/build/intermediates/javac/release/classes/net/micode/notes/ui/DateTimePickerDialog$OnDateTimeSetListener.class differ diff --git a/app/build/intermediates/javac/release/classes/net/micode/notes/ui/DateTimePickerDialog.class b/app/build/intermediates/javac/release/classes/net/micode/notes/ui/DateTimePickerDialog.class new file mode 100644 index 0000000..71e5215 Binary files /dev/null and b/app/build/intermediates/javac/release/classes/net/micode/notes/ui/DateTimePickerDialog.class differ diff --git a/app/build/intermediates/javac/release/classes/net/micode/notes/ui/DropdownMenu$1.class b/app/build/intermediates/javac/release/classes/net/micode/notes/ui/DropdownMenu$1.class new file mode 100644 index 0000000..f0814a0 Binary files /dev/null and b/app/build/intermediates/javac/release/classes/net/micode/notes/ui/DropdownMenu$1.class differ diff --git a/app/build/intermediates/javac/release/classes/net/micode/notes/ui/DropdownMenu.class b/app/build/intermediates/javac/release/classes/net/micode/notes/ui/DropdownMenu.class new file mode 100644 index 0000000..54e7df6 Binary files /dev/null and b/app/build/intermediates/javac/release/classes/net/micode/notes/ui/DropdownMenu.class differ diff --git a/app/build/intermediates/javac/release/classes/net/micode/notes/ui/FoldersListAdapter$FolderListItem.class b/app/build/intermediates/javac/release/classes/net/micode/notes/ui/FoldersListAdapter$FolderListItem.class new file mode 100644 index 0000000..0bb50d6 Binary files /dev/null and b/app/build/intermediates/javac/release/classes/net/micode/notes/ui/FoldersListAdapter$FolderListItem.class differ diff --git a/app/build/intermediates/javac/release/classes/net/micode/notes/ui/FoldersListAdapter.class b/app/build/intermediates/javac/release/classes/net/micode/notes/ui/FoldersListAdapter.class new file mode 100644 index 0000000..023f716 Binary files /dev/null and b/app/build/intermediates/javac/release/classes/net/micode/notes/ui/FoldersListAdapter.class differ diff --git a/app/build/intermediates/javac/release/classes/net/micode/notes/ui/NoteEditText$1.class b/app/build/intermediates/javac/release/classes/net/micode/notes/ui/NoteEditText$1.class new file mode 100644 index 0000000..f72784e Binary files /dev/null and b/app/build/intermediates/javac/release/classes/net/micode/notes/ui/NoteEditText$1.class differ diff --git a/app/build/intermediates/javac/release/classes/net/micode/notes/ui/NoteEditText$OnTextViewChangeListener.class b/app/build/intermediates/javac/release/classes/net/micode/notes/ui/NoteEditText$OnTextViewChangeListener.class new file mode 100644 index 0000000..9874f47 Binary files /dev/null and b/app/build/intermediates/javac/release/classes/net/micode/notes/ui/NoteEditText$OnTextViewChangeListener.class differ diff --git a/app/build/intermediates/javac/release/classes/net/micode/notes/ui/NoteEditText.class b/app/build/intermediates/javac/release/classes/net/micode/notes/ui/NoteEditText.class new file mode 100644 index 0000000..71ee7fe Binary files /dev/null and b/app/build/intermediates/javac/release/classes/net/micode/notes/ui/NoteEditText.class differ diff --git a/app/build/intermediates/javac/release/classes/net/micode/notes/ui/NotesListAdapter$AppWidgetAttribute.class b/app/build/intermediates/javac/release/classes/net/micode/notes/ui/NotesListAdapter$AppWidgetAttribute.class new file mode 100644 index 0000000..2bdb58b Binary files /dev/null and b/app/build/intermediates/javac/release/classes/net/micode/notes/ui/NotesListAdapter$AppWidgetAttribute.class differ diff --git a/app/build/intermediates/javac/release/classes/net/micode/notes/ui/NotesListAdapter.class b/app/build/intermediates/javac/release/classes/net/micode/notes/ui/NotesListAdapter.class new file mode 100644 index 0000000..5e432e9 Binary files /dev/null and b/app/build/intermediates/javac/release/classes/net/micode/notes/ui/NotesListAdapter.class differ diff --git a/app/build/intermediates/local_only_symbol_list/debug/R-def.txt b/app/build/intermediates/local_only_symbol_list/debug/R-def.txt new file mode 100644 index 0000000..5bec0cd --- /dev/null +++ b/app/build/intermediates/local_only_symbol_list/debug/R-def.txt @@ -0,0 +1,285 @@ +R_DEF: Internal format may change without notice +local +array format_for_exported_note +array menu_share_ways +color primary_text_dark +color secondary_text_dark +color user_query_highlight +dimen text_font_size_large +dimen text_font_size_medium +dimen text_font_size_normal +dimen text_font_size_small +dimen text_font_size_super +drawable bg_btn_set_color +drawable bg_color_btn_mask +drawable call_record +drawable clock +drawable delete +drawable dropdown_icon +drawable edit_blue +drawable edit_green +drawable edit_red +drawable edit_title_blue +drawable edit_title_green +drawable edit_title_red +drawable edit_title_white +drawable edit_title_yellow +drawable edit_white +drawable edit_yellow +drawable font_large +drawable font_normal +drawable font_size_selector_bg +drawable font_small +drawable font_super +drawable icon_app +drawable list_background +drawable list_blue_down +drawable list_blue_middle +drawable list_blue_single +drawable list_blue_up +drawable list_folder +drawable list_footer_bg +drawable list_green_down +drawable list_green_middle +drawable list_green_single +drawable list_green_up +drawable list_red_down +drawable list_red_middle +drawable list_red_single +drawable list_red_up +drawable list_white_down +drawable list_white_middle +drawable list_white_single +drawable list_white_up +drawable list_yellow_down +drawable list_yellow_middle +drawable list_yellow_single +drawable list_yellow_up +drawable menu_delete +drawable menu_move +drawable new_note +drawable new_note_normal +drawable new_note_pressed +drawable note_edit_color_selector_panel +drawable notification +drawable search_result +drawable selected +drawable title_alert +drawable title_bar_bg +drawable widget_2x_blue +drawable widget_2x_green +drawable widget_2x_red +drawable widget_2x_white +drawable widget_2x_yellow +drawable widget_4x_blue +drawable widget_4x_green +drawable widget_4x_red +drawable widget_4x_white +drawable widget_4x_yellow +id account_dialog_subtitle +id account_dialog_title +id action_select_all +id amPm +id btn_new_note +id btn_set_bg_color +id cb_edit_item +id date +id delete +id et_edit_text +id et_foler_name +id font_size_selector +id hour +id iv_alert_icon +id iv_bg_blue +id iv_bg_blue_select +id iv_bg_green +id iv_bg_green_select +id iv_bg_red +id iv_bg_red_select +id iv_bg_white +id iv_bg_white_select +id iv_bg_yellow +id iv_bg_yellow_select +id iv_large_select +id iv_medium_select +id iv_small_select +id iv_super_select +id ll_font_large +id ll_font_normal +id ll_font_small +id ll_font_super +id menu_alert +id menu_delete +id menu_delete_remind +id menu_export_text +id menu_font_size +id menu_list_mode +id menu_new_folder +id menu_new_note +id menu_search +id menu_send_to_desktop +id menu_setting +id menu_share +id menu_sync +id minute +id move +id navigation_bar +id note_bg_color_selector +id note_edit_list +id note_edit_view +id note_item +id note_title +id notes_list +id prefenerece_sync_status_textview +id preference_sync_button +id selection_menu +id sv_note_edit +id tv_alert_date +id tv_folder_name +id tv_modified_date +id tv_name +id tv_time +id tv_title +id tv_title_bar +id widget_bg_image +id widget_text +layout account_dialog_title +layout add_account_text +layout datetime_picker +layout dialog_edit_text +layout folder_list_item +layout note_edit +layout note_edit_list_item +layout note_item +layout note_list +layout note_list_dropdown_menu +layout note_list_footer +layout settings_header +layout widget_2x +layout widget_4x +menu call_note_edit +menu call_record_folder +menu note_edit +menu note_list +menu note_list_dropdown +menu note_list_options +menu sub_folder +plurals search_results_title +raw introduction +string alert_message_delete_folder +string alert_message_delete_note +string alert_message_delete_notes +string alert_title_delete +string app_name +string app_widget2x2 +string app_widget4x4 +string button_delete +string call_record_folder_name +string datetime_dialog_cancel +string datetime_dialog_ok +string delete_remind_time_message +string error_note_empty_for_clock +string error_note_empty_for_send_to_desktop +string error_note_not_exist +string error_sdcard_export +string error_sdcard_unmounted +string error_sync_cancelled +string error_sync_internal +string error_sync_network +string failed_sdcard_export +string file_name_txt_format +string file_path +string folder_exist +string format_date_ymd +string format_datetime_mdhm +string format_exported_file_location +string format_folder_files_count +string format_move_notes_to_folder +string hint_foler_name +string info_note_enter_desktop +string menu_alert +string menu_create_folder +string menu_delete +string menu_deselect_all +string menu_export_text +string menu_folder_change_name +string menu_folder_delete +string menu_folder_view +string menu_font_large +string menu_font_normal +string menu_font_size +string menu_font_small +string menu_font_super +string menu_list_mode +string menu_move +string menu_move_parent_folder +string menu_normal_mode +string menu_remove_remind +string menu_search +string menu_select_all +string menu_select_none +string menu_select_title +string menu_send_to_desktop +string menu_setting +string menu_share +string menu_sync +string menu_sync_cancel +string menu_title_select_folder +string note_alert_expired +string note_link_email +string note_link_other +string note_link_tel +string note_link_web +string notealert_enter +string notealert_ok +string notelist_menu_new +string notelist_string_info +string preferences_account_summary +string preferences_account_title +string preferences_add_account +string preferences_bg_random_appear_title +string preferences_button_sync_cancel +string preferences_button_sync_immediately +string preferences_dialog_change_account_title +string preferences_dialog_change_account_warn_msg +string preferences_dialog_select_account_tips +string preferences_dialog_select_account_title +string preferences_last_sync_time +string preferences_last_sync_time_format +string preferences_menu_cancel +string preferences_menu_change_account +string preferences_menu_remove_account +string preferences_title +string preferences_toast_cannot_change_account +string preferences_toast_success_set_accout +string search +string search_hint +string search_label +string search_setting_description +string set_remind_time_message +string success_sdcard_export +string success_sync_account +string sync_progress_init_list +string sync_progress_login +string sync_progress_syncing +string ticker_cancel +string ticker_fail +string ticker_success +string ticker_syncing +string widget_havenot_content +string widget_under_visit_mode +style HighlightTextAppearancePrimary +style HighlightTextAppearanceSecondary +style NoteActionBarStyle +style NoteTheme +style TextAppearanceLarge +style TextAppearanceMedium +style TextAppearanceNormal +style TextAppearancePrimaryItem +style TextAppearanceSecondaryItem +style TextAppearanceSuper +style TextAppearanceUnderMenuIcon +xml preferences +xml searchable +xml widget_2x_info +xml widget_4x_info diff --git a/app/build/intermediates/local_only_symbol_list/release/R-def.txt b/app/build/intermediates/local_only_symbol_list/release/R-def.txt new file mode 100644 index 0000000..5bec0cd --- /dev/null +++ b/app/build/intermediates/local_only_symbol_list/release/R-def.txt @@ -0,0 +1,285 @@ +R_DEF: Internal format may change without notice +local +array format_for_exported_note +array menu_share_ways +color primary_text_dark +color secondary_text_dark +color user_query_highlight +dimen text_font_size_large +dimen text_font_size_medium +dimen text_font_size_normal +dimen text_font_size_small +dimen text_font_size_super +drawable bg_btn_set_color +drawable bg_color_btn_mask +drawable call_record +drawable clock +drawable delete +drawable dropdown_icon +drawable edit_blue +drawable edit_green +drawable edit_red +drawable edit_title_blue +drawable edit_title_green +drawable edit_title_red +drawable edit_title_white +drawable edit_title_yellow +drawable edit_white +drawable edit_yellow +drawable font_large +drawable font_normal +drawable font_size_selector_bg +drawable font_small +drawable font_super +drawable icon_app +drawable list_background +drawable list_blue_down +drawable list_blue_middle +drawable list_blue_single +drawable list_blue_up +drawable list_folder +drawable list_footer_bg +drawable list_green_down +drawable list_green_middle +drawable list_green_single +drawable list_green_up +drawable list_red_down +drawable list_red_middle +drawable list_red_single +drawable list_red_up +drawable list_white_down +drawable list_white_middle +drawable list_white_single +drawable list_white_up +drawable list_yellow_down +drawable list_yellow_middle +drawable list_yellow_single +drawable list_yellow_up +drawable menu_delete +drawable menu_move +drawable new_note +drawable new_note_normal +drawable new_note_pressed +drawable note_edit_color_selector_panel +drawable notification +drawable search_result +drawable selected +drawable title_alert +drawable title_bar_bg +drawable widget_2x_blue +drawable widget_2x_green +drawable widget_2x_red +drawable widget_2x_white +drawable widget_2x_yellow +drawable widget_4x_blue +drawable widget_4x_green +drawable widget_4x_red +drawable widget_4x_white +drawable widget_4x_yellow +id account_dialog_subtitle +id account_dialog_title +id action_select_all +id amPm +id btn_new_note +id btn_set_bg_color +id cb_edit_item +id date +id delete +id et_edit_text +id et_foler_name +id font_size_selector +id hour +id iv_alert_icon +id iv_bg_blue +id iv_bg_blue_select +id iv_bg_green +id iv_bg_green_select +id iv_bg_red +id iv_bg_red_select +id iv_bg_white +id iv_bg_white_select +id iv_bg_yellow +id iv_bg_yellow_select +id iv_large_select +id iv_medium_select +id iv_small_select +id iv_super_select +id ll_font_large +id ll_font_normal +id ll_font_small +id ll_font_super +id menu_alert +id menu_delete +id menu_delete_remind +id menu_export_text +id menu_font_size +id menu_list_mode +id menu_new_folder +id menu_new_note +id menu_search +id menu_send_to_desktop +id menu_setting +id menu_share +id menu_sync +id minute +id move +id navigation_bar +id note_bg_color_selector +id note_edit_list +id note_edit_view +id note_item +id note_title +id notes_list +id prefenerece_sync_status_textview +id preference_sync_button +id selection_menu +id sv_note_edit +id tv_alert_date +id tv_folder_name +id tv_modified_date +id tv_name +id tv_time +id tv_title +id tv_title_bar +id widget_bg_image +id widget_text +layout account_dialog_title +layout add_account_text +layout datetime_picker +layout dialog_edit_text +layout folder_list_item +layout note_edit +layout note_edit_list_item +layout note_item +layout note_list +layout note_list_dropdown_menu +layout note_list_footer +layout settings_header +layout widget_2x +layout widget_4x +menu call_note_edit +menu call_record_folder +menu note_edit +menu note_list +menu note_list_dropdown +menu note_list_options +menu sub_folder +plurals search_results_title +raw introduction +string alert_message_delete_folder +string alert_message_delete_note +string alert_message_delete_notes +string alert_title_delete +string app_name +string app_widget2x2 +string app_widget4x4 +string button_delete +string call_record_folder_name +string datetime_dialog_cancel +string datetime_dialog_ok +string delete_remind_time_message +string error_note_empty_for_clock +string error_note_empty_for_send_to_desktop +string error_note_not_exist +string error_sdcard_export +string error_sdcard_unmounted +string error_sync_cancelled +string error_sync_internal +string error_sync_network +string failed_sdcard_export +string file_name_txt_format +string file_path +string folder_exist +string format_date_ymd +string format_datetime_mdhm +string format_exported_file_location +string format_folder_files_count +string format_move_notes_to_folder +string hint_foler_name +string info_note_enter_desktop +string menu_alert +string menu_create_folder +string menu_delete +string menu_deselect_all +string menu_export_text +string menu_folder_change_name +string menu_folder_delete +string menu_folder_view +string menu_font_large +string menu_font_normal +string menu_font_size +string menu_font_small +string menu_font_super +string menu_list_mode +string menu_move +string menu_move_parent_folder +string menu_normal_mode +string menu_remove_remind +string menu_search +string menu_select_all +string menu_select_none +string menu_select_title +string menu_send_to_desktop +string menu_setting +string menu_share +string menu_sync +string menu_sync_cancel +string menu_title_select_folder +string note_alert_expired +string note_link_email +string note_link_other +string note_link_tel +string note_link_web +string notealert_enter +string notealert_ok +string notelist_menu_new +string notelist_string_info +string preferences_account_summary +string preferences_account_title +string preferences_add_account +string preferences_bg_random_appear_title +string preferences_button_sync_cancel +string preferences_button_sync_immediately +string preferences_dialog_change_account_title +string preferences_dialog_change_account_warn_msg +string preferences_dialog_select_account_tips +string preferences_dialog_select_account_title +string preferences_last_sync_time +string preferences_last_sync_time_format +string preferences_menu_cancel +string preferences_menu_change_account +string preferences_menu_remove_account +string preferences_title +string preferences_toast_cannot_change_account +string preferences_toast_success_set_accout +string search +string search_hint +string search_label +string search_setting_description +string set_remind_time_message +string success_sdcard_export +string success_sync_account +string sync_progress_init_list +string sync_progress_login +string sync_progress_syncing +string ticker_cancel +string ticker_fail +string ticker_success +string ticker_syncing +string widget_havenot_content +string widget_under_visit_mode +style HighlightTextAppearancePrimary +style HighlightTextAppearanceSecondary +style NoteActionBarStyle +style NoteTheme +style TextAppearanceLarge +style TextAppearanceMedium +style TextAppearanceNormal +style TextAppearancePrimaryItem +style TextAppearanceSecondaryItem +style TextAppearanceSuper +style TextAppearanceUnderMenuIcon +xml preferences +xml searchable +xml widget_2x_info +xml widget_4x_info diff --git a/app/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt b/app/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt new file mode 100644 index 0000000..73f33c2 --- /dev/null +++ b/app/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt @@ -0,0 +1,273 @@ +1 +2 +17 +21 +22 F:\work\Notes-master\app\src\main\AndroidManifest.xml:23:5-44 +23 android:minSdkVersion="14" +23-->F:\work\Notes-master\app\src\main\AndroidManifest.xml:23:15-41 +24 android:targetSdkVersion="14" /> +25 +26 +26-->F:\work\Notes-master\app\src\main\AndroidManifest.xml:25:5-81 +26-->F:\work\Notes-master\app\src\main\AndroidManifest.xml:25:22-78 +27 +27-->F:\work\Notes-master\app\src\main\AndroidManifest.xml:26:5-88 +27-->F:\work\Notes-master\app\src\main\AndroidManifest.xml:26:22-85 +28 +28-->F:\work\Notes-master\app\src\main\AndroidManifest.xml:27:5-67 +28-->F:\work\Notes-master\app\src\main\AndroidManifest.xml:27:22-64 +29 +29-->F:\work\Notes-master\app\src\main\AndroidManifest.xml:28:5-72 +29-->F:\work\Notes-master\app\src\main\AndroidManifest.xml:28:22-69 +30 +30-->F:\work\Notes-master\app\src\main\AndroidManifest.xml:29:5-74 +30-->F:\work\Notes-master\app\src\main\AndroidManifest.xml:29:22-71 +31 +31-->F:\work\Notes-master\app\src\main\AndroidManifest.xml:30:5-80 +31-->F:\work\Notes-master\app\src\main\AndroidManifest.xml:30:22-77 +32 +32-->F:\work\Notes-master\app\src\main\AndroidManifest.xml:31:5-71 +32-->F:\work\Notes-master\app\src\main\AndroidManifest.xml:31:22-68 +33 +33-->F:\work\Notes-master\app\src\main\AndroidManifest.xml:32:5-74 +33-->F:\work\Notes-master\app\src\main\AndroidManifest.xml:32:22-71 +34 +34-->F:\work\Notes-master\app\src\main\AndroidManifest.xml:33:5-81 +34-->F:\work\Notes-master\app\src\main\AndroidManifest.xml:33:22-78 +35 +36 F:\work\Notes-master\app\src\main\AndroidManifest.xml:35:5-149:19 +37 android:debuggable="true" +38 android:extractNativeLibs="true" +39 android:icon="@drawable/icon_app" +39-->F:\work\Notes-master\app\src\main\AndroidManifest.xml:36:9-42 +40 android:label="@string/app_name" +40-->F:\work\Notes-master\app\src\main\AndroidManifest.xml:37:9-41 +41 android:testOnly="true" > +42 F:\work\Notes-master\app\src\main\AndroidManifest.xml:38:9-51:20 +43 android:name="net.micode.notes.ui.NotesListActivity" +43-->F:\work\Notes-master\app\src\main\AndroidManifest.xml:39:13-49 +44 android:configChanges="keyboardHidden|orientation|screenSize" +44-->F:\work\Notes-master\app\src\main\AndroidManifest.xml:40:13-74 +45 android:label="@string/app_name" +45-->F:\work\Notes-master\app\src\main\AndroidManifest.xml:41:13-45 +46 android:launchMode="singleTop" +46-->F:\work\Notes-master\app\src\main\AndroidManifest.xml:42:13-43 +47 android:theme="@style/NoteTheme" +47-->F:\work\Notes-master\app\src\main\AndroidManifest.xml:43:13-45 +48 android:uiOptions="splitActionBarWhenNarrow" +48-->F:\work\Notes-master\app\src\main\AndroidManifest.xml:44:13-57 +49 android:windowSoftInputMode="adjustPan" > +49-->F:\work\Notes-master\app\src\main\AndroidManifest.xml:45:13-52 +50 +50-->F:\work\Notes-master\app\src\main\AndroidManifest.xml:47:13-50:29 +51 +51-->F:\work\Notes-master\app\src\main\AndroidManifest.xml:48:17-69 +51-->F:\work\Notes-master\app\src\main\AndroidManifest.xml:48:25-66 +52 +53 +53-->F:\work\Notes-master\app\src\main\AndroidManifest.xml:49:17-77 +53-->F:\work\Notes-master\app\src\main\AndroidManifest.xml:49:27-74 +54 +55 +56 F:\work\Notes-master\app\src\main\AndroidManifest.xml:53:9-81:20 +57 android:name="net.micode.notes.ui.NoteEditActivity" +57-->F:\work\Notes-master\app\src\main\AndroidManifest.xml:54:13-48 +58 android:configChanges="keyboardHidden|orientation|screenSize" +58-->F:\work\Notes-master\app\src\main\AndroidManifest.xml:55:13-74 +59 android:launchMode="singleTop" +59-->F:\work\Notes-master\app\src\main\AndroidManifest.xml:56:13-43 +60 android:theme="@style/NoteTheme" > +60-->F:\work\Notes-master\app\src\main\AndroidManifest.xml:57:13-45 +61 +61-->F:\work\Notes-master\app\src\main\AndroidManifest.xml:59:13-64:29 +62 +62-->F:\work\Notes-master\app\src\main\AndroidManifest.xml:60:17-69 +62-->F:\work\Notes-master\app\src\main\AndroidManifest.xml:60:25-66 +63 +64 +64-->F:\work\Notes-master\app\src\main\AndroidManifest.xml:61:17-76 +64-->F:\work\Notes-master\app\src\main\AndroidManifest.xml:61:27-73 +65 +66 +66-->F:\work\Notes-master\app\src\main\AndroidManifest.xml:62:17-78 +66-->F:\work\Notes-master\app\src\main\AndroidManifest.xml:62:23-75 +67 +67-->F:\work\Notes-master\app\src\main\AndroidManifest.xml:62:17-78 +67-->F:\work\Notes-master\app\src\main\AndroidManifest.xml:62:23-75 +68 +69 +69-->F:\work\Notes-master\app\src\main\AndroidManifest.xml:66:13-71:29 +70 +70-->F:\work\Notes-master\app\src\main\AndroidManifest.xml:67:17-79 +70-->F:\work\Notes-master\app\src\main\AndroidManifest.xml:67:25-76 +71 +72 +72-->F:\work\Notes-master\app\src\main\AndroidManifest.xml:61:17-76 +72-->F:\work\Notes-master\app\src\main\AndroidManifest.xml:61:27-73 +73 +74 +74-->F:\work\Notes-master\app\src\main\AndroidManifest.xml:62:17-78 +74-->F:\work\Notes-master\app\src\main\AndroidManifest.xml:62:23-75 +75 +75-->F:\work\Notes-master\app\src\main\AndroidManifest.xml:62:17-78 +75-->F:\work\Notes-master\app\src\main\AndroidManifest.xml:62:23-75 +76 +77 +77-->F:\work\Notes-master\app\src\main\AndroidManifest.xml:73:13-76:29 +78 +78-->F:\work\Notes-master\app\src\main\AndroidManifest.xml:74:17-71 +78-->F:\work\Notes-master\app\src\main\AndroidManifest.xml:74:25-68 +79 +80 +80-->F:\work\Notes-master\app\src\main\AndroidManifest.xml:61:17-76 +80-->F:\work\Notes-master\app\src\main\AndroidManifest.xml:61:27-73 +81 +82 +83 F:\work\Notes-master\app\src\main\AndroidManifest.xml:78:13-80:54 +84 android:name="android.app.searchable" +84-->F:\work\Notes-master\app\src\main\AndroidManifest.xml:79:17-54 +85 android:resource="@xml/searchable" /> +85-->F:\work\Notes-master\app\src\main\AndroidManifest.xml:80:17-51 +86 +87 +88 F:\work\Notes-master\app\src\main\AndroidManifest.xml:83:9-86:43 +89 android:name="net.micode.notes.data.NotesProvider" +89-->F:\work\Notes-master\app\src\main\AndroidManifest.xml:84:13-63 +90 android:authorities="micode_notes" +90-->F:\work\Notes-master\app\src\main\AndroidManifest.xml:85:13-47 +91 android:multiprocess="true" /> +91-->F:\work\Notes-master\app\src\main\AndroidManifest.xml:86:13-40 +92 +93 F:\work\Notes-master\app\src\main\AndroidManifest.xml:88:9-100:20 +94 android:name="net.micode.notes.widget.NoteWidgetProvider_2x" +94-->F:\work\Notes-master\app\src\main\AndroidManifest.xml:89:13-57 +95 android:label="@string/app_widget2x2" > +95-->F:\work\Notes-master\app\src\main\AndroidManifest.xml:90:13-50 +96 +96-->F:\work\Notes-master\app\src\main\AndroidManifest.xml:91:13-95:29 +97 +97-->F:\work\Notes-master\app\src\main\AndroidManifest.xml:92:17-84 +97-->F:\work\Notes-master\app\src\main\AndroidManifest.xml:92:25-81 +98 +98-->F:\work\Notes-master\app\src\main\AndroidManifest.xml:93:17-85 +98-->F:\work\Notes-master\app\src\main\AndroidManifest.xml:93:25-82 +99 +99-->F:\work\Notes-master\app\src\main\AndroidManifest.xml:94:17-85 +99-->F:\work\Notes-master\app\src\main\AndroidManifest.xml:94:25-82 +100 +101 +102 F:\work\Notes-master\app\src\main\AndroidManifest.xml:97:13-99:58 +103 android:name="android.appwidget.provider" +103-->F:\work\Notes-master\app\src\main\AndroidManifest.xml:98:17-58 +104 android:resource="@xml/widget_2x_info" /> +104-->F:\work\Notes-master\app\src\main\AndroidManifest.xml:99:17-55 +105 +106 F:\work\Notes-master\app\src\main\AndroidManifest.xml:101:9-114:20 +107 android:name="net.micode.notes.widget.NoteWidgetProvider_4x" +107-->F:\work\Notes-master\app\src\main\AndroidManifest.xml:102:13-57 +108 android:label="@string/app_widget4x4" > +108-->F:\work\Notes-master\app\src\main\AndroidManifest.xml:103:13-50 +109 +109-->F:\work\Notes-master\app\src\main\AndroidManifest.xml:91:13-95:29 +110 +110-->F:\work\Notes-master\app\src\main\AndroidManifest.xml:92:17-84 +110-->F:\work\Notes-master\app\src\main\AndroidManifest.xml:92:25-81 +111 +111-->F:\work\Notes-master\app\src\main\AndroidManifest.xml:93:17-85 +111-->F:\work\Notes-master\app\src\main\AndroidManifest.xml:93:25-82 +112 +112-->F:\work\Notes-master\app\src\main\AndroidManifest.xml:94:17-85 +112-->F:\work\Notes-master\app\src\main\AndroidManifest.xml:94:25-82 +113 +114 +115 F:\work\Notes-master\app\src\main\AndroidManifest.xml:97:13-99:58 +116 android:name="android.appwidget.provider" +116-->F:\work\Notes-master\app\src\main\AndroidManifest.xml:98:17-58 +117 android:resource="@xml/widget_4x_info" /> +117-->F:\work\Notes-master\app\src\main\AndroidManifest.xml:99:17-55 +118 +119 +119-->F:\work\Notes-master\app\src\main\AndroidManifest.xml:116:9-120:20 +119-->F:\work\Notes-master\app\src\main\AndroidManifest.xml:116:19-55 +120 +120-->F:\work\Notes-master\app\src\main\AndroidManifest.xml:117:13-119:29 +121 +121-->F:\work\Notes-master\app\src\main\AndroidManifest.xml:118:17-79 +121-->F:\work\Notes-master\app\src\main\AndroidManifest.xml:118:25-76 +122 +123 +124 F:\work\Notes-master\app\src\main\AndroidManifest.xml:122:9-125:20 +125 android:name="net.micode.notes.ui.AlarmReceiver" +125-->F:\work\Notes-master\app\src\main\AndroidManifest.xml:123:13-61 +126 android:process=":remote" > +126-->F:\work\Notes-master\app\src\main\AndroidManifest.xml:124:13-38 +127 +128 +129 F:\work\Notes-master\app\src\main\AndroidManifest.xml:127:9-132:20 +130 android:name="net.micode.notes.ui.AlarmAlertActivity" +130-->F:\work\Notes-master\app\src\main\AndroidManifest.xml:128:13-50 +131 android:label="@string/app_name" +131-->F:\work\Notes-master\app\src\main\AndroidManifest.xml:129:13-45 +132 android:launchMode="singleInstance" +132-->F:\work\Notes-master\app\src\main\AndroidManifest.xml:130:13-48 +133 android:theme="@android:style/Theme.Holo.Wallpaper.NoTitleBar" > +133-->F:\work\Notes-master\app\src\main\AndroidManifest.xml:131:13-75 +134 +135 F:\work\Notes-master\app\src\main\AndroidManifest.xml:134:9-139:20 +136 android:name="net.micode.notes.ui.NotesPreferenceActivity" +136-->F:\work\Notes-master\app\src\main\AndroidManifest.xml:135:13-71 +137 android:label="@string/preferences_title" +137-->F:\work\Notes-master\app\src\main\AndroidManifest.xml:136:13-54 +138 android:launchMode="singleTop" +138-->F:\work\Notes-master\app\src\main\AndroidManifest.xml:137:13-43 +139 android:theme="@android:style/Theme.Holo.Light" > +139-->F:\work\Notes-master\app\src\main\AndroidManifest.xml:138:13-60 +140 +141 +142 F:\work\Notes-master\app\src\main\AndroidManifest.xml:141:9-144:19 +143 android:name="net.micode.notes.gtask.remote.GTaskSyncService" +143-->F:\work\Notes-master\app\src\main\AndroidManifest.xml:142:13-74 +144 android:exported="false" > +144-->F:\work\Notes-master\app\src\main\AndroidManifest.xml:143:13-37 +145 +146 +147 F:\work\Notes-master\app\src\main\AndroidManifest.xml:146:9-148:52 +148 android:name="android.app.default_searchable" +148-->F:\work\Notes-master\app\src\main\AndroidManifest.xml:147:13-58 +149 android:value=".ui.NoteEditActivity" /> +149-->F:\work\Notes-master\app\src\main\AndroidManifest.xml:148:13-49 +150 +151 +152 diff --git a/app/build/intermediates/manifest_merge_blame_file/release/manifest-merger-blame-release-report.txt b/app/build/intermediates/manifest_merge_blame_file/release/manifest-merger-blame-release-report.txt new file mode 100644 index 0000000..998419a --- /dev/null +++ b/app/build/intermediates/manifest_merge_blame_file/release/manifest-merger-blame-release-report.txt @@ -0,0 +1,271 @@ +1 +2 +17 +21 +22 C:\Users\alineware\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:23:5-44 +23 android:minSdkVersion="14" +23-->C:\Users\alineware\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:23:15-41 +24 android:targetSdkVersion="14" /> +25 +26 +26-->C:\Users\alineware\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:25:5-81 +26-->C:\Users\alineware\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:25:22-78 +27 +27-->C:\Users\alineware\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:26:5-88 +27-->C:\Users\alineware\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:26:22-85 +28 +28-->C:\Users\alineware\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:27:5-67 +28-->C:\Users\alineware\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:27:22-64 +29 +29-->C:\Users\alineware\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:28:5-72 +29-->C:\Users\alineware\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:28:22-69 +30 +30-->C:\Users\alineware\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:29:5-74 +30-->C:\Users\alineware\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:29:22-71 +31 +31-->C:\Users\alineware\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:30:5-80 +31-->C:\Users\alineware\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:30:22-77 +32 +32-->C:\Users\alineware\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:31:5-71 +32-->C:\Users\alineware\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:31:22-68 +33 +33-->C:\Users\alineware\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:32:5-74 +33-->C:\Users\alineware\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:32:22-71 +34 +34-->C:\Users\alineware\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:33:5-81 +34-->C:\Users\alineware\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:33:22-78 +35 +36 C:\Users\alineware\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:35:5-149:19 +37 android:extractNativeLibs="true" +38 android:icon="@drawable/icon_app" +38-->C:\Users\alineware\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:36:9-42 +39 android:label="@string/app_name" > +39-->C:\Users\alineware\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:37:9-41 +40 C:\Users\alineware\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:38:9-51:20 +41 android:name="net.micode.notes.ui.NotesListActivity" +41-->C:\Users\alineware\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:39:13-49 +42 android:configChanges="keyboardHidden|orientation|screenSize" +42-->C:\Users\alineware\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:40:13-74 +43 android:label="@string/app_name" +43-->C:\Users\alineware\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:41:13-45 +44 android:launchMode="singleTop" +44-->C:\Users\alineware\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:42:13-43 +45 android:theme="@style/NoteTheme" +45-->C:\Users\alineware\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:43:13-45 +46 android:uiOptions="splitActionBarWhenNarrow" +46-->C:\Users\alineware\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:44:13-57 +47 android:windowSoftInputMode="adjustPan" > +47-->C:\Users\alineware\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:45:13-52 +48 +48-->C:\Users\alineware\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:47:13-50:29 +49 +49-->C:\Users\alineware\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:48:17-69 +49-->C:\Users\alineware\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:48:25-66 +50 +51 +51-->C:\Users\alineware\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:49:17-77 +51-->C:\Users\alineware\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:49:27-74 +52 +53 +54 C:\Users\alineware\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:53:9-81:20 +55 android:name="net.micode.notes.ui.NoteEditActivity" +55-->C:\Users\alineware\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:54:13-48 +56 android:configChanges="keyboardHidden|orientation|screenSize" +56-->C:\Users\alineware\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:55:13-74 +57 android:launchMode="singleTop" +57-->C:\Users\alineware\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:56:13-43 +58 android:theme="@style/NoteTheme" > +58-->C:\Users\alineware\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:57:13-45 +59 +59-->C:\Users\alineware\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:59:13-64:29 +60 +60-->C:\Users\alineware\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:60:17-69 +60-->C:\Users\alineware\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:60:25-66 +61 +62 +62-->C:\Users\alineware\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:61:17-76 +62-->C:\Users\alineware\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:61:27-73 +63 +64 +64-->C:\Users\alineware\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:62:17-78 +64-->C:\Users\alineware\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:62:23-75 +65 +65-->C:\Users\alineware\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:62:17-78 +65-->C:\Users\alineware\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:62:23-75 +66 +67 +67-->C:\Users\alineware\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:66:13-71:29 +68 +68-->C:\Users\alineware\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:67:17-79 +68-->C:\Users\alineware\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:67:25-76 +69 +70 +70-->C:\Users\alineware\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:61:17-76 +70-->C:\Users\alineware\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:61:27-73 +71 +72 +72-->C:\Users\alineware\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:62:17-78 +72-->C:\Users\alineware\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:62:23-75 +73 +73-->C:\Users\alineware\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:62:17-78 +73-->C:\Users\alineware\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:62:23-75 +74 +75 +75-->C:\Users\alineware\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:73:13-76:29 +76 +76-->C:\Users\alineware\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:74:17-71 +76-->C:\Users\alineware\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:74:25-68 +77 +78 +78-->C:\Users\alineware\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:61:17-76 +78-->C:\Users\alineware\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:61:27-73 +79 +80 +81 C:\Users\alineware\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:78:13-80:54 +82 android:name="android.app.searchable" +82-->C:\Users\alineware\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:79:17-54 +83 android:resource="@xml/searchable" /> +83-->C:\Users\alineware\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:80:17-51 +84 +85 +86 C:\Users\alineware\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:83:9-86:43 +87 android:name="net.micode.notes.data.NotesProvider" +87-->C:\Users\alineware\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:84:13-63 +88 android:authorities="micode_notes" +88-->C:\Users\alineware\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:85:13-47 +89 android:multiprocess="true" /> +89-->C:\Users\alineware\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:86:13-40 +90 +91 C:\Users\alineware\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:88:9-100:20 +92 android:name="net.micode.notes.widget.NoteWidgetProvider_2x" +92-->C:\Users\alineware\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:89:13-57 +93 android:label="@string/app_widget2x2" > +93-->C:\Users\alineware\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:90:13-50 +94 +94-->C:\Users\alineware\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:91:13-95:29 +95 +95-->C:\Users\alineware\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:92:17-84 +95-->C:\Users\alineware\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:92:25-81 +96 +96-->C:\Users\alineware\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:93:17-85 +96-->C:\Users\alineware\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:93:25-82 +97 +97-->C:\Users\alineware\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:94:17-85 +97-->C:\Users\alineware\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:94:25-82 +98 +99 +100 C:\Users\alineware\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:97:13-99:58 +101 android:name="android.appwidget.provider" +101-->C:\Users\alineware\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:98:17-58 +102 android:resource="@xml/widget_2x_info" /> +102-->C:\Users\alineware\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:99:17-55 +103 +104 C:\Users\alineware\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:101:9-114:20 +105 android:name="net.micode.notes.widget.NoteWidgetProvider_4x" +105-->C:\Users\alineware\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:102:13-57 +106 android:label="@string/app_widget4x4" > +106-->C:\Users\alineware\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:103:13-50 +107 +107-->C:\Users\alineware\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:91:13-95:29 +108 +108-->C:\Users\alineware\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:92:17-84 +108-->C:\Users\alineware\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:92:25-81 +109 +109-->C:\Users\alineware\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:93:17-85 +109-->C:\Users\alineware\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:93:25-82 +110 +110-->C:\Users\alineware\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:94:17-85 +110-->C:\Users\alineware\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:94:25-82 +111 +112 +113 C:\Users\alineware\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:97:13-99:58 +114 android:name="android.appwidget.provider" +114-->C:\Users\alineware\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:98:17-58 +115 android:resource="@xml/widget_4x_info" /> +115-->C:\Users\alineware\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:99:17-55 +116 +117 +117-->C:\Users\alineware\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:116:9-120:20 +117-->C:\Users\alineware\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:116:19-55 +118 +118-->C:\Users\alineware\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:117:13-119:29 +119 +119-->C:\Users\alineware\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:118:17-79 +119-->C:\Users\alineware\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:118:25-76 +120 +121 +122 C:\Users\alineware\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:122:9-125:20 +123 android:name="net.micode.notes.ui.AlarmReceiver" +123-->C:\Users\alineware\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:123:13-61 +124 android:process=":remote" > +124-->C:\Users\alineware\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:124:13-38 +125 +126 +127 C:\Users\alineware\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:127:9-132:20 +128 android:name="net.micode.notes.ui.AlarmAlertActivity" +128-->C:\Users\alineware\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:128:13-50 +129 android:label="@string/app_name" +129-->C:\Users\alineware\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:129:13-45 +130 android:launchMode="singleInstance" +130-->C:\Users\alineware\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:130:13-48 +131 android:theme="@android:style/Theme.Holo.Wallpaper.NoTitleBar" > +131-->C:\Users\alineware\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:131:13-75 +132 +133 C:\Users\alineware\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:134:9-139:20 +134 android:name="net.micode.notes.ui.NotesPreferenceActivity" +134-->C:\Users\alineware\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:135:13-71 +135 android:label="@string/preferences_title" +135-->C:\Users\alineware\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:136:13-54 +136 android:launchMode="singleTop" +136-->C:\Users\alineware\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:137:13-43 +137 android:theme="@android:style/Theme.Holo.Light" > +137-->C:\Users\alineware\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:138:13-60 +138 +139 +140 C:\Users\alineware\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:141:9-144:19 +141 android:name="net.micode.notes.gtask.remote.GTaskSyncService" +141-->C:\Users\alineware\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:142:13-74 +142 android:exported="false" > +142-->C:\Users\alineware\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:143:13-37 +143 +144 +145 C:\Users\alineware\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:146:9-148:52 +146 android:name="android.app.default_searchable" +146-->C:\Users\alineware\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:147:13-58 +147 android:value=".ui.NoteEditActivity" /> +147-->C:\Users\alineware\StudioProjects\Notes-master\app\src\main\AndroidManifest.xml:148:13-49 +148 +149 +150 diff --git a/app/build/intermediates/merged_java_res/debug/base.jar b/app/build/intermediates/merged_java_res/debug/base.jar new file mode 100644 index 0000000..85a201f Binary files /dev/null and b/app/build/intermediates/merged_java_res/debug/base.jar differ diff --git a/app/build/intermediates/merged_java_res/release/base.jar b/app/build/intermediates/merged_java_res/release/base.jar new file mode 100644 index 0000000..f9b2a71 Binary files /dev/null and b/app/build/intermediates/merged_java_res/release/base.jar differ diff --git a/app/build/intermediates/merged_manifest/debug/AndroidManifest.xml b/app/build/intermediates/merged_manifest/debug/AndroidManifest.xml new file mode 100644 index 0000000..9e8d8ca --- /dev/null +++ b/app/build/intermediates/merged_manifest/debug/AndroidManifest.xml @@ -0,0 +1,152 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/build/intermediates/merged_manifest/release/AndroidManifest.xml b/app/build/intermediates/merged_manifest/release/AndroidManifest.xml new file mode 100644 index 0000000..d1c0d4b --- /dev/null +++ b/app/build/intermediates/merged_manifest/release/AndroidManifest.xml @@ -0,0 +1,150 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/build/intermediates/merged_manifests/debug/AndroidManifest.xml b/app/build/intermediates/merged_manifests/debug/AndroidManifest.xml new file mode 100644 index 0000000..9e8d8ca --- /dev/null +++ b/app/build/intermediates/merged_manifests/debug/AndroidManifest.xml @@ -0,0 +1,152 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/build/intermediates/merged_manifests/debug/output-metadata.json b/app/build/intermediates/merged_manifests/debug/output-metadata.json new file mode 100644 index 0000000..a56d03a --- /dev/null +++ b/app/build/intermediates/merged_manifests/debug/output-metadata.json @@ -0,0 +1,20 @@ +{ + "version": 3, + "artifactType": { + "type": "MERGED_MANIFESTS", + "kind": "Directory" + }, + "applicationId": "net.micode.notes", + "variantName": "debug", + "elements": [ + { + "type": "SINGLE", + "filters": [], + "attributes": [], + "versionCode": 1, + "versionName": "0.1", + "outputFile": "AndroidManifest.xml" + } + ], + "elementType": "File" +} \ No newline at end of file diff --git a/app/build/intermediates/merged_manifests/release/AndroidManifest.xml b/app/build/intermediates/merged_manifests/release/AndroidManifest.xml new file mode 100644 index 0000000..d1c0d4b --- /dev/null +++ b/app/build/intermediates/merged_manifests/release/AndroidManifest.xml @@ -0,0 +1,150 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/build/intermediates/merged_manifests/release/output-metadata.json b/app/build/intermediates/merged_manifests/release/output-metadata.json new file mode 100644 index 0000000..dba4e33 --- /dev/null +++ b/app/build/intermediates/merged_manifests/release/output-metadata.json @@ -0,0 +1,20 @@ +{ + "version": 3, + "artifactType": { + "type": "MERGED_MANIFESTS", + "kind": "Directory" + }, + "applicationId": "net.micode.notes", + "variantName": "release", + "elements": [ + { + "type": "SINGLE", + "filters": [], + "attributes": [], + "versionCode": 1, + "versionName": "0.1", + "outputFile": "AndroidManifest.xml" + } + ], + "elementType": "File" +} \ No newline at end of file diff --git a/app/build/intermediates/merged_res/debug/color_primary_text_dark.xml.flat b/app/build/intermediates/merged_res/debug/color_primary_text_dark.xml.flat new file mode 100644 index 0000000..e5df6da Binary files /dev/null and b/app/build/intermediates/merged_res/debug/color_primary_text_dark.xml.flat differ diff --git a/app/build/intermediates/merged_res/debug/color_secondary_text_dark.xml.flat b/app/build/intermediates/merged_res/debug/color_secondary_text_dark.xml.flat new file mode 100644 index 0000000..8cc05db Binary files /dev/null and b/app/build/intermediates/merged_res/debug/color_secondary_text_dark.xml.flat differ diff --git a/app/build/intermediates/merged_res/debug/drawable-hdpi_bg_btn_set_color.png.flat b/app/build/intermediates/merged_res/debug/drawable-hdpi_bg_btn_set_color.png.flat new file mode 100644 index 0000000..2eda191 Binary files /dev/null and b/app/build/intermediates/merged_res/debug/drawable-hdpi_bg_btn_set_color.png.flat differ diff --git a/app/build/intermediates/merged_res/debug/drawable-hdpi_bg_color_btn_mask.png.flat b/app/build/intermediates/merged_res/debug/drawable-hdpi_bg_color_btn_mask.png.flat new file mode 100644 index 0000000..59c2358 Binary files /dev/null and b/app/build/intermediates/merged_res/debug/drawable-hdpi_bg_color_btn_mask.png.flat differ diff --git a/app/build/intermediates/merged_res/debug/drawable-hdpi_call_record.png.flat b/app/build/intermediates/merged_res/debug/drawable-hdpi_call_record.png.flat new file mode 100644 index 0000000..89fb25d Binary files /dev/null and b/app/build/intermediates/merged_res/debug/drawable-hdpi_call_record.png.flat differ diff --git a/app/build/intermediates/merged_res/debug/drawable-hdpi_clock.png.flat b/app/build/intermediates/merged_res/debug/drawable-hdpi_clock.png.flat new file mode 100644 index 0000000..40e03de Binary files /dev/null and b/app/build/intermediates/merged_res/debug/drawable-hdpi_clock.png.flat differ diff --git a/app/build/intermediates/merged_res/debug/drawable-hdpi_delete.png.flat b/app/build/intermediates/merged_res/debug/drawable-hdpi_delete.png.flat new file mode 100644 index 0000000..809ce24 Binary files /dev/null and b/app/build/intermediates/merged_res/debug/drawable-hdpi_delete.png.flat differ diff --git a/app/build/intermediates/merged_res/debug/drawable-hdpi_dropdown_icon.9.png.flat b/app/build/intermediates/merged_res/debug/drawable-hdpi_dropdown_icon.9.png.flat new file mode 100644 index 0000000..f80e058 Binary files /dev/null and b/app/build/intermediates/merged_res/debug/drawable-hdpi_dropdown_icon.9.png.flat differ diff --git a/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_blue.9.png.flat b/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_blue.9.png.flat new file mode 100644 index 0000000..be22aa0 Binary files /dev/null and b/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_blue.9.png.flat differ diff --git a/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_green.9.png.flat b/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_green.9.png.flat new file mode 100644 index 0000000..2a07d4f Binary files /dev/null and b/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_green.9.png.flat differ diff --git a/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_red.9.png.flat b/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_red.9.png.flat new file mode 100644 index 0000000..b71467d Binary files /dev/null and b/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_red.9.png.flat differ diff --git a/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_title_blue.9.png.flat b/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_title_blue.9.png.flat new file mode 100644 index 0000000..9cf62b3 Binary files /dev/null and b/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_title_blue.9.png.flat differ diff --git a/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_title_green.9.png.flat b/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_title_green.9.png.flat new file mode 100644 index 0000000..f77ea7d Binary files /dev/null and b/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_title_green.9.png.flat differ diff --git a/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_title_red.9.png.flat b/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_title_red.9.png.flat new file mode 100644 index 0000000..4b9e264 Binary files /dev/null and b/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_title_red.9.png.flat differ diff --git a/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_title_white.9.png.flat b/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_title_white.9.png.flat new file mode 100644 index 0000000..cbb044c Binary files /dev/null and b/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_title_white.9.png.flat differ diff --git a/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_title_yellow.9.png.flat b/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_title_yellow.9.png.flat new file mode 100644 index 0000000..14d4feb Binary files /dev/null and b/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_title_yellow.9.png.flat differ diff --git a/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_white.9.png.flat b/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_white.9.png.flat new file mode 100644 index 0000000..9226aa6 Binary files /dev/null and b/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_white.9.png.flat differ diff --git a/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_yellow.9.png.flat b/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_yellow.9.png.flat new file mode 100644 index 0000000..d49f07e Binary files /dev/null and b/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_yellow.9.png.flat differ diff --git a/app/build/intermediates/merged_res/debug/drawable-hdpi_font_large.png.flat b/app/build/intermediates/merged_res/debug/drawable-hdpi_font_large.png.flat new file mode 100644 index 0000000..b33f03f Binary files /dev/null and b/app/build/intermediates/merged_res/debug/drawable-hdpi_font_large.png.flat differ diff --git a/app/build/intermediates/merged_res/debug/drawable-hdpi_font_normal.png.flat b/app/build/intermediates/merged_res/debug/drawable-hdpi_font_normal.png.flat new file mode 100644 index 0000000..d631a65 Binary files /dev/null and b/app/build/intermediates/merged_res/debug/drawable-hdpi_font_normal.png.flat differ diff --git a/app/build/intermediates/merged_res/debug/drawable-hdpi_font_size_selector_bg.9.png.flat b/app/build/intermediates/merged_res/debug/drawable-hdpi_font_size_selector_bg.9.png.flat new file mode 100644 index 0000000..0400aeb Binary files /dev/null and b/app/build/intermediates/merged_res/debug/drawable-hdpi_font_size_selector_bg.9.png.flat differ diff --git a/app/build/intermediates/merged_res/debug/drawable-hdpi_font_small.png.flat b/app/build/intermediates/merged_res/debug/drawable-hdpi_font_small.png.flat new file mode 100644 index 0000000..f6a97f6 Binary files /dev/null and b/app/build/intermediates/merged_res/debug/drawable-hdpi_font_small.png.flat differ diff --git a/app/build/intermediates/merged_res/debug/drawable-hdpi_font_super.png.flat b/app/build/intermediates/merged_res/debug/drawable-hdpi_font_super.png.flat new file mode 100644 index 0000000..28656cb Binary files /dev/null and b/app/build/intermediates/merged_res/debug/drawable-hdpi_font_super.png.flat differ diff --git a/app/build/intermediates/merged_res/debug/drawable-hdpi_icon_app.png.flat b/app/build/intermediates/merged_res/debug/drawable-hdpi_icon_app.png.flat new file mode 100644 index 0000000..ca8a144 Binary files /dev/null and b/app/build/intermediates/merged_res/debug/drawable-hdpi_icon_app.png.flat differ diff --git a/app/build/intermediates/merged_res/debug/drawable-hdpi_list_background.png.flat b/app/build/intermediates/merged_res/debug/drawable-hdpi_list_background.png.flat new file mode 100644 index 0000000..2a028e8 Binary files /dev/null and b/app/build/intermediates/merged_res/debug/drawable-hdpi_list_background.png.flat differ diff --git a/app/build/intermediates/merged_res/debug/drawable-hdpi_list_blue_down.9.png.flat b/app/build/intermediates/merged_res/debug/drawable-hdpi_list_blue_down.9.png.flat new file mode 100644 index 0000000..ca41f40 Binary files /dev/null and b/app/build/intermediates/merged_res/debug/drawable-hdpi_list_blue_down.9.png.flat differ diff --git a/app/build/intermediates/merged_res/debug/drawable-hdpi_list_blue_middle.9.png.flat b/app/build/intermediates/merged_res/debug/drawable-hdpi_list_blue_middle.9.png.flat new file mode 100644 index 0000000..7302f30 Binary files /dev/null and b/app/build/intermediates/merged_res/debug/drawable-hdpi_list_blue_middle.9.png.flat differ diff --git a/app/build/intermediates/merged_res/debug/drawable-hdpi_list_blue_single.9.png.flat b/app/build/intermediates/merged_res/debug/drawable-hdpi_list_blue_single.9.png.flat new file mode 100644 index 0000000..02a4f77 Binary files /dev/null and b/app/build/intermediates/merged_res/debug/drawable-hdpi_list_blue_single.9.png.flat differ diff --git a/app/build/intermediates/merged_res/debug/drawable-hdpi_list_blue_up.9.png.flat b/app/build/intermediates/merged_res/debug/drawable-hdpi_list_blue_up.9.png.flat new file mode 100644 index 0000000..4382694 Binary files /dev/null and b/app/build/intermediates/merged_res/debug/drawable-hdpi_list_blue_up.9.png.flat differ diff --git a/app/build/intermediates/merged_res/debug/drawable-hdpi_list_folder.9.png.flat b/app/build/intermediates/merged_res/debug/drawable-hdpi_list_folder.9.png.flat new file mode 100644 index 0000000..b4e71dc Binary files /dev/null and b/app/build/intermediates/merged_res/debug/drawable-hdpi_list_folder.9.png.flat differ diff --git a/app/build/intermediates/merged_res/debug/drawable-hdpi_list_footer_bg.9.png.flat b/app/build/intermediates/merged_res/debug/drawable-hdpi_list_footer_bg.9.png.flat new file mode 100644 index 0000000..b230b8f Binary files /dev/null and b/app/build/intermediates/merged_res/debug/drawable-hdpi_list_footer_bg.9.png.flat differ diff --git a/app/build/intermediates/merged_res/debug/drawable-hdpi_list_green_down.9.png.flat b/app/build/intermediates/merged_res/debug/drawable-hdpi_list_green_down.9.png.flat new file mode 100644 index 0000000..633e0e7 Binary files /dev/null and b/app/build/intermediates/merged_res/debug/drawable-hdpi_list_green_down.9.png.flat differ diff --git a/app/build/intermediates/merged_res/debug/drawable-hdpi_list_green_middle.9.png.flat b/app/build/intermediates/merged_res/debug/drawable-hdpi_list_green_middle.9.png.flat new file mode 100644 index 0000000..d432a14 Binary files /dev/null and b/app/build/intermediates/merged_res/debug/drawable-hdpi_list_green_middle.9.png.flat differ diff --git a/app/build/intermediates/merged_res/debug/drawable-hdpi_list_green_single.9.png.flat b/app/build/intermediates/merged_res/debug/drawable-hdpi_list_green_single.9.png.flat new file mode 100644 index 0000000..5a72f21 Binary files /dev/null and b/app/build/intermediates/merged_res/debug/drawable-hdpi_list_green_single.9.png.flat differ diff --git a/app/build/intermediates/merged_res/debug/drawable-hdpi_list_green_up.9.png.flat b/app/build/intermediates/merged_res/debug/drawable-hdpi_list_green_up.9.png.flat new file mode 100644 index 0000000..3e628af Binary files /dev/null and b/app/build/intermediates/merged_res/debug/drawable-hdpi_list_green_up.9.png.flat differ diff --git a/app/build/intermediates/merged_res/debug/drawable-hdpi_list_red_down.9.png.flat b/app/build/intermediates/merged_res/debug/drawable-hdpi_list_red_down.9.png.flat new file mode 100644 index 0000000..a4b4193 Binary files /dev/null and b/app/build/intermediates/merged_res/debug/drawable-hdpi_list_red_down.9.png.flat differ diff --git a/app/build/intermediates/merged_res/debug/drawable-hdpi_list_red_middle.9.png.flat b/app/build/intermediates/merged_res/debug/drawable-hdpi_list_red_middle.9.png.flat new file mode 100644 index 0000000..7ae0f98 Binary files /dev/null and b/app/build/intermediates/merged_res/debug/drawable-hdpi_list_red_middle.9.png.flat differ diff --git a/app/build/intermediates/merged_res/debug/drawable-hdpi_list_red_single.9.png.flat b/app/build/intermediates/merged_res/debug/drawable-hdpi_list_red_single.9.png.flat new file mode 100644 index 0000000..6cbb18b Binary files /dev/null and b/app/build/intermediates/merged_res/debug/drawable-hdpi_list_red_single.9.png.flat differ diff --git a/app/build/intermediates/merged_res/debug/drawable-hdpi_list_red_up.9.png.flat b/app/build/intermediates/merged_res/debug/drawable-hdpi_list_red_up.9.png.flat new file mode 100644 index 0000000..a4a6692 Binary files /dev/null and b/app/build/intermediates/merged_res/debug/drawable-hdpi_list_red_up.9.png.flat differ diff --git a/app/build/intermediates/merged_res/debug/drawable-hdpi_list_white_down.9.png.flat b/app/build/intermediates/merged_res/debug/drawable-hdpi_list_white_down.9.png.flat new file mode 100644 index 0000000..9623c13 Binary files /dev/null and b/app/build/intermediates/merged_res/debug/drawable-hdpi_list_white_down.9.png.flat differ diff --git a/app/build/intermediates/merged_res/debug/drawable-hdpi_list_white_middle.9.png.flat b/app/build/intermediates/merged_res/debug/drawable-hdpi_list_white_middle.9.png.flat new file mode 100644 index 0000000..404ea2c Binary files /dev/null and b/app/build/intermediates/merged_res/debug/drawable-hdpi_list_white_middle.9.png.flat differ diff --git a/app/build/intermediates/merged_res/debug/drawable-hdpi_list_white_single.9.png.flat b/app/build/intermediates/merged_res/debug/drawable-hdpi_list_white_single.9.png.flat new file mode 100644 index 0000000..4bb304b Binary files /dev/null and b/app/build/intermediates/merged_res/debug/drawable-hdpi_list_white_single.9.png.flat differ diff --git a/app/build/intermediates/merged_res/debug/drawable-hdpi_list_white_up.9.png.flat b/app/build/intermediates/merged_res/debug/drawable-hdpi_list_white_up.9.png.flat new file mode 100644 index 0000000..449a2d8 Binary files /dev/null and b/app/build/intermediates/merged_res/debug/drawable-hdpi_list_white_up.9.png.flat differ diff --git a/app/build/intermediates/merged_res/debug/drawable-hdpi_list_yellow_down.9.png.flat b/app/build/intermediates/merged_res/debug/drawable-hdpi_list_yellow_down.9.png.flat new file mode 100644 index 0000000..74c5445 Binary files /dev/null and b/app/build/intermediates/merged_res/debug/drawable-hdpi_list_yellow_down.9.png.flat differ diff --git a/app/build/intermediates/merged_res/debug/drawable-hdpi_list_yellow_middle.9.png.flat b/app/build/intermediates/merged_res/debug/drawable-hdpi_list_yellow_middle.9.png.flat new file mode 100644 index 0000000..99bbe37 Binary files /dev/null and b/app/build/intermediates/merged_res/debug/drawable-hdpi_list_yellow_middle.9.png.flat differ diff --git a/app/build/intermediates/merged_res/debug/drawable-hdpi_list_yellow_single.9.png.flat b/app/build/intermediates/merged_res/debug/drawable-hdpi_list_yellow_single.9.png.flat new file mode 100644 index 0000000..cfab562 Binary files /dev/null and b/app/build/intermediates/merged_res/debug/drawable-hdpi_list_yellow_single.9.png.flat differ diff --git a/app/build/intermediates/merged_res/debug/drawable-hdpi_list_yellow_up.9.png.flat b/app/build/intermediates/merged_res/debug/drawable-hdpi_list_yellow_up.9.png.flat new file mode 100644 index 0000000..afdf9b0 Binary files /dev/null and b/app/build/intermediates/merged_res/debug/drawable-hdpi_list_yellow_up.9.png.flat differ diff --git a/app/build/intermediates/merged_res/debug/drawable-hdpi_menu_delete.png.flat b/app/build/intermediates/merged_res/debug/drawable-hdpi_menu_delete.png.flat new file mode 100644 index 0000000..a53a14d Binary files /dev/null and b/app/build/intermediates/merged_res/debug/drawable-hdpi_menu_delete.png.flat differ diff --git a/app/build/intermediates/merged_res/debug/drawable-hdpi_menu_move.png.flat b/app/build/intermediates/merged_res/debug/drawable-hdpi_menu_move.png.flat new file mode 100644 index 0000000..d0312eb Binary files /dev/null and b/app/build/intermediates/merged_res/debug/drawable-hdpi_menu_move.png.flat differ diff --git a/app/build/intermediates/merged_res/debug/drawable-hdpi_new_note_normal.png.flat b/app/build/intermediates/merged_res/debug/drawable-hdpi_new_note_normal.png.flat new file mode 100644 index 0000000..01ef2da Binary files /dev/null and b/app/build/intermediates/merged_res/debug/drawable-hdpi_new_note_normal.png.flat differ diff --git a/app/build/intermediates/merged_res/debug/drawable-hdpi_new_note_pressed.png.flat b/app/build/intermediates/merged_res/debug/drawable-hdpi_new_note_pressed.png.flat new file mode 100644 index 0000000..ca5c107 Binary files /dev/null and b/app/build/intermediates/merged_res/debug/drawable-hdpi_new_note_pressed.png.flat differ diff --git a/app/build/intermediates/merged_res/debug/drawable-hdpi_note_edit_color_selector_panel.png.flat b/app/build/intermediates/merged_res/debug/drawable-hdpi_note_edit_color_selector_panel.png.flat new file mode 100644 index 0000000..23eb0dc Binary files /dev/null and b/app/build/intermediates/merged_res/debug/drawable-hdpi_note_edit_color_selector_panel.png.flat differ diff --git a/app/build/intermediates/merged_res/debug/drawable-hdpi_notification.png.flat b/app/build/intermediates/merged_res/debug/drawable-hdpi_notification.png.flat new file mode 100644 index 0000000..a138233 Binary files /dev/null and b/app/build/intermediates/merged_res/debug/drawable-hdpi_notification.png.flat differ diff --git a/app/build/intermediates/merged_res/debug/drawable-hdpi_search_result.png.flat b/app/build/intermediates/merged_res/debug/drawable-hdpi_search_result.png.flat new file mode 100644 index 0000000..3b4516a Binary files /dev/null and b/app/build/intermediates/merged_res/debug/drawable-hdpi_search_result.png.flat differ diff --git a/app/build/intermediates/merged_res/debug/drawable-hdpi_selected.png.flat b/app/build/intermediates/merged_res/debug/drawable-hdpi_selected.png.flat new file mode 100644 index 0000000..465926e Binary files /dev/null and b/app/build/intermediates/merged_res/debug/drawable-hdpi_selected.png.flat differ diff --git a/app/build/intermediates/merged_res/debug/drawable-hdpi_title_alert.png.flat b/app/build/intermediates/merged_res/debug/drawable-hdpi_title_alert.png.flat new file mode 100644 index 0000000..ed8e6a9 Binary files /dev/null and b/app/build/intermediates/merged_res/debug/drawable-hdpi_title_alert.png.flat differ diff --git a/app/build/intermediates/merged_res/debug/drawable-hdpi_title_bar_bg.9.png.flat b/app/build/intermediates/merged_res/debug/drawable-hdpi_title_bar_bg.9.png.flat new file mode 100644 index 0000000..fb37689 Binary files /dev/null and b/app/build/intermediates/merged_res/debug/drawable-hdpi_title_bar_bg.9.png.flat differ diff --git a/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_2x_blue.png.flat b/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_2x_blue.png.flat new file mode 100644 index 0000000..adfba04 Binary files /dev/null and b/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_2x_blue.png.flat differ diff --git a/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_2x_green.png.flat b/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_2x_green.png.flat new file mode 100644 index 0000000..8b13b97 Binary files /dev/null and b/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_2x_green.png.flat differ diff --git a/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_2x_red.png.flat b/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_2x_red.png.flat new file mode 100644 index 0000000..896fb83 Binary files /dev/null and b/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_2x_red.png.flat differ diff --git a/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_2x_white.png.flat b/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_2x_white.png.flat new file mode 100644 index 0000000..2c0cce3 Binary files /dev/null and b/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_2x_white.png.flat differ diff --git a/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_2x_yellow.png.flat b/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_2x_yellow.png.flat new file mode 100644 index 0000000..973eb75 Binary files /dev/null and b/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_2x_yellow.png.flat differ diff --git a/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_4x_blue.png.flat b/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_4x_blue.png.flat new file mode 100644 index 0000000..c521cf6 Binary files /dev/null and b/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_4x_blue.png.flat differ diff --git a/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_4x_green.png.flat b/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_4x_green.png.flat new file mode 100644 index 0000000..dd55472 Binary files /dev/null and b/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_4x_green.png.flat differ diff --git a/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_4x_red.png.flat b/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_4x_red.png.flat new file mode 100644 index 0000000..2912b97 Binary files /dev/null and b/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_4x_red.png.flat differ diff --git a/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_4x_white.png.flat b/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_4x_white.png.flat new file mode 100644 index 0000000..90b6f06 Binary files /dev/null and b/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_4x_white.png.flat differ diff --git a/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_4x_yellow.png.flat b/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_4x_yellow.png.flat new file mode 100644 index 0000000..6556925 Binary files /dev/null and b/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_4x_yellow.png.flat differ diff --git a/app/build/intermediates/merged_res/debug/drawable_new_note.xml.flat b/app/build/intermediates/merged_res/debug/drawable_new_note.xml.flat new file mode 100644 index 0000000..eec4deb Binary files /dev/null and b/app/build/intermediates/merged_res/debug/drawable_new_note.xml.flat differ diff --git a/app/build/intermediates/merged_res/debug/layout_account_dialog_title.xml.flat b/app/build/intermediates/merged_res/debug/layout_account_dialog_title.xml.flat new file mode 100644 index 0000000..1bbe3ab Binary files /dev/null and b/app/build/intermediates/merged_res/debug/layout_account_dialog_title.xml.flat differ diff --git a/app/build/intermediates/merged_res/debug/layout_add_account_text.xml.flat b/app/build/intermediates/merged_res/debug/layout_add_account_text.xml.flat new file mode 100644 index 0000000..305e7a6 Binary files /dev/null and b/app/build/intermediates/merged_res/debug/layout_add_account_text.xml.flat differ diff --git a/app/build/intermediates/merged_res/debug/layout_datetime_picker.xml.flat b/app/build/intermediates/merged_res/debug/layout_datetime_picker.xml.flat new file mode 100644 index 0000000..61742b5 Binary files /dev/null and b/app/build/intermediates/merged_res/debug/layout_datetime_picker.xml.flat differ diff --git a/app/build/intermediates/merged_res/debug/layout_dialog_edit_text.xml.flat b/app/build/intermediates/merged_res/debug/layout_dialog_edit_text.xml.flat new file mode 100644 index 0000000..78701a1 Binary files /dev/null and b/app/build/intermediates/merged_res/debug/layout_dialog_edit_text.xml.flat differ diff --git a/app/build/intermediates/merged_res/debug/layout_folder_list_item.xml.flat b/app/build/intermediates/merged_res/debug/layout_folder_list_item.xml.flat new file mode 100644 index 0000000..7b3fb68 Binary files /dev/null and b/app/build/intermediates/merged_res/debug/layout_folder_list_item.xml.flat differ diff --git a/app/build/intermediates/merged_res/debug/layout_note_edit.xml.flat b/app/build/intermediates/merged_res/debug/layout_note_edit.xml.flat new file mode 100644 index 0000000..6c97e3d Binary files /dev/null and b/app/build/intermediates/merged_res/debug/layout_note_edit.xml.flat differ diff --git a/app/build/intermediates/merged_res/debug/layout_note_edit_list_item.xml.flat b/app/build/intermediates/merged_res/debug/layout_note_edit_list_item.xml.flat new file mode 100644 index 0000000..006b151 Binary files /dev/null and b/app/build/intermediates/merged_res/debug/layout_note_edit_list_item.xml.flat differ diff --git a/app/build/intermediates/merged_res/debug/layout_note_item.xml.flat b/app/build/intermediates/merged_res/debug/layout_note_item.xml.flat new file mode 100644 index 0000000..1c3342f Binary files /dev/null and b/app/build/intermediates/merged_res/debug/layout_note_item.xml.flat differ diff --git a/app/build/intermediates/merged_res/debug/layout_note_list.xml.flat b/app/build/intermediates/merged_res/debug/layout_note_list.xml.flat new file mode 100644 index 0000000..8f48256 Binary files /dev/null and b/app/build/intermediates/merged_res/debug/layout_note_list.xml.flat differ diff --git a/app/build/intermediates/merged_res/debug/layout_note_list_dropdown_menu.xml.flat b/app/build/intermediates/merged_res/debug/layout_note_list_dropdown_menu.xml.flat new file mode 100644 index 0000000..749f04b Binary files /dev/null and b/app/build/intermediates/merged_res/debug/layout_note_list_dropdown_menu.xml.flat differ diff --git a/app/build/intermediates/merged_res/debug/layout_note_list_footer.xml.flat b/app/build/intermediates/merged_res/debug/layout_note_list_footer.xml.flat new file mode 100644 index 0000000..98f56f4 Binary files /dev/null and b/app/build/intermediates/merged_res/debug/layout_note_list_footer.xml.flat differ diff --git a/app/build/intermediates/merged_res/debug/layout_settings_header.xml.flat b/app/build/intermediates/merged_res/debug/layout_settings_header.xml.flat new file mode 100644 index 0000000..9caf2e6 Binary files /dev/null and b/app/build/intermediates/merged_res/debug/layout_settings_header.xml.flat differ diff --git a/app/build/intermediates/merged_res/debug/layout_widget_2x.xml.flat b/app/build/intermediates/merged_res/debug/layout_widget_2x.xml.flat new file mode 100644 index 0000000..a74989a Binary files /dev/null and b/app/build/intermediates/merged_res/debug/layout_widget_2x.xml.flat differ diff --git a/app/build/intermediates/merged_res/debug/layout_widget_4x.xml.flat b/app/build/intermediates/merged_res/debug/layout_widget_4x.xml.flat new file mode 100644 index 0000000..94470b7 Binary files /dev/null and b/app/build/intermediates/merged_res/debug/layout_widget_4x.xml.flat differ diff --git a/app/build/intermediates/merged_res/debug/menu_call_note_edit.xml.flat b/app/build/intermediates/merged_res/debug/menu_call_note_edit.xml.flat new file mode 100644 index 0000000..7b10945 Binary files /dev/null and b/app/build/intermediates/merged_res/debug/menu_call_note_edit.xml.flat differ diff --git a/app/build/intermediates/merged_res/debug/menu_call_record_folder.xml.flat b/app/build/intermediates/merged_res/debug/menu_call_record_folder.xml.flat new file mode 100644 index 0000000..5cbb9e9 Binary files /dev/null and b/app/build/intermediates/merged_res/debug/menu_call_record_folder.xml.flat differ diff --git a/app/build/intermediates/merged_res/debug/menu_note_edit.xml.flat b/app/build/intermediates/merged_res/debug/menu_note_edit.xml.flat new file mode 100644 index 0000000..c025a60 Binary files /dev/null and b/app/build/intermediates/merged_res/debug/menu_note_edit.xml.flat differ diff --git a/app/build/intermediates/merged_res/debug/menu_note_list.xml.flat b/app/build/intermediates/merged_res/debug/menu_note_list.xml.flat new file mode 100644 index 0000000..4316da7 Binary files /dev/null and b/app/build/intermediates/merged_res/debug/menu_note_list.xml.flat differ diff --git a/app/build/intermediates/merged_res/debug/menu_note_list_dropdown.xml.flat b/app/build/intermediates/merged_res/debug/menu_note_list_dropdown.xml.flat new file mode 100644 index 0000000..7d74a65 Binary files /dev/null and b/app/build/intermediates/merged_res/debug/menu_note_list_dropdown.xml.flat differ diff --git a/app/build/intermediates/merged_res/debug/menu_note_list_options.xml.flat b/app/build/intermediates/merged_res/debug/menu_note_list_options.xml.flat new file mode 100644 index 0000000..9210c15 Binary files /dev/null and b/app/build/intermediates/merged_res/debug/menu_note_list_options.xml.flat differ diff --git a/app/build/intermediates/merged_res/debug/menu_sub_folder.xml.flat b/app/build/intermediates/merged_res/debug/menu_sub_folder.xml.flat new file mode 100644 index 0000000..ad66757 Binary files /dev/null and b/app/build/intermediates/merged_res/debug/menu_sub_folder.xml.flat differ diff --git a/app/build/intermediates/merged_res/debug/raw-zh-rCN_introduction.flat b/app/build/intermediates/merged_res/debug/raw-zh-rCN_introduction.flat new file mode 100644 index 0000000..68b46ae Binary files /dev/null and b/app/build/intermediates/merged_res/debug/raw-zh-rCN_introduction.flat differ diff --git a/app/build/intermediates/merged_res/debug/raw_introduction.flat b/app/build/intermediates/merged_res/debug/raw_introduction.flat new file mode 100644 index 0000000..02a9e4e Binary files /dev/null and b/app/build/intermediates/merged_res/debug/raw_introduction.flat differ diff --git a/app/build/intermediates/merged_res/debug/values-zh-rCN_values-zh-rCN.arsc.flat b/app/build/intermediates/merged_res/debug/values-zh-rCN_values-zh-rCN.arsc.flat new file mode 100644 index 0000000..4e7bd33 Binary files /dev/null and b/app/build/intermediates/merged_res/debug/values-zh-rCN_values-zh-rCN.arsc.flat differ diff --git a/app/build/intermediates/merged_res/debug/values-zh-rTW_values-zh-rTW.arsc.flat b/app/build/intermediates/merged_res/debug/values-zh-rTW_values-zh-rTW.arsc.flat new file mode 100644 index 0000000..0e5932b Binary files /dev/null and b/app/build/intermediates/merged_res/debug/values-zh-rTW_values-zh-rTW.arsc.flat differ diff --git a/app/build/intermediates/merged_res/debug/values_values.arsc.flat b/app/build/intermediates/merged_res/debug/values_values.arsc.flat new file mode 100644 index 0000000..40e69d2 Binary files /dev/null and b/app/build/intermediates/merged_res/debug/values_values.arsc.flat differ diff --git a/app/build/intermediates/merged_res/debug/xml_preferences.xml.flat b/app/build/intermediates/merged_res/debug/xml_preferences.xml.flat new file mode 100644 index 0000000..752f47f Binary files /dev/null and b/app/build/intermediates/merged_res/debug/xml_preferences.xml.flat differ diff --git a/app/build/intermediates/merged_res/debug/xml_searchable.xml.flat b/app/build/intermediates/merged_res/debug/xml_searchable.xml.flat new file mode 100644 index 0000000..625e86f Binary files /dev/null and b/app/build/intermediates/merged_res/debug/xml_searchable.xml.flat differ diff --git a/app/build/intermediates/merged_res/debug/xml_widget_2x_info.xml.flat b/app/build/intermediates/merged_res/debug/xml_widget_2x_info.xml.flat new file mode 100644 index 0000000..ad294be Binary files /dev/null and b/app/build/intermediates/merged_res/debug/xml_widget_2x_info.xml.flat differ diff --git a/app/build/intermediates/merged_res/debug/xml_widget_4x_info.xml.flat b/app/build/intermediates/merged_res/debug/xml_widget_4x_info.xml.flat new file mode 100644 index 0000000..4d8a2a5 Binary files /dev/null and b/app/build/intermediates/merged_res/debug/xml_widget_4x_info.xml.flat differ diff --git a/app/build/intermediates/merged_res/release/color_primary_text_dark.xml.flat b/app/build/intermediates/merged_res/release/color_primary_text_dark.xml.flat new file mode 100644 index 0000000..09dc5b0 Binary files /dev/null and b/app/build/intermediates/merged_res/release/color_primary_text_dark.xml.flat differ diff --git a/app/build/intermediates/merged_res/release/color_secondary_text_dark.xml.flat b/app/build/intermediates/merged_res/release/color_secondary_text_dark.xml.flat new file mode 100644 index 0000000..bc8b7af Binary files /dev/null and b/app/build/intermediates/merged_res/release/color_secondary_text_dark.xml.flat differ diff --git a/app/build/intermediates/merged_res/release/drawable-hdpi_bg_btn_set_color.png.flat b/app/build/intermediates/merged_res/release/drawable-hdpi_bg_btn_set_color.png.flat new file mode 100644 index 0000000..a7d837b Binary files /dev/null and b/app/build/intermediates/merged_res/release/drawable-hdpi_bg_btn_set_color.png.flat differ diff --git a/app/build/intermediates/merged_res/release/drawable-hdpi_bg_color_btn_mask.png.flat b/app/build/intermediates/merged_res/release/drawable-hdpi_bg_color_btn_mask.png.flat new file mode 100644 index 0000000..69cfe20 Binary files /dev/null and b/app/build/intermediates/merged_res/release/drawable-hdpi_bg_color_btn_mask.png.flat differ diff --git a/app/build/intermediates/merged_res/release/drawable-hdpi_call_record.png.flat b/app/build/intermediates/merged_res/release/drawable-hdpi_call_record.png.flat new file mode 100644 index 0000000..1cb89c8 Binary files /dev/null and b/app/build/intermediates/merged_res/release/drawable-hdpi_call_record.png.flat differ diff --git a/app/build/intermediates/merged_res/release/drawable-hdpi_clock.png.flat b/app/build/intermediates/merged_res/release/drawable-hdpi_clock.png.flat new file mode 100644 index 0000000..903fa9f Binary files /dev/null and b/app/build/intermediates/merged_res/release/drawable-hdpi_clock.png.flat differ diff --git a/app/build/intermediates/merged_res/release/drawable-hdpi_delete.png.flat b/app/build/intermediates/merged_res/release/drawable-hdpi_delete.png.flat new file mode 100644 index 0000000..bf6fec8 Binary files /dev/null and b/app/build/intermediates/merged_res/release/drawable-hdpi_delete.png.flat differ diff --git a/app/build/intermediates/merged_res/release/drawable-hdpi_dropdown_icon.9.png.flat b/app/build/intermediates/merged_res/release/drawable-hdpi_dropdown_icon.9.png.flat new file mode 100644 index 0000000..53bcfe6 Binary files /dev/null and b/app/build/intermediates/merged_res/release/drawable-hdpi_dropdown_icon.9.png.flat differ diff --git a/app/build/intermediates/merged_res/release/drawable-hdpi_edit_blue.9.png.flat b/app/build/intermediates/merged_res/release/drawable-hdpi_edit_blue.9.png.flat new file mode 100644 index 0000000..6fd9daf Binary files /dev/null and b/app/build/intermediates/merged_res/release/drawable-hdpi_edit_blue.9.png.flat differ diff --git a/app/build/intermediates/merged_res/release/drawable-hdpi_edit_green.9.png.flat b/app/build/intermediates/merged_res/release/drawable-hdpi_edit_green.9.png.flat new file mode 100644 index 0000000..c89911f Binary files /dev/null and b/app/build/intermediates/merged_res/release/drawable-hdpi_edit_green.9.png.flat differ diff --git a/app/build/intermediates/merged_res/release/drawable-hdpi_edit_red.9.png.flat b/app/build/intermediates/merged_res/release/drawable-hdpi_edit_red.9.png.flat new file mode 100644 index 0000000..606c528 Binary files /dev/null and b/app/build/intermediates/merged_res/release/drawable-hdpi_edit_red.9.png.flat differ diff --git a/app/build/intermediates/merged_res/release/drawable-hdpi_edit_title_blue.9.png.flat b/app/build/intermediates/merged_res/release/drawable-hdpi_edit_title_blue.9.png.flat new file mode 100644 index 0000000..271d052 Binary files /dev/null and b/app/build/intermediates/merged_res/release/drawable-hdpi_edit_title_blue.9.png.flat differ diff --git a/app/build/intermediates/merged_res/release/drawable-hdpi_edit_title_green.9.png.flat b/app/build/intermediates/merged_res/release/drawable-hdpi_edit_title_green.9.png.flat new file mode 100644 index 0000000..6cef9fb Binary files /dev/null and b/app/build/intermediates/merged_res/release/drawable-hdpi_edit_title_green.9.png.flat differ diff --git a/app/build/intermediates/merged_res/release/drawable-hdpi_edit_title_red.9.png.flat b/app/build/intermediates/merged_res/release/drawable-hdpi_edit_title_red.9.png.flat new file mode 100644 index 0000000..aca0b6c Binary files /dev/null and b/app/build/intermediates/merged_res/release/drawable-hdpi_edit_title_red.9.png.flat differ diff --git a/app/build/intermediates/merged_res/release/drawable-hdpi_edit_title_white.9.png.flat b/app/build/intermediates/merged_res/release/drawable-hdpi_edit_title_white.9.png.flat new file mode 100644 index 0000000..812e4bc Binary files /dev/null and b/app/build/intermediates/merged_res/release/drawable-hdpi_edit_title_white.9.png.flat differ diff --git a/app/build/intermediates/merged_res/release/drawable-hdpi_edit_title_yellow.9.png.flat b/app/build/intermediates/merged_res/release/drawable-hdpi_edit_title_yellow.9.png.flat new file mode 100644 index 0000000..651cff3 Binary files /dev/null and b/app/build/intermediates/merged_res/release/drawable-hdpi_edit_title_yellow.9.png.flat differ diff --git a/app/build/intermediates/merged_res/release/drawable-hdpi_edit_white.9.png.flat b/app/build/intermediates/merged_res/release/drawable-hdpi_edit_white.9.png.flat new file mode 100644 index 0000000..aa28ab0 Binary files /dev/null and b/app/build/intermediates/merged_res/release/drawable-hdpi_edit_white.9.png.flat differ diff --git a/app/build/intermediates/merged_res/release/drawable-hdpi_edit_yellow.9.png.flat b/app/build/intermediates/merged_res/release/drawable-hdpi_edit_yellow.9.png.flat new file mode 100644 index 0000000..0a50ba8 Binary files /dev/null and b/app/build/intermediates/merged_res/release/drawable-hdpi_edit_yellow.9.png.flat differ diff --git a/app/build/intermediates/merged_res/release/drawable-hdpi_font_large.png.flat b/app/build/intermediates/merged_res/release/drawable-hdpi_font_large.png.flat new file mode 100644 index 0000000..05f1bf5 Binary files /dev/null and b/app/build/intermediates/merged_res/release/drawable-hdpi_font_large.png.flat differ diff --git a/app/build/intermediates/merged_res/release/drawable-hdpi_font_normal.png.flat b/app/build/intermediates/merged_res/release/drawable-hdpi_font_normal.png.flat new file mode 100644 index 0000000..c521631 Binary files /dev/null and b/app/build/intermediates/merged_res/release/drawable-hdpi_font_normal.png.flat differ diff --git a/app/build/intermediates/merged_res/release/drawable-hdpi_font_size_selector_bg.9.png.flat b/app/build/intermediates/merged_res/release/drawable-hdpi_font_size_selector_bg.9.png.flat new file mode 100644 index 0000000..0fdf7d0 Binary files /dev/null and b/app/build/intermediates/merged_res/release/drawable-hdpi_font_size_selector_bg.9.png.flat differ diff --git a/app/build/intermediates/merged_res/release/drawable-hdpi_font_small.png.flat b/app/build/intermediates/merged_res/release/drawable-hdpi_font_small.png.flat new file mode 100644 index 0000000..7b9f6a7 Binary files /dev/null and b/app/build/intermediates/merged_res/release/drawable-hdpi_font_small.png.flat differ diff --git a/app/build/intermediates/merged_res/release/drawable-hdpi_font_super.png.flat b/app/build/intermediates/merged_res/release/drawable-hdpi_font_super.png.flat new file mode 100644 index 0000000..ef33d65 Binary files /dev/null and b/app/build/intermediates/merged_res/release/drawable-hdpi_font_super.png.flat differ diff --git a/app/build/intermediates/merged_res/release/drawable-hdpi_icon_app.png.flat b/app/build/intermediates/merged_res/release/drawable-hdpi_icon_app.png.flat new file mode 100644 index 0000000..c61e324 Binary files /dev/null and b/app/build/intermediates/merged_res/release/drawable-hdpi_icon_app.png.flat differ diff --git a/app/build/intermediates/merged_res/release/drawable-hdpi_list_background.png.flat b/app/build/intermediates/merged_res/release/drawable-hdpi_list_background.png.flat new file mode 100644 index 0000000..c5efc7d Binary files /dev/null and b/app/build/intermediates/merged_res/release/drawable-hdpi_list_background.png.flat differ diff --git a/app/build/intermediates/merged_res/release/drawable-hdpi_list_blue_down.9.png.flat b/app/build/intermediates/merged_res/release/drawable-hdpi_list_blue_down.9.png.flat new file mode 100644 index 0000000..3fdb17f Binary files /dev/null and b/app/build/intermediates/merged_res/release/drawable-hdpi_list_blue_down.9.png.flat differ diff --git a/app/build/intermediates/merged_res/release/drawable-hdpi_list_blue_middle.9.png.flat b/app/build/intermediates/merged_res/release/drawable-hdpi_list_blue_middle.9.png.flat new file mode 100644 index 0000000..de5f5da Binary files /dev/null and b/app/build/intermediates/merged_res/release/drawable-hdpi_list_blue_middle.9.png.flat differ diff --git a/app/build/intermediates/merged_res/release/drawable-hdpi_list_blue_single.9.png.flat b/app/build/intermediates/merged_res/release/drawable-hdpi_list_blue_single.9.png.flat new file mode 100644 index 0000000..75706ad Binary files /dev/null and b/app/build/intermediates/merged_res/release/drawable-hdpi_list_blue_single.9.png.flat differ diff --git a/app/build/intermediates/merged_res/release/drawable-hdpi_list_blue_up.9.png.flat b/app/build/intermediates/merged_res/release/drawable-hdpi_list_blue_up.9.png.flat new file mode 100644 index 0000000..2e766eb Binary files /dev/null and b/app/build/intermediates/merged_res/release/drawable-hdpi_list_blue_up.9.png.flat differ diff --git a/app/build/intermediates/merged_res/release/drawable-hdpi_list_folder.9.png.flat b/app/build/intermediates/merged_res/release/drawable-hdpi_list_folder.9.png.flat new file mode 100644 index 0000000..a0fb8a5 Binary files /dev/null and b/app/build/intermediates/merged_res/release/drawable-hdpi_list_folder.9.png.flat differ diff --git a/app/build/intermediates/merged_res/release/drawable-hdpi_list_footer_bg.9.png.flat b/app/build/intermediates/merged_res/release/drawable-hdpi_list_footer_bg.9.png.flat new file mode 100644 index 0000000..231e936 Binary files /dev/null and b/app/build/intermediates/merged_res/release/drawable-hdpi_list_footer_bg.9.png.flat differ diff --git a/app/build/intermediates/merged_res/release/drawable-hdpi_list_green_down.9.png.flat b/app/build/intermediates/merged_res/release/drawable-hdpi_list_green_down.9.png.flat new file mode 100644 index 0000000..6f5265d Binary files /dev/null and b/app/build/intermediates/merged_res/release/drawable-hdpi_list_green_down.9.png.flat differ diff --git a/app/build/intermediates/merged_res/release/drawable-hdpi_list_green_middle.9.png.flat b/app/build/intermediates/merged_res/release/drawable-hdpi_list_green_middle.9.png.flat new file mode 100644 index 0000000..fc2bf65 Binary files /dev/null and b/app/build/intermediates/merged_res/release/drawable-hdpi_list_green_middle.9.png.flat differ diff --git a/app/build/intermediates/merged_res/release/drawable-hdpi_list_green_single.9.png.flat b/app/build/intermediates/merged_res/release/drawable-hdpi_list_green_single.9.png.flat new file mode 100644 index 0000000..de3ea7d Binary files /dev/null and b/app/build/intermediates/merged_res/release/drawable-hdpi_list_green_single.9.png.flat differ diff --git a/app/build/intermediates/merged_res/release/drawable-hdpi_list_green_up.9.png.flat b/app/build/intermediates/merged_res/release/drawable-hdpi_list_green_up.9.png.flat new file mode 100644 index 0000000..5526e5e Binary files /dev/null and b/app/build/intermediates/merged_res/release/drawable-hdpi_list_green_up.9.png.flat differ diff --git a/app/build/intermediates/merged_res/release/drawable-hdpi_list_red_down.9.png.flat b/app/build/intermediates/merged_res/release/drawable-hdpi_list_red_down.9.png.flat new file mode 100644 index 0000000..cb5e538 Binary files /dev/null and b/app/build/intermediates/merged_res/release/drawable-hdpi_list_red_down.9.png.flat differ diff --git a/app/build/intermediates/merged_res/release/drawable-hdpi_list_red_middle.9.png.flat b/app/build/intermediates/merged_res/release/drawable-hdpi_list_red_middle.9.png.flat new file mode 100644 index 0000000..82ba754 Binary files /dev/null and b/app/build/intermediates/merged_res/release/drawable-hdpi_list_red_middle.9.png.flat differ diff --git a/app/build/intermediates/merged_res/release/drawable-hdpi_list_red_single.9.png.flat b/app/build/intermediates/merged_res/release/drawable-hdpi_list_red_single.9.png.flat new file mode 100644 index 0000000..dbca84a Binary files /dev/null and b/app/build/intermediates/merged_res/release/drawable-hdpi_list_red_single.9.png.flat differ diff --git a/app/build/intermediates/merged_res/release/drawable-hdpi_list_red_up.9.png.flat b/app/build/intermediates/merged_res/release/drawable-hdpi_list_red_up.9.png.flat new file mode 100644 index 0000000..86965b6 Binary files /dev/null and b/app/build/intermediates/merged_res/release/drawable-hdpi_list_red_up.9.png.flat differ diff --git a/app/build/intermediates/merged_res/release/drawable-hdpi_list_white_down.9.png.flat b/app/build/intermediates/merged_res/release/drawable-hdpi_list_white_down.9.png.flat new file mode 100644 index 0000000..058d82d Binary files /dev/null and b/app/build/intermediates/merged_res/release/drawable-hdpi_list_white_down.9.png.flat differ diff --git a/app/build/intermediates/merged_res/release/drawable-hdpi_list_white_middle.9.png.flat b/app/build/intermediates/merged_res/release/drawable-hdpi_list_white_middle.9.png.flat new file mode 100644 index 0000000..e3a147e Binary files /dev/null and b/app/build/intermediates/merged_res/release/drawable-hdpi_list_white_middle.9.png.flat differ diff --git a/app/build/intermediates/merged_res/release/drawable-hdpi_list_white_single.9.png.flat b/app/build/intermediates/merged_res/release/drawable-hdpi_list_white_single.9.png.flat new file mode 100644 index 0000000..c333255 Binary files /dev/null and b/app/build/intermediates/merged_res/release/drawable-hdpi_list_white_single.9.png.flat differ diff --git a/app/build/intermediates/merged_res/release/drawable-hdpi_list_white_up.9.png.flat b/app/build/intermediates/merged_res/release/drawable-hdpi_list_white_up.9.png.flat new file mode 100644 index 0000000..72519be Binary files /dev/null and b/app/build/intermediates/merged_res/release/drawable-hdpi_list_white_up.9.png.flat differ diff --git a/app/build/intermediates/merged_res/release/drawable-hdpi_list_yellow_down.9.png.flat b/app/build/intermediates/merged_res/release/drawable-hdpi_list_yellow_down.9.png.flat new file mode 100644 index 0000000..3fc3613 Binary files /dev/null and b/app/build/intermediates/merged_res/release/drawable-hdpi_list_yellow_down.9.png.flat differ diff --git a/app/build/intermediates/merged_res/release/drawable-hdpi_list_yellow_middle.9.png.flat b/app/build/intermediates/merged_res/release/drawable-hdpi_list_yellow_middle.9.png.flat new file mode 100644 index 0000000..b383538 Binary files /dev/null and b/app/build/intermediates/merged_res/release/drawable-hdpi_list_yellow_middle.9.png.flat differ diff --git a/app/build/intermediates/merged_res/release/drawable-hdpi_list_yellow_single.9.png.flat b/app/build/intermediates/merged_res/release/drawable-hdpi_list_yellow_single.9.png.flat new file mode 100644 index 0000000..6658a57 Binary files /dev/null and b/app/build/intermediates/merged_res/release/drawable-hdpi_list_yellow_single.9.png.flat differ diff --git a/app/build/intermediates/merged_res/release/drawable-hdpi_list_yellow_up.9.png.flat b/app/build/intermediates/merged_res/release/drawable-hdpi_list_yellow_up.9.png.flat new file mode 100644 index 0000000..994f569 Binary files /dev/null and b/app/build/intermediates/merged_res/release/drawable-hdpi_list_yellow_up.9.png.flat differ diff --git a/app/build/intermediates/merged_res/release/drawable-hdpi_menu_delete.png.flat b/app/build/intermediates/merged_res/release/drawable-hdpi_menu_delete.png.flat new file mode 100644 index 0000000..23d8db7 Binary files /dev/null and b/app/build/intermediates/merged_res/release/drawable-hdpi_menu_delete.png.flat differ diff --git a/app/build/intermediates/merged_res/release/drawable-hdpi_menu_move.png.flat b/app/build/intermediates/merged_res/release/drawable-hdpi_menu_move.png.flat new file mode 100644 index 0000000..1567f7a Binary files /dev/null and b/app/build/intermediates/merged_res/release/drawable-hdpi_menu_move.png.flat differ diff --git a/app/build/intermediates/merged_res/release/drawable-hdpi_new_note_normal.png.flat b/app/build/intermediates/merged_res/release/drawable-hdpi_new_note_normal.png.flat new file mode 100644 index 0000000..b91b1b1 Binary files /dev/null and b/app/build/intermediates/merged_res/release/drawable-hdpi_new_note_normal.png.flat differ diff --git a/app/build/intermediates/merged_res/release/drawable-hdpi_new_note_pressed.png.flat b/app/build/intermediates/merged_res/release/drawable-hdpi_new_note_pressed.png.flat new file mode 100644 index 0000000..9569f82 Binary files /dev/null and b/app/build/intermediates/merged_res/release/drawable-hdpi_new_note_pressed.png.flat differ diff --git a/app/build/intermediates/merged_res/release/drawable-hdpi_note_edit_color_selector_panel.png.flat b/app/build/intermediates/merged_res/release/drawable-hdpi_note_edit_color_selector_panel.png.flat new file mode 100644 index 0000000..ea74af3 Binary files /dev/null and b/app/build/intermediates/merged_res/release/drawable-hdpi_note_edit_color_selector_panel.png.flat differ diff --git a/app/build/intermediates/merged_res/release/drawable-hdpi_notification.png.flat b/app/build/intermediates/merged_res/release/drawable-hdpi_notification.png.flat new file mode 100644 index 0000000..c8d29c6 Binary files /dev/null and b/app/build/intermediates/merged_res/release/drawable-hdpi_notification.png.flat differ diff --git a/app/build/intermediates/merged_res/release/drawable-hdpi_search_result.png.flat b/app/build/intermediates/merged_res/release/drawable-hdpi_search_result.png.flat new file mode 100644 index 0000000..e91f2b4 Binary files /dev/null and b/app/build/intermediates/merged_res/release/drawable-hdpi_search_result.png.flat differ diff --git a/app/build/intermediates/merged_res/release/drawable-hdpi_selected.png.flat b/app/build/intermediates/merged_res/release/drawable-hdpi_selected.png.flat new file mode 100644 index 0000000..6401daf Binary files /dev/null and b/app/build/intermediates/merged_res/release/drawable-hdpi_selected.png.flat differ diff --git a/app/build/intermediates/merged_res/release/drawable-hdpi_title_alert.png.flat b/app/build/intermediates/merged_res/release/drawable-hdpi_title_alert.png.flat new file mode 100644 index 0000000..d4ae4b3 Binary files /dev/null and b/app/build/intermediates/merged_res/release/drawable-hdpi_title_alert.png.flat differ diff --git a/app/build/intermediates/merged_res/release/drawable-hdpi_title_bar_bg.9.png.flat b/app/build/intermediates/merged_res/release/drawable-hdpi_title_bar_bg.9.png.flat new file mode 100644 index 0000000..306285d Binary files /dev/null and b/app/build/intermediates/merged_res/release/drawable-hdpi_title_bar_bg.9.png.flat differ diff --git a/app/build/intermediates/merged_res/release/drawable-hdpi_widget_2x_blue.png.flat b/app/build/intermediates/merged_res/release/drawable-hdpi_widget_2x_blue.png.flat new file mode 100644 index 0000000..2aae1b4 Binary files /dev/null and b/app/build/intermediates/merged_res/release/drawable-hdpi_widget_2x_blue.png.flat differ diff --git a/app/build/intermediates/merged_res/release/drawable-hdpi_widget_2x_green.png.flat b/app/build/intermediates/merged_res/release/drawable-hdpi_widget_2x_green.png.flat new file mode 100644 index 0000000..95051b6 Binary files /dev/null and b/app/build/intermediates/merged_res/release/drawable-hdpi_widget_2x_green.png.flat differ diff --git a/app/build/intermediates/merged_res/release/drawable-hdpi_widget_2x_red.png.flat b/app/build/intermediates/merged_res/release/drawable-hdpi_widget_2x_red.png.flat new file mode 100644 index 0000000..dbb656c Binary files /dev/null and b/app/build/intermediates/merged_res/release/drawable-hdpi_widget_2x_red.png.flat differ diff --git a/app/build/intermediates/merged_res/release/drawable-hdpi_widget_2x_white.png.flat b/app/build/intermediates/merged_res/release/drawable-hdpi_widget_2x_white.png.flat new file mode 100644 index 0000000..8d8fb50 Binary files /dev/null and b/app/build/intermediates/merged_res/release/drawable-hdpi_widget_2x_white.png.flat differ diff --git a/app/build/intermediates/merged_res/release/drawable-hdpi_widget_2x_yellow.png.flat b/app/build/intermediates/merged_res/release/drawable-hdpi_widget_2x_yellow.png.flat new file mode 100644 index 0000000..d8705ff Binary files /dev/null and b/app/build/intermediates/merged_res/release/drawable-hdpi_widget_2x_yellow.png.flat differ diff --git a/app/build/intermediates/merged_res/release/drawable-hdpi_widget_4x_blue.png.flat b/app/build/intermediates/merged_res/release/drawable-hdpi_widget_4x_blue.png.flat new file mode 100644 index 0000000..34753c8 Binary files /dev/null and b/app/build/intermediates/merged_res/release/drawable-hdpi_widget_4x_blue.png.flat differ diff --git a/app/build/intermediates/merged_res/release/drawable-hdpi_widget_4x_green.png.flat b/app/build/intermediates/merged_res/release/drawable-hdpi_widget_4x_green.png.flat new file mode 100644 index 0000000..9de275e Binary files /dev/null and b/app/build/intermediates/merged_res/release/drawable-hdpi_widget_4x_green.png.flat differ diff --git a/app/build/intermediates/merged_res/release/drawable-hdpi_widget_4x_red.png.flat b/app/build/intermediates/merged_res/release/drawable-hdpi_widget_4x_red.png.flat new file mode 100644 index 0000000..52ad11c Binary files /dev/null and b/app/build/intermediates/merged_res/release/drawable-hdpi_widget_4x_red.png.flat differ diff --git a/app/build/intermediates/merged_res/release/drawable-hdpi_widget_4x_white.png.flat b/app/build/intermediates/merged_res/release/drawable-hdpi_widget_4x_white.png.flat new file mode 100644 index 0000000..416fdf4 Binary files /dev/null and b/app/build/intermediates/merged_res/release/drawable-hdpi_widget_4x_white.png.flat differ diff --git a/app/build/intermediates/merged_res/release/drawable-hdpi_widget_4x_yellow.png.flat b/app/build/intermediates/merged_res/release/drawable-hdpi_widget_4x_yellow.png.flat new file mode 100644 index 0000000..d490371 Binary files /dev/null and b/app/build/intermediates/merged_res/release/drawable-hdpi_widget_4x_yellow.png.flat differ diff --git a/app/build/intermediates/merged_res/release/drawable_new_note.xml.flat b/app/build/intermediates/merged_res/release/drawable_new_note.xml.flat new file mode 100644 index 0000000..c58dd7b Binary files /dev/null and b/app/build/intermediates/merged_res/release/drawable_new_note.xml.flat differ diff --git a/app/build/intermediates/merged_res/release/layout_account_dialog_title.xml.flat b/app/build/intermediates/merged_res/release/layout_account_dialog_title.xml.flat new file mode 100644 index 0000000..632d158 Binary files /dev/null and b/app/build/intermediates/merged_res/release/layout_account_dialog_title.xml.flat differ diff --git a/app/build/intermediates/merged_res/release/layout_add_account_text.xml.flat b/app/build/intermediates/merged_res/release/layout_add_account_text.xml.flat new file mode 100644 index 0000000..b46effa Binary files /dev/null and b/app/build/intermediates/merged_res/release/layout_add_account_text.xml.flat differ diff --git a/app/build/intermediates/merged_res/release/layout_datetime_picker.xml.flat b/app/build/intermediates/merged_res/release/layout_datetime_picker.xml.flat new file mode 100644 index 0000000..fec097a Binary files /dev/null and b/app/build/intermediates/merged_res/release/layout_datetime_picker.xml.flat differ diff --git a/app/build/intermediates/merged_res/release/layout_dialog_edit_text.xml.flat b/app/build/intermediates/merged_res/release/layout_dialog_edit_text.xml.flat new file mode 100644 index 0000000..2e36f8d Binary files /dev/null and b/app/build/intermediates/merged_res/release/layout_dialog_edit_text.xml.flat differ diff --git a/app/build/intermediates/merged_res/release/layout_folder_list_item.xml.flat b/app/build/intermediates/merged_res/release/layout_folder_list_item.xml.flat new file mode 100644 index 0000000..aff30cb Binary files /dev/null and b/app/build/intermediates/merged_res/release/layout_folder_list_item.xml.flat differ diff --git a/app/build/intermediates/merged_res/release/layout_note_edit.xml.flat b/app/build/intermediates/merged_res/release/layout_note_edit.xml.flat new file mode 100644 index 0000000..194cc1c Binary files /dev/null and b/app/build/intermediates/merged_res/release/layout_note_edit.xml.flat differ diff --git a/app/build/intermediates/merged_res/release/layout_note_edit_list_item.xml.flat b/app/build/intermediates/merged_res/release/layout_note_edit_list_item.xml.flat new file mode 100644 index 0000000..0d7b135 Binary files /dev/null and b/app/build/intermediates/merged_res/release/layout_note_edit_list_item.xml.flat differ diff --git a/app/build/intermediates/merged_res/release/layout_note_item.xml.flat b/app/build/intermediates/merged_res/release/layout_note_item.xml.flat new file mode 100644 index 0000000..474a99d Binary files /dev/null and b/app/build/intermediates/merged_res/release/layout_note_item.xml.flat differ diff --git a/app/build/intermediates/merged_res/release/layout_note_list.xml.flat b/app/build/intermediates/merged_res/release/layout_note_list.xml.flat new file mode 100644 index 0000000..c8d2db1 Binary files /dev/null and b/app/build/intermediates/merged_res/release/layout_note_list.xml.flat differ diff --git a/app/build/intermediates/merged_res/release/layout_note_list_dropdown_menu.xml.flat b/app/build/intermediates/merged_res/release/layout_note_list_dropdown_menu.xml.flat new file mode 100644 index 0000000..16ac32d Binary files /dev/null and b/app/build/intermediates/merged_res/release/layout_note_list_dropdown_menu.xml.flat differ diff --git a/app/build/intermediates/merged_res/release/layout_note_list_footer.xml.flat b/app/build/intermediates/merged_res/release/layout_note_list_footer.xml.flat new file mode 100644 index 0000000..68ed15e Binary files /dev/null and b/app/build/intermediates/merged_res/release/layout_note_list_footer.xml.flat differ diff --git a/app/build/intermediates/merged_res/release/layout_settings_header.xml.flat b/app/build/intermediates/merged_res/release/layout_settings_header.xml.flat new file mode 100644 index 0000000..f342efb Binary files /dev/null and b/app/build/intermediates/merged_res/release/layout_settings_header.xml.flat differ diff --git a/app/build/intermediates/merged_res/release/layout_widget_2x.xml.flat b/app/build/intermediates/merged_res/release/layout_widget_2x.xml.flat new file mode 100644 index 0000000..c84d1a5 Binary files /dev/null and b/app/build/intermediates/merged_res/release/layout_widget_2x.xml.flat differ diff --git a/app/build/intermediates/merged_res/release/layout_widget_4x.xml.flat b/app/build/intermediates/merged_res/release/layout_widget_4x.xml.flat new file mode 100644 index 0000000..56b5316 Binary files /dev/null and b/app/build/intermediates/merged_res/release/layout_widget_4x.xml.flat differ diff --git a/app/build/intermediates/merged_res/release/menu_call_note_edit.xml.flat b/app/build/intermediates/merged_res/release/menu_call_note_edit.xml.flat new file mode 100644 index 0000000..e57f250 Binary files /dev/null and b/app/build/intermediates/merged_res/release/menu_call_note_edit.xml.flat differ diff --git a/app/build/intermediates/merged_res/release/menu_call_record_folder.xml.flat b/app/build/intermediates/merged_res/release/menu_call_record_folder.xml.flat new file mode 100644 index 0000000..5577464 Binary files /dev/null and b/app/build/intermediates/merged_res/release/menu_call_record_folder.xml.flat differ diff --git a/app/build/intermediates/merged_res/release/menu_note_edit.xml.flat b/app/build/intermediates/merged_res/release/menu_note_edit.xml.flat new file mode 100644 index 0000000..a479e9f Binary files /dev/null and b/app/build/intermediates/merged_res/release/menu_note_edit.xml.flat differ diff --git a/app/build/intermediates/merged_res/release/menu_note_list.xml.flat b/app/build/intermediates/merged_res/release/menu_note_list.xml.flat new file mode 100644 index 0000000..fd103b4 Binary files /dev/null and b/app/build/intermediates/merged_res/release/menu_note_list.xml.flat differ diff --git a/app/build/intermediates/merged_res/release/menu_note_list_dropdown.xml.flat b/app/build/intermediates/merged_res/release/menu_note_list_dropdown.xml.flat new file mode 100644 index 0000000..b0dd5d6 Binary files /dev/null and b/app/build/intermediates/merged_res/release/menu_note_list_dropdown.xml.flat differ diff --git a/app/build/intermediates/merged_res/release/menu_note_list_options.xml.flat b/app/build/intermediates/merged_res/release/menu_note_list_options.xml.flat new file mode 100644 index 0000000..2fc1a54 Binary files /dev/null and b/app/build/intermediates/merged_res/release/menu_note_list_options.xml.flat differ diff --git a/app/build/intermediates/merged_res/release/menu_sub_folder.xml.flat b/app/build/intermediates/merged_res/release/menu_sub_folder.xml.flat new file mode 100644 index 0000000..c33c990 Binary files /dev/null and b/app/build/intermediates/merged_res/release/menu_sub_folder.xml.flat differ diff --git a/app/build/intermediates/merged_res/release/raw-zh-rCN_introduction.flat b/app/build/intermediates/merged_res/release/raw-zh-rCN_introduction.flat new file mode 100644 index 0000000..daec094 Binary files /dev/null and b/app/build/intermediates/merged_res/release/raw-zh-rCN_introduction.flat differ diff --git a/app/build/intermediates/merged_res/release/raw_introduction.flat b/app/build/intermediates/merged_res/release/raw_introduction.flat new file mode 100644 index 0000000..0a653fe Binary files /dev/null and b/app/build/intermediates/merged_res/release/raw_introduction.flat differ diff --git a/app/build/intermediates/merged_res/release/values-zh-rCN_values-zh-rCN.arsc.flat b/app/build/intermediates/merged_res/release/values-zh-rCN_values-zh-rCN.arsc.flat new file mode 100644 index 0000000..cb82be6 Binary files /dev/null and b/app/build/intermediates/merged_res/release/values-zh-rCN_values-zh-rCN.arsc.flat differ diff --git a/app/build/intermediates/merged_res/release/values-zh-rTW_values-zh-rTW.arsc.flat b/app/build/intermediates/merged_res/release/values-zh-rTW_values-zh-rTW.arsc.flat new file mode 100644 index 0000000..169c9c9 Binary files /dev/null and b/app/build/intermediates/merged_res/release/values-zh-rTW_values-zh-rTW.arsc.flat differ diff --git a/app/build/intermediates/merged_res/release/values_values.arsc.flat b/app/build/intermediates/merged_res/release/values_values.arsc.flat new file mode 100644 index 0000000..01a8f19 Binary files /dev/null and b/app/build/intermediates/merged_res/release/values_values.arsc.flat differ diff --git a/app/build/intermediates/merged_res/release/xml_preferences.xml.flat b/app/build/intermediates/merged_res/release/xml_preferences.xml.flat new file mode 100644 index 0000000..7018ede Binary files /dev/null and b/app/build/intermediates/merged_res/release/xml_preferences.xml.flat differ diff --git a/app/build/intermediates/merged_res/release/xml_searchable.xml.flat b/app/build/intermediates/merged_res/release/xml_searchable.xml.flat new file mode 100644 index 0000000..caf109f Binary files /dev/null and b/app/build/intermediates/merged_res/release/xml_searchable.xml.flat differ diff --git a/app/build/intermediates/merged_res/release/xml_widget_2x_info.xml.flat b/app/build/intermediates/merged_res/release/xml_widget_2x_info.xml.flat new file mode 100644 index 0000000..ae846cd Binary files /dev/null and b/app/build/intermediates/merged_res/release/xml_widget_2x_info.xml.flat differ diff --git a/app/build/intermediates/merged_res/release/xml_widget_4x_info.xml.flat b/app/build/intermediates/merged_res/release/xml_widget_4x_info.xml.flat new file mode 100644 index 0000000..4ead2b1 Binary files /dev/null and b/app/build/intermediates/merged_res/release/xml_widget_4x_info.xml.flat differ diff --git a/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/debug.json b/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/debug.json new file mode 100644 index 0000000..33ffc27 --- /dev/null +++ b/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/debug.json @@ -0,0 +1,186 @@ +{ + "logs": [ + { + "outputFile": "net.micode.notes.app-merged_res-4:/values-zh-rCN_values-zh-rCN.arsc.flat", + "map": [ + { + "source": "F:\\work\\Notes-master\\app\\src\\main\\res\\values-zh-rCN\\strings.xml", + "from": { + "startLines": "121,71,70,69,68,19,20,21,112,113,120,119,26,77,78,76,75,74,90,89,88,80,60,29,30,81,72,114,67,63,38,44,49,39,59,58,57,53,52,50,51,54,55,45,66,56,64,43,48,47,46,62,42,61,40,41,65,28,34,36,33,35,32,31,25,24,97,96,99,111,104,103,105,106,108,107,98,102,100,101,95,109,110,118,116,115,117,27,79,87,92,91,93,86,85,84,83,22,23", + "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", + "startOffsets": "6532,3495,3429,3356,3306,827,867,915,6083,6128,6478,6428,1199,3861,3929,3802,3737,3674,4592,4532,4469,4061,2877,1369,1422,4115,3568,6185,3247,3034,1798,2079,2325,1851,2817,2764,2713,2518,2470,2376,2424,2564,2611,2122,3188,2661,3077,2036,2278,2222,2167,2979,1992,2937,1901,1942,3129,1318,1623,1719,1576,1672,1529,1484,1148,1095,4967,4908,5108,6009,5419,5350,5483,5561,5744,5671,5042,5295,5165,5230,4859,5848,5931,6390,6283,6235,6328,1261,4006,4410,4705,4647,4772,4362,4317,4269,4218,963,1029", + "endLines": "123,71,70,69,68,19,20,21,112,113,120,119,26,77,78,76,75,74,90,89,88,80,60,29,30,81,72,114,67,63,38,44,49,39,59,58,57,53,52,50,51,54,55,45,66,56,64,43,48,47,46,62,42,61,40,41,65,28,34,36,33,35,32,31,25,24,97,96,99,111,104,103,105,106,108,107,98,102,100,101,95,109,110,118,116,115,117,27,79,87,92,91,93,86,85,84,83,22,23", + "endColumns": "14,72,65,72,49,39,47,47,44,56,53,49,61,67,76,58,64,62,54,59,62,53,59,52,61,84,80,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65", + "endOffsets": "6704,3563,3490,3424,3351,862,910,958,6123,6180,6527,6473,1256,3924,4001,3856,3797,3732,4642,4587,4527,4110,2932,1417,1479,4195,3644,6230,3301,3072,1846,2117,2371,1896,2872,2812,2759,2559,2513,2419,2465,2606,2656,2162,3242,2708,3124,2074,2320,2273,2217,3029,2031,2974,1937,1987,3183,1364,1667,1763,1618,1714,1571,1524,1194,1143,5037,4962,5160,6078,5478,5414,5556,5666,5843,5739,5103,5345,5225,5290,4903,5926,6004,6423,6323,6278,6385,1313,4056,4464,4767,4700,4829,4405,4357,4312,4264,1024,1090" + }, + "to": { + "startLines": "6,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106", + "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", + "startOffsets": "215,384,457,523,596,646,686,734,782,827,884,938,988,1050,1118,1195,1254,1319,1382,1437,1497,1560,1614,1674,1727,1789,1874,1955,2005,2064,2107,2160,2203,2254,2304,2364,2417,2468,2514,2562,2610,2656,2703,2753,2798,2857,2909,2961,3004,3051,3107,3162,3217,3261,3303,3344,3394,3453,3504,3553,3602,3649,3696,3743,3788,3839,3892,3967,4026,4083,4157,4221,4290,4368,4478,4582,4655,4721,4776,4841,4906,4955,5038,5116,5154,5199,5247,5309,5366,5421,5480,5547,5605,5667,5715,5760,5808,5859,5925", + "endLines": "8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106", + "endColumns": "14,72,65,72,49,39,47,47,44,56,53,49,61,67,76,58,64,62,54,59,62,53,59,52,61,84,80,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65", + "endOffsets": "379,452,518,591,641,681,729,777,822,879,933,983,1045,1113,1190,1249,1314,1377,1432,1492,1555,1609,1669,1722,1784,1869,1950,2000,2059,2102,2155,2198,2249,2299,2359,2412,2463,2509,2557,2605,2651,2698,2748,2793,2852,2904,2956,2999,3046,3102,3157,3212,3256,3298,3339,3389,3448,3499,3548,3597,3644,3691,3738,3783,3834,3887,3962,4021,4078,4152,4216,4285,4363,4473,4577,4650,4716,4771,4836,4901,4950,5033,5111,5149,5194,5242,5304,5361,5416,5475,5542,5600,5662,5710,5755,5803,5854,5920,5986" + } + }, + { + "source": "F:\\work\\Notes-master\\app\\src\\main\\res\\values-zh-rCN\\arrays.xml", + "from": { + "startLines": "18", + "startColumns": "4", + "startOffsets": "712", + "endLines": "21", + "endColumns": "19", + "endOffsets": "817" + }, + "to": { + "startLines": "2", + "startColumns": "4", + "startOffsets": "105", + "endLines": "5", + "endColumns": "19", + "endOffsets": "210" + } + } + ] + }, + { + "outputFile": "net.micode.notes.app-merged_res-4:/values_values.arsc.flat", + "map": [ + { + "source": "F:\\work\\Notes-master\\app\\src\\main\\res\\values\\styles.xml", + "from": { + "startLines": "50,55,64,60,22,26,30,35,40,18,45", + "startColumns": "4,4,4,4,4,4,4,4,4,4,4", + "startOffsets": "2062,2267,2640,2479,895,1078,1263,1449,1653,712,1860", + "endLines": "53,58,67,62,25,29,33,38,43,21,48", + "endColumns": "12,12,12,12,12,12,12,12,12,12,12", + "endOffsets": "2261,2473,2843,2634,1073,1258,1443,1647,1854,890,2056" + }, + "to": { + "startLines": "125,129,133,137,140,144,148,152,156,160,164", + "startColumns": "4,4,4,4,4,4,4,4,4,4,4", + "startOffsets": "8124,8328,8539,8746,8906,9089,9274,9459,9662,9868,10051", + "endLines": "128,132,136,139,143,147,151,155,159,163,167", + "endColumns": "12,12,12,12,12,12,12,12,12,12,12", + "endOffsets": "8323,8534,8741,8901,9084,9269,9454,9657,9863,10046,10247" + } + }, + { + "source": "F:\\work\\Notes-master\\app\\src\\main\\res\\values\\colors.xml", + "from": { + "startLines": "18", + "startColumns": "4", + "startOffsets": "712", + "endColumns": "56", + "endOffsets": "764" + }, + "to": { + "startLines": "12", + "startColumns": "4", + "startOffsets": "420", + "endColumns": "56", + "endOffsets": "472" + } + }, + { + "source": "F:\\work\\Notes-master\\app\\src\\main\\res\\values\\strings.xml", + "from": { + "startLines": "128,72,75,74,73,19,20,21,118,119,127,126,26,81,82,80,79,78,94,93,92,84,39,38,64,29,30,85,41,76,120,71,67,42,48,53,43,63,62,61,57,56,54,55,58,59,49,70,60,68,47,52,51,50,66,46,65,44,45,69,28,34,36,33,35,32,31,25,24,101,100,104,116,109,108,110,111,113,112,102,103,107,105,106,99,114,115,125,123,122,124,27,83,91,96,95,97,90,89,88,87,22,23", + "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", + "startOffsets": "8008,3898,4159,4063,3994,827,870,922,7506,7555,7950,7899,1282,4613,4707,4542,4458,4375,5574,5491,5389,4883,2004,1953,3397,1486,1539,4944,2097,4242,7618,3827,3582,2156,2471,2772,2214,3326,3265,3208,2986,2934,2831,2884,3036,3086,2518,3761,3146,3631,2424,2717,2629,2571,3520,2374,3475,2271,2314,3694,1431,1750,1858,1703,1805,1647,1599,1227,1174,6030,5963,6271,7409,6635,6554,6709,6798,7040,6961,6114,6189,6495,6335,6415,5908,7184,7306,7858,7731,7674,7784,1366,4815,5303,5709,5640,5789,5244,5189,5127,5067,974,1084", + "endLines": "132,72,75,74,73,19,20,21,118,119,127,126,26,81,82,80,79,78,94,93,92,84,39,38,64,29,30,85,41,76,120,71,67,42,48,53,43,63,62,61,57,56,54,55,58,59,49,70,60,68,47,52,51,50,66,46,65,44,45,69,28,34,36,33,35,32,31,25,24,101,100,104,116,109,108,110,111,113,112,102,103,107,105,106,99,114,115,125,123,122,124,27,83,91,96,95,97,90,89,88,87,22,23", + "endColumns": "14,95,82,95,68,42,51,51,48,62,57,50,83,93,107,70,83,82,65,82,101,60,61,50,77,52,59,104,58,101,54,70,48,57,46,58,56,70,60,56,49,51,52,49,49,59,52,65,61,62,46,54,87,57,61,49,44,42,59,66,54,54,52,46,52,55,47,54,52,83,66,63,95,73,80,88,162,143,78,74,81,58,79,79,54,121,102,40,52,56,73,64,67,85,79,68,93,58,54,61,59,109,89", + "endOffsets": "8412,3989,4237,4154,4058,865,917,969,7550,7613,8003,7945,1361,4702,4810,4608,4537,4453,5635,5569,5486,4939,2061,1999,3470,1534,1594,5044,2151,4339,7668,3893,3626,2209,2513,2826,2266,3392,3321,3260,3031,2981,2879,2929,3081,3141,2566,3822,3203,3689,2466,2767,2712,2624,3577,2419,3515,2309,2369,3756,1481,1800,1906,1745,1853,1698,1642,1277,1222,6109,6025,6330,7500,6704,6630,6793,6956,7179,7035,6184,6266,6549,6410,6490,5958,7301,7404,7894,7779,7726,7853,1426,4878,5384,5784,5704,5878,5298,5239,5184,5122,1079,1169" + }, + "to": { + "startLines": "18,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124", + "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", + "startOffsets": "739,1092,1188,1271,1367,1436,1479,1531,1583,1632,1695,1753,1804,1888,1982,2090,2161,2245,2328,2394,2477,2579,2640,2702,2753,2831,2884,2944,3049,3108,3210,3265,3336,3385,3443,3490,3549,3606,3677,3738,3795,3845,3897,3950,4000,4050,4110,4163,4229,4291,4354,4401,4456,4544,4602,4664,4714,4759,4802,4862,4929,4984,5039,5092,5139,5192,5248,5296,5351,5404,5488,5555,5619,5715,5789,5870,5959,6122,6266,6345,6420,6502,6561,6641,6721,6776,6898,7001,7042,7095,7152,7226,7291,7359,7445,7525,7594,7688,7747,7802,7864,7924,8034", + "endLines": "22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124", + "endColumns": "14,95,82,95,68,42,51,51,48,62,57,50,83,93,107,70,83,82,65,82,101,60,61,50,77,52,59,104,58,101,54,70,48,57,46,58,56,70,60,56,49,51,52,49,49,59,52,65,61,62,46,54,87,57,61,49,44,42,59,66,54,54,52,46,52,55,47,54,52,83,66,63,95,73,80,88,162,143,78,74,81,58,79,79,54,121,102,40,52,56,73,64,67,85,79,68,93,58,54,61,59,109,89", + "endOffsets": "1087,1183,1266,1362,1431,1474,1526,1578,1627,1690,1748,1799,1883,1977,2085,2156,2240,2323,2389,2472,2574,2635,2697,2748,2826,2879,2939,3044,3103,3205,3260,3331,3380,3438,3485,3544,3601,3672,3733,3790,3840,3892,3945,3995,4045,4105,4158,4224,4286,4349,4396,4451,4539,4597,4659,4709,4754,4797,4857,4924,4979,5034,5087,5134,5187,5243,5291,5346,5399,5483,5550,5614,5710,5784,5865,5954,6117,6261,6340,6415,6497,6556,6636,6716,6771,6893,6996,7037,7090,7147,7221,7286,7354,7440,7520,7589,7683,7742,7797,7859,7919,8029,8119" + } + }, + { + "source": "F:\\work\\Notes-master\\app\\src\\main\\res\\values\\arrays.xml", + "from": { + "startLines": "19,26", + "startColumns": "4,4", + "startOffsets": "739,1047", + "endLines": "24,29", + "endColumns": "19,19", + "endOffsets": "1041,1162" + }, + "to": { + "startLines": "2,8", + "startColumns": "4,4", + "startOffsets": "105,300", + "endLines": "7,11", + "endColumns": "19,19", + "endOffsets": "295,415" + } + }, + { + "source": "F:\\work\\Notes-master\\app\\src\\main\\res\\values\\dimens.xml", + "from": { + "startLines": "19,20,21,22,18", + "startColumns": "4,4,4,4,4", + "startOffsets": "764,816,869,922,712", + "endColumns": "51,52,52,51,51", + "endOffsets": "811,864,917,969,759" + }, + "to": { + "startLines": "13,14,15,16,17", + "startColumns": "4,4,4,4,4", + "startOffsets": "477,529,582,635,687", + "endColumns": "51,52,52,51,51", + "endOffsets": "524,577,630,682,734" + } + } + ] + }, + { + "outputFile": "net.micode.notes.app-merged_res-4:/values-zh-rTW_values-zh-rTW.arsc.flat", + "map": [ + { + "source": "F:\\work\\Notes-master\\app\\src\\main\\res\\values-zh-rTW\\arrays.xml", + "from": { + "startLines": "18", + "startColumns": "4", + "startOffsets": "712", + "endLines": "21", + "endColumns": "19", + "endOffsets": "817" + }, + "to": { + "startLines": "2", + "startColumns": "4", + "startOffsets": "105", + "endLines": "5", + "endColumns": "19", + "endOffsets": "210" + } + }, + { + "source": "F:\\work\\Notes-master\\app\\src\\main\\res\\values-zh-rTW\\strings.xml", + "from": { + "startLines": "122,72,71,70,69,19,20,21,112,113,121,120,26,76,77,75,74,73,89,88,87,79,61,29,30,80,37,114,68,64,39,45,50,40,60,59,58,54,53,51,52,55,56,46,67,57,65,44,49,48,47,63,43,62,41,42,66,28,34,36,33,35,32,31,25,24,96,95,98,110,103,102,104,105,107,106,97,101,99,100,94,108,109,119,117,116,118,27,78,86,91,90,92,85,84,83,82,22,23", + "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", + "startOffsets": "6507,3575,3509,3436,3386,827,867,915,6057,6102,6453,6403,1199,3835,3903,3776,3710,3647,4565,4505,4442,4035,2957,1369,1422,4089,1768,6159,3327,3114,1878,2159,2405,1931,2897,2844,2793,2598,2550,2456,2504,2644,2691,2202,3268,2741,3157,2116,2358,2302,2247,3059,2072,3017,1981,2022,3209,1318,1623,1719,1576,1672,1529,1484,1148,1095,4940,4881,5081,5982,5392,5323,5456,5534,5717,5644,5015,5268,5138,5203,4832,5821,5904,6365,6258,6210,6303,1261,3980,4383,4678,4620,4745,4335,4290,4242,4191,963,1029", + "endLines": "124,72,71,70,69,19,20,21,112,113,121,120,26,76,77,75,74,73,89,88,87,79,61,29,30,80,37,114,68,64,39,45,50,40,60,59,58,54,53,51,52,55,56,46,67,57,65,44,49,48,47,63,43,62,41,42,66,28,34,36,33,35,32,31,25,24,96,95,98,110,103,102,104,105,107,106,97,101,99,100,94,108,109,119,117,116,118,27,78,86,91,90,92,85,84,83,82,22,23", + "endColumns": "14,71,65,72,49,39,47,47,44,56,53,49,61,67,76,58,65,62,54,59,62,53,59,52,61,83,79,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65", + "endOffsets": "6679,3642,3570,3504,3431,862,910,958,6097,6154,6502,6448,1256,3898,3975,3830,3771,3705,4615,4560,4500,4084,3012,1417,1479,4168,1843,6204,3381,3152,1926,2197,2451,1976,2952,2892,2839,2639,2593,2499,2545,2686,2736,2242,3322,2788,3204,2154,2400,2353,2297,3109,2111,3054,2017,2067,3263,1364,1667,1763,1618,1714,1571,1524,1194,1143,5010,4935,5133,6051,5451,5387,5529,5639,5816,5712,5076,5318,5198,5263,4876,5899,5977,6398,6298,6253,6360,1313,4030,4437,4740,4673,4802,4378,4330,4285,4237,1024,1090" + }, + "to": { + "startLines": "6,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106", + "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", + "startOffsets": "215,384,456,522,595,645,685,733,781,826,883,937,987,1049,1117,1194,1253,1319,1382,1437,1497,1560,1614,1674,1727,1789,1873,1953,2003,2062,2105,2158,2201,2252,2302,2362,2415,2466,2512,2560,2608,2654,2701,2751,2796,2855,2907,2959,3002,3049,3105,3160,3215,3259,3301,3342,3392,3451,3502,3551,3600,3647,3694,3741,3786,3837,3890,3965,4024,4081,4155,4219,4288,4366,4476,4580,4653,4719,4774,4839,4904,4953,5036,5114,5152,5197,5245,5307,5364,5419,5478,5545,5603,5665,5713,5758,5806,5857,5923", + "endLines": "8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106", + "endColumns": "14,71,65,72,49,39,47,47,44,56,53,49,61,67,76,58,65,62,54,59,62,53,59,52,61,83,79,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65", + "endOffsets": "379,451,517,590,640,680,728,776,821,878,932,982,1044,1112,1189,1248,1314,1377,1432,1492,1555,1609,1669,1722,1784,1868,1948,1998,2057,2100,2153,2196,2247,2297,2357,2410,2461,2507,2555,2603,2649,2696,2746,2791,2850,2902,2954,2997,3044,3100,3155,3210,3254,3296,3337,3387,3446,3497,3546,3595,3642,3689,3736,3781,3832,3885,3960,4019,4076,4150,4214,4283,4361,4471,4575,4648,4714,4769,4834,4899,4948,5031,5109,5147,5192,5240,5302,5359,5414,5473,5540,5598,5660,5708,5753,5801,5852,5918,5984" + } + } + ] + } + ] +} \ No newline at end of file diff --git a/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rCN.json b/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rCN.json new file mode 100644 index 0000000..0cb5bce --- /dev/null +++ b/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rCN.json @@ -0,0 +1,47 @@ +{ + "logs": [ + { + "outputFile": "net.micode.notes.app-mergeDebugResources-2:/values-zh-rCN/values-zh-rCN.xml", + "map": [ + { + "source": "F:\\work\\Notes-master\\app\\src\\main\\res\\values-zh-rCN\\strings.xml", + "from": { + "startLines": "121,71,70,69,68,19,20,21,112,113,120,119,26,77,78,76,75,74,90,89,88,80,60,29,30,81,72,114,67,63,38,44,49,39,59,58,57,53,52,50,51,54,55,45,66,56,64,43,48,47,46,62,42,61,40,41,65,28,34,36,33,35,32,31,25,24,97,96,99,111,104,103,105,106,108,107,98,102,100,101,95,109,110,118,116,115,117,27,79,87,92,91,93,86,85,84,83,22,23", + "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", + "startOffsets": "6532,3495,3429,3356,3306,827,867,915,6083,6128,6478,6428,1199,3861,3929,3802,3737,3674,4592,4532,4469,4061,2877,1369,1422,4115,3568,6185,3247,3034,1798,2079,2325,1851,2817,2764,2713,2518,2470,2376,2424,2564,2611,2122,3188,2661,3077,2036,2278,2222,2167,2979,1992,2937,1901,1942,3129,1318,1623,1719,1576,1672,1529,1484,1148,1095,4967,4908,5108,6009,5419,5350,5483,5561,5744,5671,5042,5295,5165,5230,4859,5848,5931,6390,6283,6235,6328,1261,4006,4410,4705,4647,4772,4362,4317,4269,4218,963,1029", + "endLines": "123,71,70,69,68,19,20,21,112,113,120,119,26,77,78,76,75,74,90,89,88,80,60,29,30,81,72,114,67,63,38,44,49,39,59,58,57,53,52,50,51,54,55,45,66,56,64,43,48,47,46,62,42,61,40,41,65,28,34,36,33,35,32,31,25,24,97,96,99,111,104,103,105,106,108,107,98,102,100,101,95,109,110,118,116,115,117,27,79,87,92,91,93,86,85,84,83,22,23", + "endColumns": "14,72,65,72,49,39,47,47,44,56,53,49,61,67,76,58,64,62,54,59,62,53,59,52,61,84,80,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65", + "endOffsets": "6704,3563,3490,3424,3351,862,910,958,6123,6180,6527,6473,1256,3924,4001,3856,3797,3732,4642,4587,4527,4110,2932,1417,1479,4195,3644,6230,3301,3072,1846,2117,2371,1896,2872,2812,2759,2559,2513,2419,2465,2606,2656,2162,3242,2708,3124,2074,2320,2273,2217,3029,2031,2974,1937,1987,3183,1364,1667,1763,1618,1714,1571,1524,1194,1143,5037,4962,5160,6078,5478,5414,5556,5666,5843,5739,5103,5345,5225,5290,4903,5926,6004,6423,6323,6278,6385,1313,4056,4464,4767,4700,4829,4405,4357,4312,4264,1024,1090" + }, + "to": { + "startLines": "6,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106", + "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", + "startOffsets": "215,384,457,523,596,646,686,734,782,827,884,938,988,1050,1118,1195,1254,1319,1382,1437,1497,1560,1614,1674,1727,1789,1874,1955,2005,2064,2107,2160,2203,2254,2304,2364,2417,2468,2514,2562,2610,2656,2703,2753,2798,2857,2909,2961,3004,3051,3107,3162,3217,3261,3303,3344,3394,3453,3504,3553,3602,3649,3696,3743,3788,3839,3892,3967,4026,4083,4157,4221,4290,4368,4478,4582,4655,4721,4776,4841,4906,4955,5038,5116,5154,5199,5247,5309,5366,5421,5480,5547,5605,5667,5715,5760,5808,5859,5925", + "endLines": "8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106", + "endColumns": "14,72,65,72,49,39,47,47,44,56,53,49,61,67,76,58,64,62,54,59,62,53,59,52,61,84,80,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65", + "endOffsets": "379,452,518,591,641,681,729,777,822,879,933,983,1045,1113,1190,1249,1314,1377,1432,1492,1555,1609,1669,1722,1784,1869,1950,2000,2059,2102,2155,2198,2249,2299,2359,2412,2463,2509,2557,2605,2651,2698,2748,2793,2852,2904,2956,2999,3046,3102,3157,3212,3256,3298,3339,3389,3448,3499,3548,3597,3644,3691,3738,3783,3834,3887,3962,4021,4078,4152,4216,4285,4363,4473,4577,4650,4716,4771,4836,4901,4950,5033,5111,5149,5194,5242,5304,5361,5416,5475,5542,5600,5662,5710,5755,5803,5854,5920,5986" + } + }, + { + "source": "F:\\work\\Notes-master\\app\\src\\main\\res\\values-zh-rCN\\arrays.xml", + "from": { + "startLines": "18", + "startColumns": "4", + "startOffsets": "712", + "endLines": "21", + "endColumns": "19", + "endOffsets": "817" + }, + "to": { + "startLines": "2", + "startColumns": "4", + "startOffsets": "105", + "endLines": "5", + "endColumns": "19", + "endOffsets": "210" + } + } + ] + } + ] +} \ No newline at end of file diff --git a/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rTW.json b/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rTW.json new file mode 100644 index 0000000..d876e12 --- /dev/null +++ b/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rTW.json @@ -0,0 +1,47 @@ +{ + "logs": [ + { + "outputFile": "net.micode.notes.app-mergeDebugResources-2:/values-zh-rTW/values-zh-rTW.xml", + "map": [ + { + "source": "F:\\work\\Notes-master\\app\\src\\main\\res\\values-zh-rTW\\arrays.xml", + "from": { + "startLines": "18", + "startColumns": "4", + "startOffsets": "712", + "endLines": "21", + "endColumns": "19", + "endOffsets": "817" + }, + "to": { + "startLines": "2", + "startColumns": "4", + "startOffsets": "105", + "endLines": "5", + "endColumns": "19", + "endOffsets": "210" + } + }, + { + "source": "F:\\work\\Notes-master\\app\\src\\main\\res\\values-zh-rTW\\strings.xml", + "from": { + "startLines": "122,72,71,70,69,19,20,21,112,113,121,120,26,76,77,75,74,73,89,88,87,79,61,29,30,80,37,114,68,64,39,45,50,40,60,59,58,54,53,51,52,55,56,46,67,57,65,44,49,48,47,63,43,62,41,42,66,28,34,36,33,35,32,31,25,24,96,95,98,110,103,102,104,105,107,106,97,101,99,100,94,108,109,119,117,116,118,27,78,86,91,90,92,85,84,83,82,22,23", + "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", + "startOffsets": "6507,3575,3509,3436,3386,827,867,915,6057,6102,6453,6403,1199,3835,3903,3776,3710,3647,4565,4505,4442,4035,2957,1369,1422,4089,1768,6159,3327,3114,1878,2159,2405,1931,2897,2844,2793,2598,2550,2456,2504,2644,2691,2202,3268,2741,3157,2116,2358,2302,2247,3059,2072,3017,1981,2022,3209,1318,1623,1719,1576,1672,1529,1484,1148,1095,4940,4881,5081,5982,5392,5323,5456,5534,5717,5644,5015,5268,5138,5203,4832,5821,5904,6365,6258,6210,6303,1261,3980,4383,4678,4620,4745,4335,4290,4242,4191,963,1029", + "endLines": "124,72,71,70,69,19,20,21,112,113,121,120,26,76,77,75,74,73,89,88,87,79,61,29,30,80,37,114,68,64,39,45,50,40,60,59,58,54,53,51,52,55,56,46,67,57,65,44,49,48,47,63,43,62,41,42,66,28,34,36,33,35,32,31,25,24,96,95,98,110,103,102,104,105,107,106,97,101,99,100,94,108,109,119,117,116,118,27,78,86,91,90,92,85,84,83,82,22,23", + "endColumns": "14,71,65,72,49,39,47,47,44,56,53,49,61,67,76,58,65,62,54,59,62,53,59,52,61,83,79,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65", + "endOffsets": "6679,3642,3570,3504,3431,862,910,958,6097,6154,6502,6448,1256,3898,3975,3830,3771,3705,4615,4560,4500,4084,3012,1417,1479,4168,1843,6204,3381,3152,1926,2197,2451,1976,2952,2892,2839,2639,2593,2499,2545,2686,2736,2242,3322,2788,3204,2154,2400,2353,2297,3109,2111,3054,2017,2067,3263,1364,1667,1763,1618,1714,1571,1524,1194,1143,5010,4935,5133,6051,5451,5387,5529,5639,5816,5712,5076,5318,5198,5263,4876,5899,5977,6398,6298,6253,6360,1313,4030,4437,4740,4673,4802,4378,4330,4285,4237,1024,1090" + }, + "to": { + "startLines": "6,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106", + "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", + "startOffsets": "215,384,456,522,595,645,685,733,781,826,883,937,987,1049,1117,1194,1253,1319,1382,1437,1497,1560,1614,1674,1727,1789,1873,1953,2003,2062,2105,2158,2201,2252,2302,2362,2415,2466,2512,2560,2608,2654,2701,2751,2796,2855,2907,2959,3002,3049,3105,3160,3215,3259,3301,3342,3392,3451,3502,3551,3600,3647,3694,3741,3786,3837,3890,3965,4024,4081,4155,4219,4288,4366,4476,4580,4653,4719,4774,4839,4904,4953,5036,5114,5152,5197,5245,5307,5364,5419,5478,5545,5603,5665,5713,5758,5806,5857,5923", + "endLines": "8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106", + "endColumns": "14,71,65,72,49,39,47,47,44,56,53,49,61,67,76,58,65,62,54,59,62,53,59,52,61,83,79,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65", + "endOffsets": "379,451,517,590,640,680,728,776,821,878,932,982,1044,1112,1189,1248,1314,1377,1432,1492,1555,1609,1669,1722,1784,1868,1948,1998,2057,2100,2153,2196,2247,2297,2357,2410,2461,2507,2555,2603,2649,2696,2746,2791,2850,2902,2954,2997,3044,3100,3155,3210,3254,3296,3337,3387,3446,3497,3546,3595,3642,3689,3736,3781,3832,3885,3960,4019,4076,4150,4214,4283,4361,4471,4575,4648,4714,4769,4834,4899,4948,5031,5109,5147,5192,5240,5302,5359,5414,5473,5540,5598,5660,5708,5753,5801,5852,5918,5984" + } + } + ] + } + ] +} \ No newline at end of file diff --git a/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values.json b/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values.json new file mode 100644 index 0000000..c039dd1 --- /dev/null +++ b/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values.json @@ -0,0 +1,100 @@ +{ + "logs": [ + { + "outputFile": "net.micode.notes.app-mergeDebugResources-2:/values/values.xml", + "map": [ + { + "source": "F:\\work\\Notes-master\\app\\src\\main\\res\\values\\styles.xml", + "from": { + "startLines": "50,55,64,60,22,26,30,35,40,18,45", + "startColumns": "4,4,4,4,4,4,4,4,4,4,4", + "startOffsets": "2062,2267,2640,2479,895,1078,1263,1449,1653,712,1860", + "endLines": "53,58,67,62,25,29,33,38,43,21,48", + "endColumns": "12,12,12,12,12,12,12,12,12,12,12", + "endOffsets": "2261,2473,2843,2634,1073,1258,1443,1647,1854,890,2056" + }, + "to": { + "startLines": "125,129,133,137,140,144,148,152,156,160,164", + "startColumns": "4,4,4,4,4,4,4,4,4,4,4", + "startOffsets": "8124,8328,8539,8746,8906,9089,9274,9459,9662,9868,10051", + "endLines": "128,132,136,139,143,147,151,155,159,163,167", + "endColumns": "12,12,12,12,12,12,12,12,12,12,12", + "endOffsets": "8323,8534,8741,8901,9084,9269,9454,9657,9863,10046,10247" + } + }, + { + "source": "F:\\work\\Notes-master\\app\\src\\main\\res\\values\\colors.xml", + "from": { + "startLines": "18", + "startColumns": "4", + "startOffsets": "712", + "endColumns": "56", + "endOffsets": "764" + }, + "to": { + "startLines": "12", + "startColumns": "4", + "startOffsets": "420", + "endColumns": "56", + "endOffsets": "472" + } + }, + { + "source": "F:\\work\\Notes-master\\app\\src\\main\\res\\values\\strings.xml", + "from": { + "startLines": "128,72,75,74,73,19,20,21,118,119,127,126,26,81,82,80,79,78,94,93,92,84,39,38,64,29,30,85,41,76,120,71,67,42,48,53,43,63,62,61,57,56,54,55,58,59,49,70,60,68,47,52,51,50,66,46,65,44,45,69,28,34,36,33,35,32,31,25,24,101,100,104,116,109,108,110,111,113,112,102,103,107,105,106,99,114,115,125,123,122,124,27,83,91,96,95,97,90,89,88,87,22,23", + "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", + "startOffsets": "8008,3898,4159,4063,3994,827,870,922,7506,7555,7950,7899,1282,4613,4707,4542,4458,4375,5574,5491,5389,4883,2004,1953,3397,1486,1539,4944,2097,4242,7618,3827,3582,2156,2471,2772,2214,3326,3265,3208,2986,2934,2831,2884,3036,3086,2518,3761,3146,3631,2424,2717,2629,2571,3520,2374,3475,2271,2314,3694,1431,1750,1858,1703,1805,1647,1599,1227,1174,6030,5963,6271,7409,6635,6554,6709,6798,7040,6961,6114,6189,6495,6335,6415,5908,7184,7306,7858,7731,7674,7784,1366,4815,5303,5709,5640,5789,5244,5189,5127,5067,974,1084", + "endLines": "132,72,75,74,73,19,20,21,118,119,127,126,26,81,82,80,79,78,94,93,92,84,39,38,64,29,30,85,41,76,120,71,67,42,48,53,43,63,62,61,57,56,54,55,58,59,49,70,60,68,47,52,51,50,66,46,65,44,45,69,28,34,36,33,35,32,31,25,24,101,100,104,116,109,108,110,111,113,112,102,103,107,105,106,99,114,115,125,123,122,124,27,83,91,96,95,97,90,89,88,87,22,23", + "endColumns": "14,95,82,95,68,42,51,51,48,62,57,50,83,93,107,70,83,82,65,82,101,60,61,50,77,52,59,104,58,101,54,70,48,57,46,58,56,70,60,56,49,51,52,49,49,59,52,65,61,62,46,54,87,57,61,49,44,42,59,66,54,54,52,46,52,55,47,54,52,83,66,63,95,73,80,88,162,143,78,74,81,58,79,79,54,121,102,40,52,56,73,64,67,85,79,68,93,58,54,61,59,109,89", + "endOffsets": "8412,3989,4237,4154,4058,865,917,969,7550,7613,8003,7945,1361,4702,4810,4608,4537,4453,5635,5569,5486,4939,2061,1999,3470,1534,1594,5044,2151,4339,7668,3893,3626,2209,2513,2826,2266,3392,3321,3260,3031,2981,2879,2929,3081,3141,2566,3822,3203,3689,2466,2767,2712,2624,3577,2419,3515,2309,2369,3756,1481,1800,1906,1745,1853,1698,1642,1277,1222,6109,6025,6330,7500,6704,6630,6793,6956,7179,7035,6184,6266,6549,6410,6490,5958,7301,7404,7894,7779,7726,7853,1426,4878,5384,5784,5704,5878,5298,5239,5184,5122,1079,1169" + }, + "to": { + "startLines": "18,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124", + "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", + "startOffsets": "739,1092,1188,1271,1367,1436,1479,1531,1583,1632,1695,1753,1804,1888,1982,2090,2161,2245,2328,2394,2477,2579,2640,2702,2753,2831,2884,2944,3049,3108,3210,3265,3336,3385,3443,3490,3549,3606,3677,3738,3795,3845,3897,3950,4000,4050,4110,4163,4229,4291,4354,4401,4456,4544,4602,4664,4714,4759,4802,4862,4929,4984,5039,5092,5139,5192,5248,5296,5351,5404,5488,5555,5619,5715,5789,5870,5959,6122,6266,6345,6420,6502,6561,6641,6721,6776,6898,7001,7042,7095,7152,7226,7291,7359,7445,7525,7594,7688,7747,7802,7864,7924,8034", + "endLines": "22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124", + "endColumns": "14,95,82,95,68,42,51,51,48,62,57,50,83,93,107,70,83,82,65,82,101,60,61,50,77,52,59,104,58,101,54,70,48,57,46,58,56,70,60,56,49,51,52,49,49,59,52,65,61,62,46,54,87,57,61,49,44,42,59,66,54,54,52,46,52,55,47,54,52,83,66,63,95,73,80,88,162,143,78,74,81,58,79,79,54,121,102,40,52,56,73,64,67,85,79,68,93,58,54,61,59,109,89", + "endOffsets": "1087,1183,1266,1362,1431,1474,1526,1578,1627,1690,1748,1799,1883,1977,2085,2156,2240,2323,2389,2472,2574,2635,2697,2748,2826,2879,2939,3044,3103,3205,3260,3331,3380,3438,3485,3544,3601,3672,3733,3790,3840,3892,3945,3995,4045,4105,4158,4224,4286,4349,4396,4451,4539,4597,4659,4709,4754,4797,4857,4924,4979,5034,5087,5134,5187,5243,5291,5346,5399,5483,5550,5614,5710,5784,5865,5954,6117,6261,6340,6415,6497,6556,6636,6716,6771,6893,6996,7037,7090,7147,7221,7286,7354,7440,7520,7589,7683,7742,7797,7859,7919,8029,8119" + } + }, + { + "source": "F:\\work\\Notes-master\\app\\src\\main\\res\\values\\arrays.xml", + "from": { + "startLines": "19,26", + "startColumns": "4,4", + "startOffsets": "739,1047", + "endLines": "24,29", + "endColumns": "19,19", + "endOffsets": "1041,1162" + }, + "to": { + "startLines": "2,8", + "startColumns": "4,4", + "startOffsets": "105,300", + "endLines": "7,11", + "endColumns": "19,19", + "endOffsets": "295,415" + } + }, + { + "source": "F:\\work\\Notes-master\\app\\src\\main\\res\\values\\dimens.xml", + "from": { + "startLines": "19,20,21,22,18", + "startColumns": "4,4,4,4,4", + "startOffsets": "764,816,869,922,712", + "endColumns": "51,52,52,51,51", + "endOffsets": "811,864,917,969,759" + }, + "to": { + "startLines": "13,14,15,16,17", + "startColumns": "4,4,4,4,4", + "startOffsets": "477,529,582,635,687", + "endColumns": "51,52,52,51,51", + "endOffsets": "524,577,630,682,734" + } + } + ] + } + ] +} \ No newline at end of file diff --git a/app/build/intermediates/merged_res_blame_folder/debug/out/single/debug.json b/app/build/intermediates/merged_res_blame_folder/debug/out/single/debug.json new file mode 100644 index 0000000..2603807 --- /dev/null +++ b/app/build/intermediates/merged_res_blame_folder/debug/out/single/debug.json @@ -0,0 +1,382 @@ +[ + { + "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_list_yellow_middle.9.png.flat", + "source": "net.micode.notes.app-main-6:/drawable-hdpi/list_yellow_middle.9.png" + }, + { + "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_font_normal.png.flat", + "source": "net.micode.notes.app-main-6:/drawable-hdpi/font_normal.png" + }, + { + "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_list_yellow_single.9.png.flat", + "source": "net.micode.notes.app-main-6:/drawable-hdpi/list_yellow_single.9.png" + }, + { + "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_widget_4x_green.png.flat", + "source": "net.micode.notes.app-main-6:/drawable-hdpi/widget_4x_green.png" + }, + { + "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_search_result.png.flat", + "source": "net.micode.notes.app-main-6:/drawable-hdpi/search_result.png" + }, + { + "merged": "net.micode.notes.app-merged_res-4:/layout_note_list_dropdown_menu.xml.flat", + "source": "net.micode.notes.app-main-6:/layout/note_list_dropdown_menu.xml" + }, + { + "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_font_super.png.flat", + "source": "net.micode.notes.app-main-6:/drawable-hdpi/font_super.png" + }, + { + "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_widget_2x_blue.png.flat", + "source": "net.micode.notes.app-main-6:/drawable-hdpi/widget_2x_blue.png" + }, + { + "merged": "net.micode.notes.app-merged_res-4:/menu_sub_folder.xml.flat", + "source": "net.micode.notes.app-main-6:/menu/sub_folder.xml" + }, + { + "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_edit_yellow.9.png.flat", + "source": "net.micode.notes.app-main-6:/drawable-hdpi/edit_yellow.9.png" + }, + { + "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_new_note_pressed.png.flat", + "source": "net.micode.notes.app-main-6:/drawable-hdpi/new_note_pressed.png" + }, + { + "merged": "net.micode.notes.app-merged_res-4:/color_secondary_text_dark.xml.flat", + "source": "net.micode.notes.app-main-6:/color/secondary_text_dark.xml" + }, + { + "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_dropdown_icon.9.png.flat", + "source": "net.micode.notes.app-main-6:/drawable-hdpi/dropdown_icon.9.png" + }, + { + "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_list_red_middle.9.png.flat", + "source": "net.micode.notes.app-main-6:/drawable-hdpi/list_red_middle.9.png" + }, + { + "merged": "net.micode.notes.app-merged_res-4:/color_primary_text_dark.xml.flat", + "source": "net.micode.notes.app-main-6:/color/primary_text_dark.xml" + }, + { + "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_list_green_single.9.png.flat", + "source": "net.micode.notes.app-main-6:/drawable-hdpi/list_green_single.9.png" + }, + { + "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_delete.png.flat", + "source": "net.micode.notes.app-main-6:/drawable-hdpi/delete.png" + }, + { + "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_list_white_middle.9.png.flat", + "source": "net.micode.notes.app-main-6:/drawable-hdpi/list_white_middle.9.png" + }, + { + "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_new_note_normal.png.flat", + "source": "net.micode.notes.app-main-6:/drawable-hdpi/new_note_normal.png" + }, + { + "merged": "net.micode.notes.app-merged_res-4:/layout_dialog_edit_text.xml.flat", + "source": "net.micode.notes.app-main-6:/layout/dialog_edit_text.xml" + }, + { + "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_list_background.png.flat", + "source": "net.micode.notes.app-main-6:/drawable-hdpi/list_background.png" + }, + { + "merged": "net.micode.notes.app-merged_res-4:/layout_note_edit.xml.flat", + "source": "net.micode.notes.app-main-6:/layout/note_edit.xml" + }, + { + "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_list_yellow_down.9.png.flat", + "source": "net.micode.notes.app-main-6:/drawable-hdpi/list_yellow_down.9.png" + }, + { + "merged": "net.micode.notes.app-merged_res-4:/layout_note_edit_list_item.xml.flat", + "source": "net.micode.notes.app-main-6:/layout/note_edit_list_item.xml" + }, + { + "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_font_size_selector_bg.9.png.flat", + "source": "net.micode.notes.app-main-6:/drawable-hdpi/font_size_selector_bg.9.png" + }, + { + "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_title_bar_bg.9.png.flat", + "source": "net.micode.notes.app-main-6:/drawable-hdpi/title_bar_bg.9.png" + }, + { + "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_list_white_up.9.png.flat", + "source": "net.micode.notes.app-main-6:/drawable-hdpi/list_white_up.9.png" + }, + { + "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_widget_4x_yellow.png.flat", + "source": "net.micode.notes.app-main-6:/drawable-hdpi/widget_4x_yellow.png" + }, + { + "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_list_footer_bg.9.png.flat", + "source": "net.micode.notes.app-main-6:/drawable-hdpi/list_footer_bg.9.png" + }, + { + "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_list_white_down.9.png.flat", + "source": "net.micode.notes.app-main-6:/drawable-hdpi/list_white_down.9.png" + }, + { + "merged": "net.micode.notes.app-merged_res-4:/layout_folder_list_item.xml.flat", + "source": "net.micode.notes.app-main-6:/layout/folder_list_item.xml" + }, + { + "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_font_small.png.flat", + "source": "net.micode.notes.app-main-6:/drawable-hdpi/font_small.png" + }, + { + "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_widget_2x_green.png.flat", + "source": "net.micode.notes.app-main-6:/drawable-hdpi/widget_2x_green.png" + }, + { + "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_bg_color_btn_mask.png.flat", + "source": "net.micode.notes.app-main-6:/drawable-hdpi/bg_color_btn_mask.png" + }, + { + "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_list_red_down.9.png.flat", + "source": "net.micode.notes.app-main-6:/drawable-hdpi/list_red_down.9.png" + }, + { + "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_list_red_up.9.png.flat", + "source": "net.micode.notes.app-main-6:/drawable-hdpi/list_red_up.9.png" + }, + { + "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_list_red_single.9.png.flat", + "source": "net.micode.notes.app-main-6:/drawable-hdpi/list_red_single.9.png" + }, + { + "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_edit_title_green.9.png.flat", + "source": "net.micode.notes.app-main-6:/drawable-hdpi/edit_title_green.9.png" + }, + { + "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_note_edit_color_selector_panel.png.flat", + "source": "net.micode.notes.app-main-6:/drawable-hdpi/note_edit_color_selector_panel.png" + }, + { + "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_list_yellow_up.9.png.flat", + "source": "net.micode.notes.app-main-6:/drawable-hdpi/list_yellow_up.9.png" + }, + { + "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_clock.png.flat", + "source": "net.micode.notes.app-main-6:/drawable-hdpi/clock.png" + }, + { + "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_widget_2x_white.png.flat", + "source": "net.micode.notes.app-main-6:/drawable-hdpi/widget_2x_white.png" + }, + { + "merged": "net.micode.notes.app-merged_res-4:/layout_note_list.xml.flat", + "source": "net.micode.notes.app-main-6:/layout/note_list.xml" + }, + { + "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_edit_red.9.png.flat", + "source": "net.micode.notes.app-main-6:/drawable-hdpi/edit_red.9.png" + }, + { + "merged": "net.micode.notes.app-merged_res-4:/menu_note_list_dropdown.xml.flat", + "source": "net.micode.notes.app-main-6:/menu/note_list_dropdown.xml" + }, + { + "merged": "net.micode.notes.app-merged_res-4:/layout_note_item.xml.flat", + "source": "net.micode.notes.app-main-6:/layout/note_item.xml" + }, + { + "merged": "net.micode.notes.app-merged_res-4:/xml_searchable.xml.flat", + "source": "net.micode.notes.app-main-6:/xml/searchable.xml" + }, + { + "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_icon_app.png.flat", + "source": "net.micode.notes.app-main-6:/drawable-hdpi/icon_app.png" + }, + { + "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_menu_move.png.flat", + "source": "net.micode.notes.app-main-6:/drawable-hdpi/menu_move.png" + }, + { + "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_bg_btn_set_color.png.flat", + "source": "net.micode.notes.app-main-6:/drawable-hdpi/bg_btn_set_color.png" + }, + { + "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_list_green_down.9.png.flat", + "source": "net.micode.notes.app-main-6:/drawable-hdpi/list_green_down.9.png" + }, + { + "merged": "net.micode.notes.app-merged_res-4:/layout_note_list_footer.xml.flat", + "source": "net.micode.notes.app-main-6:/layout/note_list_footer.xml" + }, + { + "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_edit_green.9.png.flat", + "source": "net.micode.notes.app-main-6:/drawable-hdpi/edit_green.9.png" + }, + { + "merged": "net.micode.notes.app-merged_res-4:/menu_note_edit.xml.flat", + "source": "net.micode.notes.app-main-6:/menu/note_edit.xml" + }, + { + "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_list_blue_middle.9.png.flat", + "source": "net.micode.notes.app-main-6:/drawable-hdpi/list_blue_middle.9.png" + }, + { + "merged": "net.micode.notes.app-merged_res-4:/raw-zh-rCN_introduction.flat", + "source": "net.micode.notes.app-main-6:/raw-zh-rCN/introduction" + }, + { + "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_widget_4x_blue.png.flat", + "source": "net.micode.notes.app-main-6:/drawable-hdpi/widget_4x_blue.png" + }, + { + "merged": "net.micode.notes.app-merged_res-4:/layout_add_account_text.xml.flat", + "source": "net.micode.notes.app-main-6:/layout/add_account_text.xml" + }, + { + "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_title_alert.png.flat", + "source": "net.micode.notes.app-main-6:/drawable-hdpi/title_alert.png" + }, + { + "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_notification.png.flat", + "source": "net.micode.notes.app-main-6:/drawable-hdpi/notification.png" + }, + { + "merged": "net.micode.notes.app-merged_res-4:/menu_note_list.xml.flat", + "source": "net.micode.notes.app-main-6:/menu/note_list.xml" + }, + { + "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_list_blue_single.9.png.flat", + "source": "net.micode.notes.app-main-6:/drawable-hdpi/list_blue_single.9.png" + }, + { + "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_edit_white.9.png.flat", + "source": "net.micode.notes.app-main-6:/drawable-hdpi/edit_white.9.png" + }, + { + "merged": "net.micode.notes.app-merged_res-4:/menu_note_list_options.xml.flat", + "source": "net.micode.notes.app-main-6:/menu/note_list_options.xml" + }, + { + "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_widget_4x_white.png.flat", + "source": "net.micode.notes.app-main-6:/drawable-hdpi/widget_4x_white.png" + }, + { + "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_widget_4x_red.png.flat", + "source": "net.micode.notes.app-main-6:/drawable-hdpi/widget_4x_red.png" + }, + { + "merged": "net.micode.notes.app-merged_res-4:/xml_widget_2x_info.xml.flat", + "source": "net.micode.notes.app-main-6:/xml/widget_2x_info.xml" + }, + { + "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_edit_title_white.9.png.flat", + "source": "net.micode.notes.app-main-6:/drawable-hdpi/edit_title_white.9.png" + }, + { + "merged": "net.micode.notes.app-merged_res-4:/layout_widget_2x.xml.flat", + "source": "net.micode.notes.app-main-6:/layout/widget_2x.xml" + }, + { + "merged": "net.micode.notes.app-merged_res-4:/menu_call_record_folder.xml.flat", + "source": "net.micode.notes.app-main-6:/menu/call_record_folder.xml" + }, + { + "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_font_large.png.flat", + "source": "net.micode.notes.app-main-6:/drawable-hdpi/font_large.png" + }, + { + "merged": "net.micode.notes.app-merged_res-4:/menu_call_note_edit.xml.flat", + "source": "net.micode.notes.app-main-6:/menu/call_note_edit.xml" + }, + { + "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_edit_blue.9.png.flat", + "source": "net.micode.notes.app-main-6:/drawable-hdpi/edit_blue.9.png" + }, + { + "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_edit_title_yellow.9.png.flat", + "source": "net.micode.notes.app-main-6:/drawable-hdpi/edit_title_yellow.9.png" + }, + { + "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_list_blue_up.9.png.flat", + "source": "net.micode.notes.app-main-6:/drawable-hdpi/list_blue_up.9.png" + }, + { + "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_call_record.png.flat", + "source": "net.micode.notes.app-main-6:/drawable-hdpi/call_record.png" + }, + { + "merged": "net.micode.notes.app-merged_res-4:/xml_widget_4x_info.xml.flat", + "source": "net.micode.notes.app-main-6:/xml/widget_4x_info.xml" + }, + { + "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_list_blue_down.9.png.flat", + "source": "net.micode.notes.app-main-6:/drawable-hdpi/list_blue_down.9.png" + }, + { + "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_menu_delete.png.flat", + "source": "net.micode.notes.app-main-6:/drawable-hdpi/menu_delete.png" + }, + { + "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_edit_title_red.9.png.flat", + "source": "net.micode.notes.app-main-6:/drawable-hdpi/edit_title_red.9.png" + }, + { + "merged": "net.micode.notes.app-merged_res-4:/xml_preferences.xml.flat", + "source": "net.micode.notes.app-main-6:/xml/preferences.xml" + }, + { + "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_selected.png.flat", + "source": "net.micode.notes.app-main-6:/drawable-hdpi/selected.png" + }, + { + "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_widget_2x_yellow.png.flat", + "source": "net.micode.notes.app-main-6:/drawable-hdpi/widget_2x_yellow.png" + }, + { + "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_list_green_up.9.png.flat", + "source": "net.micode.notes.app-main-6:/drawable-hdpi/list_green_up.9.png" + }, + { + "merged": "net.micode.notes.app-merged_res-4:/layout_datetime_picker.xml.flat", + "source": "net.micode.notes.app-main-6:/layout/datetime_picker.xml" + }, + { + "merged": "net.micode.notes.app-merged_res-4:/raw_introduction.flat", + "source": "net.micode.notes.app-main-6:/raw/introduction" + }, + { + "merged": "net.micode.notes.app-merged_res-4:/layout_settings_header.xml.flat", + "source": "net.micode.notes.app-main-6:/layout/settings_header.xml" + }, + { + "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_edit_title_blue.9.png.flat", + "source": "net.micode.notes.app-main-6:/drawable-hdpi/edit_title_blue.9.png" + }, + { + "merged": "net.micode.notes.app-merged_res-4:/layout_widget_4x.xml.flat", + "source": "net.micode.notes.app-main-6:/layout/widget_4x.xml" + }, + { + "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_list_green_middle.9.png.flat", + "source": "net.micode.notes.app-main-6:/drawable-hdpi/list_green_middle.9.png" + }, + { + "merged": "net.micode.notes.app-merged_res-4:/drawable_new_note.xml.flat", + "source": "net.micode.notes.app-main-6:/drawable/new_note.xml" + }, + { + "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_widget_2x_red.png.flat", + "source": "net.micode.notes.app-main-6:/drawable-hdpi/widget_2x_red.png" + }, + { + "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_list_white_single.9.png.flat", + "source": "net.micode.notes.app-main-6:/drawable-hdpi/list_white_single.9.png" + }, + { + "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_list_folder.9.png.flat", + "source": "net.micode.notes.app-main-6:/drawable-hdpi/list_folder.9.png" + }, + { + "merged": "net.micode.notes.app-merged_res-4:/layout_account_dialog_title.xml.flat", + "source": "net.micode.notes.app-main-6:/layout/account_dialog_title.xml" + } +] \ No newline at end of file diff --git a/app/build/intermediates/merged_res_blame_folder/release/out/multi-v2/release.json b/app/build/intermediates/merged_res_blame_folder/release/out/multi-v2/release.json new file mode 100644 index 0000000..cd16320 --- /dev/null +++ b/app/build/intermediates/merged_res_blame_folder/release/out/multi-v2/release.json @@ -0,0 +1,186 @@ +{ + "logs": [ + { + "outputFile": "net.micode.notes.app-merged_res-4:/values-zh-rCN_values-zh-rCN.arsc.flat", + "map": [ + { + "source": "C:\\Users\\alineware\\StudioProjects\\Notes-master\\app\\src\\main\\res\\values-zh-rCN\\strings.xml", + "from": { + "startLines": "121,71,70,69,68,19,20,21,112,113,120,119,26,77,78,76,75,74,90,89,88,80,60,29,30,81,72,114,67,63,38,44,49,39,59,58,57,53,52,50,51,54,55,45,66,56,64,43,48,47,46,62,42,61,40,41,65,28,34,36,33,35,32,31,25,24,97,96,99,111,104,103,105,106,108,107,98,102,100,101,95,109,110,118,116,115,117,27,79,87,92,91,93,86,85,84,83,22,23", + "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", + "startOffsets": "6532,3495,3429,3356,3306,827,867,915,6083,6128,6478,6428,1199,3861,3929,3802,3737,3674,4592,4532,4469,4061,2877,1369,1422,4115,3568,6185,3247,3034,1798,2079,2325,1851,2817,2764,2713,2518,2470,2376,2424,2564,2611,2122,3188,2661,3077,2036,2278,2222,2167,2979,1992,2937,1901,1942,3129,1318,1623,1719,1576,1672,1529,1484,1148,1095,4967,4908,5108,6009,5419,5350,5483,5561,5744,5671,5042,5295,5165,5230,4859,5848,5931,6390,6283,6235,6328,1261,4006,4410,4705,4647,4772,4362,4317,4269,4218,963,1029", + "endLines": "123,71,70,69,68,19,20,21,112,113,120,119,26,77,78,76,75,74,90,89,88,80,60,29,30,81,72,114,67,63,38,44,49,39,59,58,57,53,52,50,51,54,55,45,66,56,64,43,48,47,46,62,42,61,40,41,65,28,34,36,33,35,32,31,25,24,97,96,99,111,104,103,105,106,108,107,98,102,100,101,95,109,110,118,116,115,117,27,79,87,92,91,93,86,85,84,83,22,23", + "endColumns": "14,72,65,72,49,39,47,47,44,56,53,49,61,67,76,58,64,62,54,59,62,53,59,52,61,84,80,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65", + "endOffsets": "6704,3563,3490,3424,3351,862,910,958,6123,6180,6527,6473,1256,3924,4001,3856,3797,3732,4642,4587,4527,4110,2932,1417,1479,4195,3644,6230,3301,3072,1846,2117,2371,1896,2872,2812,2759,2559,2513,2419,2465,2606,2656,2162,3242,2708,3124,2074,2320,2273,2217,3029,2031,2974,1937,1987,3183,1364,1667,1763,1618,1714,1571,1524,1194,1143,5037,4962,5160,6078,5478,5414,5556,5666,5843,5739,5103,5345,5225,5290,4903,5926,6004,6423,6323,6278,6385,1313,4056,4464,4767,4700,4829,4405,4357,4312,4264,1024,1090" + }, + "to": { + "startLines": "6,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106", + "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", + "startOffsets": "215,384,457,523,596,646,686,734,782,827,884,938,988,1050,1118,1195,1254,1319,1382,1437,1497,1560,1614,1674,1727,1789,1874,1955,2005,2064,2107,2160,2203,2254,2304,2364,2417,2468,2514,2562,2610,2656,2703,2753,2798,2857,2909,2961,3004,3051,3107,3162,3217,3261,3303,3344,3394,3453,3504,3553,3602,3649,3696,3743,3788,3839,3892,3967,4026,4083,4157,4221,4290,4368,4478,4582,4655,4721,4776,4841,4906,4955,5038,5116,5154,5199,5247,5309,5366,5421,5480,5547,5605,5667,5715,5760,5808,5859,5925", + "endLines": "8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106", + "endColumns": "14,72,65,72,49,39,47,47,44,56,53,49,61,67,76,58,64,62,54,59,62,53,59,52,61,84,80,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65", + "endOffsets": "379,452,518,591,641,681,729,777,822,879,933,983,1045,1113,1190,1249,1314,1377,1432,1492,1555,1609,1669,1722,1784,1869,1950,2000,2059,2102,2155,2198,2249,2299,2359,2412,2463,2509,2557,2605,2651,2698,2748,2793,2852,2904,2956,2999,3046,3102,3157,3212,3256,3298,3339,3389,3448,3499,3548,3597,3644,3691,3738,3783,3834,3887,3962,4021,4078,4152,4216,4285,4363,4473,4577,4650,4716,4771,4836,4901,4950,5033,5111,5149,5194,5242,5304,5361,5416,5475,5542,5600,5662,5710,5755,5803,5854,5920,5986" + } + }, + { + "source": "C:\\Users\\alineware\\StudioProjects\\Notes-master\\app\\src\\main\\res\\values-zh-rCN\\arrays.xml", + "from": { + "startLines": "18", + "startColumns": "4", + "startOffsets": "712", + "endLines": "21", + "endColumns": "19", + "endOffsets": "817" + }, + "to": { + "startLines": "2", + "startColumns": "4", + "startOffsets": "105", + "endLines": "5", + "endColumns": "19", + "endOffsets": "210" + } + } + ] + }, + { + "outputFile": "net.micode.notes.app-merged_res-4:/values_values.arsc.flat", + "map": [ + { + "source": "C:\\Users\\alineware\\StudioProjects\\Notes-master\\app\\src\\main\\res\\values\\arrays.xml", + "from": { + "startLines": "19,26", + "startColumns": "4,4", + "startOffsets": "739,1047", + "endLines": "24,29", + "endColumns": "19,19", + "endOffsets": "1041,1162" + }, + "to": { + "startLines": "2,8", + "startColumns": "4,4", + "startOffsets": "105,300", + "endLines": "7,11", + "endColumns": "19,19", + "endOffsets": "295,415" + } + }, + { + "source": "C:\\Users\\alineware\\StudioProjects\\Notes-master\\app\\src\\main\\res\\values\\styles.xml", + "from": { + "startLines": "50,55,64,60,22,26,30,35,40,18,45", + "startColumns": "4,4,4,4,4,4,4,4,4,4,4", + "startOffsets": "2062,2267,2640,2479,895,1078,1263,1449,1653,712,1860", + "endLines": "53,58,67,62,25,29,33,38,43,21,48", + "endColumns": "12,12,12,12,12,12,12,12,12,12,12", + "endOffsets": "2261,2473,2843,2634,1073,1258,1443,1647,1854,890,2056" + }, + "to": { + "startLines": "125,129,133,137,140,144,148,152,156,160,164", + "startColumns": "4,4,4,4,4,4,4,4,4,4,4", + "startOffsets": "8124,8328,8539,8746,8906,9089,9274,9459,9662,9868,10051", + "endLines": "128,132,136,139,143,147,151,155,159,163,167", + "endColumns": "12,12,12,12,12,12,12,12,12,12,12", + "endOffsets": "8323,8534,8741,8901,9084,9269,9454,9657,9863,10046,10247" + } + }, + { + "source": "C:\\Users\\alineware\\StudioProjects\\Notes-master\\app\\src\\main\\res\\values\\colors.xml", + "from": { + "startLines": "18", + "startColumns": "4", + "startOffsets": "712", + "endColumns": "56", + "endOffsets": "764" + }, + "to": { + "startLines": "12", + "startColumns": "4", + "startOffsets": "420", + "endColumns": "56", + "endOffsets": "472" + } + }, + { + "source": "C:\\Users\\alineware\\StudioProjects\\Notes-master\\app\\src\\main\\res\\values\\dimens.xml", + "from": { + "startLines": "19,20,21,22,18", + "startColumns": "4,4,4,4,4", + "startOffsets": "764,816,869,922,712", + "endColumns": "51,52,52,51,51", + "endOffsets": "811,864,917,969,759" + }, + "to": { + "startLines": "13,14,15,16,17", + "startColumns": "4,4,4,4,4", + "startOffsets": "477,529,582,635,687", + "endColumns": "51,52,52,51,51", + "endOffsets": "524,577,630,682,734" + } + }, + { + "source": "C:\\Users\\alineware\\StudioProjects\\Notes-master\\app\\src\\main\\res\\values\\strings.xml", + "from": { + "startLines": "128,72,75,74,73,19,20,21,118,119,127,126,26,81,82,80,79,78,94,93,92,84,39,38,64,29,30,85,41,76,120,71,67,42,48,53,43,63,62,61,57,56,54,55,58,59,49,70,60,68,47,52,51,50,66,46,65,44,45,69,28,34,36,33,35,32,31,25,24,101,100,104,116,109,108,110,111,113,112,102,103,107,105,106,99,114,115,125,123,122,124,27,83,91,96,95,97,90,89,88,87,22,23", + "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", + "startOffsets": "8008,3898,4159,4063,3994,827,870,922,7506,7555,7950,7899,1282,4613,4707,4542,4458,4375,5574,5491,5389,4883,2004,1953,3397,1486,1539,4944,2097,4242,7618,3827,3582,2156,2471,2772,2214,3326,3265,3208,2986,2934,2831,2884,3036,3086,2518,3761,3146,3631,2424,2717,2629,2571,3520,2374,3475,2271,2314,3694,1431,1750,1858,1703,1805,1647,1599,1227,1174,6030,5963,6271,7409,6635,6554,6709,6798,7040,6961,6114,6189,6495,6335,6415,5908,7184,7306,7858,7731,7674,7784,1366,4815,5303,5709,5640,5789,5244,5189,5127,5067,974,1084", + "endLines": "132,72,75,74,73,19,20,21,118,119,127,126,26,81,82,80,79,78,94,93,92,84,39,38,64,29,30,85,41,76,120,71,67,42,48,53,43,63,62,61,57,56,54,55,58,59,49,70,60,68,47,52,51,50,66,46,65,44,45,69,28,34,36,33,35,32,31,25,24,101,100,104,116,109,108,110,111,113,112,102,103,107,105,106,99,114,115,125,123,122,124,27,83,91,96,95,97,90,89,88,87,22,23", + "endColumns": "14,95,82,95,68,42,51,51,48,62,57,50,83,93,107,70,83,82,65,82,101,60,61,50,77,52,59,104,58,101,54,70,48,57,46,58,56,70,60,56,49,51,52,49,49,59,52,65,61,62,46,54,87,57,61,49,44,42,59,66,54,54,52,46,52,55,47,54,52,83,66,63,95,73,80,88,162,143,78,74,81,58,79,79,54,121,102,40,52,56,73,64,67,85,79,68,93,58,54,61,59,109,89", + "endOffsets": "8412,3989,4237,4154,4058,865,917,969,7550,7613,8003,7945,1361,4702,4810,4608,4537,4453,5635,5569,5486,4939,2061,1999,3470,1534,1594,5044,2151,4339,7668,3893,3626,2209,2513,2826,2266,3392,3321,3260,3031,2981,2879,2929,3081,3141,2566,3822,3203,3689,2466,2767,2712,2624,3577,2419,3515,2309,2369,3756,1481,1800,1906,1745,1853,1698,1642,1277,1222,6109,6025,6330,7500,6704,6630,6793,6956,7179,7035,6184,6266,6549,6410,6490,5958,7301,7404,7894,7779,7726,7853,1426,4878,5384,5784,5704,5878,5298,5239,5184,5122,1079,1169" + }, + "to": { + "startLines": "18,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124", + "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", + "startOffsets": "739,1092,1188,1271,1367,1436,1479,1531,1583,1632,1695,1753,1804,1888,1982,2090,2161,2245,2328,2394,2477,2579,2640,2702,2753,2831,2884,2944,3049,3108,3210,3265,3336,3385,3443,3490,3549,3606,3677,3738,3795,3845,3897,3950,4000,4050,4110,4163,4229,4291,4354,4401,4456,4544,4602,4664,4714,4759,4802,4862,4929,4984,5039,5092,5139,5192,5248,5296,5351,5404,5488,5555,5619,5715,5789,5870,5959,6122,6266,6345,6420,6502,6561,6641,6721,6776,6898,7001,7042,7095,7152,7226,7291,7359,7445,7525,7594,7688,7747,7802,7864,7924,8034", + "endLines": "22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124", + "endColumns": "14,95,82,95,68,42,51,51,48,62,57,50,83,93,107,70,83,82,65,82,101,60,61,50,77,52,59,104,58,101,54,70,48,57,46,58,56,70,60,56,49,51,52,49,49,59,52,65,61,62,46,54,87,57,61,49,44,42,59,66,54,54,52,46,52,55,47,54,52,83,66,63,95,73,80,88,162,143,78,74,81,58,79,79,54,121,102,40,52,56,73,64,67,85,79,68,93,58,54,61,59,109,89", + "endOffsets": "1087,1183,1266,1362,1431,1474,1526,1578,1627,1690,1748,1799,1883,1977,2085,2156,2240,2323,2389,2472,2574,2635,2697,2748,2826,2879,2939,3044,3103,3205,3260,3331,3380,3438,3485,3544,3601,3672,3733,3790,3840,3892,3945,3995,4045,4105,4158,4224,4286,4349,4396,4451,4539,4597,4659,4709,4754,4797,4857,4924,4979,5034,5087,5134,5187,5243,5291,5346,5399,5483,5550,5614,5710,5784,5865,5954,6117,6261,6340,6415,6497,6556,6636,6716,6771,6893,6996,7037,7090,7147,7221,7286,7354,7440,7520,7589,7683,7742,7797,7859,7919,8029,8119" + } + } + ] + }, + { + "outputFile": "net.micode.notes.app-merged_res-4:/values-zh-rTW_values-zh-rTW.arsc.flat", + "map": [ + { + "source": "C:\\Users\\alineware\\StudioProjects\\Notes-master\\app\\src\\main\\res\\values-zh-rTW\\strings.xml", + "from": { + "startLines": "122,72,71,70,69,19,20,21,112,113,121,120,26,76,77,75,74,73,89,88,87,79,61,29,30,80,37,114,68,64,39,45,50,40,60,59,58,54,53,51,52,55,56,46,67,57,65,44,49,48,47,63,43,62,41,42,66,28,34,36,33,35,32,31,25,24,96,95,98,110,103,102,104,105,107,106,97,101,99,100,94,108,109,119,117,116,118,27,78,86,91,90,92,85,84,83,82,22,23", + "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", + "startOffsets": "6507,3575,3509,3436,3386,827,867,915,6057,6102,6453,6403,1199,3835,3903,3776,3710,3647,4565,4505,4442,4035,2957,1369,1422,4089,1768,6159,3327,3114,1878,2159,2405,1931,2897,2844,2793,2598,2550,2456,2504,2644,2691,2202,3268,2741,3157,2116,2358,2302,2247,3059,2072,3017,1981,2022,3209,1318,1623,1719,1576,1672,1529,1484,1148,1095,4940,4881,5081,5982,5392,5323,5456,5534,5717,5644,5015,5268,5138,5203,4832,5821,5904,6365,6258,6210,6303,1261,3980,4383,4678,4620,4745,4335,4290,4242,4191,963,1029", + "endLines": "124,72,71,70,69,19,20,21,112,113,121,120,26,76,77,75,74,73,89,88,87,79,61,29,30,80,37,114,68,64,39,45,50,40,60,59,58,54,53,51,52,55,56,46,67,57,65,44,49,48,47,63,43,62,41,42,66,28,34,36,33,35,32,31,25,24,96,95,98,110,103,102,104,105,107,106,97,101,99,100,94,108,109,119,117,116,118,27,78,86,91,90,92,85,84,83,82,22,23", + "endColumns": "14,71,65,72,49,39,47,47,44,56,53,49,61,67,76,58,65,62,54,59,62,53,59,52,61,83,79,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65", + "endOffsets": "6679,3642,3570,3504,3431,862,910,958,6097,6154,6502,6448,1256,3898,3975,3830,3771,3705,4615,4560,4500,4084,3012,1417,1479,4168,1843,6204,3381,3152,1926,2197,2451,1976,2952,2892,2839,2639,2593,2499,2545,2686,2736,2242,3322,2788,3204,2154,2400,2353,2297,3109,2111,3054,2017,2067,3263,1364,1667,1763,1618,1714,1571,1524,1194,1143,5010,4935,5133,6051,5451,5387,5529,5639,5816,5712,5076,5318,5198,5263,4876,5899,5977,6398,6298,6253,6360,1313,4030,4437,4740,4673,4802,4378,4330,4285,4237,1024,1090" + }, + "to": { + "startLines": "6,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106", + "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", + "startOffsets": "215,384,456,522,595,645,685,733,781,826,883,937,987,1049,1117,1194,1253,1319,1382,1437,1497,1560,1614,1674,1727,1789,1873,1953,2003,2062,2105,2158,2201,2252,2302,2362,2415,2466,2512,2560,2608,2654,2701,2751,2796,2855,2907,2959,3002,3049,3105,3160,3215,3259,3301,3342,3392,3451,3502,3551,3600,3647,3694,3741,3786,3837,3890,3965,4024,4081,4155,4219,4288,4366,4476,4580,4653,4719,4774,4839,4904,4953,5036,5114,5152,5197,5245,5307,5364,5419,5478,5545,5603,5665,5713,5758,5806,5857,5923", + "endLines": "8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106", + "endColumns": "14,71,65,72,49,39,47,47,44,56,53,49,61,67,76,58,65,62,54,59,62,53,59,52,61,83,79,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65", + "endOffsets": "379,451,517,590,640,680,728,776,821,878,932,982,1044,1112,1189,1248,1314,1377,1432,1492,1555,1609,1669,1722,1784,1868,1948,1998,2057,2100,2153,2196,2247,2297,2357,2410,2461,2507,2555,2603,2649,2696,2746,2791,2850,2902,2954,2997,3044,3100,3155,3210,3254,3296,3337,3387,3446,3497,3546,3595,3642,3689,3736,3781,3832,3885,3960,4019,4076,4150,4214,4283,4361,4471,4575,4648,4714,4769,4834,4899,4948,5031,5109,5147,5192,5240,5302,5359,5414,5473,5540,5598,5660,5708,5753,5801,5852,5918,5984" + } + }, + { + "source": "C:\\Users\\alineware\\StudioProjects\\Notes-master\\app\\src\\main\\res\\values-zh-rTW\\arrays.xml", + "from": { + "startLines": "18", + "startColumns": "4", + "startOffsets": "712", + "endLines": "21", + "endColumns": "19", + "endOffsets": "817" + }, + "to": { + "startLines": "2", + "startColumns": "4", + "startOffsets": "105", + "endLines": "5", + "endColumns": "19", + "endOffsets": "210" + } + } + ] + } + ] +} \ No newline at end of file diff --git a/app/build/intermediates/merged_res_blame_folder/release/out/multi-v2/values-zh-rCN.json b/app/build/intermediates/merged_res_blame_folder/release/out/multi-v2/values-zh-rCN.json new file mode 100644 index 0000000..b07d84a --- /dev/null +++ b/app/build/intermediates/merged_res_blame_folder/release/out/multi-v2/values-zh-rCN.json @@ -0,0 +1,47 @@ +{ + "logs": [ + { + "outputFile": "net.micode.notes.app-mergeReleaseResources-2:/values-zh-rCN/values-zh-rCN.xml", + "map": [ + { + "source": "C:\\Users\\alineware\\StudioProjects\\Notes-master\\app\\src\\main\\res\\values-zh-rCN\\strings.xml", + "from": { + "startLines": "121,71,70,69,68,19,20,21,112,113,120,119,26,77,78,76,75,74,90,89,88,80,60,29,30,81,72,114,67,63,38,44,49,39,59,58,57,53,52,50,51,54,55,45,66,56,64,43,48,47,46,62,42,61,40,41,65,28,34,36,33,35,32,31,25,24,97,96,99,111,104,103,105,106,108,107,98,102,100,101,95,109,110,118,116,115,117,27,79,87,92,91,93,86,85,84,83,22,23", + "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", + "startOffsets": "6532,3495,3429,3356,3306,827,867,915,6083,6128,6478,6428,1199,3861,3929,3802,3737,3674,4592,4532,4469,4061,2877,1369,1422,4115,3568,6185,3247,3034,1798,2079,2325,1851,2817,2764,2713,2518,2470,2376,2424,2564,2611,2122,3188,2661,3077,2036,2278,2222,2167,2979,1992,2937,1901,1942,3129,1318,1623,1719,1576,1672,1529,1484,1148,1095,4967,4908,5108,6009,5419,5350,5483,5561,5744,5671,5042,5295,5165,5230,4859,5848,5931,6390,6283,6235,6328,1261,4006,4410,4705,4647,4772,4362,4317,4269,4218,963,1029", + "endLines": "123,71,70,69,68,19,20,21,112,113,120,119,26,77,78,76,75,74,90,89,88,80,60,29,30,81,72,114,67,63,38,44,49,39,59,58,57,53,52,50,51,54,55,45,66,56,64,43,48,47,46,62,42,61,40,41,65,28,34,36,33,35,32,31,25,24,97,96,99,111,104,103,105,106,108,107,98,102,100,101,95,109,110,118,116,115,117,27,79,87,92,91,93,86,85,84,83,22,23", + "endColumns": "14,72,65,72,49,39,47,47,44,56,53,49,61,67,76,58,64,62,54,59,62,53,59,52,61,84,80,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65", + "endOffsets": "6704,3563,3490,3424,3351,862,910,958,6123,6180,6527,6473,1256,3924,4001,3856,3797,3732,4642,4587,4527,4110,2932,1417,1479,4195,3644,6230,3301,3072,1846,2117,2371,1896,2872,2812,2759,2559,2513,2419,2465,2606,2656,2162,3242,2708,3124,2074,2320,2273,2217,3029,2031,2974,1937,1987,3183,1364,1667,1763,1618,1714,1571,1524,1194,1143,5037,4962,5160,6078,5478,5414,5556,5666,5843,5739,5103,5345,5225,5290,4903,5926,6004,6423,6323,6278,6385,1313,4056,4464,4767,4700,4829,4405,4357,4312,4264,1024,1090" + }, + "to": { + "startLines": "6,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106", + "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", + "startOffsets": "215,384,457,523,596,646,686,734,782,827,884,938,988,1050,1118,1195,1254,1319,1382,1437,1497,1560,1614,1674,1727,1789,1874,1955,2005,2064,2107,2160,2203,2254,2304,2364,2417,2468,2514,2562,2610,2656,2703,2753,2798,2857,2909,2961,3004,3051,3107,3162,3217,3261,3303,3344,3394,3453,3504,3553,3602,3649,3696,3743,3788,3839,3892,3967,4026,4083,4157,4221,4290,4368,4478,4582,4655,4721,4776,4841,4906,4955,5038,5116,5154,5199,5247,5309,5366,5421,5480,5547,5605,5667,5715,5760,5808,5859,5925", + "endLines": "8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106", + "endColumns": "14,72,65,72,49,39,47,47,44,56,53,49,61,67,76,58,64,62,54,59,62,53,59,52,61,84,80,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65", + "endOffsets": "379,452,518,591,641,681,729,777,822,879,933,983,1045,1113,1190,1249,1314,1377,1432,1492,1555,1609,1669,1722,1784,1869,1950,2000,2059,2102,2155,2198,2249,2299,2359,2412,2463,2509,2557,2605,2651,2698,2748,2793,2852,2904,2956,2999,3046,3102,3157,3212,3256,3298,3339,3389,3448,3499,3548,3597,3644,3691,3738,3783,3834,3887,3962,4021,4078,4152,4216,4285,4363,4473,4577,4650,4716,4771,4836,4901,4950,5033,5111,5149,5194,5242,5304,5361,5416,5475,5542,5600,5662,5710,5755,5803,5854,5920,5986" + } + }, + { + "source": "C:\\Users\\alineware\\StudioProjects\\Notes-master\\app\\src\\main\\res\\values-zh-rCN\\arrays.xml", + "from": { + "startLines": "18", + "startColumns": "4", + "startOffsets": "712", + "endLines": "21", + "endColumns": "19", + "endOffsets": "817" + }, + "to": { + "startLines": "2", + "startColumns": "4", + "startOffsets": "105", + "endLines": "5", + "endColumns": "19", + "endOffsets": "210" + } + } + ] + } + ] +} \ No newline at end of file diff --git a/app/build/intermediates/merged_res_blame_folder/release/out/multi-v2/values-zh-rTW.json b/app/build/intermediates/merged_res_blame_folder/release/out/multi-v2/values-zh-rTW.json new file mode 100644 index 0000000..c431a68 --- /dev/null +++ b/app/build/intermediates/merged_res_blame_folder/release/out/multi-v2/values-zh-rTW.json @@ -0,0 +1,47 @@ +{ + "logs": [ + { + "outputFile": "net.micode.notes.app-mergeReleaseResources-2:/values-zh-rTW/values-zh-rTW.xml", + "map": [ + { + "source": "C:\\Users\\alineware\\StudioProjects\\Notes-master\\app\\src\\main\\res\\values-zh-rTW\\strings.xml", + "from": { + "startLines": "122,72,71,70,69,19,20,21,112,113,121,120,26,76,77,75,74,73,89,88,87,79,61,29,30,80,37,114,68,64,39,45,50,40,60,59,58,54,53,51,52,55,56,46,67,57,65,44,49,48,47,63,43,62,41,42,66,28,34,36,33,35,32,31,25,24,96,95,98,110,103,102,104,105,107,106,97,101,99,100,94,108,109,119,117,116,118,27,78,86,91,90,92,85,84,83,82,22,23", + "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", + "startOffsets": "6507,3575,3509,3436,3386,827,867,915,6057,6102,6453,6403,1199,3835,3903,3776,3710,3647,4565,4505,4442,4035,2957,1369,1422,4089,1768,6159,3327,3114,1878,2159,2405,1931,2897,2844,2793,2598,2550,2456,2504,2644,2691,2202,3268,2741,3157,2116,2358,2302,2247,3059,2072,3017,1981,2022,3209,1318,1623,1719,1576,1672,1529,1484,1148,1095,4940,4881,5081,5982,5392,5323,5456,5534,5717,5644,5015,5268,5138,5203,4832,5821,5904,6365,6258,6210,6303,1261,3980,4383,4678,4620,4745,4335,4290,4242,4191,963,1029", + "endLines": "124,72,71,70,69,19,20,21,112,113,121,120,26,76,77,75,74,73,89,88,87,79,61,29,30,80,37,114,68,64,39,45,50,40,60,59,58,54,53,51,52,55,56,46,67,57,65,44,49,48,47,63,43,62,41,42,66,28,34,36,33,35,32,31,25,24,96,95,98,110,103,102,104,105,107,106,97,101,99,100,94,108,109,119,117,116,118,27,78,86,91,90,92,85,84,83,82,22,23", + "endColumns": "14,71,65,72,49,39,47,47,44,56,53,49,61,67,76,58,65,62,54,59,62,53,59,52,61,83,79,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65", + "endOffsets": "6679,3642,3570,3504,3431,862,910,958,6097,6154,6502,6448,1256,3898,3975,3830,3771,3705,4615,4560,4500,4084,3012,1417,1479,4168,1843,6204,3381,3152,1926,2197,2451,1976,2952,2892,2839,2639,2593,2499,2545,2686,2736,2242,3322,2788,3204,2154,2400,2353,2297,3109,2111,3054,2017,2067,3263,1364,1667,1763,1618,1714,1571,1524,1194,1143,5010,4935,5133,6051,5451,5387,5529,5639,5816,5712,5076,5318,5198,5263,4876,5899,5977,6398,6298,6253,6360,1313,4030,4437,4740,4673,4802,4378,4330,4285,4237,1024,1090" + }, + "to": { + "startLines": "6,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106", + "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", + "startOffsets": "215,384,456,522,595,645,685,733,781,826,883,937,987,1049,1117,1194,1253,1319,1382,1437,1497,1560,1614,1674,1727,1789,1873,1953,2003,2062,2105,2158,2201,2252,2302,2362,2415,2466,2512,2560,2608,2654,2701,2751,2796,2855,2907,2959,3002,3049,3105,3160,3215,3259,3301,3342,3392,3451,3502,3551,3600,3647,3694,3741,3786,3837,3890,3965,4024,4081,4155,4219,4288,4366,4476,4580,4653,4719,4774,4839,4904,4953,5036,5114,5152,5197,5245,5307,5364,5419,5478,5545,5603,5665,5713,5758,5806,5857,5923", + "endLines": "8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106", + "endColumns": "14,71,65,72,49,39,47,47,44,56,53,49,61,67,76,58,65,62,54,59,62,53,59,52,61,83,79,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65", + "endOffsets": "379,451,517,590,640,680,728,776,821,878,932,982,1044,1112,1189,1248,1314,1377,1432,1492,1555,1609,1669,1722,1784,1868,1948,1998,2057,2100,2153,2196,2247,2297,2357,2410,2461,2507,2555,2603,2649,2696,2746,2791,2850,2902,2954,2997,3044,3100,3155,3210,3254,3296,3337,3387,3446,3497,3546,3595,3642,3689,3736,3781,3832,3885,3960,4019,4076,4150,4214,4283,4361,4471,4575,4648,4714,4769,4834,4899,4948,5031,5109,5147,5192,5240,5302,5359,5414,5473,5540,5598,5660,5708,5753,5801,5852,5918,5984" + } + }, + { + "source": "C:\\Users\\alineware\\StudioProjects\\Notes-master\\app\\src\\main\\res\\values-zh-rTW\\arrays.xml", + "from": { + "startLines": "18", + "startColumns": "4", + "startOffsets": "712", + "endLines": "21", + "endColumns": "19", + "endOffsets": "817" + }, + "to": { + "startLines": "2", + "startColumns": "4", + "startOffsets": "105", + "endLines": "5", + "endColumns": "19", + "endOffsets": "210" + } + } + ] + } + ] +} \ No newline at end of file diff --git a/app/build/intermediates/merged_res_blame_folder/release/out/multi-v2/values.json b/app/build/intermediates/merged_res_blame_folder/release/out/multi-v2/values.json new file mode 100644 index 0000000..a34cc69 --- /dev/null +++ b/app/build/intermediates/merged_res_blame_folder/release/out/multi-v2/values.json @@ -0,0 +1,100 @@ +{ + "logs": [ + { + "outputFile": "net.micode.notes.app-mergeReleaseResources-2:/values/values.xml", + "map": [ + { + "source": "C:\\Users\\alineware\\StudioProjects\\Notes-master\\app\\src\\main\\res\\values\\arrays.xml", + "from": { + "startLines": "19,26", + "startColumns": "4,4", + "startOffsets": "739,1047", + "endLines": "24,29", + "endColumns": "19,19", + "endOffsets": "1041,1162" + }, + "to": { + "startLines": "2,8", + "startColumns": "4,4", + "startOffsets": "105,300", + "endLines": "7,11", + "endColumns": "19,19", + "endOffsets": "295,415" + } + }, + { + "source": "C:\\Users\\alineware\\StudioProjects\\Notes-master\\app\\src\\main\\res\\values\\styles.xml", + "from": { + "startLines": "50,55,64,60,22,26,30,35,40,18,45", + "startColumns": "4,4,4,4,4,4,4,4,4,4,4", + "startOffsets": "2062,2267,2640,2479,895,1078,1263,1449,1653,712,1860", + "endLines": "53,58,67,62,25,29,33,38,43,21,48", + "endColumns": "12,12,12,12,12,12,12,12,12,12,12", + "endOffsets": "2261,2473,2843,2634,1073,1258,1443,1647,1854,890,2056" + }, + "to": { + "startLines": "125,129,133,137,140,144,148,152,156,160,164", + "startColumns": "4,4,4,4,4,4,4,4,4,4,4", + "startOffsets": "8124,8328,8539,8746,8906,9089,9274,9459,9662,9868,10051", + "endLines": "128,132,136,139,143,147,151,155,159,163,167", + "endColumns": "12,12,12,12,12,12,12,12,12,12,12", + "endOffsets": "8323,8534,8741,8901,9084,9269,9454,9657,9863,10046,10247" + } + }, + { + "source": "C:\\Users\\alineware\\StudioProjects\\Notes-master\\app\\src\\main\\res\\values\\colors.xml", + "from": { + "startLines": "18", + "startColumns": "4", + "startOffsets": "712", + "endColumns": "56", + "endOffsets": "764" + }, + "to": { + "startLines": "12", + "startColumns": "4", + "startOffsets": "420", + "endColumns": "56", + "endOffsets": "472" + } + }, + { + "source": "C:\\Users\\alineware\\StudioProjects\\Notes-master\\app\\src\\main\\res\\values\\dimens.xml", + "from": { + "startLines": "19,20,21,22,18", + "startColumns": "4,4,4,4,4", + "startOffsets": "764,816,869,922,712", + "endColumns": "51,52,52,51,51", + "endOffsets": "811,864,917,969,759" + }, + "to": { + "startLines": "13,14,15,16,17", + "startColumns": "4,4,4,4,4", + "startOffsets": "477,529,582,635,687", + "endColumns": "51,52,52,51,51", + "endOffsets": "524,577,630,682,734" + } + }, + { + "source": "C:\\Users\\alineware\\StudioProjects\\Notes-master\\app\\src\\main\\res\\values\\strings.xml", + "from": { + "startLines": "128,72,75,74,73,19,20,21,118,119,127,126,26,81,82,80,79,78,94,93,92,84,39,38,64,29,30,85,41,76,120,71,67,42,48,53,43,63,62,61,57,56,54,55,58,59,49,70,60,68,47,52,51,50,66,46,65,44,45,69,28,34,36,33,35,32,31,25,24,101,100,104,116,109,108,110,111,113,112,102,103,107,105,106,99,114,115,125,123,122,124,27,83,91,96,95,97,90,89,88,87,22,23", + "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", + "startOffsets": "8008,3898,4159,4063,3994,827,870,922,7506,7555,7950,7899,1282,4613,4707,4542,4458,4375,5574,5491,5389,4883,2004,1953,3397,1486,1539,4944,2097,4242,7618,3827,3582,2156,2471,2772,2214,3326,3265,3208,2986,2934,2831,2884,3036,3086,2518,3761,3146,3631,2424,2717,2629,2571,3520,2374,3475,2271,2314,3694,1431,1750,1858,1703,1805,1647,1599,1227,1174,6030,5963,6271,7409,6635,6554,6709,6798,7040,6961,6114,6189,6495,6335,6415,5908,7184,7306,7858,7731,7674,7784,1366,4815,5303,5709,5640,5789,5244,5189,5127,5067,974,1084", + "endLines": "132,72,75,74,73,19,20,21,118,119,127,126,26,81,82,80,79,78,94,93,92,84,39,38,64,29,30,85,41,76,120,71,67,42,48,53,43,63,62,61,57,56,54,55,58,59,49,70,60,68,47,52,51,50,66,46,65,44,45,69,28,34,36,33,35,32,31,25,24,101,100,104,116,109,108,110,111,113,112,102,103,107,105,106,99,114,115,125,123,122,124,27,83,91,96,95,97,90,89,88,87,22,23", + "endColumns": "14,95,82,95,68,42,51,51,48,62,57,50,83,93,107,70,83,82,65,82,101,60,61,50,77,52,59,104,58,101,54,70,48,57,46,58,56,70,60,56,49,51,52,49,49,59,52,65,61,62,46,54,87,57,61,49,44,42,59,66,54,54,52,46,52,55,47,54,52,83,66,63,95,73,80,88,162,143,78,74,81,58,79,79,54,121,102,40,52,56,73,64,67,85,79,68,93,58,54,61,59,109,89", + "endOffsets": "8412,3989,4237,4154,4058,865,917,969,7550,7613,8003,7945,1361,4702,4810,4608,4537,4453,5635,5569,5486,4939,2061,1999,3470,1534,1594,5044,2151,4339,7668,3893,3626,2209,2513,2826,2266,3392,3321,3260,3031,2981,2879,2929,3081,3141,2566,3822,3203,3689,2466,2767,2712,2624,3577,2419,3515,2309,2369,3756,1481,1800,1906,1745,1853,1698,1642,1277,1222,6109,6025,6330,7500,6704,6630,6793,6956,7179,7035,6184,6266,6549,6410,6490,5958,7301,7404,7894,7779,7726,7853,1426,4878,5384,5784,5704,5878,5298,5239,5184,5122,1079,1169" + }, + "to": { + "startLines": "18,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124", + "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", + "startOffsets": "739,1092,1188,1271,1367,1436,1479,1531,1583,1632,1695,1753,1804,1888,1982,2090,2161,2245,2328,2394,2477,2579,2640,2702,2753,2831,2884,2944,3049,3108,3210,3265,3336,3385,3443,3490,3549,3606,3677,3738,3795,3845,3897,3950,4000,4050,4110,4163,4229,4291,4354,4401,4456,4544,4602,4664,4714,4759,4802,4862,4929,4984,5039,5092,5139,5192,5248,5296,5351,5404,5488,5555,5619,5715,5789,5870,5959,6122,6266,6345,6420,6502,6561,6641,6721,6776,6898,7001,7042,7095,7152,7226,7291,7359,7445,7525,7594,7688,7747,7802,7864,7924,8034", + "endLines": "22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124", + "endColumns": "14,95,82,95,68,42,51,51,48,62,57,50,83,93,107,70,83,82,65,82,101,60,61,50,77,52,59,104,58,101,54,70,48,57,46,58,56,70,60,56,49,51,52,49,49,59,52,65,61,62,46,54,87,57,61,49,44,42,59,66,54,54,52,46,52,55,47,54,52,83,66,63,95,73,80,88,162,143,78,74,81,58,79,79,54,121,102,40,52,56,73,64,67,85,79,68,93,58,54,61,59,109,89", + "endOffsets": "1087,1183,1266,1362,1431,1474,1526,1578,1627,1690,1748,1799,1883,1977,2085,2156,2240,2323,2389,2472,2574,2635,2697,2748,2826,2879,2939,3044,3103,3205,3260,3331,3380,3438,3485,3544,3601,3672,3733,3790,3840,3892,3945,3995,4045,4105,4158,4224,4286,4349,4396,4451,4539,4597,4659,4709,4754,4797,4857,4924,4979,5034,5087,5134,5187,5243,5291,5346,5399,5483,5550,5614,5710,5784,5865,5954,6117,6261,6340,6415,6497,6556,6636,6716,6771,6893,6996,7037,7090,7147,7221,7286,7354,7440,7520,7589,7683,7742,7797,7859,7919,8029,8119" + } + } + ] + } + ] +} \ No newline at end of file diff --git a/app/build/intermediates/merged_res_blame_folder/release/out/single/release.json b/app/build/intermediates/merged_res_blame_folder/release/out/single/release.json new file mode 100644 index 0000000..f91cfdb --- /dev/null +++ b/app/build/intermediates/merged_res_blame_folder/release/out/single/release.json @@ -0,0 +1,382 @@ +[ + { + "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_list_yellow_middle.9.png.flat", + "source": "net.micode.notes.app-main-5:/drawable-hdpi/list_yellow_middle.9.png" + }, + { + "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_font_normal.png.flat", + "source": "net.micode.notes.app-main-5:/drawable-hdpi/font_normal.png" + }, + { + "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_list_yellow_single.9.png.flat", + "source": "net.micode.notes.app-main-5:/drawable-hdpi/list_yellow_single.9.png" + }, + { + "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_widget_4x_green.png.flat", + "source": "net.micode.notes.app-main-5:/drawable-hdpi/widget_4x_green.png" + }, + { + "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_search_result.png.flat", + "source": "net.micode.notes.app-main-5:/drawable-hdpi/search_result.png" + }, + { + "merged": "net.micode.notes.app-merged_res-4:/layout_note_list_dropdown_menu.xml.flat", + "source": "net.micode.notes.app-main-5:/layout/note_list_dropdown_menu.xml" + }, + { + "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_font_super.png.flat", + "source": "net.micode.notes.app-main-5:/drawable-hdpi/font_super.png" + }, + { + "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_widget_2x_blue.png.flat", + "source": "net.micode.notes.app-main-5:/drawable-hdpi/widget_2x_blue.png" + }, + { + "merged": "net.micode.notes.app-merged_res-4:/menu_sub_folder.xml.flat", + "source": "net.micode.notes.app-main-5:/menu/sub_folder.xml" + }, + { + "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_edit_yellow.9.png.flat", + "source": "net.micode.notes.app-main-5:/drawable-hdpi/edit_yellow.9.png" + }, + { + "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_new_note_pressed.png.flat", + "source": "net.micode.notes.app-main-5:/drawable-hdpi/new_note_pressed.png" + }, + { + "merged": "net.micode.notes.app-merged_res-4:/color_secondary_text_dark.xml.flat", + "source": "net.micode.notes.app-main-5:/color/secondary_text_dark.xml" + }, + { + "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_dropdown_icon.9.png.flat", + "source": "net.micode.notes.app-main-5:/drawable-hdpi/dropdown_icon.9.png" + }, + { + "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_list_red_middle.9.png.flat", + "source": "net.micode.notes.app-main-5:/drawable-hdpi/list_red_middle.9.png" + }, + { + "merged": "net.micode.notes.app-merged_res-4:/color_primary_text_dark.xml.flat", + "source": "net.micode.notes.app-main-5:/color/primary_text_dark.xml" + }, + { + "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_list_green_single.9.png.flat", + "source": "net.micode.notes.app-main-5:/drawable-hdpi/list_green_single.9.png" + }, + { + "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_delete.png.flat", + "source": "net.micode.notes.app-main-5:/drawable-hdpi/delete.png" + }, + { + "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_list_white_middle.9.png.flat", + "source": "net.micode.notes.app-main-5:/drawable-hdpi/list_white_middle.9.png" + }, + { + "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_new_note_normal.png.flat", + "source": "net.micode.notes.app-main-5:/drawable-hdpi/new_note_normal.png" + }, + { + "merged": "net.micode.notes.app-merged_res-4:/layout_dialog_edit_text.xml.flat", + "source": "net.micode.notes.app-main-5:/layout/dialog_edit_text.xml" + }, + { + "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_list_background.png.flat", + "source": "net.micode.notes.app-main-5:/drawable-hdpi/list_background.png" + }, + { + "merged": "net.micode.notes.app-merged_res-4:/layout_note_edit.xml.flat", + "source": "net.micode.notes.app-main-5:/layout/note_edit.xml" + }, + { + "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_list_yellow_down.9.png.flat", + "source": "net.micode.notes.app-main-5:/drawable-hdpi/list_yellow_down.9.png" + }, + { + "merged": "net.micode.notes.app-merged_res-4:/layout_note_edit_list_item.xml.flat", + "source": "net.micode.notes.app-main-5:/layout/note_edit_list_item.xml" + }, + { + "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_font_size_selector_bg.9.png.flat", + "source": "net.micode.notes.app-main-5:/drawable-hdpi/font_size_selector_bg.9.png" + }, + { + "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_title_bar_bg.9.png.flat", + "source": "net.micode.notes.app-main-5:/drawable-hdpi/title_bar_bg.9.png" + }, + { + "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_list_white_up.9.png.flat", + "source": "net.micode.notes.app-main-5:/drawable-hdpi/list_white_up.9.png" + }, + { + "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_widget_4x_yellow.png.flat", + "source": "net.micode.notes.app-main-5:/drawable-hdpi/widget_4x_yellow.png" + }, + { + "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_list_footer_bg.9.png.flat", + "source": "net.micode.notes.app-main-5:/drawable-hdpi/list_footer_bg.9.png" + }, + { + "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_list_white_down.9.png.flat", + "source": "net.micode.notes.app-main-5:/drawable-hdpi/list_white_down.9.png" + }, + { + "merged": "net.micode.notes.app-merged_res-4:/layout_folder_list_item.xml.flat", + "source": "net.micode.notes.app-main-5:/layout/folder_list_item.xml" + }, + { + "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_font_small.png.flat", + "source": "net.micode.notes.app-main-5:/drawable-hdpi/font_small.png" + }, + { + "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_widget_2x_green.png.flat", + "source": "net.micode.notes.app-main-5:/drawable-hdpi/widget_2x_green.png" + }, + { + "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_bg_color_btn_mask.png.flat", + "source": "net.micode.notes.app-main-5:/drawable-hdpi/bg_color_btn_mask.png" + }, + { + "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_list_red_down.9.png.flat", + "source": "net.micode.notes.app-main-5:/drawable-hdpi/list_red_down.9.png" + }, + { + "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_list_red_up.9.png.flat", + "source": "net.micode.notes.app-main-5:/drawable-hdpi/list_red_up.9.png" + }, + { + "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_list_red_single.9.png.flat", + "source": "net.micode.notes.app-main-5:/drawable-hdpi/list_red_single.9.png" + }, + { + "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_edit_title_green.9.png.flat", + "source": "net.micode.notes.app-main-5:/drawable-hdpi/edit_title_green.9.png" + }, + { + "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_note_edit_color_selector_panel.png.flat", + "source": "net.micode.notes.app-main-5:/drawable-hdpi/note_edit_color_selector_panel.png" + }, + { + "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_list_yellow_up.9.png.flat", + "source": "net.micode.notes.app-main-5:/drawable-hdpi/list_yellow_up.9.png" + }, + { + "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_clock.png.flat", + "source": "net.micode.notes.app-main-5:/drawable-hdpi/clock.png" + }, + { + "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_widget_2x_white.png.flat", + "source": "net.micode.notes.app-main-5:/drawable-hdpi/widget_2x_white.png" + }, + { + "merged": "net.micode.notes.app-merged_res-4:/layout_note_list.xml.flat", + "source": "net.micode.notes.app-main-5:/layout/note_list.xml" + }, + { + "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_edit_red.9.png.flat", + "source": "net.micode.notes.app-main-5:/drawable-hdpi/edit_red.9.png" + }, + { + "merged": "net.micode.notes.app-merged_res-4:/menu_note_list_dropdown.xml.flat", + "source": "net.micode.notes.app-main-5:/menu/note_list_dropdown.xml" + }, + { + "merged": "net.micode.notes.app-merged_res-4:/layout_note_item.xml.flat", + "source": "net.micode.notes.app-main-5:/layout/note_item.xml" + }, + { + "merged": "net.micode.notes.app-merged_res-4:/xml_searchable.xml.flat", + "source": "net.micode.notes.app-main-5:/xml/searchable.xml" + }, + { + "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_icon_app.png.flat", + "source": "net.micode.notes.app-main-5:/drawable-hdpi/icon_app.png" + }, + { + "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_menu_move.png.flat", + "source": "net.micode.notes.app-main-5:/drawable-hdpi/menu_move.png" + }, + { + "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_bg_btn_set_color.png.flat", + "source": "net.micode.notes.app-main-5:/drawable-hdpi/bg_btn_set_color.png" + }, + { + "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_list_green_down.9.png.flat", + "source": "net.micode.notes.app-main-5:/drawable-hdpi/list_green_down.9.png" + }, + { + "merged": "net.micode.notes.app-merged_res-4:/layout_note_list_footer.xml.flat", + "source": "net.micode.notes.app-main-5:/layout/note_list_footer.xml" + }, + { + "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_edit_green.9.png.flat", + "source": "net.micode.notes.app-main-5:/drawable-hdpi/edit_green.9.png" + }, + { + "merged": "net.micode.notes.app-merged_res-4:/menu_note_edit.xml.flat", + "source": "net.micode.notes.app-main-5:/menu/note_edit.xml" + }, + { + "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_list_blue_middle.9.png.flat", + "source": "net.micode.notes.app-main-5:/drawable-hdpi/list_blue_middle.9.png" + }, + { + "merged": "net.micode.notes.app-merged_res-4:/raw-zh-rCN_introduction.flat", + "source": "net.micode.notes.app-main-5:/raw-zh-rCN/introduction" + }, + { + "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_widget_4x_blue.png.flat", + "source": "net.micode.notes.app-main-5:/drawable-hdpi/widget_4x_blue.png" + }, + { + "merged": "net.micode.notes.app-merged_res-4:/layout_add_account_text.xml.flat", + "source": "net.micode.notes.app-main-5:/layout/add_account_text.xml" + }, + { + "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_title_alert.png.flat", + "source": "net.micode.notes.app-main-5:/drawable-hdpi/title_alert.png" + }, + { + "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_notification.png.flat", + "source": "net.micode.notes.app-main-5:/drawable-hdpi/notification.png" + }, + { + "merged": "net.micode.notes.app-merged_res-4:/menu_note_list.xml.flat", + "source": "net.micode.notes.app-main-5:/menu/note_list.xml" + }, + { + "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_list_blue_single.9.png.flat", + "source": "net.micode.notes.app-main-5:/drawable-hdpi/list_blue_single.9.png" + }, + { + "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_edit_white.9.png.flat", + "source": "net.micode.notes.app-main-5:/drawable-hdpi/edit_white.9.png" + }, + { + "merged": "net.micode.notes.app-merged_res-4:/menu_note_list_options.xml.flat", + "source": "net.micode.notes.app-main-5:/menu/note_list_options.xml" + }, + { + "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_widget_4x_white.png.flat", + "source": "net.micode.notes.app-main-5:/drawable-hdpi/widget_4x_white.png" + }, + { + "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_widget_4x_red.png.flat", + "source": "net.micode.notes.app-main-5:/drawable-hdpi/widget_4x_red.png" + }, + { + "merged": "net.micode.notes.app-merged_res-4:/xml_widget_2x_info.xml.flat", + "source": "net.micode.notes.app-main-5:/xml/widget_2x_info.xml" + }, + { + "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_edit_title_white.9.png.flat", + "source": "net.micode.notes.app-main-5:/drawable-hdpi/edit_title_white.9.png" + }, + { + "merged": "net.micode.notes.app-merged_res-4:/layout_widget_2x.xml.flat", + "source": "net.micode.notes.app-main-5:/layout/widget_2x.xml" + }, + { + "merged": "net.micode.notes.app-merged_res-4:/menu_call_record_folder.xml.flat", + "source": "net.micode.notes.app-main-5:/menu/call_record_folder.xml" + }, + { + "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_font_large.png.flat", + "source": "net.micode.notes.app-main-5:/drawable-hdpi/font_large.png" + }, + { + "merged": "net.micode.notes.app-merged_res-4:/menu_call_note_edit.xml.flat", + "source": "net.micode.notes.app-main-5:/menu/call_note_edit.xml" + }, + { + "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_edit_blue.9.png.flat", + "source": "net.micode.notes.app-main-5:/drawable-hdpi/edit_blue.9.png" + }, + { + "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_edit_title_yellow.9.png.flat", + "source": "net.micode.notes.app-main-5:/drawable-hdpi/edit_title_yellow.9.png" + }, + { + "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_list_blue_up.9.png.flat", + "source": "net.micode.notes.app-main-5:/drawable-hdpi/list_blue_up.9.png" + }, + { + "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_call_record.png.flat", + "source": "net.micode.notes.app-main-5:/drawable-hdpi/call_record.png" + }, + { + "merged": "net.micode.notes.app-merged_res-4:/xml_widget_4x_info.xml.flat", + "source": "net.micode.notes.app-main-5:/xml/widget_4x_info.xml" + }, + { + "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_list_blue_down.9.png.flat", + "source": "net.micode.notes.app-main-5:/drawable-hdpi/list_blue_down.9.png" + }, + { + "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_menu_delete.png.flat", + "source": "net.micode.notes.app-main-5:/drawable-hdpi/menu_delete.png" + }, + { + "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_edit_title_red.9.png.flat", + "source": "net.micode.notes.app-main-5:/drawable-hdpi/edit_title_red.9.png" + }, + { + "merged": "net.micode.notes.app-merged_res-4:/xml_preferences.xml.flat", + "source": "net.micode.notes.app-main-5:/xml/preferences.xml" + }, + { + "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_selected.png.flat", + "source": "net.micode.notes.app-main-5:/drawable-hdpi/selected.png" + }, + { + "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_widget_2x_yellow.png.flat", + "source": "net.micode.notes.app-main-5:/drawable-hdpi/widget_2x_yellow.png" + }, + { + "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_list_green_up.9.png.flat", + "source": "net.micode.notes.app-main-5:/drawable-hdpi/list_green_up.9.png" + }, + { + "merged": "net.micode.notes.app-merged_res-4:/layout_datetime_picker.xml.flat", + "source": "net.micode.notes.app-main-5:/layout/datetime_picker.xml" + }, + { + "merged": "net.micode.notes.app-merged_res-4:/raw_introduction.flat", + "source": "net.micode.notes.app-main-5:/raw/introduction" + }, + { + "merged": "net.micode.notes.app-merged_res-4:/layout_settings_header.xml.flat", + "source": "net.micode.notes.app-main-5:/layout/settings_header.xml" + }, + { + "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_edit_title_blue.9.png.flat", + "source": "net.micode.notes.app-main-5:/drawable-hdpi/edit_title_blue.9.png" + }, + { + "merged": "net.micode.notes.app-merged_res-4:/layout_widget_4x.xml.flat", + "source": "net.micode.notes.app-main-5:/layout/widget_4x.xml" + }, + { + "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_list_green_middle.9.png.flat", + "source": "net.micode.notes.app-main-5:/drawable-hdpi/list_green_middle.9.png" + }, + { + "merged": "net.micode.notes.app-merged_res-4:/drawable_new_note.xml.flat", + "source": "net.micode.notes.app-main-5:/drawable/new_note.xml" + }, + { + "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_widget_2x_red.png.flat", + "source": "net.micode.notes.app-main-5:/drawable-hdpi/widget_2x_red.png" + }, + { + "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_list_white_single.9.png.flat", + "source": "net.micode.notes.app-main-5:/drawable-hdpi/list_white_single.9.png" + }, + { + "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_list_folder.9.png.flat", + "source": "net.micode.notes.app-main-5:/drawable-hdpi/list_folder.9.png" + }, + { + "merged": "net.micode.notes.app-merged_res-4:/layout_account_dialog_title.xml.flat", + "source": "net.micode.notes.app-main-5:/layout/account_dialog_title.xml" + } +] \ No newline at end of file diff --git a/app/build/intermediates/metadata_library_dependencies_report/release/dependencies.pb b/app/build/intermediates/metadata_library_dependencies_report/release/dependencies.pb new file mode 100644 index 0000000..45abba1 Binary files /dev/null and b/app/build/intermediates/metadata_library_dependencies_report/release/dependencies.pb differ diff --git a/app/build/intermediates/navigation_json/debug/navigation.json b/app/build/intermediates/navigation_json/debug/navigation.json new file mode 100644 index 0000000..0637a08 --- /dev/null +++ b/app/build/intermediates/navigation_json/debug/navigation.json @@ -0,0 +1 @@ +[] \ No newline at end of file diff --git a/app/build/intermediates/navigation_json/release/navigation.json b/app/build/intermediates/navigation_json/release/navigation.json new file mode 100644 index 0000000..0637a08 --- /dev/null +++ b/app/build/intermediates/navigation_json/release/navigation.json @@ -0,0 +1 @@ +[] \ No newline at end of file diff --git a/app/build/intermediates/packaged_manifests/debug/AndroidManifest.xml b/app/build/intermediates/packaged_manifests/debug/AndroidManifest.xml new file mode 100644 index 0000000..9e8d8ca --- /dev/null +++ b/app/build/intermediates/packaged_manifests/debug/AndroidManifest.xml @@ -0,0 +1,152 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/build/intermediates/packaged_manifests/debug/output-metadata.json b/app/build/intermediates/packaged_manifests/debug/output-metadata.json new file mode 100644 index 0000000..eea66e3 --- /dev/null +++ b/app/build/intermediates/packaged_manifests/debug/output-metadata.json @@ -0,0 +1,20 @@ +{ + "version": 3, + "artifactType": { + "type": "PACKAGED_MANIFESTS", + "kind": "Directory" + }, + "applicationId": "net.micode.notes", + "variantName": "debug", + "elements": [ + { + "type": "SINGLE", + "filters": [], + "attributes": [], + "versionCode": 1, + "versionName": "0.1", + "outputFile": "AndroidManifest.xml" + } + ], + "elementType": "File" +} \ No newline at end of file diff --git a/app/build/intermediates/packaged_manifests/release/AndroidManifest.xml b/app/build/intermediates/packaged_manifests/release/AndroidManifest.xml new file mode 100644 index 0000000..d1c0d4b --- /dev/null +++ b/app/build/intermediates/packaged_manifests/release/AndroidManifest.xml @@ -0,0 +1,150 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/build/intermediates/packaged_manifests/release/output-metadata.json b/app/build/intermediates/packaged_manifests/release/output-metadata.json new file mode 100644 index 0000000..a6b664d --- /dev/null +++ b/app/build/intermediates/packaged_manifests/release/output-metadata.json @@ -0,0 +1,20 @@ +{ + "version": 3, + "artifactType": { + "type": "PACKAGED_MANIFESTS", + "kind": "Directory" + }, + "applicationId": "net.micode.notes", + "variantName": "release", + "elements": [ + { + "type": "SINGLE", + "filters": [], + "attributes": [], + "versionCode": 1, + "versionName": "0.1", + "outputFile": "AndroidManifest.xml" + } + ], + "elementType": "File" +} \ No newline at end of file diff --git a/res/color/primary_text_dark.xml b/app/build/intermediates/packaged_res/debug/color/primary_text_dark.xml similarity index 94% rename from res/color/primary_text_dark.xml rename to app/build/intermediates/packaged_res/debug/color/primary_text_dark.xml index 7c85459..8ad98e3 100644 --- a/res/color/primary_text_dark.xml +++ b/app/build/intermediates/packaged_res/debug/color/primary_text_dark.xml @@ -1,4 +1,4 @@ - + + + + + + + \ No newline at end of file diff --git a/app/build/intermediates/packaged_res/release/color/secondary_text_dark.xml b/app/build/intermediates/packaged_res/release/color/secondary_text_dark.xml new file mode 100644 index 0000000..9cf8a1a --- /dev/null +++ b/app/build/intermediates/packaged_res/release/color/secondary_text_dark.xml @@ -0,0 +1,20 @@ + + + + + + + \ No newline at end of file diff --git a/app/build/intermediates/packaged_res/release/drawable-hdpi-v4/bg_btn_set_color.png b/app/build/intermediates/packaged_res/release/drawable-hdpi-v4/bg_btn_set_color.png new file mode 100644 index 0000000..5eb5d44 Binary files /dev/null and b/app/build/intermediates/packaged_res/release/drawable-hdpi-v4/bg_btn_set_color.png differ diff --git a/app/build/intermediates/packaged_res/release/drawable-hdpi-v4/bg_color_btn_mask.png b/app/build/intermediates/packaged_res/release/drawable-hdpi-v4/bg_color_btn_mask.png new file mode 100644 index 0000000..100db77 Binary files /dev/null and b/app/build/intermediates/packaged_res/release/drawable-hdpi-v4/bg_color_btn_mask.png differ diff --git a/app/build/intermediates/packaged_res/release/drawable-hdpi-v4/call_record.png b/app/build/intermediates/packaged_res/release/drawable-hdpi-v4/call_record.png new file mode 100644 index 0000000..fb88ca4 Binary files /dev/null and b/app/build/intermediates/packaged_res/release/drawable-hdpi-v4/call_record.png differ diff --git a/app/build/intermediates/packaged_res/release/drawable-hdpi-v4/clock.png b/app/build/intermediates/packaged_res/release/drawable-hdpi-v4/clock.png new file mode 100644 index 0000000..5f2ae9a Binary files /dev/null and b/app/build/intermediates/packaged_res/release/drawable-hdpi-v4/clock.png differ diff --git a/app/build/intermediates/packaged_res/release/drawable-hdpi-v4/delete.png b/app/build/intermediates/packaged_res/release/drawable-hdpi-v4/delete.png new file mode 100644 index 0000000..643de3e Binary files /dev/null and b/app/build/intermediates/packaged_res/release/drawable-hdpi-v4/delete.png differ diff --git a/app/build/intermediates/packaged_res/release/drawable-hdpi-v4/dropdown_icon.9.png b/app/build/intermediates/packaged_res/release/drawable-hdpi-v4/dropdown_icon.9.png new file mode 100644 index 0000000..5525025 Binary files /dev/null and b/app/build/intermediates/packaged_res/release/drawable-hdpi-v4/dropdown_icon.9.png differ diff --git a/app/build/intermediates/packaged_res/release/drawable-hdpi-v4/edit_blue.9.png b/app/build/intermediates/packaged_res/release/drawable-hdpi-v4/edit_blue.9.png new file mode 100644 index 0000000..55a1856 Binary files /dev/null and b/app/build/intermediates/packaged_res/release/drawable-hdpi-v4/edit_blue.9.png differ diff --git a/app/build/intermediates/packaged_res/release/drawable-hdpi-v4/edit_green.9.png b/app/build/intermediates/packaged_res/release/drawable-hdpi-v4/edit_green.9.png new file mode 100644 index 0000000..2cb2d60 Binary files /dev/null and b/app/build/intermediates/packaged_res/release/drawable-hdpi-v4/edit_green.9.png differ diff --git a/app/build/intermediates/packaged_res/release/drawable-hdpi-v4/edit_red.9.png b/app/build/intermediates/packaged_res/release/drawable-hdpi-v4/edit_red.9.png new file mode 100644 index 0000000..bae944a Binary files /dev/null and b/app/build/intermediates/packaged_res/release/drawable-hdpi-v4/edit_red.9.png differ diff --git a/app/build/intermediates/packaged_res/release/drawable-hdpi-v4/edit_title_blue.9.png b/app/build/intermediates/packaged_res/release/drawable-hdpi-v4/edit_title_blue.9.png new file mode 100644 index 0000000..96e6092 Binary files /dev/null and b/app/build/intermediates/packaged_res/release/drawable-hdpi-v4/edit_title_blue.9.png differ diff --git a/app/build/intermediates/packaged_res/release/drawable-hdpi-v4/edit_title_green.9.png b/app/build/intermediates/packaged_res/release/drawable-hdpi-v4/edit_title_green.9.png new file mode 100644 index 0000000..08d8644 Binary files /dev/null and b/app/build/intermediates/packaged_res/release/drawable-hdpi-v4/edit_title_green.9.png differ diff --git a/app/build/intermediates/packaged_res/release/drawable-hdpi-v4/edit_title_red.9.png b/app/build/intermediates/packaged_res/release/drawable-hdpi-v4/edit_title_red.9.png new file mode 100644 index 0000000..9c430e5 Binary files /dev/null and b/app/build/intermediates/packaged_res/release/drawable-hdpi-v4/edit_title_red.9.png differ diff --git a/app/build/intermediates/packaged_res/release/drawable-hdpi-v4/edit_title_white.9.png b/app/build/intermediates/packaged_res/release/drawable-hdpi-v4/edit_title_white.9.png new file mode 100644 index 0000000..19e8d95 Binary files /dev/null and b/app/build/intermediates/packaged_res/release/drawable-hdpi-v4/edit_title_white.9.png differ diff --git a/app/build/intermediates/packaged_res/release/drawable-hdpi-v4/edit_title_yellow.9.png b/app/build/intermediates/packaged_res/release/drawable-hdpi-v4/edit_title_yellow.9.png new file mode 100644 index 0000000..bf8f580 Binary files /dev/null and b/app/build/intermediates/packaged_res/release/drawable-hdpi-v4/edit_title_yellow.9.png differ diff --git a/app/build/intermediates/packaged_res/release/drawable-hdpi-v4/edit_white.9.png b/app/build/intermediates/packaged_res/release/drawable-hdpi-v4/edit_white.9.png new file mode 100644 index 0000000..918f7a6 Binary files /dev/null and b/app/build/intermediates/packaged_res/release/drawable-hdpi-v4/edit_white.9.png differ diff --git a/app/build/intermediates/packaged_res/release/drawable-hdpi-v4/edit_yellow.9.png b/app/build/intermediates/packaged_res/release/drawable-hdpi-v4/edit_yellow.9.png new file mode 100644 index 0000000..10cb642 Binary files /dev/null and b/app/build/intermediates/packaged_res/release/drawable-hdpi-v4/edit_yellow.9.png differ diff --git a/app/build/intermediates/packaged_res/release/drawable-hdpi-v4/font_large.png b/app/build/intermediates/packaged_res/release/drawable-hdpi-v4/font_large.png new file mode 100644 index 0000000..78cf2e6 Binary files /dev/null and b/app/build/intermediates/packaged_res/release/drawable-hdpi-v4/font_large.png differ diff --git a/app/build/intermediates/packaged_res/release/drawable-hdpi-v4/font_normal.png b/app/build/intermediates/packaged_res/release/drawable-hdpi-v4/font_normal.png new file mode 100644 index 0000000..9de7ced Binary files /dev/null and b/app/build/intermediates/packaged_res/release/drawable-hdpi-v4/font_normal.png differ diff --git a/app/build/intermediates/packaged_res/release/drawable-hdpi-v4/font_size_selector_bg.9.png b/app/build/intermediates/packaged_res/release/drawable-hdpi-v4/font_size_selector_bg.9.png new file mode 100644 index 0000000..be8e64c Binary files /dev/null and b/app/build/intermediates/packaged_res/release/drawable-hdpi-v4/font_size_selector_bg.9.png differ diff --git a/app/build/intermediates/packaged_res/release/drawable-hdpi-v4/font_small.png b/app/build/intermediates/packaged_res/release/drawable-hdpi-v4/font_small.png new file mode 100644 index 0000000..d3ff104 Binary files /dev/null and b/app/build/intermediates/packaged_res/release/drawable-hdpi-v4/font_small.png differ diff --git a/app/build/intermediates/packaged_res/release/drawable-hdpi-v4/font_super.png b/app/build/intermediates/packaged_res/release/drawable-hdpi-v4/font_super.png new file mode 100644 index 0000000..85b13a1 Binary files /dev/null and b/app/build/intermediates/packaged_res/release/drawable-hdpi-v4/font_super.png differ diff --git a/app/build/intermediates/packaged_res/release/drawable-hdpi-v4/icon_app.png b/app/build/intermediates/packaged_res/release/drawable-hdpi-v4/icon_app.png new file mode 100644 index 0000000..418aadc Binary files /dev/null and b/app/build/intermediates/packaged_res/release/drawable-hdpi-v4/icon_app.png differ diff --git a/app/build/intermediates/packaged_res/release/drawable-hdpi-v4/list_background.png b/app/build/intermediates/packaged_res/release/drawable-hdpi-v4/list_background.png new file mode 100644 index 0000000..087e1f9 Binary files /dev/null and b/app/build/intermediates/packaged_res/release/drawable-hdpi-v4/list_background.png differ diff --git a/app/build/intermediates/packaged_res/release/drawable-hdpi-v4/list_blue_down.9.png b/app/build/intermediates/packaged_res/release/drawable-hdpi-v4/list_blue_down.9.png new file mode 100644 index 0000000..b88eebf Binary files /dev/null and b/app/build/intermediates/packaged_res/release/drawable-hdpi-v4/list_blue_down.9.png differ diff --git a/app/build/intermediates/packaged_res/release/drawable-hdpi-v4/list_blue_middle.9.png b/app/build/intermediates/packaged_res/release/drawable-hdpi-v4/list_blue_middle.9.png new file mode 100644 index 0000000..96b1c8b Binary files /dev/null and b/app/build/intermediates/packaged_res/release/drawable-hdpi-v4/list_blue_middle.9.png differ diff --git a/app/build/intermediates/packaged_res/release/drawable-hdpi-v4/list_blue_single.9.png b/app/build/intermediates/packaged_res/release/drawable-hdpi-v4/list_blue_single.9.png new file mode 100644 index 0000000..d7e7206 Binary files /dev/null and b/app/build/intermediates/packaged_res/release/drawable-hdpi-v4/list_blue_single.9.png differ diff --git a/app/build/intermediates/packaged_res/release/drawable-hdpi-v4/list_blue_up.9.png b/app/build/intermediates/packaged_res/release/drawable-hdpi-v4/list_blue_up.9.png new file mode 100644 index 0000000..632e88c Binary files /dev/null and b/app/build/intermediates/packaged_res/release/drawable-hdpi-v4/list_blue_up.9.png differ diff --git a/app/build/intermediates/packaged_res/release/drawable-hdpi-v4/list_folder.9.png b/app/build/intermediates/packaged_res/release/drawable-hdpi-v4/list_folder.9.png new file mode 100644 index 0000000..829f61b Binary files /dev/null and b/app/build/intermediates/packaged_res/release/drawable-hdpi-v4/list_folder.9.png differ diff --git a/app/build/intermediates/packaged_res/release/drawable-hdpi-v4/list_footer_bg.9.png b/app/build/intermediates/packaged_res/release/drawable-hdpi-v4/list_footer_bg.9.png new file mode 100644 index 0000000..5325c25 Binary files /dev/null and b/app/build/intermediates/packaged_res/release/drawable-hdpi-v4/list_footer_bg.9.png differ diff --git a/app/build/intermediates/packaged_res/release/drawable-hdpi-v4/list_green_down.9.png b/app/build/intermediates/packaged_res/release/drawable-hdpi-v4/list_green_down.9.png new file mode 100644 index 0000000..64a39d9 Binary files /dev/null and b/app/build/intermediates/packaged_res/release/drawable-hdpi-v4/list_green_down.9.png differ diff --git a/app/build/intermediates/packaged_res/release/drawable-hdpi-v4/list_green_middle.9.png b/app/build/intermediates/packaged_res/release/drawable-hdpi-v4/list_green_middle.9.png new file mode 100644 index 0000000..897325a Binary files /dev/null and b/app/build/intermediates/packaged_res/release/drawable-hdpi-v4/list_green_middle.9.png differ diff --git a/app/build/intermediates/packaged_res/release/drawable-hdpi-v4/list_green_single.9.png b/app/build/intermediates/packaged_res/release/drawable-hdpi-v4/list_green_single.9.png new file mode 100644 index 0000000..c83405f Binary files /dev/null and b/app/build/intermediates/packaged_res/release/drawable-hdpi-v4/list_green_single.9.png differ diff --git a/app/build/intermediates/packaged_res/release/drawable-hdpi-v4/list_green_up.9.png b/app/build/intermediates/packaged_res/release/drawable-hdpi-v4/list_green_up.9.png new file mode 100644 index 0000000..141f9e1 Binary files /dev/null and b/app/build/intermediates/packaged_res/release/drawable-hdpi-v4/list_green_up.9.png differ diff --git a/app/build/intermediates/packaged_res/release/drawable-hdpi-v4/list_red_down.9.png b/app/build/intermediates/packaged_res/release/drawable-hdpi-v4/list_red_down.9.png new file mode 100644 index 0000000..4224309 Binary files /dev/null and b/app/build/intermediates/packaged_res/release/drawable-hdpi-v4/list_red_down.9.png differ diff --git a/app/build/intermediates/packaged_res/release/drawable-hdpi-v4/list_red_middle.9.png b/app/build/intermediates/packaged_res/release/drawable-hdpi-v4/list_red_middle.9.png new file mode 100644 index 0000000..9988f17 Binary files /dev/null and b/app/build/intermediates/packaged_res/release/drawable-hdpi-v4/list_red_middle.9.png differ diff --git a/app/build/intermediates/packaged_res/release/drawable-hdpi-v4/list_red_single.9.png b/app/build/intermediates/packaged_res/release/drawable-hdpi-v4/list_red_single.9.png new file mode 100644 index 0000000..587c348 Binary files /dev/null and b/app/build/intermediates/packaged_res/release/drawable-hdpi-v4/list_red_single.9.png differ diff --git a/app/build/intermediates/packaged_res/release/drawable-hdpi-v4/list_red_up.9.png b/app/build/intermediates/packaged_res/release/drawable-hdpi-v4/list_red_up.9.png new file mode 100644 index 0000000..46b4757 Binary files /dev/null and b/app/build/intermediates/packaged_res/release/drawable-hdpi-v4/list_red_up.9.png differ diff --git a/app/build/intermediates/packaged_res/release/drawable-hdpi-v4/list_white_down.9.png b/app/build/intermediates/packaged_res/release/drawable-hdpi-v4/list_white_down.9.png new file mode 100644 index 0000000..29f9d8c Binary files /dev/null and b/app/build/intermediates/packaged_res/release/drawable-hdpi-v4/list_white_down.9.png differ diff --git a/app/build/intermediates/packaged_res/release/drawable-hdpi-v4/list_white_middle.9.png b/app/build/intermediates/packaged_res/release/drawable-hdpi-v4/list_white_middle.9.png new file mode 100644 index 0000000..77a4ab4 Binary files /dev/null and b/app/build/intermediates/packaged_res/release/drawable-hdpi-v4/list_white_middle.9.png differ diff --git a/app/build/intermediates/packaged_res/release/drawable-hdpi-v4/list_white_single.9.png b/app/build/intermediates/packaged_res/release/drawable-hdpi-v4/list_white_single.9.png new file mode 100644 index 0000000..3e79189 Binary files /dev/null and b/app/build/intermediates/packaged_res/release/drawable-hdpi-v4/list_white_single.9.png differ diff --git a/app/build/intermediates/packaged_res/release/drawable-hdpi-v4/list_white_up.9.png b/app/build/intermediates/packaged_res/release/drawable-hdpi-v4/list_white_up.9.png new file mode 100644 index 0000000..e23cd5c Binary files /dev/null and b/app/build/intermediates/packaged_res/release/drawable-hdpi-v4/list_white_up.9.png differ diff --git a/app/build/intermediates/packaged_res/release/drawable-hdpi-v4/list_yellow_down.9.png b/app/build/intermediates/packaged_res/release/drawable-hdpi-v4/list_yellow_down.9.png new file mode 100644 index 0000000..31cfc1e Binary files /dev/null and b/app/build/intermediates/packaged_res/release/drawable-hdpi-v4/list_yellow_down.9.png differ diff --git a/app/build/intermediates/packaged_res/release/drawable-hdpi-v4/list_yellow_middle.9.png b/app/build/intermediates/packaged_res/release/drawable-hdpi-v4/list_yellow_middle.9.png new file mode 100644 index 0000000..b6549b2 Binary files /dev/null and b/app/build/intermediates/packaged_res/release/drawable-hdpi-v4/list_yellow_middle.9.png differ diff --git a/app/build/intermediates/packaged_res/release/drawable-hdpi-v4/list_yellow_single.9.png b/app/build/intermediates/packaged_res/release/drawable-hdpi-v4/list_yellow_single.9.png new file mode 100644 index 0000000..3faf507 Binary files /dev/null and b/app/build/intermediates/packaged_res/release/drawable-hdpi-v4/list_yellow_single.9.png differ diff --git a/app/build/intermediates/packaged_res/release/drawable-hdpi-v4/list_yellow_up.9.png b/app/build/intermediates/packaged_res/release/drawable-hdpi-v4/list_yellow_up.9.png new file mode 100644 index 0000000..4ae791c Binary files /dev/null and b/app/build/intermediates/packaged_res/release/drawable-hdpi-v4/list_yellow_up.9.png differ diff --git a/app/build/intermediates/packaged_res/release/drawable-hdpi-v4/menu_delete.png b/app/build/intermediates/packaged_res/release/drawable-hdpi-v4/menu_delete.png new file mode 100644 index 0000000..ccdfc4b Binary files /dev/null and b/app/build/intermediates/packaged_res/release/drawable-hdpi-v4/menu_delete.png differ diff --git a/app/build/intermediates/packaged_res/release/drawable-hdpi-v4/menu_move.png b/app/build/intermediates/packaged_res/release/drawable-hdpi-v4/menu_move.png new file mode 100644 index 0000000..1140b71 Binary files /dev/null and b/app/build/intermediates/packaged_res/release/drawable-hdpi-v4/menu_move.png differ diff --git a/app/build/intermediates/packaged_res/release/drawable-hdpi-v4/new_note_normal.png b/app/build/intermediates/packaged_res/release/drawable-hdpi-v4/new_note_normal.png new file mode 100644 index 0000000..e24e0d1 Binary files /dev/null and b/app/build/intermediates/packaged_res/release/drawable-hdpi-v4/new_note_normal.png differ diff --git a/app/build/intermediates/packaged_res/release/drawable-hdpi-v4/new_note_pressed.png b/app/build/intermediates/packaged_res/release/drawable-hdpi-v4/new_note_pressed.png new file mode 100644 index 0000000..c748936 Binary files /dev/null and b/app/build/intermediates/packaged_res/release/drawable-hdpi-v4/new_note_pressed.png differ diff --git a/app/build/intermediates/packaged_res/release/drawable-hdpi-v4/note_edit_color_selector_panel.png b/app/build/intermediates/packaged_res/release/drawable-hdpi-v4/note_edit_color_selector_panel.png new file mode 100644 index 0000000..fc49552 Binary files /dev/null and b/app/build/intermediates/packaged_res/release/drawable-hdpi-v4/note_edit_color_selector_panel.png differ diff --git a/app/build/intermediates/packaged_res/release/drawable-hdpi-v4/notification.png b/app/build/intermediates/packaged_res/release/drawable-hdpi-v4/notification.png new file mode 100644 index 0000000..b13ab4a Binary files /dev/null and b/app/build/intermediates/packaged_res/release/drawable-hdpi-v4/notification.png differ diff --git a/app/build/intermediates/packaged_res/release/drawable-hdpi-v4/search_result.png b/app/build/intermediates/packaged_res/release/drawable-hdpi-v4/search_result.png new file mode 100644 index 0000000..ff2befd Binary files /dev/null and b/app/build/intermediates/packaged_res/release/drawable-hdpi-v4/search_result.png differ diff --git a/app/build/intermediates/packaged_res/release/drawable-hdpi-v4/selected.png b/app/build/intermediates/packaged_res/release/drawable-hdpi-v4/selected.png new file mode 100644 index 0000000..b889bef Binary files /dev/null and b/app/build/intermediates/packaged_res/release/drawable-hdpi-v4/selected.png differ diff --git a/app/build/intermediates/packaged_res/release/drawable-hdpi-v4/title_alert.png b/app/build/intermediates/packaged_res/release/drawable-hdpi-v4/title_alert.png new file mode 100644 index 0000000..544ee9c Binary files /dev/null and b/app/build/intermediates/packaged_res/release/drawable-hdpi-v4/title_alert.png differ diff --git a/app/build/intermediates/packaged_res/release/drawable-hdpi-v4/title_bar_bg.9.png b/app/build/intermediates/packaged_res/release/drawable-hdpi-v4/title_bar_bg.9.png new file mode 100644 index 0000000..eb6bff0 Binary files /dev/null and b/app/build/intermediates/packaged_res/release/drawable-hdpi-v4/title_bar_bg.9.png differ diff --git a/app/build/intermediates/packaged_res/release/drawable-hdpi-v4/widget_2x_blue.png b/app/build/intermediates/packaged_res/release/drawable-hdpi-v4/widget_2x_blue.png new file mode 100644 index 0000000..a1707f4 Binary files /dev/null and b/app/build/intermediates/packaged_res/release/drawable-hdpi-v4/widget_2x_blue.png differ diff --git a/app/build/intermediates/packaged_res/release/drawable-hdpi-v4/widget_2x_green.png b/app/build/intermediates/packaged_res/release/drawable-hdpi-v4/widget_2x_green.png new file mode 100644 index 0000000..f86886c Binary files /dev/null and b/app/build/intermediates/packaged_res/release/drawable-hdpi-v4/widget_2x_green.png differ diff --git a/app/build/intermediates/packaged_res/release/drawable-hdpi-v4/widget_2x_red.png b/app/build/intermediates/packaged_res/release/drawable-hdpi-v4/widget_2x_red.png new file mode 100644 index 0000000..0e66c29 Binary files /dev/null and b/app/build/intermediates/packaged_res/release/drawable-hdpi-v4/widget_2x_red.png differ diff --git a/app/build/intermediates/packaged_res/release/drawable-hdpi-v4/widget_2x_white.png b/app/build/intermediates/packaged_res/release/drawable-hdpi-v4/widget_2x_white.png new file mode 100644 index 0000000..5f0619a Binary files /dev/null and b/app/build/intermediates/packaged_res/release/drawable-hdpi-v4/widget_2x_white.png differ diff --git a/app/build/intermediates/packaged_res/release/drawable-hdpi-v4/widget_2x_yellow.png b/app/build/intermediates/packaged_res/release/drawable-hdpi-v4/widget_2x_yellow.png new file mode 100644 index 0000000..12d1c2b Binary files /dev/null and b/app/build/intermediates/packaged_res/release/drawable-hdpi-v4/widget_2x_yellow.png differ diff --git a/app/build/intermediates/packaged_res/release/drawable-hdpi-v4/widget_4x_blue.png b/app/build/intermediates/packaged_res/release/drawable-hdpi-v4/widget_4x_blue.png new file mode 100644 index 0000000..9183738 Binary files /dev/null and b/app/build/intermediates/packaged_res/release/drawable-hdpi-v4/widget_4x_blue.png differ diff --git a/app/build/intermediates/packaged_res/release/drawable-hdpi-v4/widget_4x_green.png b/app/build/intermediates/packaged_res/release/drawable-hdpi-v4/widget_4x_green.png new file mode 100644 index 0000000..fa8b452 Binary files /dev/null and b/app/build/intermediates/packaged_res/release/drawable-hdpi-v4/widget_4x_green.png differ diff --git a/app/build/intermediates/packaged_res/release/drawable-hdpi-v4/widget_4x_red.png b/app/build/intermediates/packaged_res/release/drawable-hdpi-v4/widget_4x_red.png new file mode 100644 index 0000000..62de074 Binary files /dev/null and b/app/build/intermediates/packaged_res/release/drawable-hdpi-v4/widget_4x_red.png differ diff --git a/app/build/intermediates/packaged_res/release/drawable-hdpi-v4/widget_4x_white.png b/app/build/intermediates/packaged_res/release/drawable-hdpi-v4/widget_4x_white.png new file mode 100644 index 0000000..a37d67c Binary files /dev/null and b/app/build/intermediates/packaged_res/release/drawable-hdpi-v4/widget_4x_white.png differ diff --git a/app/build/intermediates/packaged_res/release/drawable-hdpi-v4/widget_4x_yellow.png b/app/build/intermediates/packaged_res/release/drawable-hdpi-v4/widget_4x_yellow.png new file mode 100644 index 0000000..d7c5fa4 Binary files /dev/null and b/app/build/intermediates/packaged_res/release/drawable-hdpi-v4/widget_4x_yellow.png differ diff --git a/app/build/intermediates/packaged_res/release/drawable/new_note.xml b/app/build/intermediates/packaged_res/release/drawable/new_note.xml new file mode 100644 index 0000000..2154ebc --- /dev/null +++ b/app/build/intermediates/packaged_res/release/drawable/new_note.xml @@ -0,0 +1,23 @@ + + + + + + + + diff --git a/app/build/intermediates/packaged_res/release/layout/account_dialog_title.xml b/app/build/intermediates/packaged_res/release/layout/account_dialog_title.xml new file mode 100644 index 0000000..7717112 --- /dev/null +++ b/app/build/intermediates/packaged_res/release/layout/account_dialog_title.xml @@ -0,0 +1,43 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/app/build/intermediates/packaged_res/release/layout/add_account_text.xml b/app/build/intermediates/packaged_res/release/layout/add_account_text.xml new file mode 100644 index 0000000..c799178 --- /dev/null +++ b/app/build/intermediates/packaged_res/release/layout/add_account_text.xml @@ -0,0 +1,32 @@ + + + + + + + + \ No newline at end of file diff --git a/app/build/intermediates/packaged_res/release/layout/datetime_picker.xml b/app/build/intermediates/packaged_res/release/layout/datetime_picker.xml new file mode 100644 index 0000000..f10d592 --- /dev/null +++ b/app/build/intermediates/packaged_res/release/layout/datetime_picker.xml @@ -0,0 +1,56 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/app/build/intermediates/packaged_res/release/layout/dialog_edit_text.xml b/app/build/intermediates/packaged_res/release/layout/dialog_edit_text.xml new file mode 100644 index 0000000..361b39a --- /dev/null +++ b/app/build/intermediates/packaged_res/release/layout/dialog_edit_text.xml @@ -0,0 +1,23 @@ + + + + + \ No newline at end of file diff --git a/app/build/intermediates/packaged_res/release/layout/folder_list_item.xml b/app/build/intermediates/packaged_res/release/layout/folder_list_item.xml new file mode 100644 index 0000000..77e8148 --- /dev/null +++ b/app/build/intermediates/packaged_res/release/layout/folder_list_item.xml @@ -0,0 +1,29 @@ + + + + + + + + \ No newline at end of file diff --git a/app/build/intermediates/packaged_res/release/layout/note_edit.xml b/app/build/intermediates/packaged_res/release/layout/note_edit.xml new file mode 100644 index 0000000..10b2aa7 --- /dev/null +++ b/app/build/intermediates/packaged_res/release/layout/note_edit.xml @@ -0,0 +1,400 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/build/intermediates/packaged_res/release/layout/note_edit_list_item.xml b/app/build/intermediates/packaged_res/release/layout/note_edit_list_item.xml new file mode 100644 index 0000000..a885f9c --- /dev/null +++ b/app/build/intermediates/packaged_res/release/layout/note_edit_list_item.xml @@ -0,0 +1,39 @@ + + + + + + + + + + diff --git a/app/build/intermediates/packaged_res/release/layout/note_item.xml b/app/build/intermediates/packaged_res/release/layout/note_item.xml new file mode 100644 index 0000000..d541f6a --- /dev/null +++ b/app/build/intermediates/packaged_res/release/layout/note_item.xml @@ -0,0 +1,78 @@ + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/build/intermediates/packaged_res/release/layout/note_list.xml b/app/build/intermediates/packaged_res/release/layout/note_list.xml new file mode 100644 index 0000000..6b25d38 --- /dev/null +++ b/app/build/intermediates/packaged_res/release/layout/note_list.xml @@ -0,0 +1,58 @@ + + + + + + + + + + + + + +