From ea5799df884694995877305bd16962663dffe776 Mon Sep 17 00:00:00 2001 From: suqi8 <157949748+suqi8@users.noreply.github.com> Date: Sun, 16 Jun 2024 11:37:13 +0800 Subject: [PATCH 001/875] Create LICENSE --- LICENSE | 674 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 674 insertions(+) create mode 100644 LICENSE diff --git a/LICENSE b/LICENSE new file mode 100644 index 00000000..f288702d --- /dev/null +++ b/LICENSE @@ -0,0 +1,674 @@ + GNU GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The GNU General Public License is a free, copyleft license for +software and other kinds of works. + + The licenses for most software and other practical works are designed +to take away your freedom to share and change the works. By contrast, +the GNU General Public License is intended to guarantee your freedom to +share and change all versions of a program--to make sure it remains free +software for all its users. We, the Free Software Foundation, use the +GNU General Public License for most of our software; it applies also to +any other work released this way by its authors. You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +them if you wish), that you receive source code or can get it if you +want it, that you can change the software or use pieces of it in new +free programs, and that you know you can do these things. + + To protect your rights, we need to prevent others from denying you +these rights or asking you to surrender the rights. Therefore, you have +certain responsibilities if you distribute copies of the software, or if +you modify it: responsibilities to respect the freedom of others. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must pass on to the recipients the same +freedoms that you received. You must make sure that they, too, receive +or can get the source code. And you must show them these terms so they +know their rights. + + Developers that use the GNU GPL protect your rights with two steps: +(1) assert copyright on the software, and (2) offer you this License +giving you legal permission to copy, distribute and/or modify it. + + For the developers' and authors' protection, the GPL clearly explains +that there is no warranty for this free software. For both users' and +authors' sake, the GPL requires that modified versions be marked as +changed, so that their problems will not be attributed erroneously to +authors of previous versions. + + Some devices are designed to deny users access to install or run +modified versions of the software inside them, although the manufacturer +can do so. This is fundamentally incompatible with the aim of +protecting users' freedom to change the software. The systematic +pattern of such abuse occurs in the area of products for individuals to +use, which is precisely where it is most unacceptable. Therefore, we +have designed this version of the GPL to prohibit the practice for those +products. If such problems arise substantially in other domains, we +stand ready to extend this provision to those domains in future versions +of the GPL, as needed to protect the freedom of users. + + Finally, every program is threatened constantly by software patents. +States should not allow patents to restrict development and use of +software on general-purpose computers, but in those that do, we wish to +avoid the special danger that patents applied to a free program could +make it effectively proprietary. To prevent this, the GPL assures that +patents cannot be used to render the program non-free. + + The precise terms and conditions for copying, distribution and +modification follow. + + TERMS AND CONDITIONS + + 0. Definitions. + + "This License" refers to version 3 of the GNU General Public License. + + "Copyright" also means copyright-like laws that apply to other kinds of +works, such as semiconductor masks. + + "The Program" refers to any copyrightable work licensed under this +License. Each licensee is addressed as "you". "Licensees" and +"recipients" may be individuals or organizations. + + To "modify" a work means to copy from or adapt all or part of the work +in a fashion requiring copyright permission, other than the making of an +exact copy. The resulting work is called a "modified version" of the +earlier work or a work "based on" the earlier work. + + A "covered work" means either the unmodified Program or a work based +on the Program. + + To "propagate" a work means to do anything with it that, without +permission, would make you directly or secondarily liable for +infringement under applicable copyright law, except executing it on a +computer or modifying a private copy. Propagation includes copying, +distribution (with or without modification), making available to the +public, and in some countries other activities as well. + + To "convey" a work means any kind of propagation that enables other +parties to make or receive copies. Mere interaction with a user through +a computer network, with no transfer of a copy, is not conveying. + + An interactive user interface displays "Appropriate Legal Notices" +to the extent that it includes a convenient and prominently visible +feature that (1) displays an appropriate copyright notice, and (2) +tells the user that there is no warranty for the work (except to the +extent that warranties are provided), that licensees may convey the +work under this License, and how to view a copy of this License. If +the interface presents a list of user commands or options, such as a +menu, a prominent item in the list meets this criterion. + + 1. Source Code. + + The "source code" for a work means the preferred form of the work +for making modifications to it. "Object code" means any non-source +form of a work. + + A "Standard Interface" means an interface that either is an official +standard defined by a recognized standards body, or, in the case of +interfaces specified for a particular programming language, one that +is widely used among developers working in that language. + + The "System Libraries" of an executable work include anything, other +than the work as a whole, that (a) is included in the normal form of +packaging a Major Component, but which is not part of that Major +Component, and (b) serves only to enable use of the work with that +Major Component, or to implement a Standard Interface for which an +implementation is available to the public in source code form. A +"Major Component", in this context, means a major essential component +(kernel, window system, and so on) of the specific operating system +(if any) on which the executable work runs, or a compiler used to +produce the work, or an object code interpreter used to run it. + + The "Corresponding Source" for a work in object code form means all +the source code needed to generate, install, and (for an executable +work) run the object code and to modify the work, including scripts to +control those activities. However, it does not include the work's +System Libraries, or general-purpose tools or generally available free +programs which are used unmodified in performing those activities but +which are not part of the work. For example, Corresponding Source +includes interface definition files associated with source files for +the work, and the source code for shared libraries and dynamically +linked subprograms that the work is specifically designed to require, +such as by intimate data communication or control flow between those +subprograms and other parts of the work. + + The Corresponding Source need not include anything that users +can regenerate automatically from other parts of the Corresponding +Source. + + The Corresponding Source for a work in source code form is that +same work. + + 2. Basic Permissions. + + All rights granted under this License are granted for the term of +copyright on the Program, and are irrevocable provided the stated +conditions are met. This License explicitly affirms your unlimited +permission to run the unmodified Program. The output from running a +covered work is covered by this License only if the output, given its +content, constitutes a covered work. This License acknowledges your +rights of fair use or other equivalent, as provided by copyright law. + + You may make, run and propagate covered works that you do not +convey, without conditions so long as your license otherwise remains +in force. You may convey covered works to others for the sole purpose +of having them make modifications exclusively for you, or provide you +with facilities for running those works, provided that you comply with +the terms of this License in conveying all material for which you do +not control copyright. Those thus making or running the covered works +for you must do so exclusively on your behalf, under your direction +and control, on terms that prohibit them from making any copies of +your copyrighted material outside their relationship with you. + + Conveying under any other circumstances is permitted solely under +the conditions stated below. Sublicensing is not allowed; section 10 +makes it unnecessary. + + 3. Protecting Users' Legal Rights From Anti-Circumvention Law. + + No covered work shall be deemed part of an effective technological +measure under any applicable law fulfilling obligations under article +11 of the WIPO copyright treaty adopted on 20 December 1996, or +similar laws prohibiting or restricting circumvention of such +measures. + + When you convey a covered work, you waive any legal power to forbid +circumvention of technological measures to the extent such circumvention +is effected by exercising rights under this License with respect to +the covered work, and you disclaim any intention to limit operation or +modification of the work as a means of enforcing, against the work's +users, your or third parties' legal rights to forbid circumvention of +technological measures. + + 4. Conveying Verbatim Copies. + + You may convey verbatim copies of the Program's source code as you +receive it, in any medium, provided that you conspicuously and +appropriately publish on each copy an appropriate copyright notice; +keep intact all notices stating that this License and any +non-permissive terms added in accord with section 7 apply to the code; +keep intact all notices of the absence of any warranty; and give all +recipients a copy of this License along with the Program. + + You may charge any price or no price for each copy that you convey, +and you may offer support or warranty protection for a fee. + + 5. Conveying Modified Source Versions. + + You may convey a work based on the Program, or the modifications to +produce it from the Program, in the form of source code under the +terms of section 4, provided that you also meet all of these conditions: + + a) The work must carry prominent notices stating that you modified + it, and giving a relevant date. + + b) The work must carry prominent notices stating that it is + released under this License and any conditions added under section + 7. This requirement modifies the requirement in section 4 to + "keep intact all notices". + + c) You must license the entire work, as a whole, under this + License to anyone who comes into possession of a copy. This + License will therefore apply, along with any applicable section 7 + additional terms, to the whole of the work, and all its parts, + regardless of how they are packaged. This License gives no + permission to license the work in any other way, but it does not + invalidate such permission if you have separately received it. + + d) If the work has interactive user interfaces, each must display + Appropriate Legal Notices; however, if the Program has interactive + interfaces that do not display Appropriate Legal Notices, your + work need not make them do so. + + A compilation of a covered work with other separate and independent +works, which are not by their nature extensions of the covered work, +and which are not combined with it such as to form a larger program, +in or on a volume of a storage or distribution medium, is called an +"aggregate" if the compilation and its resulting copyright are not +used to limit the access or legal rights of the compilation's users +beyond what the individual works permit. Inclusion of a covered work +in an aggregate does not cause this License to apply to the other +parts of the aggregate. + + 6. Conveying Non-Source Forms. + + You may convey a covered work in object code form under the terms +of sections 4 and 5, provided that you also convey the +machine-readable Corresponding Source under the terms of this License, +in one of these ways: + + a) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by the + Corresponding Source fixed on a durable physical medium + customarily used for software interchange. + + b) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by a + written offer, valid for at least three years and valid for as + long as you offer spare parts or customer support for that product + model, to give anyone who possesses the object code either (1) a + copy of the Corresponding Source for all the software in the + product that is covered by this License, on a durable physical + medium customarily used for software interchange, for a price no + more than your reasonable cost of physically performing this + conveying of source, or (2) access to copy the + Corresponding Source from a network server at no charge. + + c) Convey individual copies of the object code with a copy of the + written offer to provide the Corresponding Source. This + alternative is allowed only occasionally and noncommercially, and + only if you received the object code with such an offer, in accord + with subsection 6b. + + d) Convey the object code by offering access from a designated + place (gratis or for a charge), and offer equivalent access to the + Corresponding Source in the same way through the same place at no + further charge. You need not require recipients to copy the + Corresponding Source along with the object code. If the place to + copy the object code is a network server, the Corresponding Source + may be on a different server (operated by you or a third party) + that supports equivalent copying facilities, provided you maintain + clear directions next to the object code saying where to find the + Corresponding Source. Regardless of what server hosts the + Corresponding Source, you remain obligated to ensure that it is + available for as long as needed to satisfy these requirements. + + e) Convey the object code using peer-to-peer transmission, provided + you inform other peers where the object code and Corresponding + Source of the work are being offered to the general public at no + charge under subsection 6d. + + A separable portion of the object code, whose source code is excluded +from the Corresponding Source as a System Library, need not be +included in conveying the object code work. + + A "User Product" is either (1) a "consumer product", which means any +tangible personal property which is normally used for personal, family, +or household purposes, or (2) anything designed or sold for incorporation +into a dwelling. In determining whether a product is a consumer product, +doubtful cases shall be resolved in favor of coverage. For a particular +product received by a particular user, "normally used" refers to a +typical or common use of that class of product, regardless of the status +of the particular user or of the way in which the particular user +actually uses, or expects or is expected to use, the product. A product +is a consumer product regardless of whether the product has substantial +commercial, industrial or non-consumer uses, unless such uses represent +the only significant mode of use of the product. + + "Installation Information" for a User Product means any methods, +procedures, authorization keys, or other information required to install +and execute modified versions of a covered work in that User Product from +a modified version of its Corresponding Source. The information must +suffice to ensure that the continued functioning of the modified object +code is in no case prevented or interfered with solely because +modification has been made. + + If you convey an object code work under this section in, or with, or +specifically for use in, a User Product, and the conveying occurs as +part of a transaction in which the right of possession and use of the +User Product is transferred to the recipient in perpetuity or for a +fixed term (regardless of how the transaction is characterized), the +Corresponding Source conveyed under this section must be accompanied +by the Installation Information. But this requirement does not apply +if neither you nor any third party retains the ability to install +modified object code on the User Product (for example, the work has +been installed in ROM). + + The requirement to provide Installation Information does not include a +requirement to continue to provide support service, warranty, or updates +for a work that has been modified or installed by the recipient, or for +the User Product in which it has been modified or installed. Access to a +network may be denied when the modification itself materially and +adversely affects the operation of the network or violates the rules and +protocols for communication across the network. + + Corresponding Source conveyed, and Installation Information provided, +in accord with this section must be in a format that is publicly +documented (and with an implementation available to the public in +source code form), and must require no special password or key for +unpacking, reading or copying. + + 7. Additional Terms. + + "Additional permissions" are terms that supplement the terms of this +License by making exceptions from one or more of its conditions. +Additional permissions that are applicable to the entire Program shall +be treated as though they were included in this License, to the extent +that they are valid under applicable law. If additional permissions +apply only to part of the Program, that part may be used separately +under those permissions, but the entire Program remains governed by +this License without regard to the additional permissions. + + When you convey a copy of a covered work, you may at your option +remove any additional permissions from that copy, or from any part of +it. (Additional permissions may be written to require their own +removal in certain cases when you modify the work.) You may place +additional permissions on material, added by you to a covered work, +for which you have or can give appropriate copyright permission. + + Notwithstanding any other provision of this License, for material you +add to a covered work, you may (if authorized by the copyright holders of +that material) supplement the terms of this License with terms: + + a) Disclaiming warranty or limiting liability differently from the + terms of sections 15 and 16 of this License; or + + b) Requiring preservation of specified reasonable legal notices or + author attributions in that material or in the Appropriate Legal + Notices displayed by works containing it; or + + c) Prohibiting misrepresentation of the origin of that material, or + requiring that modified versions of such material be marked in + reasonable ways as different from the original version; or + + d) Limiting the use for publicity purposes of names of licensors or + authors of the material; or + + e) Declining to grant rights under trademark law for use of some + trade names, trademarks, or service marks; or + + f) Requiring indemnification of licensors and authors of that + material by anyone who conveys the material (or modified versions of + it) with contractual assumptions of liability to the recipient, for + any liability that these contractual assumptions directly impose on + those licensors and authors. + + All other non-permissive additional terms are considered "further +restrictions" within the meaning of section 10. If the Program as you +received it, or any part of it, contains a notice stating that it is +governed by this License along with a term that is a further +restriction, you may remove that term. If a license document contains +a further restriction but permits relicensing or conveying under this +License, you may add to a covered work material governed by the terms +of that license document, provided that the further restriction does +not survive such relicensing or conveying. + + If you add terms to a covered work in accord with this section, you +must place, in the relevant source files, a statement of the +additional terms that apply to those files, or a notice indicating +where to find the applicable terms. + + Additional terms, permissive or non-permissive, may be stated in the +form of a separately written license, or stated as exceptions; +the above requirements apply either way. + + 8. Termination. + + You may not propagate or modify a covered work except as expressly +provided under this License. Any attempt otherwise to propagate or +modify it is void, and will automatically terminate your rights under +this License (including any patent licenses granted under the third +paragraph of section 11). + + However, if you cease all violation of this License, then your +license from a particular copyright holder is reinstated (a) +provisionally, unless and until the copyright holder explicitly and +finally terminates your license, and (b) permanently, if the copyright +holder fails to notify you of the violation by some reasonable means +prior to 60 days after the cessation. + + Moreover, your license from a particular copyright holder is +reinstated permanently if the copyright holder notifies you of the +violation by some reasonable means, this is the first time you have +received notice of violation of this License (for any work) from that +copyright holder, and you cure the violation prior to 30 days after +your receipt of the notice. + + Termination of your rights under this section does not terminate the +licenses of parties who have received copies or rights from you under +this License. If your rights have been terminated and not permanently +reinstated, you do not qualify to receive new licenses for the same +material under section 10. + + 9. Acceptance Not Required for Having Copies. + + You are not required to accept this License in order to receive or +run a copy of the Program. Ancillary propagation of a covered work +occurring solely as a consequence of using peer-to-peer transmission +to receive a copy likewise does not require acceptance. However, +nothing other than this License grants you permission to propagate or +modify any covered work. These actions infringe copyright if you do +not accept this License. Therefore, by modifying or propagating a +covered work, you indicate your acceptance of this License to do so. + + 10. Automatic Licensing of Downstream Recipients. + + Each time you convey a covered work, the recipient automatically +receives a license from the original licensors, to run, modify and +propagate that work, subject to this License. You are not responsible +for enforcing compliance by third parties with this License. + + An "entity transaction" is a transaction transferring control of an +organization, or substantially all assets of one, or subdividing an +organization, or merging organizations. If propagation of a covered +work results from an entity transaction, each party to that +transaction who receives a copy of the work also receives whatever +licenses to the work the party's predecessor in interest had or could +give under the previous paragraph, plus a right to possession of the +Corresponding Source of the work from the predecessor in interest, if +the predecessor has it or can get it with reasonable efforts. + + You may not impose any further restrictions on the exercise of the +rights granted or affirmed under this License. For example, you may +not impose a license fee, royalty, or other charge for exercise of +rights granted under this License, and you may not initiate litigation +(including a cross-claim or counterclaim in a lawsuit) alleging that +any patent claim is infringed by making, using, selling, offering for +sale, or importing the Program or any portion of it. + + 11. Patents. + + A "contributor" is a copyright holder who authorizes use under this +License of the Program or a work on which the Program is based. The +work thus licensed is called the contributor's "contributor version". + + A contributor's "essential patent claims" are all patent claims +owned or controlled by the contributor, whether already acquired or +hereafter acquired, that would be infringed by some manner, permitted +by this License, of making, using, or selling its contributor version, +but do not include claims that would be infringed only as a +consequence of further modification of the contributor version. For +purposes of this definition, "control" includes the right to grant +patent sublicenses in a manner consistent with the requirements of +this License. + + Each contributor grants you a non-exclusive, worldwide, royalty-free +patent license under the contributor's essential patent claims, to +make, use, sell, offer for sale, import and otherwise run, modify and +propagate the contents of its contributor version. + + In the following three paragraphs, a "patent license" is any express +agreement or commitment, however denominated, not to enforce a patent +(such as an express permission to practice a patent or covenant not to +sue for patent infringement). To "grant" such a patent license to a +party means to make such an agreement or commitment not to enforce a +patent against the party. + + If you convey a covered work, knowingly relying on a patent license, +and the Corresponding Source of the work is not available for anyone +to copy, free of charge and under the terms of this License, through a +publicly available network server or other readily accessible means, +then you must either (1) cause the Corresponding Source to be so +available, or (2) arrange to deprive yourself of the benefit of the +patent license for this particular work, or (3) arrange, in a manner +consistent with the requirements of this License, to extend the patent +license to downstream recipients. "Knowingly relying" means you have +actual knowledge that, but for the patent license, your conveying the +covered work in a country, or your recipient's use of the covered work +in a country, would infringe one or more identifiable patents in that +country that you have reason to believe are valid. + + If, pursuant to or in connection with a single transaction or +arrangement, you convey, or propagate by procuring conveyance of, a +covered work, and grant a patent license to some of the parties +receiving the covered work authorizing them to use, propagate, modify +or convey a specific copy of the covered work, then the patent license +you grant is automatically extended to all recipients of the covered +work and works based on it. + + A patent license is "discriminatory" if it does not include within +the scope of its coverage, prohibits the exercise of, or is +conditioned on the non-exercise of one or more of the rights that are +specifically granted under this License. You may not convey a covered +work if you are a party to an arrangement with a third party that is +in the business of distributing software, under which you make payment +to the third party based on the extent of your activity of conveying +the work, and under which the third party grants, to any of the +parties who would receive the covered work from you, a discriminatory +patent license (a) in connection with copies of the covered work +conveyed by you (or copies made from those copies), or (b) primarily +for and in connection with specific products or compilations that +contain the covered work, unless you entered into that arrangement, +or that patent license was granted, prior to 28 March 2007. + + Nothing in this License shall be construed as excluding or limiting +any implied license or other defenses to infringement that may +otherwise be available to you under applicable patent law. + + 12. No Surrender of Others' Freedom. + + If conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot convey a +covered work so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you may +not convey it at all. For example, if you agree to terms that obligate you +to collect a royalty for further conveying from those to whom you convey +the Program, the only way you could satisfy both those terms and this +License would be to refrain entirely from conveying the Program. + + 13. Use with the GNU Affero General Public License. + + Notwithstanding any other provision of this License, you have +permission to link or combine any covered work with a work licensed +under version 3 of the GNU Affero General Public License into a single +combined work, and to convey the resulting work. The terms of this +License will continue to apply to the part which is the covered work, +but the special requirements of the GNU Affero General Public License, +section 13, concerning interaction through a network will apply to the +combination as such. + + 14. Revised Versions of this License. + + The Free Software Foundation may publish revised and/or new versions of +the GNU General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + + Each version is given a distinguishing version number. If the +Program specifies that a certain numbered version of the GNU General +Public License "or any later version" applies to it, you have the +option of following the terms and conditions either of that numbered +version or of any later version published by the Free Software +Foundation. If the Program does not specify a version number of the +GNU General Public License, you may choose any version ever published +by the Free Software Foundation. + + If the Program specifies that a proxy can decide which future +versions of the GNU General Public License can be used, that proxy's +public statement of acceptance of a version permanently authorizes you +to choose that version for the Program. + + Later license versions may give you additional or different +permissions. However, no additional obligations are imposed on any +author or copyright holder as a result of your choosing to follow a +later version. + + 15. Disclaimer of Warranty. + + THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY +APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT +HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY +OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, +THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM +IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF +ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. Limitation of Liability. + + IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS +THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY +GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE +USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF +DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD +PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), +EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF +SUCH DAMAGES. + + 17. Interpretation of Sections 15 and 16. + + If the disclaimer of warranty and limitation of liability provided +above cannot be given local legal effect according to their terms, +reviewing courts shall apply local law that most closely approximates +an absolute waiver of all civil liability in connection with the +Program, unless a warranty or assumption of liability accompanies a +copy of the Program in return for a fee. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +state the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . + +Also add information on how to contact you by electronic and paper mail. + + If the program does terminal interaction, make it output a short +notice like this when it starts in an interactive mode: + + Copyright (C) + This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, your program's commands +might be different; for a GUI interface, you would use an "about box". + + You should also get your employer (if you work as a programmer) or school, +if any, to sign a "copyright disclaimer" for the program, if necessary. +For more information on this, and how to apply and follow the GNU GPL, see +. + + The GNU General Public License does not permit incorporating your program +into proprietary programs. If your program is a subroutine library, you +may consider it more useful to permit linking proprietary applications with +the library. If this is what you want to do, use the GNU Lesser General +Public License instead of this License. But first, please read +. From e8c796205390206998329857bcde70b65ccd155d Mon Sep 17 00:00:00 2001 From: suqi8 <157949748+suqi8@users.noreply.github.com> Date: Sun, 16 Jun 2024 11:37:30 +0800 Subject: [PATCH 002/875] Create README.md --- README.md | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) create mode 100644 README.md diff --git a/README.md b/README.md new file mode 100644 index 00000000..daad407e --- /dev/null +++ b/README.md @@ -0,0 +1,32 @@ +# OPatch - ColorOS辅助模块 + +## 简介 +OPatch是一个专为ColorOS系统设计的辅助模块，旨在增强和定制用户的操作系统体验。该模块允许用户轻松地应用补丁，以实现特定的功能或优化。 + +## 名称的由来 +仓库的名称"OPatch"来源于"OPPO OnePlus Patch"，这表明了模块的主要应用场景是OPPO和OnePlus设备上的ColorOS系统。 + +## 特点 +- **兼容性**：专为OPPO和OnePlus设备设计，确保与ColorOS系统的兼容性。 +- **易用性**：用户界面友好，使得应用补丁变得简单快捷。 +- **定制性**：允许用户根据自己的需求定制系统功能。 + +## 使用方法 +1. 克隆或下载本仓库。 +2. 按照文档说明配置您的开发环境。 +3. 根据需要应用相应的补丁。 + +## 贡献 +我们欢迎社区的贡献，如果您有改进意见或想要添加新功能，请提交Pull Request或创建Issue。 + +## 许可 +本项目采用[GPL许可证](LICENSE)，详情请参阅LICENSE文件。 + +## 联系我们 +如果您有任何问题或需要帮助，请通过以下方式联系我们： +- GitHub Issues +- 电子邮件：[3383787570@qq.com] + +--- + +感谢您的关注和支持！ From f0fd84e865409255e8125bf388f953ecc686363b Mon Sep 17 00:00:00 2001 From: suqi8 <3383787570@qq.com> Date: Sun, 16 Jun 2024 11:37:45 +0800 Subject: [PATCH 003/875] =?UTF-8?q?=E9=A6=96=E6=AC=A1=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .idea/.gitignore | 5 + .idea/compiler.xml | 6 + .idea/inspectionProfiles/Project_Default.xml | 12 + .idea/kotlinc.xml | 6 + .idea/migrations.xml | 10 + .idea/other.xml | 263 ++++++++++++++++++ app/.gitignore | 1 + app/build.gradle.kts | 60 ++++ app/proguard-rules.pro | 39 +++ .../suqi8/opatch/ExampleInstrumentedTest.kt | 24 ++ app/src/main/AndroidManifest.xml | 54 ++++ app/src/main/assets/xposed_init | 1 + .../opatch/application/DefaultApplication.kt | 17 ++ .../io/github/suqi8/opatch/hook/HookEntry.kt | 18 ++ .../suqi8/opatch/ui/activity/MainActivity.kt | 85 ++++++ .../opatch/ui/activity/base/BaseActivity.kt | 64 +++++ .../suqi8/opatch/ui/view/MaterialSwitch.kt | 53 ++++ .../opatch/utils/factory/FunctionFactory.kt | 40 +++ .../main/res/drawable-night/bg_dark_round.xml | 6 + .../drawable-night/bg_permotion_ripple.xml | 10 + .../res/drawable-night/bg_permotion_round.xml | 6 + .../drawable-v24/ic_launcher_foreground.xml | 30 ++ app/src/main/res/drawable/bg_dark_round.xml | 6 + app/src/main/res/drawable/bg_green_round.xml | 6 + app/src/main/res/drawable/bg_orange_round.xml | 6 + .../main/res/drawable/bg_permotion_ripple.xml | 10 + .../main/res/drawable/bg_permotion_round.xml | 6 + .../res/drawable/ic_launcher_background.xml | 170 +++++++++++ app/src/main/res/layout/activity_main.xml | 250 +++++++++++++++++ .../res/mipmap-anydpi-v26/ic_launcher.xml | 5 + .../mipmap-anydpi-v26/ic_launcher_round.xml | 5 + app/src/main/res/mipmap-hdpi/ic_launcher.webp | Bin 0 -> 1404 bytes .../res/mipmap-hdpi/ic_launcher_round.webp | Bin 0 -> 2898 bytes app/src/main/res/mipmap-mdpi/ic_launcher.webp | Bin 0 -> 982 bytes .../res/mipmap-mdpi/ic_launcher_round.webp | Bin 0 -> 1772 bytes .../main/res/mipmap-xhdpi/ic_launcher.webp | Bin 0 -> 1900 bytes .../res/mipmap-xhdpi/ic_launcher_round.webp | Bin 0 -> 3918 bytes app/src/main/res/mipmap-xxhdpi/ic_github.png | Bin 0 -> 5987 bytes app/src/main/res/mipmap-xxhdpi/ic_home.png | Bin 0 -> 4999 bytes .../main/res/mipmap-xxhdpi/ic_launcher.webp | Bin 0 -> 2884 bytes .../res/mipmap-xxhdpi/ic_launcher_round.webp | Bin 0 -> 5914 bytes app/src/main/res/mipmap-xxhdpi/ic_success.png | Bin 0 -> 4948 bytes app/src/main/res/mipmap-xxhdpi/ic_warn.png | Bin 0 -> 4102 bytes .../main/res/mipmap-xxhdpi/ic_yukihookapi.png | Bin 0 -> 8490 bytes .../main/res/mipmap-xxxhdpi/ic_launcher.webp | Bin 0 -> 3844 bytes .../res/mipmap-xxxhdpi/ic_launcher_round.webp | Bin 0 -> 7778 bytes app/src/main/res/values-night/color.xml | 6 + app/src/main/res/values-night/themes.xml | 17 ++ app/src/main/res/values-zh-rCN/strings.xml | 13 + app/src/main/res/values/array.xml | 6 + app/src/main/res/values/color.xml | 6 + app/src/main/res/values/colors.xml | 7 + app/src/main/res/values/strings.xml | 12 + app/src/main/res/values/themes.xml | 17 ++ .../main/resources/META-INF/yukihookapi_init | 1 + .../io/github/suqi8/opatch/ExampleUnitTest.kt | 17 ++ build.gradle.kts | 5 + gradle.properties | 14 + .../sweet-dependency-config.yaml | 65 +++++ gradle/wrapper/gradle-wrapper.jar | Bin 0 -> 59203 bytes gradle/wrapper/gradle-wrapper.properties | 6 + gradlew | 185 ++++++++++++ gradlew.bat | 89 ++++++ settings.gradle.kts | 16 ++ 64 files changed, 1756 insertions(+) create mode 100644 .idea/.gitignore create mode 100644 .idea/compiler.xml create mode 100644 .idea/inspectionProfiles/Project_Default.xml create mode 100644 .idea/kotlinc.xml create mode 100644 .idea/migrations.xml create mode 100644 .idea/other.xml create mode 100644 app/.gitignore create mode 100644 app/build.gradle.kts create mode 100644 app/proguard-rules.pro create mode 100644 app/src/androidTest/java/io/github/suqi8/opatch/ExampleInstrumentedTest.kt create mode 100644 app/src/main/AndroidManifest.xml create mode 100644 app/src/main/assets/xposed_init create mode 100644 app/src/main/java/io/github/suqi8/opatch/application/DefaultApplication.kt create mode 100644 app/src/main/java/io/github/suqi8/opatch/hook/HookEntry.kt create mode 100644 app/src/main/java/io/github/suqi8/opatch/ui/activity/MainActivity.kt create mode 100644 app/src/main/java/io/github/suqi8/opatch/ui/activity/base/BaseActivity.kt create mode 100644 app/src/main/java/io/github/suqi8/opatch/ui/view/MaterialSwitch.kt create mode 100644 app/src/main/java/io/github/suqi8/opatch/utils/factory/FunctionFactory.kt create mode 100644 app/src/main/res/drawable-night/bg_dark_round.xml create mode 100644 app/src/main/res/drawable-night/bg_permotion_ripple.xml create mode 100644 app/src/main/res/drawable-night/bg_permotion_round.xml create mode 100644 app/src/main/res/drawable-v24/ic_launcher_foreground.xml create mode 100644 app/src/main/res/drawable/bg_dark_round.xml create mode 100644 app/src/main/res/drawable/bg_green_round.xml create mode 100644 app/src/main/res/drawable/bg_orange_round.xml create mode 100644 app/src/main/res/drawable/bg_permotion_ripple.xml create mode 100644 app/src/main/res/drawable/bg_permotion_round.xml create mode 100644 app/src/main/res/drawable/ic_launcher_background.xml create mode 100644 app/src/main/res/layout/activity_main.xml create mode 100644 app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml create mode 100644 app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml create mode 100644 app/src/main/res/mipmap-hdpi/ic_launcher.webp create mode 100644 app/src/main/res/mipmap-hdpi/ic_launcher_round.webp create mode 100644 app/src/main/res/mipmap-mdpi/ic_launcher.webp create mode 100644 app/src/main/res/mipmap-mdpi/ic_launcher_round.webp create mode 100644 app/src/main/res/mipmap-xhdpi/ic_launcher.webp create mode 100644 app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp create mode 100644 app/src/main/res/mipmap-xxhdpi/ic_github.png create mode 100644 app/src/main/res/mipmap-xxhdpi/ic_home.png create mode 100644 app/src/main/res/mipmap-xxhdpi/ic_launcher.webp create mode 100644 app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp create mode 100644 app/src/main/res/mipmap-xxhdpi/ic_success.png create mode 100644 app/src/main/res/mipmap-xxhdpi/ic_warn.png create mode 100644 app/src/main/res/mipmap-xxhdpi/ic_yukihookapi.png create mode 100644 app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp create mode 100644 app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp create mode 100644 app/src/main/res/values-night/color.xml create mode 100644 app/src/main/res/values-night/themes.xml create mode 100644 app/src/main/res/values-zh-rCN/strings.xml create mode 100644 app/src/main/res/values/array.xml create mode 100644 app/src/main/res/values/color.xml create mode 100644 app/src/main/res/values/colors.xml create mode 100644 app/src/main/res/values/strings.xml create mode 100644 app/src/main/res/values/themes.xml create mode 100644 app/src/main/resources/META-INF/yukihookapi_init create mode 100644 app/src/test/java/io/github/suqi8/opatch/ExampleUnitTest.kt create mode 100644 build.gradle.kts create mode 100644 gradle.properties create mode 100644 gradle/sweet-dependency/sweet-dependency-config.yaml create mode 100644 gradle/wrapper/gradle-wrapper.jar create mode 100644 gradle/wrapper/gradle-wrapper.properties create mode 100644 gradlew create mode 100644 gradlew.bat create mode 100644 settings.gradle.kts diff --git a/.idea/.gitignore b/.idea/.gitignore new file mode 100644 index 00000000..239c4267 --- /dev/null +++ b/.idea/.gitignore @@ -0,0 +1,5 @@ +# Default ignored files +/shelf/ +/workspace.xml +/gradle.xml +/misc.xml \ No newline at end of file diff --git a/.idea/compiler.xml b/.idea/compiler.xml new file mode 100644 index 00000000..b589d56e --- /dev/null +++ b/.idea/compiler.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml new file mode 100644 index 00000000..47c3e245 --- /dev/null +++ b/.idea/inspectionProfiles/Project_Default.xml @@ -0,0 +1,12 @@ + + + + \ No newline at end of file diff --git a/.idea/kotlinc.xml b/.idea/kotlinc.xml new file mode 100644 index 00000000..148fdd24 --- /dev/null +++ b/.idea/kotlinc.xml @@ -0,0 +1,6 @@ + + + + + \ No newline at end of file diff --git a/.idea/migrations.xml b/.idea/migrations.xml new file mode 100644 index 00000000..f8051a6f --- /dev/null +++ b/.idea/migrations.xml @@ -0,0 +1,10 @@ + + + + + + \ No newline at end of file diff --git a/.idea/other.xml b/.idea/other.xml new file mode 100644 index 00000000..0d3a1fbb --- /dev/null +++ b/.idea/other.xml @@ -0,0 +1,263 @@ + + + + + + \ No newline at end of file diff --git a/app/.gitignore b/app/.gitignore new file mode 100644 index 00000000..42afabfd --- /dev/null +++ b/app/.gitignore @@ -0,0 +1 @@ +/build \ No newline at end of file diff --git a/app/build.gradle.kts b/app/build.gradle.kts new file mode 100644 index 00000000..c988a2f2 --- /dev/null +++ b/app/build.gradle.kts @@ -0,0 +1,60 @@ +plugins { + autowire(libs.plugins.android.application) + autowire(libs.plugins.kotlin.android) + autowire(libs.plugins.kotlin.ksp) +} + +android { + namespace = property.project.app.packageName + compileSdk = property.project.android.compileSdk + + defaultConfig { + applicationId = property.project.app.packageName + minSdk = property.project.android.minSdk + targetSdk = property.project.android.targetSdk + versionName = property.project.app.versionName + versionCode = property.project.app.versionCode + testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" + } + buildTypes { + release { + isMinifyEnabled = true + isShrinkResources = true + proguardFiles(getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro") + } + } + compileOptions { + sourceCompatibility = JavaVersion.VERSION_17 + targetCompatibility = JavaVersion.VERSION_17 + } + kotlinOptions { + jvmTarget = "17" + freeCompilerArgs = listOf( + "-Xno-param-assertions", + "-Xno-call-assertions", + "-Xno-receiver-assertions" + ) + } + buildFeatures { + buildConfig = true + viewBinding = true + } + lint { checkReleaseBuilds = false } + // TODO Please visit https://highcapable.github.io/YukiHookAPI/en/api/special-features/host-inject + // TODO 请参考 https://highcapable.github.io/YukiHookAPI/zh-cn/api/special-features/host-inject + // androidResources.additionalParameters += listOf("--allow-reserved-package-id", "--package-id", "0x64") +} + +dependencies { + compileOnly(de.robv.android.xposed.api) + implementation(com.highcapable.yukihookapi.api) + ksp(com.highcapable.yukihookapi.ksp.xposed) + implementation(com.github.duanhong169.drawabletoolbox) + implementation(androidx.core.core.ktx) + implementation(androidx.appcompat.appcompat) + implementation(com.google.android.material.material) + implementation(androidx.constraintlayout.constraintlayout) + testImplementation(junit.junit) + androidTestImplementation(androidx.test.ext.junit) + androidTestImplementation(androidx.test.espresso.espresso.core) +} \ No newline at end of file diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro new file mode 100644 index 00000000..301191dc --- /dev/null +++ b/app/proguard-rules.pro @@ -0,0 +1,39 @@ +# Add project specific ProGuard rules here. +# You can control the set of applied configuration files using the +# proguardFiles setting in build.gradle.kts. +# +# For more details, see +# http://developer.android.com/guide/developing/tools/proguard.html + +# If your project uses WebView with JS, uncomment the following +# and specify the fully qualified class name to the JavaScript interface +# class: +#-keepclassmembers class fqcn.of.javascript.interface.for.webview { +# public *; +#} + +# Uncomment this to preserve the line number information for +# debugging stack traces. +#-keepattributes SourceFile,LineNumberTable + +# If you keep the line number information, uncomment this to +# hide the original source file name. +#-renamesourcefileattribute SourceFile + +# FreeReflection +-keep class me.weishu.reflection.** {*;} + +-assumenosideeffects class kotlin.jvm.internal.Intrinsics { + public static *** throwUninitializedProperty(...); + public static *** throwUninitializedPropertyAccessException(...); +} + +-keepclassmembers class * implements androidx.viewbinding.ViewBinding { + *** inflate(android.view.LayoutInflater); +} + +-keep class * extends android.app.Activity +-keep class * implements androidx.viewbinding.ViewBinding { + (); + *** inflate(android.view.LayoutInflater); +} \ No newline at end of file diff --git a/app/src/androidTest/java/io/github/suqi8/opatch/ExampleInstrumentedTest.kt b/app/src/androidTest/java/io/github/suqi8/opatch/ExampleInstrumentedTest.kt new file mode 100644 index 00000000..9c14206d --- /dev/null +++ b/app/src/androidTest/java/io/github/suqi8/opatch/ExampleInstrumentedTest.kt @@ -0,0 +1,24 @@ +package io.github.suqi8.opatch + +import androidx.test.platform.app.InstrumentationRegistry +import androidx.test.ext.junit.runners.AndroidJUnit4 + +import org.junit.Test +import org.junit.runner.RunWith + +import org.junit.Assert.* + +/** + * Instrumented test, which will execute on an Android device. + * + * See [testing documentation](http://d.android.com/tools/testing). + */ +@RunWith(AndroidJUnit4::class) +class ExampleInstrumentedTest { + @Test + fun useAppContext() { + // Context of the app under test. + val appContext = InstrumentationRegistry.getInstrumentation().targetContext + assertEquals("io.github.suqi8.opatch", appContext.packageName) + } +} \ No newline at end of file diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml new file mode 100644 index 00000000..46d6cd88 --- /dev/null +++ b/app/src/main/AndroidManifest.xml @@ -0,0 +1,54 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/assets/xposed_init b/app/src/main/assets/xposed_init new file mode 100644 index 00000000..7a43b347 --- /dev/null +++ b/app/src/main/assets/xposed_init @@ -0,0 +1 @@ +io.github.suqi8.opatch.hook.opatch \ No newline at end of file diff --git a/app/src/main/java/io/github/suqi8/opatch/application/DefaultApplication.kt b/app/src/main/java/io/github/suqi8/opatch/application/DefaultApplication.kt new file mode 100644 index 00000000..90915756 --- /dev/null +++ b/app/src/main/java/io/github/suqi8/opatch/application/DefaultApplication.kt @@ -0,0 +1,17 @@ +package io.github.suqi8.opatch.application + +import androidx.appcompat.app.AppCompatDelegate +import com.highcapable.yukihookapi.hook.xposed.application.ModuleApplication + +class DefaultApplication : ModuleApplication() { + + override fun onCreate() { + super.onCreate() + /** + * 跟随系统夜间模式 + * Follow system night mode + */ + AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_FOLLOW_SYSTEM) + // Your code here. + } +} \ No newline at end of file diff --git a/app/src/main/java/io/github/suqi8/opatch/hook/HookEntry.kt b/app/src/main/java/io/github/suqi8/opatch/hook/HookEntry.kt new file mode 100644 index 00000000..472b9c50 --- /dev/null +++ b/app/src/main/java/io/github/suqi8/opatch/hook/HookEntry.kt @@ -0,0 +1,18 @@ +package io.github.suqi8.opatch.hook + +import com.highcapable.yukihookapi.annotation.xposed.InjectYukiHookWithXposed +import com.highcapable.yukihookapi.hook.factory.configs +import com.highcapable.yukihookapi.hook.factory.encase +import com.highcapable.yukihookapi.hook.xposed.proxy.IYukiHookXposedInit + +@InjectYukiHookWithXposed(entryClassName = "opatch", isUsingResourcesHook = true) +class HookEntry : IYukiHookXposedInit { + + override fun onInit() = configs { + // Your code here. + } + + override fun onHook() = encase { + // Your code here. + } +} \ No newline at end of file diff --git a/app/src/main/java/io/github/suqi8/opatch/ui/activity/MainActivity.kt b/app/src/main/java/io/github/suqi8/opatch/ui/activity/MainActivity.kt new file mode 100644 index 00000000..3b3a4983 --- /dev/null +++ b/app/src/main/java/io/github/suqi8/opatch/ui/activity/MainActivity.kt @@ -0,0 +1,85 @@ +@file:Suppress("SetTextI18n") + +package io.github.suqi8.opatch.ui.activity + +import android.content.ComponentName +import android.content.pm.PackageManager +import androidx.core.view.isVisible +import com.highcapable.yukihookapi.YukiHookAPI +import io.github.suqi8.opatch.BuildConfig +import io.github.suqi8.opatch.R +import io.github.suqi8.opatch.databinding.ActivityMainBinding +import io.github.suqi8.opatch.ui.activity.base.BaseActivity + +class MainActivity : BaseActivity() { + + override fun onCreate() { + refreshModuleStatus() + binding.mainTextVersion.text = getString(R.string.module_version, BuildConfig.VERSION_NAME) + binding.hideIconInLauncherSwitch.isChecked = isLauncherIconShowing.not() + binding.hideIconInLauncherSwitch.setOnCheckedChangeListener { button, isChecked -> + if (button.isPressed) hideOrShowLauncherIcon(isChecked) + } + // Your code here. + } + + /** + * Hide or show launcher icons + * + * - You may need the latest version of LSPosed to enable the function of hiding launcher + * icons in higher version systems + * + * 隐藏或显示启动器图标 + * + * - 你可能需要 LSPosed 的最新版本以开启高版本系统中隐藏 APP 桌面图标功能 + * @param isShow Whether to display / 是否显示 + */ + private fun hideOrShowLauncherIcon(isShow: Boolean) { + packageManager?.setComponentEnabledSetting( + ComponentName(packageName, "${BuildConfig.APPLICATION_ID}.Home"), + if (isShow) PackageManager.COMPONENT_ENABLED_STATE_DISABLED else PackageManager.COMPONENT_ENABLED_STATE_ENABLED, + PackageManager.DONT_KILL_APP + ) + } + + /** + * Get launcher icon state + * + * 获取启动器图标状态 + * @return [Boolean] Whether to display / 是否显示 + */ + private val isLauncherIconShowing + get() = packageManager?.getComponentEnabledSetting( + ComponentName(packageName, "${BuildConfig.APPLICATION_ID}.Home") + ) != PackageManager.COMPONENT_ENABLED_STATE_DISABLED + + /** + * Refresh module status + * + * 刷新模块状态 + */ + private fun refreshModuleStatus() { + binding.mainLinStatus.setBackgroundResource( + when { + YukiHookAPI.Status.isModuleActive -> R.drawable.bg_green_round + else -> R.drawable.bg_dark_round + } + ) + binding.mainImgStatus.setImageResource( + when { + YukiHookAPI.Status.isModuleActive -> R.mipmap.ic_success + else -> R.mipmap.ic_warn + } + ) + binding.mainTextStatus.text = getString( + when { + YukiHookAPI.Status.isModuleActive -> R.string.module_is_activated + else -> R.string.module_not_activated + } + ) + binding.mainTextApiWay.isVisible = YukiHookAPI.Status.isModuleActive + binding.mainTextApiWay.text = if (YukiHookAPI.Status.Executor.apiLevel > 0) + "Activated by ${YukiHookAPI.Status.Executor.name} API ${YukiHookAPI.Status.Executor.apiLevel}" + else "Activated by ${YukiHookAPI.Status.Executor.name}" + } +} \ No newline at end of file diff --git a/app/src/main/java/io/github/suqi8/opatch/ui/activity/base/BaseActivity.kt b/app/src/main/java/io/github/suqi8/opatch/ui/activity/base/BaseActivity.kt new file mode 100644 index 00000000..8dce4140 --- /dev/null +++ b/app/src/main/java/io/github/suqi8/opatch/ui/activity/base/BaseActivity.kt @@ -0,0 +1,64 @@ +@file:Suppress("MemberVisibilityCanBePrivate", "UNCHECKED_CAST") + +package io.github.suqi8.opatch.ui.activity.base + +import android.os.Build +import android.os.Bundle +import androidx.appcompat.app.AppCompatActivity +import androidx.core.content.res.ResourcesCompat +import androidx.core.view.WindowCompat +import androidx.viewbinding.ViewBinding +import com.highcapable.yukihookapi.hook.factory.current +import com.highcapable.yukihookapi.hook.factory.method +import com.highcapable.yukihookapi.hook.type.android.LayoutInflaterClass +import io.github.suqi8.opatch.R +import io.github.suqi8.opatch.utils.factory.isNotSystemInDarkMode + +abstract class BaseActivity : AppCompatActivity() { + + /** + * Get the binding layout object + * + * 获取绑定布局对象 + */ + lateinit var binding: VB + + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + binding = current().generic()?.argument()?.method { + name = "inflate" + param(LayoutInflaterClass) + }?.get()?.invoke(layoutInflater) ?: error("binding failed") + setContentView(binding.root) + /** + * Hide Activity title bar + * 隐藏系统的标题栏 + */ + supportActionBar?.hide() + /** + * Init immersive status bar + * 初始化沉浸状态栏 + */ + WindowCompat.getInsetsController(window, window.decorView).apply { + isAppearanceLightStatusBars = isNotSystemInDarkMode + isAppearanceLightNavigationBars = isNotSystemInDarkMode + } + ResourcesCompat.getColor(resources, R.color.colorThemeBackground, null).also { + window?.statusBarColor = it + window?.navigationBarColor = it + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) window?.navigationBarDividerColor = it + } + /** + * Init children + * 装载子类 + */ + onCreate() + } + + /** + * Callback [onCreate] method + * + * 回调 [onCreate] 方法 + */ + abstract fun onCreate() +} \ No newline at end of file diff --git a/app/src/main/java/io/github/suqi8/opatch/ui/view/MaterialSwitch.kt b/app/src/main/java/io/github/suqi8/opatch/ui/view/MaterialSwitch.kt new file mode 100644 index 00000000..3d70cea1 --- /dev/null +++ b/app/src/main/java/io/github/suqi8/opatch/ui/view/MaterialSwitch.kt @@ -0,0 +1,53 @@ +@file:Suppress("SameParameterValue") + +package io.github.suqi8.opatch.ui.view + +import android.content.Context +import android.content.res.ColorStateList +import android.graphics.Color +import android.text.TextUtils +import android.util.AttributeSet +import androidx.appcompat.widget.SwitchCompat +import io.github.suqi8.opatch.utils.factory.dp +import io.github.suqi8.opatch.utils.factory.isSystemInDarkMode +import top.defaults.drawabletoolbox.DrawableBuilder + +class MaterialSwitch(context: Context, attrs: AttributeSet?) : SwitchCompat(context, attrs) { + + private fun trackColors(selected: Int, pressed: Int, normal: Int): ColorStateList { + val colors = intArrayOf(selected, pressed, normal) + val states = arrayOfNulls(3) + states[0] = intArrayOf(android.R.attr.state_checked) + states[1] = intArrayOf(android.R.attr.state_pressed) + states[2] = intArrayOf() + return ColorStateList(states, colors) + } + + private val thumbColor get() = if (context.isSystemInDarkMode) 0xFF7C7C7C else 0xFFCCCCCC + + init { + trackDrawable = DrawableBuilder() + .rectangle() + .rounded() + .solidColor(0xFF656565.toInt()) + .height(20.dp(context)) + .cornerRadius(15.dp(context)) + .build() + thumbDrawable = DrawableBuilder() + .rectangle() + .rounded() + .solidColor(Color.WHITE) + .size(20.dp(context), 20.dp(context)) + .cornerRadius(20.dp(context)) + .strokeWidth(8.dp(context)) + .strokeColor(Color.TRANSPARENT) + .build() + trackTintList = trackColors( + 0xFF656565.toInt(), + thumbColor.toInt(), + thumbColor.toInt() + ) + isSingleLine = true + ellipsize = TextUtils.TruncateAt.END + } +} \ No newline at end of file diff --git a/app/src/main/java/io/github/suqi8/opatch/utils/factory/FunctionFactory.kt b/app/src/main/java/io/github/suqi8/opatch/utils/factory/FunctionFactory.kt new file mode 100644 index 00000000..bdd7b7ee --- /dev/null +++ b/app/src/main/java/io/github/suqi8/opatch/utils/factory/FunctionFactory.kt @@ -0,0 +1,40 @@ +@file:Suppress("unused") + +package io.github.suqi8.opatch.utils.factory + +import android.content.Context +import android.content.res.Configuration + +/** + * System dark mode is enabled or not + * + * 系统深色模式是否开启 + * @return [Boolean] Whether to enable / 是否开启 + */ +val Context.isSystemInDarkMode get() = (resources.configuration.uiMode and Configuration.UI_MODE_NIGHT_MASK) == Configuration.UI_MODE_NIGHT_YES + +/** + * System dark mode is disable or not + * + * 系统深色模式是否没开启 + * @return [Boolean] Whether to enable / 是否开启 + */ +inline val Context.isNotSystemInDarkMode get() = isSystemInDarkMode.not() + +/** + * dp to pxInt + * + * dp 转换为 pxInt + * @param context using instance / 使用的实例 + * @return [Int] + */ +fun Number.dp(context: Context) = dpFloat(context).toInt() + +/** + * dp to pxFloat + * + * dp 转换为 pxFloat + * @param context using instance / 使用的实例 + * @return [Float] + */ +fun Number.dpFloat(context: Context) = toFloat() * context.resources.displayMetrics.density \ No newline at end of file diff --git a/app/src/main/res/drawable-night/bg_dark_round.xml b/app/src/main/res/drawable-night/bg_dark_round.xml new file mode 100644 index 00000000..71baadb9 --- /dev/null +++ b/app/src/main/res/drawable-night/bg_dark_round.xml @@ -0,0 +1,6 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable-night/bg_permotion_ripple.xml b/app/src/main/res/drawable-night/bg_permotion_ripple.xml new file mode 100644 index 00000000..d7547e2b --- /dev/null +++ b/app/src/main/res/drawable-night/bg_permotion_ripple.xml @@ -0,0 +1,10 @@ + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable-night/bg_permotion_round.xml b/app/src/main/res/drawable-night/bg_permotion_round.xml new file mode 100644 index 00000000..09cbc156 --- /dev/null +++ b/app/src/main/res/drawable-night/bg_permotion_round.xml @@ -0,0 +1,6 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable-v24/ic_launcher_foreground.xml b/app/src/main/res/drawable-v24/ic_launcher_foreground.xml new file mode 100644 index 00000000..2b068d11 --- /dev/null +++ b/app/src/main/res/drawable-v24/ic_launcher_foreground.xml @@ -0,0 +1,30 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/bg_dark_round.xml b/app/src/main/res/drawable/bg_dark_round.xml new file mode 100644 index 00000000..ccc45c06 --- /dev/null +++ b/app/src/main/res/drawable/bg_dark_round.xml @@ -0,0 +1,6 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/bg_green_round.xml b/app/src/main/res/drawable/bg_green_round.xml new file mode 100644 index 00000000..31a6d3d5 --- /dev/null +++ b/app/src/main/res/drawable/bg_green_round.xml @@ -0,0 +1,6 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/bg_orange_round.xml b/app/src/main/res/drawable/bg_orange_round.xml new file mode 100644 index 00000000..8cc80667 --- /dev/null +++ b/app/src/main/res/drawable/bg_orange_round.xml @@ -0,0 +1,6 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/bg_permotion_ripple.xml b/app/src/main/res/drawable/bg_permotion_ripple.xml new file mode 100644 index 00000000..e0052d78 --- /dev/null +++ b/app/src/main/res/drawable/bg_permotion_ripple.xml @@ -0,0 +1,10 @@ + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/bg_permotion_round.xml b/app/src/main/res/drawable/bg_permotion_round.xml new file mode 100644 index 00000000..b7d8b2bf --- /dev/null +++ b/app/src/main/res/drawable/bg_permotion_round.xml @@ -0,0 +1,6 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_launcher_background.xml b/app/src/main/res/drawable/ic_launcher_background.xml new file mode 100644 index 00000000..3c152dde --- /dev/null +++ b/app/src/main/res/drawable/ic_launcher_background.xml @@ -0,0 +1,170 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml new file mode 100644 index 00000000..582f1c79 --- /dev/null +++ b/app/src/main/res/layout/activity_main.xml @@ -0,0 +1,250 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml new file mode 100644 index 00000000..eca70cfe --- /dev/null +++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml new file mode 100644 index 00000000..eca70cfe --- /dev/null +++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.webp b/app/src/main/res/mipmap-hdpi/ic_launcher.webp new file mode 100644 index 0000000000000000000000000000000000000000..c209e78ecd372343283f4157dcfd918ec5165bb3 GIT binary patch literal 1404 zcmV-?1%vuhNk&F=1pok7MM6+kP&il$0000G0000-002h-06|PpNX!5L00Dqw+t%{r zzW2vH!KF=w&cMnnN@{whkTw+#mAh0SV?YL=)3MimFYCWp#fpdtz~8$hD5VPuQgtcN zXl<@<#Cme5f5yr2h%@8TWh?)bSK`O z^Z@d={gn7J{iyxL_y_%J|L>ep{dUxUP8a{byupH&!UNR*OutO~0{*T4q5R6@ApLF! z5{w?Z150gC7#>(VHFJZ-^6O@PYp{t!jH(_Z*nzTK4 zkc{fLE4Q3|mA2`CWQ3{8;gxGizgM!zccbdQoOLZc8hThi-IhN90RFT|zlxh3Ty&VG z?Fe{#9RrRnxzsu|Lg2ddugg7k%>0JeD+{XZ7>Z~{=|M+sh1MF7~ zz>To~`~LVQe1nNoR-gEzkpe{Ak^7{{ZBk2i_<+`Bq<^GB!RYG+z)h;Y3+<{zlMUYd zrd*W4w&jZ0%kBuDZ1EW&KLpyR7r2=}fF2%0VwHM4pUs}ZI2egi#DRMYZPek*^H9YK zay4Iy3WXFG(F14xYsoDA|KXgGc5%2DhmQ1gFCkrgHBm!lXG8I5h*uf{rn48Z!_@ z4Bk6TJAB2CKYqPjiX&mWoW>OPFGd$wqroa($ne7EUK;#3VYkXaew%Kh^3OrMhtjYN?XEoY`tRPQsAkH-DSL^QqyN0>^ zmC>{#F14jz4GeW{pJoRpLFa_*GI{?T93^rX7SPQgT@LbLqpNA}<@2wH;q493)G=1Y z#-sCiRNX~qf3KgiFzB3I>4Z%AfS(3$`-aMIBU+6?gbgDb!)L~A)je+;fR0jWLL-Fu z4)P{c7{B4Hp91&%??2$v9iRSFnuckHUm}or9seH6 z>%NbT+5*@L5(I9j@06@(!{ZI?U0=pKn8uwIg&L{JV14+8s2hnvbRrU|hZCd}IJu7*;;ECgO%8_*W Kmw_-CKmY()leWbG literal 0 HcmV?d00001 diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp new file mode 100644 index 0000000000000000000000000000000000000000..b2dfe3d1ba5cf3ee31b3ecc1ced89044a1f3b7a9 GIT binary patch literal 2898 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 literal 0 HcmV?d00001 diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher.webp b/app/src/main/res/mipmap-mdpi/ic_launcher.webp new file mode 100644 index 0000000000000000000000000000000000000000..4f0f1d64e58ba64d180ce43ee13bf9a17835fbca GIT binary patch literal 982 zcmV;{11bDcNk&G_0{{S5MM6+kP&il$0000G0000l001ul06|PpNU8t;00Dqo+t#w^ z^1csucXz7-Qrhzl9HuHB%l>&>1tG2^vb*E&k^T3$FG1eQZ51g$uv4V+kI`0<^1Z@N zk?Jjh$olyC%l>)Xq;7!>{iBj&BjJ`P&$fsCfpve_epJOBkTF?nu-B7D!hO=2ZR}

C%4 zc_9eOXvPbC4kzU8YowIA8cW~Uv|eB&yYwAObSwL2vY~UYI7NXPvf3b+c^?wcs~_t{ ze_m66-0)^{JdOMKPwjpQ@Sna!*?$wTZ~su*tNv7o!gXT!GRgivP}ec?5>l1!7<(rT zds|8x(qGc673zrvYIz;J23FG{9nHMnAuP}NpAED^laz3mAN1sy+NXK)!6v1FxQ;lh zOBLA>$~P3r4b*NcqR;y6pwyhZ3_PiDb|%n1gGjl3ZU}ujInlP{eks-#oA6>rh&g+!f`hv#_%JrgYPu z(U^&XLW^QX7F9Z*SRPpQl{B%x)_AMp^}_v~?j7 zapvHMKxSf*Mtyx8I}-<*UGn3)oHd(nn=)BZ`d$lDBwq_GL($_TPaS{UeevT(AJ`p0 z9%+hQb6z)U9qjbuXjg|dExCLjpS8$VKQ55VsIC%@{N5t{NsW)=hNGI`J=x97_kbz@ E0Of=7!TQj4N+cqN`nQhxvX7dAV-`K|Ub$-q+H-5I?Tx0g9jWxd@A|?POE8`3b8fO$T))xP* z(X?&brZw({`)WU&rdAs1iTa0x6F@PIxJ&&L|dpySV!ID|iUhjCcKz(@mE z!x@~W#3H<)4Ae(4eQJRk`Iz3<1)6^m)0b_4_TRZ+cz#eD3f8V;2r-1fE!F}W zEi0MEkTTx}8i1{`l_6vo0(Vuh0HD$I4SjZ=?^?k82R51bC)2D_{y8mi_?X^=U?2|F{Vr7s!k(AZC$O#ZMyavHhlQ7 zUR~QXuH~#o#>(b$u4?s~HLF*3IcF7023AlwAYudn0FV~|odGH^05AYPEfR)8p`i{n zwg3zPVp{+wOsxKc>)(pMupKF!Y2HoUqQ3|Yu|8lwR=?5zZuhG6J?H`bSNk_wPoM{u zSL{c@pY7+c2kck>`^q1^^gR0QB7Y?KUD{vz-uVX~;V-rW)PDcI)$_UjgVV?S?=oLR zf4}zz{#*R_{LkiJ#0RdQLNC^2Vp%JPEUvG9ra2BVZ92(p9h7Ka@!yf9(lj#}>+|u* z;^_?KWdzkM`6gqPo9;;r6&JEa)}R3X{(CWv?NvgLeOTq$cZXqf7|sPImi-7cS8DCN zGf;DVt3Am`>hH3{4-WzH43Ftx)SofNe^-#|0HdCo<+8Qs!}TZP{HH8~z5n`ExcHuT zDL1m&|DVpIy=xsLO>8k92HcmfSKhflQ0H~9=^-{#!I1g(;+44xw~=* zxvNz35vfsQE)@)Zsp*6_GjYD};Squ83<_?^SbALb{a`j<0Gn%6JY!zhp=Fg}Ga2|8 z52e1WU%^L1}15Ex0fF$e@eCT(()_P zvV?CA%#Sy08_U6VPt4EtmVQraWJX` zh=N|WQ>LgrvF~R&qOfB$!%D3cGv?;Xh_z$z7k&s4N)$WYf*k=|*jCEkO19{h_(%W4 zPuOqbCw`SeAX*R}UUsbVsgtuG?xs(#Ikx9`JZoQFz0n*7ZG@Fv@kZk`gzO$HoA9kN z8U5{-yY zvV{`&WKU2$mZeoBmiJrEdzUZAv1sRxpePdg1)F*X^Y)zp^Y*R;;z~vOv-z&)&G)JQ{m!C9cmziu1^nHA z`#`0c>@PnQ9CJKgC5NjJD8HM3|KC(g5nnCq$n0Gsu_DXk36@ql%npEye|?%RmG)

FJ$wK}0tWNB{uH;AM~i literal 0 HcmV?d00001 diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher.webp b/app/src/main/res/mipmap-xhdpi/ic_launcher.webp new file mode 100644 index 0000000000000000000000000000000000000000..948a3070fe34c611c42c0d3ad3013a0dce358be0 GIT binary patch literal 1900 zcmV-y2b1_xNk&Fw2LJ$9MM6+kP&il$0000G0001A003VA06|PpNH75a00DqwTbm-~ zullQTcXxO9ki!OCRx^i?oR|n!<8G0=kI^!JSjFi-LL*`V;ET0H2IXfU0*i>o6o6Gy zRq6Ap5(_{XLdXcL-MzlN`ugSdZY_`jXhcENAu)N_0?GhF))9R;E`!bo9p?g?SRgw_ zEXHhFG$0{qYOqhdX<(wE4N@es3VIo$%il%6xP9gjiBri+2pI6aY4 zJbgh-Ud|V%3O!IcHKQx1FQH(_*TK;1>FQWbt^$K1zNn^cczkBs=QHCYZ8b&l!UV{K z{L0$KCf_&KR^}&2Fe|L&?1I7~pBENnCtCuH3sjcx6$c zwqkNkru);ie``q+_QI;IYLD9OV0ZxkuyBz|5<$1BH|vtey$> z5oto4=l-R-Aaq`Dk0}o9N0VrkqW_#;!u{!bJLDq%0092{Ghe=F;(kn} z+sQ@1=UlX30+2nWjkL$B^b!H2^QYO@iFc0{(-~yXj2TWz?VG{v`Jg zg}WyYnwGgn>{HFaG7E~pt=)sOO}*yd(UU-D(E&x{xKEl6OcU?pl)K%#U$dn1mDF19 zSw@l8G!GNFB3c3VVK0?uyqN&utT-D5%NM4g-3@Sii9tSXKtwce~uF zS&Jn746EW^wV~8zdQ1XC28~kXu8+Yo9p!<8h&(Q({J*4DBglPdpe4M_mD8AguZFn~ ztiuO~{6Bx?SfO~_ZV(GIboeR9~hAym{{fV|VM=77MxDrbW6`ujX z<3HF(>Zr;#*uCvC*bpoSr~C$h?_%nXps@A)=l_;({Fo#6Y1+Zv`!T5HB+)#^-Ud_; zBwftPN=d8Vx)*O1Mj+0oO=mZ+NVH*ptNDC-&zZ7Hwho6UQ#l-yNvc0Cm+2$$6YUk2D2t#vdZX-u3>-Be1u9gtTBiMB^xwWQ_rgvGpZ6(C@e23c!^K=>ai-Rqu zhqT`ZQof;9Bu!AD(i^PCbYV%yha9zuoKMp`U^z;3!+&d@Hud&_iy!O-$b9ZLcSRh? z)R|826w}TU!J#X6P%@Zh=La$I6zXa#h!B;{qfug}O%z@K{EZECu6zl)7CiNi%xti0 zB{OKfAj83~iJvmpTU|&q1^?^cIMn2RQ?jeSB95l}{DrEPTW{_gmU_pqTc)h@4T>~& zluq3)GM=xa(#^VU5}@FNqpc$?#SbVsX!~RH*5p0p@w z;~v{QMX0^bFT1!cXGM8K9FP+=9~-d~#TK#ZE{4umGT=;dfvWi?rYj;^l_Zxywze`W z^Cr{55U@*BalS}K%Czii_80e0#0#Zkhlij4-~I@}`-JFJ7$5{>LnoJSs??J8kWVl6|8A}RCGAu9^rAsfCE=2}tHwl93t0C?#+jMpvr7O3`2=tr{Hg$=HlnjVG^ewm|Js0J*kfPa6*GhtB>`fN!m#9J(sU!?(OSfzY*zS(FJ<-Vb zfAIg+`U)YaXv#sY(c--|X zEB+TVyZ%Ie4L$gi#Fc++`h6%vzsS$pjz9aLt+ZL(g;n$Dzy5=m=_TV(3H8^C{r0xd zp#a%}ht55dOq?yhwYPrtp-m1xXp;4X;)NhxxUpgP%XTLmO zcjaFva^}dP3$&sfFTIR_jC=2pHh9kpI@2(6V*GQo7Ws)`j)hd+tr@P~gR*2gO@+1? zG<`_tB+LJuF|SZ9tIec;h%}}6WClT`L>HSW?E{Hp1h^+mlbf_$9zA>!ug>NALJsO{ mU%z=YwVD?}XMya)Bp;vlyE5&E_6!fzx9pwrdz474!~g(M6R?N? literal 0 HcmV?d00001 diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp new file mode 100644 index 0000000000000000000000000000000000000000..1b9a6956b3acdc11f40ce2bb3f6efbd845cc243f GIT binary patch literal 3918 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 HxBq_tfmS9j literal 0 HcmV?d00001 diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp b/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp new file mode 100644 index 0000000000000000000000000000000000000000..28d4b77f9f036a47549d47db79c16788749dca10 GIT binary patch literal 2884 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�(p-{x$&=IACIfoAR!za)F-^da-t3#0Dycnp zwO~NVXwXCl;jE<}>%@xz|=8fIJAB?>+E{7)|4l${4ngA3G|=r z2Dyv;VVWSgZx9Wj>qUjleGl3Ei9K4>h!(lPS%8VOG>Xu0%6VDz^O=bjJmuP7>DeUv zrbI}MlHB^^d?{zv6d=@_ZD2lg1&G7UjnVN{1}9WkaM3H~btX0GtSzB+tZ^qRgWo4m z!GmimlG$=wgXCnr6j@m<1gAL46#T~5Bnm=2{^@>|t&`9mkEPddj zAvG~@Tv~TAm2i%VW}R-g(Z0)z-Y|szHr@rk>4MAyG*Ma*7Yh#H7(!-5>DZ@8r;_dx z{prSe<>~099F8vsYd2xff7uAS%7{S)f(|@me3t2$iy&NEc7OUEchp@9A|X;;IA>8!oX+y(BKJ$EzV* znR$z;!L$s7uy@{OT~nG#B!NRraT8(X##Ho!0r_o@gg0CA-9H^;-uE&?$2$nHv_00o z%cbuUc-tCx$Uh&EZ4Nf4Zgqv)Y6>usG3>GeQnxx_Z6+PcbX-+ysbt1hQ`K1LDpOE? zrAhIZhSN9yVIAOa22gn577tbc&i3|3V8NWy&!tw##`}9*x}gtI^h1DzZRA>UuaJG) zaZ7j)dq!O}{?#8Y7~7i6fHh4{`pL?>-18|p!S75Y#^DM>-S3)vuZG+Q7l@ek zQP~#cBpWgg#mApc_sPYjpw8odQuRokmTkzcNl`^CcKB7e&;zViV;{Y{o^Y$%7i0m# z62%#1Lq!RC?}lK>%mp}T!3Xv;L*0v*>USLm``N%>w>@fwC+#T&Tx2bN4w(20JB}oU zuSa6v^kXi0xPs?pbaOHnyiqq6By1EZY9OZ^^QA>{q-Hsd&m`pbQ%8121aWG-F5xf zlZ%;B{;C>X19|`^_?dVyCq>n+41w7|!tUS!{9rHlbhX=SZO5CQ^;!Du_E7*`GiR^Q w)2!4MKjfSAeNj$X?%xX%Ls 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 LYGX^4EyDi?Ys6*r literal 0 HcmV?d00001 diff --git a/app/src/main/res/mipmap-xxhdpi/ic_warn.png b/app/src/main/res/mipmap-xxhdpi/ic_warn.png new file mode 100644 index 0000000000000000000000000000000000000000..5e87f03a3793efdfc9b4de7b3a3d04c375aa22e3 GIT binary patch literal 4102 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 B)j|LO literal 0 HcmV?d00001 diff --git a/app/src/main/res/mipmap-xxhdpi/ic_yukihookapi.png b/app/src/main/res/mipmap-xxhdpi/ic_yukihookapi.png new file mode 100644 index 0000000000000000000000000000000000000000..f16902d4a651d3366383f826e940473ca9d8dc3e GIT binary patch literal 8490 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

UmY2RIYtNPVDpE$%vda+HD#3m z&VuXJ{BK&Qe+rBa7eq}Q(bq|tn(RrJAk|ztj2(i{d>nmQnM?;HF2k&9sA6up5tmjl z7lySlzMbifH17-m-Lwa_F&e7nOH?ESi3#ckR3tsM+jsck3`oG!uMS}|eAwVXv>}qxwq?QY%QJ0}r@^;fhuUA9W z*BVl>TGo&N004@xSiwDUXUvp51sVmqO3m)=B55aPwf@0=e}cN+$-BdKxY`YrT_4)0 z_d10#i44Q*rFr8MC>*)v$EJvz``(pb{e&*6k+b zsMz%($|1+8hn8c2?P(l@;Rb&CsZeYoCI3?2!LqjbwPXW3z4G$Qfj=cT5Yb%vY0(AX oeb?AaKtwrnc|$|zzw9vfvn^aJJ!zd)XFXqqy0000001=f@-~a#s literal 0 HcmV?d00001 diff --git a/app/src/main/res/values-night/color.xml b/app/src/main/res/values-night/color.xml new file mode 100644 index 00000000..809ab400 --- /dev/null +++ b/app/src/main/res/values-night/color.xml @@ -0,0 +1,6 @@ + + + #FF2D2D2D + #FFCFCFCF + #FFD3D3D3 + \ No newline at end of file diff --git a/app/src/main/res/values-night/themes.xml b/app/src/main/res/values-night/themes.xml new file mode 100644 index 00000000..ac270926 --- /dev/null +++ b/app/src/main/res/values-night/themes.xml @@ -0,0 +1,17 @@ + + + + \ No newline at end of file diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml new file mode 100644 index 00000000..2d11b0eb --- /dev/null +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -0,0 +1,13 @@ + + + OPatch + Make ColorOS Great Again! + 此模块使用 YukiHookAPI 构建。\n了解更多 https://github.com/HighCapable/YuKiHookAPI + 模块版本：%1$s + 模块未激活 + 模块已激活 + 显示设置 + 在桌面隐藏模块图标 + 隐藏模块图标后界面可能会被关闭，将不会再在桌面显示，你可以在 EdXposed、LSPosed 中找到模块设置并打开。 + 注意：请务必在 LSPosed 中关闭“强制显示桌面图标”功能 + \ No newline at end of file diff --git a/app/src/main/res/values/array.xml b/app/src/main/res/values/array.xml new file mode 100644 index 00000000..d9780391 --- /dev/null +++ b/app/src/main/res/values/array.xml @@ -0,0 +1,6 @@ + + + + android + + \ No newline at end of file diff --git a/app/src/main/res/values/color.xml b/app/src/main/res/values/color.xml new file mode 100644 index 00000000..24917f97 --- /dev/null +++ b/app/src/main/res/values/color.xml @@ -0,0 +1,6 @@ + + + #FFFFFFFF + #FF777777 + #FF323B42 + \ No newline at end of file diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml new file mode 100644 index 00000000..e756d88d --- /dev/null +++ b/app/src/main/res/values/colors.xml @@ -0,0 +1,7 @@ + + + #FF656565 + #FF000000 + #FFFFFFFF + #00000000 + \ No newline at end of file diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml new file mode 100644 index 00000000..536873ba --- /dev/null +++ b/app/src/main/res/values/strings.xml @@ -0,0 +1,12 @@ + + OPatch + Make ColorOS Great Again! + This module is made by YukiHookAPI. \nLearn more https://github.com/HighCapable/YuKiHookAPI + Module version: %1$s + Module not activated + Module is activated + Display settings + Hide app icons on launcher + After hiding the app icon, the interface may be closed and will no longer be displayed on the launcher. You can find and open the module settings in EdXposed or LSPosed. + Note: Be sure to turn off the \"Force apps to show launcher icons\" feature in LSPosed + \ No newline at end of file diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml new file mode 100644 index 00000000..2a3a4242 --- /dev/null +++ b/app/src/main/res/values/themes.xml @@ -0,0 +1,17 @@ + + + + \ No newline at end of file diff --git a/app/src/main/resources/META-INF/yukihookapi_init b/app/src/main/resources/META-INF/yukihookapi_init new file mode 100644 index 00000000..5200b4bf --- /dev/null +++ b/app/src/main/resources/META-INF/yukihookapi_init @@ -0,0 +1 @@ +io.github.suqi8.opatch.hook.HookEntry \ No newline at end of file diff --git a/app/src/test/java/io/github/suqi8/opatch/ExampleUnitTest.kt b/app/src/test/java/io/github/suqi8/opatch/ExampleUnitTest.kt new file mode 100644 index 00000000..9320130e --- /dev/null +++ b/app/src/test/java/io/github/suqi8/opatch/ExampleUnitTest.kt @@ -0,0 +1,17 @@ +package io.github.suqi8.opatch + +import org.junit.Test + +import org.junit.Assert.* + +/** + * Example local unit test, which will execute on the development machine (host). + * + * See [testing documentation](http://d.android.com/tools/testing). + */ +class ExampleUnitTest { + @Test + fun addition_isCorrect() { + assertEquals(4, 2 + 2) + } +} \ No newline at end of file diff --git a/build.gradle.kts b/build.gradle.kts new file mode 100644 index 00000000..a895ba5b --- /dev/null +++ b/build.gradle.kts @@ -0,0 +1,5 @@ +plugins { + autowire(libs.plugins.android.application) apply false + autowire(libs.plugins.kotlin.android) apply false + autowire(libs.plugins.kotlin.ksp) apply false +} \ No newline at end of file diff --git a/gradle.properties b/gradle.properties new file mode 100644 index 00000000..bc688d1b --- /dev/null +++ b/gradle.properties @@ -0,0 +1,14 @@ +# Compiler Configuration +org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8 +android.useAndroidX=true +android.nonTransitiveRClass=true +kotlin.code.style=official +kotlin.incremental.useClasspathSnapshot=true +# Project Configuration +project.name=OPatch +project.android.compileSdk=34 +project.android.minSdk=34 +project.android.targetSdk=34 +project.app.packageName=io.github.suqi8.opatch +project.app.versionName="1.0.0" +project.app.versionCode=1 \ No newline at end of file diff --git a/gradle/sweet-dependency/sweet-dependency-config.yaml b/gradle/sweet-dependency/sweet-dependency-config.yaml new file mode 100644 index 00000000..d0ef6c33 --- /dev/null +++ b/gradle/sweet-dependency/sweet-dependency-config.yaml @@ -0,0 +1,65 @@ +preferences: + autowire-on-sync-mode: UPDATE_OPTIONAL_DEPENDENCIES + repositories-mode: FAIL_ON_PROJECT_REPOS + +repositories: + gradle-plugin-portal: + scope: PLUGINS + google: + maven-central: + jit-pack: + sonatype-oss-releases: + rovo89-xposed-api: + scope: LIBRARIES + url: https://api.xposed.info/ + content: + include: + group: + de.robv.android.xposed + +plugins: + com.android.application: + alias: android-application + version: 8.5.0 + org.jetbrains.kotlin.android: + alias: kotlin-android + version: 1.9.24 + com.google.devtools.ksp: + alias: kotlin-ksp + version: 1.9.24-1.0.20 + +libraries: + de.robv.android.xposed: + api: + version: 82 + repositories: + rovo89-xposed-api + com.highcapable.yukihookapi: + api: + version: 1.2.0 + ksp-xposed: + version-ref: ::api + com.github.duanhong169: + drawabletoolbox: + version: 1.0.7 + androidx.core: + core-ktx: + version: 1.13.1 + androidx.appcompat: + appcompat: + version: 1.7.0 + com.google.android.material: + material: + version: 1.12.0 + androidx.constraintlayout: + constraintlayout: + version: 2.1.4 + androidx.test.ext: + junit: + version: 1.1.5 + androidx.test.espresso: + espresso-core: + version: 3.5.1 + junit: + junit: + version: 4.13.2 \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000000000000000000000000000000000000..e708b1c023ec8b20f512888fe07c5bd3ff77bb8f GIT binary patch literal 59203 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

K7UpUK$>l@ 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 E2O(~oYXATM literal 0 HcmV?d00001 diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 00000000..d2a241a3 --- /dev/null +++ b/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,6 @@ +#Sun Jun 16 11:31:31 CST 2024 +distributionBase=GRADLE_USER_HOME +distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip +distributionPath=wrapper/dists +zipStorePath=wrapper/dists +zipStoreBase=GRADLE_USER_HOME \ No newline at end of file diff --git a/gradlew b/gradlew new file mode 100644 index 00000000..3a163de7 --- /dev/null +++ b/gradlew @@ -0,0 +1,185 @@ +#!/usr/bin/env sh + +# +# Copyright 2015 the original author or authors. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +############################################################################## +## +## Gradle start up script for UN*X +## +############################################################################## + +# Attempt to set APP_HOME +# Resolve links: $0 may be a link +PRG="$0" +# Need this for relative symlinks. +while [ -h "$PRG" ] ; do + ls=`ls -ld "$PRG"` + link=`expr "$ls" : '.*-> \(.*\)$'` + if expr "$link" : '/.*' > /dev/null; then + PRG="$link" + else + PRG=`dirname "$PRG"`"/$link" + fi +done +SAVED="`pwd`" +cd "`dirname \"$PRG\"`/" >/dev/null +APP_HOME="`pwd -P`" +cd "$SAVED" >/dev/null + +APP_NAME="Gradle" +APP_BASE_NAME=`basename "$0"` + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD="maximum" + +warn () { + echo "$*" +} + +die () { + echo + echo "$*" + echo + exit 1 +} + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "`uname`" in + CYGWIN* ) + cygwin=true + ;; + Darwin* ) + darwin=true + ;; + MINGW* ) + msys=true + ;; + NONSTOP* ) + nonstop=true + ;; +esac + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD="$JAVA_HOME/jre/sh/java" + else + JAVACMD="$JAVA_HOME/bin/java" + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD="java" + which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." +fi + +# Increase the maximum file descriptors if we can. +if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then + MAX_FD_LIMIT=`ulimit -H -n` + if [ $? -eq 0 ] ; then + if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then + MAX_FD="$MAX_FD_LIMIT" + fi + ulimit -n $MAX_FD + if [ $? -ne 0 ] ; then + warn "Could not set maximum file descriptor limit: $MAX_FD" + fi + else + warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" + fi +fi + +# For Darwin, add options to specify how the application appears in the dock +if $darwin; then + GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" +fi + +# For Cygwin or MSYS, switch paths to Windows format before running java +if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then + APP_HOME=`cygpath --path --mixed "$APP_HOME"` + CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` + + JAVACMD=`cygpath --unix "$JAVACMD"` + + # We build the pattern for arguments to be converted via cygpath + ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` + SEP="" + for dir in $ROOTDIRSRAW ; do + ROOTDIRS="$ROOTDIRS$SEP$dir" + SEP="|" + done + OURCYGPATTERN="(^($ROOTDIRS))" + # Add a user-defined pattern to the cygpath arguments + if [ "$GRADLE_CYGPATTERN" != "" ] ; then + OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" + fi + # Now convert the arguments - kludge to limit ourselves to /bin/sh + i=0 + for arg in "$@" ; do + CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` + CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option + + if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition + eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` + else + eval `echo args$i`="\"$arg\"" + fi + i=`expr $i + 1` + done + case $i in + 0) set -- ;; + 1) set -- "$args0" ;; + 2) set -- "$args0" "$args1" ;; + 3) set -- "$args0" "$args1" "$args2" ;; + 4) set -- "$args0" "$args1" "$args2" "$args3" ;; + 5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; + 6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; + 7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; + 8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; + 9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; + esac +fi + +# Escape application args +save () { + for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done + echo " " +} +APP_ARGS=`save "$@"` + +# Collect all arguments for the java command, following the shell quoting and substitution rules +eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" + +exec "$JAVACMD" "$@" \ No newline at end of file diff --git a/gradlew.bat b/gradlew.bat new file mode 100644 index 00000000..477c8966 --- /dev/null +++ b/gradlew.bat @@ -0,0 +1,89 @@ +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem + +@if "%DEBUG%" == "" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%" == "" set DIRNAME=. +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if "%ERRORLEVEL%" == "0" goto execute + +echo. +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto execute + +echo. +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* + +:end +@rem End local scope for the variables with windows NT shell +if "%ERRORLEVEL%"=="0" goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 +exit /b 1 + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega \ No newline at end of file diff --git a/settings.gradle.kts b/settings.gradle.kts new file mode 100644 index 00000000..27a32aca --- /dev/null +++ b/settings.gradle.kts @@ -0,0 +1,16 @@ +pluginManagement { + repositories { + gradlePluginPortal() + google() + mavenCentral() + } +} +plugins { + id("com.highcapable.sweetdependency") version "1.0.4" + id("com.highcapable.sweetproperty") version "1.0.5" +} +sweetProperty { + rootProject { all { isEnable = false } } +} +rootProject.name = "OPatch" +include(":app") \ No newline at end of file From b38f9125d7d22d3d2c0234cb0ac456702525378c Mon Sep 17 00:00:00 2001 From: suqi8 <3383787570@qq.com> Date: Sun, 16 Jun 2024 11:37:58 +0800 Subject: [PATCH 004/875] =?UTF-8?q?=E9=A6=96=E6=AC=A1=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .idea/vcs.xml | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 .idea/vcs.xml diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 00000000..94a25f7f --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file From 1e73ea0ebffc6c4c377b0024278cc7b9e4e12c54 Mon Sep 17 00:00:00 2001 From: suqi8 <3383787570@qq.com> Date: Sun, 16 Jun 2024 11:39:47 +0800 Subject: [PATCH 005/875] Update build configuration to target SDK 34 and set NDK version to 27.0.11718014 rc1. Enable view binding and update build tools version to 34.0.0. --- app/build.gradle.kts | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/app/build.gradle.kts b/app/build.gradle.kts index c988a2f2..35800a41 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -6,7 +6,7 @@ plugins { android { namespace = property.project.app.packageName - compileSdk = property.project.android.compileSdk + compileSdk = 34 defaultConfig { applicationId = property.project.app.packageName @@ -40,6 +40,8 @@ android { viewBinding = true } lint { checkReleaseBuilds = false } + ndkVersion = "27.0.11718014 rc1" + buildToolsVersion = "34.0.0" // TODO Please visit https://highcapable.github.io/YukiHookAPI/en/api/special-features/host-inject // TODO 请参考 https://highcapable.github.io/YukiHookAPI/zh-cn/api/special-features/host-inject // androidResources.additionalParameters += listOf("--allow-reserved-package-id", "--package-id", "0x64") @@ -57,4 +59,4 @@ dependencies { testImplementation(junit.junit) androidTestImplementation(androidx.test.ext.junit) androidTestImplementation(androidx.test.espresso.espresso.core) -} \ No newline at end of file +} From 4686b398463efd5042f62968c754fef584a4f1b5 Mon Sep 17 00:00:00 2001 From: suqi8 <3383787570@qq.com> Date: Sun, 16 Jun 2024 11:39:55 +0800 Subject: [PATCH 006/875] Update build configuration to target SDK 34 and set NDK version to 27.0.11718014 rc1. Enable view binding and update build tools version to 34.0.0. --- .idea/deploymentTargetSelector.xml | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 .idea/deploymentTargetSelector.xml diff --git a/.idea/deploymentTargetSelector.xml b/.idea/deploymentTargetSelector.xml new file mode 100644 index 00000000..b268ef36 --- /dev/null +++ b/.idea/deploymentTargetSelector.xml @@ -0,0 +1,10 @@ + + + + + + + + + \ No newline at end of file From 8a8c61eb8cef611cc3f59a7698ac2622f8a9f7de Mon Sep 17 00:00:00 2001 From: suqi8 <3383787570@qq.com> Date: Sun, 16 Jun 2024 11:45:15 +0800 Subject: [PATCH 007/875] Update launcher icons with adaptive-icon support --- .../drawable-v24/ic_launcher_foreground.xml | 30 ------------------ .../res/mipmap-anydpi-v26/ic_launcher.xml | 4 +-- .../mipmap-anydpi-v26/ic_launcher_round.xml | 4 +-- app/src/main/res/mipmap-hdpi/ic_launcher.webp | Bin 1404 -> 1532 bytes .../res/mipmap-hdpi/ic_launcher_round.webp | Bin 2898 -> 2976 bytes app/src/main/res/mipmap-mdpi/ic_launcher.webp | Bin 982 -> 1148 bytes .../res/mipmap-mdpi/ic_launcher_round.webp | Bin 1772 -> 1830 bytes .../main/res/mipmap-xhdpi/ic_launcher.webp | Bin 1900 -> 1906 bytes .../res/mipmap-xhdpi/ic_launcher_round.webp | Bin 3918 -> 4042 bytes .../main/res/mipmap-xxhdpi/ic_launcher.webp | Bin 2884 -> 3228 bytes .../res/mipmap-xxhdpi/ic_launcher_round.webp | Bin 5914 -> 6568 bytes .../main/res/mipmap-xxxhdpi/ic_launcher.webp | Bin 3844 -> 4234 bytes .../res/mipmap-xxxhdpi/ic_launcher_round.webp | Bin 7778 -> 9262 bytes 13 files changed, 4 insertions(+), 34 deletions(-) delete mode 100644 app/src/main/res/drawable-v24/ic_launcher_foreground.xml diff --git a/app/src/main/res/drawable-v24/ic_launcher_foreground.xml b/app/src/main/res/drawable-v24/ic_launcher_foreground.xml deleted file mode 100644 index 2b068d11..00000000 --- a/app/src/main/res/drawable-v24/ic_launcher_foreground.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml index eca70cfe..7353dbd1 100644 --- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml +++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml @@ -1,5 +1,5 @@ - - + + \ No newline at end of file diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml index eca70cfe..7353dbd1 100644 --- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml +++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml @@ -1,5 +1,5 @@ - - + + \ No newline at end of file diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.webp b/app/src/main/res/mipmap-hdpi/ic_launcher.webp index c209e78ecd372343283f4157dcfd918ec5165bb3..868bc7375d3c99bbf26595bd24c20c621fefedfe 100644 GIT binary patch literal 1532 zcmV#jNvQ?3Wj2sm&YK(SgVq(_x)77R8v`r{23)7P!feOHOuGkFRwv8jD-F7Xz03lH{j4U5nWC+$YNs>76M8Zw1Sw#3El#IL< zMMGpW3ln#tX-r@M=Wq(Lr9S)y&qkRgag4D=C=@jz6r=1RnZZ?@hLdC4n*xf5B!%xd zYiUC$t#EE*$Y2C#;b?04fthJ~-*H#bhESR30zfPjAh&&%|Uo~w7woa@uNSA8JdD83r$9NfSBb<1233m&wBRyVtAzujQJLm zZ=yITw?(Nj#$Ip3?)B`43{L|;k7$y(8O664n5?f2+oCu~i|Vtw5#dtfwHRG-oNYbY zO!0bzM@uL}b$Y^LpeT;BJ&LfHs4nn_ER-aR-J2Pc5!$dL$|+FU5!%3Hcdcj1YIID@ z?e#V&Wk-)w1s(OBQIvRnF>pFUQz%P2a-obJy{s|DLK$?7WoYk>YJ)aoBN>z+3jUzf z_!bkn=oB?d#xpQq&v6`sY!?%Bcs+#!au}cCO$d<9e}?}Z(3_)))hNhd81NdO!v_I5 znx6q)p|9}pjNmlDxo<&$rtjbg!0-dj6wU%1e;ZupLma^wY}y}z%eq|%YZ6Gjt8f5L z;!|+W-D`OC08tdJN1n?${|w;Z3R1u^fi}cJ_#hWQtSD4kb(eGV5FpyW0!JSl2xWK; zQ7r!aBa)#I>9O?dA8Qpg=mm;2IR|k08xX)h!7QR!SJg7ZAM_zX-8N#Z~p1LwSDMT@1kAHtUo1a=k$wiZ+a+l#`N4=sKCQn8Lg zIS~g^BpBiZL^<736w4nzg)VFhY%Ne3y0~rm%eP_)MU3c1bhMwY90{IXGjsDyV1L=~ z1P+$XTssjwz3Qi{$D(t)0GXqJ(QRVk@w33`HG%B~!NXYG}P;V6H#c`ir)< z4iB*Y4mdX(Ai)Cn{)@%M0yWsUjd>`{;s#u0$RI8hVl`y@@N;n*;L55d?{l2MMf`Uh z6)yW0z~$|5fo`t`0XLp`u4x`_LI>!$( z3Y*OaB6liN{a^Z{Y>T4f|7A48rlL2Be*e2|Jzj0YNCqXZw86I+^7^nnN{vynA?E|G zE~Uh12~NQn6Bd&lz0l_;J9-r8^OK1wRQb}*D0RxRvxkx|y}p=G=1WQJSR?^Uu&xIYY`%B zYHaU^jOH6{V2ss}@lBLXCI4@(rwf~soSBnzgr^wG7|r13{Q|?y(S~}tAEmDs9-3le z4tXw~SuQdCqg1tlYA|<-1Tg(0KMxS|T%r1F9@Jkuje){N_18vugqYzJ*?*kERkSs@ zh#yBo_8)t=g1E=FUC030pY4UE-e+*M1Z)heSrWlscDe&pwU8(h%7n?E`1WcAq^3w> zq+y$80cXt{z$z{&`J%Sa*(-A!Qy{ro?}`o@b?2nB7o(jZI`mfxp! zj@KK!U8Q}Uj_fr$hS5>xYn%Y~WIESrchB+qKCQC#G)+PQfKYsjF2V$1mM}+{*WFfu iFusLuLeT(yit1Jdo?>JRW4c>jD;g+Ue}KlnC=CEX2HF7t literal 1404 zcmV-?1%vuhNk&F=1pok7MM6+kP&il$0000G0000-002h-06|PpNX!5L00Dqw+t%{r zzW2vH!KF=w&cMnnN@{whkTw+#mAh0SV?YL=)3MimFYCWp#fpdtz~8$hD5VPuQgtcN zXl<@<#Cme5f5yr2h%@8TWh?)bSK`O z^Z@d={gn7J{iyxL_y_%J|L>ep{dUxUP8a{byupH&!UNR*OutO~0{*T4q5R6@ApLF! z5{w?Z150gC7#>(VHFJZ-^6O@PYp{t!jH(_Z*nzTK4 zkc{fLE4Q3|mA2`CWQ3{8;gxGizgM!zccbdQoOLZc8hThi-IhN90RFT|zlxh3Ty&VG z?Fe{#9RrRnxzsu|Lg2ddugg7k%>0JeD+{XZ7>Z~{=|M+sh1MF7~ zz>To~`~LVQe1nNoR-gEzkpe{Ak^7{{ZBk2i_<+`Bq<^GB!RYG+z)h;Y3+<{zlMUYd zrd*W4w&jZ0%kBuDZ1EW&KLpyR7r2=}fF2%0VwHM4pUs}ZI2egi#DRMYZPek*^H9YK zay4Iy3WXFG(F14xYsoDA|KXgGc5%2DhmQ1gFCkrgHBm!lXG8I5h*uf{rn48Z!_@ z4Bk6TJAB2CKYqPjiX&mWoW>OPFGd$wqroa($ne7EUK;#3VYkXaew%Kh^3OrMhtjYN?XEoY`tRPQsAkH-DSL^QqyN0>^ zmC>{#F14jz4GeW{pJoRpLFa_*GI{?T93^rX7SPQgT@LbLqpNA}<@2wH;q493)G=1Y z#-sCiRNX~qf3KgiFzB3I>4Z%AfS(3$`-aMIBU+6?gbgDb!)L~A)je+;fR0jWLL-Fu z4)P{c7{B4Hp91&%??2$v9iRSFnuckHUm}or9seH6 z>%NbT+5*@L5(I9j@06@(!{ZI?U0=pKn8uwIg&L{JV14+8s2hnvbRrU|hZCd}IJu7*;;ECgO%8_*W Kmw_-CKmY()leWbG diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp index b2dfe3d1ba5cf3ee31b3ecc1ced89044a1f3b7a9..b64b2720977818b97f522e771562aa4c889bbd08 100644 GIT binary patch literal 2976 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 literal 2898 zcmV-Y3$650Nk&FW3jhFDMM6+kP&il$0000G0000-002h-06|PpNWB9900E$G+qN-D z+81ABX7q?;bwx%xBg?kcwr$(C-Tex-ZCkHUw(Y9#+`E5-zuONG5fgw~E2WDng@Bc@ z24xy+R1n%~6xI#u9vJ8zREI)sb<&Il(016}Z~V1n^PU3-_H17A*Bf^o)&{_uBv}Py zulRfeE8g(g6HFhk_?o_;0@tz?1I+l+Y#Q*;RVC?(ud`_cU-~n|AX-b`JHrOIqn(-t&rOg-o`#C zh0LPxmbOAEb;zHTu!R3LDh1QO zZTf-|lJNUxi-PpcbRjw3n~n-pG;$+dIF6eqM5+L();B2O2tQ~|p{PlpNcvDbd1l%c zLtXn%lu(3!aNK!V#+HNn_D3lp z2%l+hK-nsj|Bi9;V*WIcQRTt5j90A<=am+cc`J zTYIN|PsYAhJ|=&h*4wI4ebv-C=Be#u>}%m;a{IGmJDU`0snWS&$9zdrT(z8#{OZ_Y zxwJx!ZClUi%YJjD6Xz@OP8{ieyJB=tn?>zaI-4JN;rr`JQbb%y5h2O-?_V@7pG_+y z(lqAsqYr!NyVb0C^|uclHaeecG)Sz;WV?rtoqOdAAN{j%?Uo%owya(F&qps@Id|Of zo@~Y-(YmfB+chv^%*3g4k3R0WqvuYUIA+8^SGJ{2Bl$X&X&v02>+0$4?di(34{pt* zG=f#yMs@Y|b&=HyH3k4yP&goF2LJ#tBLJNNDo6lG06r}ghC-pC4Q*=x3;|+W04zte zAl>l4kzUBQFYF(E`KJy?ZXd1tnfbH+Z~SMmA21KokJNs#eqcXWKUIC>{TuoKe^vhF z);H)o`t9j~`$h1D`#bxe@E`oE`cM9w(@)5Bp8BNukIwM>wZHfd0S;5bcXA*5KT3bj zc&_~`&{z7u{Et!Z_k78H75gXf4g8<_ul!H$eVspPeU3j&&Au=2R*Zp#M9$9s;fqwgzfiX=E_?BwVcfx3tG9Q-+<5fw z%Hs64z)@Q*%s3_Xd5>S4dg$s>@rN^ixeVj*tqu3ZV)biDcFf&l?lGwsa zWj3rvK}?43c{IruV2L`hUU0t^MemAn3U~x3$4mFDxj=Byowu^Q+#wKRPrWywLjIAp z9*n}eQ9-gZmnd9Y0WHtwi2sn6n~?i#n9VN1B*074_VbZZ=WrpkMYr{RsI ztM_8X1)J*DZejxkjOTRJ&a*lrvMKBQURNP#K)a5wIitfu(CFYV4FT?LUB$jVwJSZz zNBFTWg->Yk0j&h3e*a5>B=-xM7dE`IuOQna!u$OoxLlE;WdrNlN)1 z7**de7-hZ!(%_ZllHBLg`Ir#|t>2$*xVOZ-ADZKTN?{(NUeLU9GbuG-+Axf*AZ-P1 z0ZZ*fx+ck4{XtFsbcc%GRStht@q!m*ImssGwuK+P@%gEK!f5dHymg<9nSCXsB6 zQ*{<`%^bxB($Z@5286^-A(tR;r+p7B%^%$N5h%lb*Vlz-?DL9x;!j<5>~kmXP$E}m zQV|7uv4SwFs0jUervsxVUm>&9Y3DBIzc1XW|CUZrUdb<&{@D5yuLe%Xniw^x&{A2s z0q1+owDSfc3Gs?ht;3jw49c#mmrViUfX-yvc_B*wY|Lo7; zGh!t2R#BHx{1wFXReX*~`NS-LpSX z#TV*miO^~B9PF%O0huw!1Zv>^d0G3$^8dsC6VI!$oKDKiXdJt{mGkyA`+Gwd4D-^1qtNTUK)`N*=NTG-6}=5k6suNfdLt*dt8D| z%H#$k)z#ZRcf|zDWB|pn<3+7Nz>?WW9WdkO5(a^m+D4WRJ9{wc>Y}IN)2Kbgn;_O? zGqdr&9~|$Y0tP=N(k7^Eu;iO*w+f%W`20BNo)=Xa@M_)+o$4LXJyiw{F?a633SC{B zl~9FH%?^Rm*LVz`lkULs)%idDX^O)SxQol(3jDRyBVR!7d`;ar+D7do)jQ}m`g$TevUD5@?*P8)voa?kEe@_hl{_h8j&5eB-5FrYW&*FHVt$ z$kRF9Nstj%KRzpjdd_9wO=4zO8ritN*NPk_9avYrsF(!4))tm{Ga#OY z(r{0buexOzu7+rw8E08Gxd`LTOID{*AC1m*6Nw@osfB%0oBF5sf<~wH1kL;sd zo)k6^VyRFU`)dt*iX^9&QtWbo6yE8XXH?`ztvpiOLgI3R+=MOBQ9=rMVgi<*CU%+d1PQQ0a1U=&b0vkF207%xU0ssI2 diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher.webp b/app/src/main/res/mipmap-mdpi/ic_launcher.webp index 4f0f1d64e58ba64d180ce43ee13bf9a17835fbca..a0d39c4f7b94a182c50e22299978b2565c24ecfe 100644 GIT binary patch literal 1148 zcmV-?1cUohNk&F=1ONb6MM6+kP&iCz1ONapFTe{B4+kNVB*j+l-un#x6@4Aw05fiV z5+OU1WY>yv?&S;rT_NxQW3<-0Q*aweawJ9X`tR0xaq_>&*^)`PwQZ|b<~?6<&n$8+ zfeI|61FwyYj6U3Ach~dQ0ZcwfTBGyk9?&HvLaefBf9m-%as)P=q2B(zb0o<7jHzw!OA(+qN~e-L7lf zo!U*;?%Mt>O`iA7;`{p~5&d`IHj*Ma#|#61Q2Z|$8H&ybX3UT>>d(dy^>y_`CZht4 zfuq4AGjq|&k0mq~dSYt%2g0Xnd`9SRV`*(+1?4zx)ycC=n&k+66boxpzr70Hiy7hy zJ4-8s3fz89Io5?8q0oo1GW9K2$b9>3VY3e_g~>BvHvobY=OuX+mH8KyP-luOF?X2@ z-!&qSl0gpp;+1gm{fNUwo^)IaImGTbC8^kM4zbXc%F;m&JEN84BD**oT1+LE@+e7B zT^!z~Qpt7mjx-m0xGFk*aZ1`^`>LrFgKt!tk&P1gKKV2zA5#h?)-<)MWUNh;gk79N z77C4~^!hf$Rzz%I&e`z3c)268ol;vZ z;L3D@)zGUowWYC_&qn1}EUB%jR48IC!AU@ts%>q+yKg_gN&#zBt(kzM1ZM$P+gg{u z`S9iU=l5@yx2UoK$EjtuwjKEN{l_m^`gl;qvZzni!8fPA7)3;Uo($i-fneSx_-Q+R z+!1|bsjW^a6h4>0Z5JS^p{<3jSw+qfg z7b(W=x%r~!MP{}H&WpHWx_Q?htE4TiznXSlN75cUI665Tc12N%XB^(5vUr%ou1K28 z0~`)6qvBe~A@;@+#dINJfeYQb>RB{Iv98AUBMugLTk??Cd6&gGRn^6(K^OC@<(rFK zi0k}*!ag$NFf^JL!u!H?J|ir1GKKf4u&tLP#tPp(1>C1hLfRFF`1_#7YX=ikgtDBp z^2kxPagIIoQB2Wgv!-z0RDZB(LQt?IDp?x8<)J#TF>C7F8@VI0k^4HD;KqMfOIvg( OGX>b8^`bk3|49hbLPj$H literal 982 zcmV;{11bDcNk&G_0{{S5MM6+kP&il$0000G0000l001ul06|PpNU8t;00Dqo+t#w^ z^1csucXz7-Qrhzl9HuHB%l>&>1tG2^vb*E&k^T3$FG1eQZ51g$uv4V+kI`0<^1Z@N zk?Jjh$olyC%l>)Xq;7!>{iBj&BjJ`P&$fsCfpve_epJOBkTF?nu-B7D!hO=2ZR}

C%4 zc_9eOXvPbC4kzU8YowIA8cW~Uv|eB&yYwAObSwL2vY~UYI7NXPvf3b+c^?wcs~_t{ ze_m66-0)^{JdOMKPwjpQ@Sna!*?$wTZ~su*tNv7o!gXT!GRgivP}ec?5>l1!7<(rT zds|8x(qGc673zrvYIz;J23FG{9nHMnAuP}NpAED^laz3mAN1sy+NXK)!6v1FxQ;lh zOBLA>$~P3r4b*NcqR;y6pwyhZ3_PiDb|%n1gGjl3ZU}ujInlP{eks-#oA6>rh&g+!f`hv#_%JrgYPu z(U^&XLW^QX7F9Z*SRPpQl{B%x)_AMp^}_v~?j7 zapvHMKxSf*Mtyx8I}-<*UGn3)oHd(nn=)BZ`d$lDBwq_GL($_TPaS{UeevT(AJ`p0 z9%+hQb6z)U9qjbuXjg|dExCLjpS8$VKQ55VsIC%@{N5t{NsW)=hNGI`J=x97_kbz@ E0Of=7!T2if>iNk&E<2LJ$9MM6+kP&iBx2LJ#sFTe{B)zFi+PjMUdC6>;>c!0eD^X@ga z^5=rt%M4+T?VuE9W@ZqCIbwqbx@s)-jBfA?YV2_ZI+c!Qqm)5owl}4+stlcsB}tOx z$c;Y-pV8usqXw?(nRtW-$nHH%%`}ajkRwS_B)R@_oCwSe!rVQn+bSpN+}d_*bLRCs zwry25I@`9b&Ynr~18k?Zt#SXUj_o|pb#Di5+eVU{&gH!~b>|JBDog=W!c@8-PF;GJ z0SO9I#FU{{n0A=nn8AI6ccE4$PxuHk0<#12sLUr4O%mV9{L+1;cev|nQ(^}?z+KE1 znRjLWkRgEz2*MA`?x&P?FeNZB`z0D0DV0dogqzq#IEh(AcheIWQAJ23 zO6g6^egjNH16=@^DKa-3sYHlmB5@jv;lLckDEsgv1VZnlROIGWfG#Zqb6h5u&?l19 zD2`x0EP~qa3!ox-AC<`^j;mJ}fW*U%q15J)Y|WOmYDDYW|7DTo#Ku{zt*f`B=HM&| zQ65z*4j}PTRcc91{J7gu(3ZTmD#T-tz=#J^28m;hS!J-1HD;&g zK!aLFuE7`^SX>hVe4GT6@P9{{ERzRAjZ6h1Ri@W%D%?F)mu_tTdY`DuSQT+QZ<6un#nH@m_c?}({6X7Xms%R3hl_2jqZ?=8ke?lX|FoXXNm%jekk2xprwh;a2 zX(^;Lzz+IG`POz4M1BP4M-UDdUcY%C-?@*^xlhh{Up`%U{nF?H=Rbjng9stOcVid? zu!W%lKl?F@AW{Tgh=Jg4bM2oxw0A<$oj}_Lvb+RDx&sLEO9i63nDUd;JVPT93t^Eo3OdisfD30Z;6`nqkoOBy z;WR|-=0!xs#8eQ4T^yzo$s1{IAok%O$Oq@V2wBd#{wL~4ID;#aOsd8rP9X|PAC6;O zl;5a8?4D&2Yb3Pwxg+cfQKHw!@5M|-v|3IXQvgJ}b9_WavMAQiQkh4opHKqhX6goc zYHyg;rPG6ais%TKf?}-V$aRU7Sv6v0jRfauUCYW5A_ximZ zH*y^h*n^+@%9qvfg>}4v7}8TliM&qLBZjW#b>91DXxO;JL(8*}@(`z4zi(j=GgVr5hjoe`s_aM?p+ z1QesUns5_a2xT3gO{`C2|7=9k=3M$5 z^-JgvBM3W$8qoeKT;SJTd^(EL*8j@?tyM-E(HhYcG4f*;jpN)ZUfsvdV>F%Rn@jwd zOdY3bKR0_W=Mbap&h%Fl6T5RkR1h8PjyumW;VtI8&D^v;c&Ed@*JE->P{#0Hs%2Dr UIuUIV?c0)_Jy$W6Vf8lw0NBuEs{jB1 literal 1772 zcmVQj4N+cqN`nQhxvX7dAV-`K|Ub$-q+H-5I?Tx0g9jWxd@A|?POE8`3b8fO$T))xP* z(X?&brZw({`)WU&rdAs1iTa0x6F@PIxJ&&L|dpySV!ID|iUhjCcKz(@mE z!x@~W#3H<)4Ae(4eQJRk`Iz3<1)6^m)0b_4_TRZ+cz#eD3f8V;2r-1fE!F}W zEi0MEkTTx}8i1{`l_6vo0(Vuh0HD$I4SjZ=?^?k82R51bC)2D_{y8mi_?X^=U?2|F{Vr7s!k(AZC$O#ZMyavHhlQ7 zUR~QXuH~#o#>(b$u4?s~HLF*3IcF7023AlwAYudn0FV~|odGH^05AYPEfR)8p`i{n zwg3zPVp{+wOsxKc>)(pMupKF!Y2HoUqQ3|Yu|8lwR=?5zZuhG6J?H`bSNk_wPoM{u zSL{c@pY7+c2kck>`^q1^^gR0QB7Y?KUD{vz-uVX~;V-rW)PDcI)$_UjgVV?S?=oLR zf4}zz{#*R_{LkiJ#0RdQLNC^2Vp%JPEUvG9ra2BVZ92(p9h7Ka@!yf9(lj#}>+|u* z;^_?KWdzkM`6gqPo9;;r6&JEa)}R3X{(CWv?NvgLeOTq$cZXqf7|sPImi-7cS8DCN zGf;DVt3Am`>hH3{4-WzH43Ftx)SofNe^-#|0HdCo<+8Qs!}TZP{HH8~z5n`ExcHuT zDL1m&|DVpIy=xsLO>8k92HcmfSKhflQ0H~9=^-{#!I1g(;+44xw~=* zxvNz35vfsQE)@)Zsp*6_GjYD};Squ83<_?^SbALb{a`j<0Gn%6JY!zhp=Fg}Ga2|8 z52e1WU%^L1}15Ex0fF$e@eCT(()_P zvV?CA%#Sy08_U6VPt4EtmVQraWJX` zh=N|WQ>LgrvF~R&qOfB$!%D3cGv?;Xh_z$z7k&s4N)$WYf*k=|*jCEkO19{h_(%W4 zPuOqbCw`SeAX*R}UUsbVsgtuG?xs(#Ikx9`JZoQFz0n*7ZG@Fv@kZk`gzO$HoA9kN z8U5{-yY zvV{`&WKU2$mZeoBmiJrEdzUZAv1sRxpePdg1)F*X^Y)zp^Y*R;;z~vOv-z&)&G)JQ{m!C9cmziu1^nHA z`#`0c>@PnQ9CJKgC5NjJD8HM3|KC(g5nnCq$n0Gsu_DXk36@ql%npEye|?%RmG)

FJ$wK}0tWNB{uH;AM~i diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher.webp b/app/src/main/res/mipmap-xhdpi/ic_launcher.webp index 948a3070fe34c611c42c0d3ad3013a0dce358be0..19dc110a95a8457d0facfc727ba3c7645e985386 100644 GIT binary patch literal 1906 zcmV-&2aWhrNk&F$2LJ$9MM6+kP&iCp2LJ#sU%(d-wT6PWZ6t?3?A^;CA|}9Ljh0Yx za_ZOG`1?+xW2C=w~ZW0oIJDXwm|)W z+O}OZE85BdCZia3%*=F-^dFpi-kpIQNs=PT^_OEAUT61b<`aUMue+zK`tQJP z8%L66u-SHfTJ8sY!3t4`b^$g9t=UGpyn4hiBNip7LZxE2fB!MxQ-3cb0}EKkJ>Kwo zr<7%0zUXVF9o{pVaD-rj09W8PM`sqkCmo-#%&}X189(CJ1^jz+pG_vYtSS8}A{gJ| z|HhJ2LIhZ2i5W5r$XqF$VxaVj@9(f!B7`U&#*3!g_`R`GVUHEY8Ds#~^JR8PVqko` z+3c240P!K;FDS+F#`v@H!~qMGL|RMpTxAgW5q3^(CizYSa>gPaRyyJjhVV(%f9DFr z-m}%~$OF`b)k;ZL5g=E1fnfL1NKFqZHF@thKqv00=McOw*J~k!rP?_M5NA zSt3V??3}d5QXHk2rdpeN41h9oXEOfVF=1diXlfhYQ(-4Bl z%aY01I%#ASEVeQ+QOFjnK!v;rsaEDyGBH_bsWg=0Uj!Ad)*ZDnk0wZE9?VgTs|{4F zw9Y)MAeMR35*gs;jBenRq-xP;yJF^!5KXM$kPO!l;GVjV4qEw`cc^~CMJ)&J#VbT4 znN0#lFJJK%P9zx3t1syRIu6AW2}za_Ao^+Ib?mfOnlS~)84?h1#45o05e?XXV=fCU zw*@q({0^|bgAMRqfaNz%!4hB)Sp5(QhWm6e!T0>YBu3q41cs#mNDf&*fUuaeuQ0*` zBE(2p4>C-iIcW)y^CZEsO9@2rRqPaR@+(Zl1lI-T!HTfW4k$9fNBj~d{tceaDA&wY zW#BCt3<~4GnsY&Agb4iMv-iksU zeDoS^J@n~2^y*!C{So^79UXd2`S}-vAE0i`4g|=3Fv!4Y!A{Xl1kS6Qm#?-?Y{`3T zd3oepoxI#SxxIPgCfbAZdd*JR3XI>u0KEGnRHorPGVgmAFXXj}yfk8z*C%_|uA@We zd<>P(0p5&Z1{h46{sGQ+&tKfg%i|l3d)KZwUq$6TfSnUL@1o*`KfHA>@66VAXOHjR z@0{9I**&}W_~xy=Ih7AC9zA@F;Xxl3f$=FS6Y$MbyEpRk$bV=pZ%$R#wx(-)>zkXc zbH}`(@+ssyK47$>(nY9s|KSba#x$+|>1HT3a2 zm@p5t2Zn<*m|*StE$ozoMBr(y4})meLz%&Z;V5$^Qh@vlrqBL~C~5npYF*_^fL9)6 zqWaZ8$AIrXu4I%}ZTF$IMH= z;62{ub5QfrXMSG&%&!an3G15Y#k$PZ21hM=tt+Kc+^tjbR}ZNcz1GE2t@0wMNG4|~ zx~=PvAj?a%PMThMiPrsQ5TM!BE3YE=pyQPGNz*4U)H!K{c_HIz(kZX?Jju%$MzwP~ zQ0EmdluYux=vnghsF3AF9koieS{;)nFXAlelGi;>8$CR&t9e`35L1zGCL@`=uB&yq z_d^Kt#zgTnp9y6qGM046OH(EB0Apf|7?`{|sUe5OxxgTV4{}E)G7SX(>w}cqO~%RA zxkf)TX(OFrVAwdkrh)R;|H~;1SAhP^@_gEo|OB%bofFE0|(f#p8x;= literal 1900 zcmV-y2b1_xNk&Fw2LJ$9MM6+kP&il$0000G0001A003VA06|PpNH75a00DqwTbm-~ zullQTcXxO9ki!OCRx^i?oR|n!<8G0=kI^!JSjFi-LL*`V;ET0H2IXfU0*i>o6o6Gy zRq6Ap5(_{XLdXcL-MzlN`ugSdZY_`jXhcENAu)N_0?GhF))9R;E`!bo9p?g?SRgw_ zEXHhFG$0{qYOqhdX<(wE4N@es3VIo$%il%6xP9gjiBri+2pI6aY4 zJbgh-Ud|V%3O!IcHKQx1FQH(_*TK;1>FQWbt^$K1zNn^cczkBs=QHCYZ8b&l!UV{K z{L0$KCf_&KR^}&2Fe|L&?1I7~pBENnCtCuH3sjcx6$c zwqkNkru);ie``q+_QI;IYLD9OV0ZxkuyBz|5<$1BH|vtey$> z5oto4=l-R-Aaq`Dk0}o9N0VrkqW_#;!u{!bJLDq%0092{Ghe=F;(kn} z+sQ@1=UlX30+2nWjkL$B^b!H2^QYO@iFc0{(-~yXj2TWz?VG{v`Jg zg}WyYnwGgn>{HFaG7E~pt=)sOO}*yd(UU-D(E&x{xKEl6OcU?pl)K%#U$dn1mDF19 zSw@l8G!GNFB3c3VVK0?uyqN&utT-D5%NM4g-3@Sii9tSXKtwce~uF zS&Jn746EW^wV~8zdQ1XC28~kXu8+Yo9p!<8h&(Q({J*4DBglPdpe4M_mD8AguZFn~ ztiuO~{6Bx?SfO~_ZV(GIboeR9~hAym{{fV|VM=77MxDrbW6`ujX z<3HF(>Zr;#*uCvC*bpoSr~C$h?_%nXps@A)=l_;({Fo#6Y1+Zv`!T5HB+)#^-Ud_; zBwftPN=d8Vx)*O1Mj+0oO=mZ+NVH*ptNDC-&zZ7Hwho6UQ#l-yNvc0Cm+2$$6YUk2D2t#vdZX-u3>-Be1u9gtTBiMB^xwWQ_rgvGpZ6(C@e23c!^K=>ai-Rqu zhqT`ZQof;9Bu!AD(i^PCbYV%yha9zuoKMp`U^z;3!+&d@Hud&_iy!O-$b9ZLcSRh? z)R|826w}TU!J#X6P%@Zh=La$I6zXa#h!B;{qfug}O%z@K{EZECu6zl)7CiNi%xti0 zB{OKfAj83~iJvmpTU|&q1^?^cIMn2RQ?jeSB95l}{DrEPTW{_gmU_pqTc)h@4T>~& zluq3)GM=xa(#^VU5}@FNqpc$?#SbVsX!~RH*5p0p@w z;~v{QMX0^bFT1!cXGM8K9FP+=9~-d~#TK#ZE{4umGT=;dfvWi?rYj;^l_Zxywze`W z^Cr{55U@*BalS}K%Czii_80e0#0#Zkhlij4-~I@}`-JFJ7$5{>LnoJSs??J8kWVl6|8A}RCGAu9^rAsfCE=2}tHwl93t0C?#+jMpvr7O3`2=tr{Hg$=HlnjVG^ewm|Js0J*kfPa6*GhtB>`fN!m#9J(sU!?(OSfzY*zS(FJ<-Vb zfAIg+`U)YaXv#sY(c--|X zEB+TVyZ%Ie4L$gi#Fc++`h6%vzsS$pjz9aLt+ZL(g;n$Dzy5=m=_TV(3H8^C{r0xd zp#a%}ht55dOq?yhwYPrtp-m1xXp;4X;)NhxxUpgP%XTLmO zcjaFva^}dP3$&sfFTIR_jC=2pHh9kpI@2(6V*GQo7Ws)`j)hd+tr@P~gR*2gO@+1? zG<`_tB+LJuF|SZ9tIec;h%}}6WClT`L>HSW?E{Hp1h^+mlbf_$9zA>!ug>NALJsO{ mU%z=YwVD?}XMya)Bp;vlyE5&E_6!fzx9pwrdz474!~g(M6R?N? diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp index 1b9a6956b3acdc11f40ce2bb3f6efbd845cc243f..5eab8981fe7356dc10d21f6ee69de493d1b9f3c8 100644 GIT binary patch literal 4042 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 literal 3918 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 OrMHlZ+(6I2DCq%>U?1B6 literal 2884 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 aO3ch>W6{2+woo=5rx;ey4w%i_j@1EYRg!@K literal 5914 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�(p-{x$&=IACIfoAR!za)F-^da-t3#0Dycnp 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 gt$X0EKO8$o!9>IaV6aUZ*?W>} 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 QBrPmwQd&}QK2G}N0Mi^}CIA2c literal 7778 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

UmY2RIYtNPVDpE$%vda+HD#3m z&VuXJ{BK&Qe+rBa7eq}Q(bq|tn(RrJAk|ztj2(i{d>nmQnM?;HF2k&9sA6up5tmjl z7lySlzMbifH17-m-Lwa_F&e7nOH?ESi3#ckR3tsM+jsck3`oG!uMS}|eAwVXv>}qxwq?QY%QJ0}r@^;fhuUA9W z*BVl>TGo&N004@xSiwDUXUvp51sVmqO3m)=B55aPwf@0=e}cN+$-BdKxY`YrT_4)0 z_d10#i44Q*rFr8MC>*)v$EJvz``(pb{e&*6k+b zsMz%($|1+8hn8c2?P(l@;Rb&CsZeYoCI3?2!LqjbwPXW3z4G$Qfj=cT5Yb%vY0(AX oeb?AaKtwrnc|$|zzw9vfvn^aJJ!zd)XFXqqy0000001=f@-~a#s From abe922a19f44eccbc740ef88ec06a31851ba07e4 Mon Sep 17 00:00:00 2001 From: suqi8 <3383787570@qq.com> Date: Sun, 16 Jun 2024 11:47:34 +0800 Subject: [PATCH 008/875] icon --- app/src/main/ic_launcher-playstore.png | Bin 0 -> 25910 bytes .../res/drawable/ic_launcher_foreground.xml | 63 ++++++++++++++++++ app/src/main/res/drawable/icon.xml | 58 ++++++++++++++++ .../res/values/ic_launcher_background.xml | 4 ++ 4 files changed, 125 insertions(+) create mode 100644 app/src/main/ic_launcher-playstore.png create mode 100644 app/src/main/res/drawable/ic_launcher_foreground.xml create mode 100644 app/src/main/res/drawable/icon.xml create mode 100644 app/src/main/res/values/ic_launcher_background.xml diff --git a/app/src/main/ic_launcher-playstore.png b/app/src/main/ic_launcher-playstore.png new file mode 100644 index 0000000000000000000000000000000000000000..96a36cfc6d5eb4fdf77b09c27c594fe7f03812a6 GIT binary patch literal 25910 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 OLVA~twVz>}V*U?_8E>rs literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable/ic_launcher_foreground.xml b/app/src/main/res/drawable/ic_launcher_foreground.xml new file mode 100644 index 00000000..2db98ebd --- /dev/null +++ b/app/src/main/res/drawable/ic_launcher_foreground.xml @@ -0,0 +1,63 @@ + + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/drawable/icon.xml b/app/src/main/res/drawable/icon.xml new file mode 100644 index 00000000..fd58b0aa --- /dev/null +++ b/app/src/main/res/drawable/icon.xml @@ -0,0 +1,58 @@ + + + + + + + + + + + + + + + diff --git a/app/src/main/res/values/ic_launcher_background.xml b/app/src/main/res/values/ic_launcher_background.xml new file mode 100644 index 00000000..c5d5899f --- /dev/null +++ b/app/src/main/res/values/ic_launcher_background.xml @@ -0,0 +1,4 @@ + + + #FFFFFF + \ No newline at end of file From e42c15a60da39043b2e1937eb7eb8186e07cb7bf Mon Sep 17 00:00:00 2001 From: suqi8 <3383787570@qq.com> Date: Sun, 16 Jun 2024 12:02:22 +0800 Subject: [PATCH 009/875] Update launcher icons with monochrome support --- app/src/main/res/drawable/ic_launcher_foreground.xml | 12 ++++++++---- app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml | 5 +++-- .../main/res/mipmap-anydpi-v26/ic_launcher_round.xml | 4 ++-- 3 files changed, 13 insertions(+), 8 deletions(-) diff --git a/app/src/main/res/drawable/ic_launcher_foreground.xml b/app/src/main/res/drawable/ic_launcher_foreground.xml index 2db98ebd..4756bd38 100644 --- a/app/src/main/res/drawable/ic_launcher_foreground.xml +++ b/app/src/main/res/drawable/ic_launcher_foreground.xml @@ -1,5 +1,6 @@ @@ -10,15 +11,18 @@ + android:fillColor="#b3b3b3" + tools:ignore="VectorPath" /> + android:fillColor="#74847d" + tools:ignore="VectorPath" /> + android:fillColor="#74847d" + tools:ignore="VectorPath" /> - - \ No newline at end of file + + + diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml index 7353dbd1..d0750202 100644 --- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml +++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml @@ -1,5 +1,5 @@ - - \ No newline at end of file + + From 0f547a4ca3b4c603230b47afcb2de7c6e97ba574 Mon Sep 17 00:00:00 2001 From: suqi8 <3383787570@qq.com> Date: Sun, 16 Jun 2024 12:02:29 +0800 Subject: [PATCH 010/875] Update AndroidManifest.xml to enable onBackInvokedCallback --- app/src/main/AndroidManifest.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 46d6cd88..2b65b4f9 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -10,6 +10,7 @@ android:roundIcon="@mipmap/ic_launcher_round" android:supportsRtl="true" android:theme="@style/Theme.AppDefault" + android:enableOnBackInvokedCallback="true" tools:targetApi="31"> - \ No newline at end of file + From e88dd38869c6b2f1808f0058e8582cf8efc55b95 Mon Sep 17 00:00:00 2001 From: suqi8 <3383787570@qq.com> Date: Sun, 16 Jun 2024 12:33:59 +0800 Subject: [PATCH 011/875] Update AndroidManifest.xml to remove roundIcon attribute --- app/src/main/AndroidManifest.xml | 1 - 1 file changed, 1 deletion(-) diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 2b65b4f9..75869ba5 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -7,7 +7,6 @@ android:allowBackup="true" android:icon="@mipmap/ic_launcher" android:label="@string/app_name" - android:roundIcon="@mipmap/ic_launcher_round" android:supportsRtl="true" android:theme="@style/Theme.AppDefault" android:enableOnBackInvokedCallback="true" From 082c1853000f52ec19bb511277e089910d2a43aa Mon Sep 17 00:00:00 2001 From: suqi8 <3383787570@qq.com> Date: Sun, 16 Jun 2024 12:34:06 +0800 Subject: [PATCH 012/875] Update build configuration to target SDK 34 and set NDK version to 27.0.11718014 rc1. Enable view binding and update build tools version to 34.0.0. --- how | 54 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 54 insertions(+) create mode 100644 how diff --git a/how b/how new file mode 100644 index 00000000..0eec81f3 --- /dev/null +++ b/how @@ -0,0 +1,54 @@ +commit d652236a3df1b68ba5e8cafb9ffe700eba6b6322 (HEAD -> master) +Author: suqi8 <3383787570@qq.com> +Date: Sun Jun 16 11:41:31 2024 +0800 + + Update build configuration to target SDK 34 and set NDK version to 27.0.11718014 rc1. Enable view binding and update build tools version to 34.0.0. + +commit 4686b398463efd5042f62968c754fef584a4f1b5 +Author: suqi8 <3383787570@qq.com> +Date: Sun Jun 16 11:39:55 2024 +0800 + + Update build configuration to target SDK 34 and set NDK version to 27.0.11718014 rc1. Enable view binding and update build tools version to 34.0.0. + +commit 1e73ea0ebffc6c4c377b0024278cc7b9e4e12c54 +Author: suqi8 <3383787570@qq.com> +Date: Sun Jun 16 11:39:47 2024 +0800 + + Update build configuration to target SDK 34 and set NDK version to 27.0.11718014 rc1. Enable view binding and update build tools version to 34.0.0. + +commit deaa30696b764539d4090f8f9fc78c2f464e6413 (origin/master) +Merge: b38f912 e8c7962 +Author: suqi8 <3383787570@qq.com> +Date: Sun Jun 16 11:38:06 2024 +0800 + + Merge remote-tracking branch 'origin/master' + +commit b38f9125d7d22d3d2c0234cb0ac456702525378c +Author: suqi8 <3383787570@qq.com> +Date: Sun Jun 16 11:37:58 2024 +0800 + + 首次提交 + +commit f0fd84e865409255e8125bf388f953ecc686363b +Author: suqi8 <3383787570@qq.com> +Date: Sun Jun 16 11:37:45 2024 +0800 + + 首次提交 + +commit e8c796205390206998329857bcde70b65ccd155d +Author: suqi8 <157949748+suqi8@users.noreply.github.com> +Date: Sun Jun 16 11:37:30 2024 +0800 + + Create README.md + +commit ea5799df884694995877305bd16962663dffe776 +Author: suqi8 <157949748+suqi8@users.noreply.github.com> +Date: Sun Jun 16 11:37:13 2024 +0800 + + Create LICENSE + +commit 253f82a6739ddf6968bd52df265032cd56b68907 +Author: suqi8 <3383787570@qq.com> +Date: Sun Jun 16 11:35:54 2024 +0800 + + 首次提交 From 213e480fa29324f0640a1fac5ccb6b3f42c98729 Mon Sep 17 00:00:00 2001 From: suqi8 <3383787570@qq.com> Date: Sun, 16 Jun 2024 12:34:20 +0800 Subject: [PATCH 013/875] Update launcher icon translation values for better positioning --- app/src/main/ic_launcher-playstore.png | Bin 25910 -> 19990 bytes .../res/drawable/ic_launcher_foreground.xml | 91 ++++++------------ app/src/main/res/drawable/icon1.xml | 23 +++++ .../res/mipmap-anydpi-v26/ic_launcher.xml | 2 +- .../mipmap-anydpi-v26/ic_launcher_round.xml | 1 + app/src/main/res/mipmap-hdpi/ic_launcher.webp | Bin 1532 -> 0 bytes app/src/main/res/mipmap-hdpi/ic_launcher.xml | 6 ++ .../res/mipmap-hdpi/ic_launcher_round.webp | Bin 2976 -> 0 bytes .../res/mipmap-hdpi/ic_launcher_round.xml | 6 ++ app/src/main/res/mipmap-mdpi/ic_launcher.webp | Bin 1148 -> 0 bytes app/src/main/res/mipmap-mdpi/ic_launcher.xml | 6 ++ .../res/mipmap-mdpi/ic_launcher_round.webp | Bin 1830 -> 0 bytes .../res/mipmap-mdpi/ic_launcher_round.xml | 6 ++ .../main/res/mipmap-xhdpi/ic_launcher.webp | Bin 1906 -> 0 bytes app/src/main/res/mipmap-xhdpi/ic_launcher.xml | 6 ++ .../res/mipmap-xhdpi/ic_launcher_round.webp | Bin 4042 -> 0 bytes .../res/mipmap-xhdpi/ic_launcher_round.xml | 6 ++ .../main/res/mipmap-xxhdpi/ic_launcher.webp | Bin 3228 -> 0 bytes .../main/res/mipmap-xxhdpi/ic_launcher.xml | 6 ++ .../res/mipmap-xxhdpi/ic_launcher_round.webp | Bin 6568 -> 0 bytes .../res/mipmap-xxhdpi/ic_launcher_round.xml | 6 ++ .../main/res/mipmap-xxxhdpi/ic_launcher.webp | Bin 4234 -> 0 bytes .../main/res/mipmap-xxxhdpi/ic_launcher.xml | 6 ++ .../res/mipmap-xxxhdpi/ic_launcher_round.webp | Bin 9262 -> 0 bytes .../res/mipmap-xxxhdpi/ic_launcher_round.xml | 6 ++ 25 files changed, 113 insertions(+), 64 deletions(-) create mode 100644 app/src/main/res/drawable/icon1.xml delete mode 100644 app/src/main/res/mipmap-hdpi/ic_launcher.webp create mode 100644 app/src/main/res/mipmap-hdpi/ic_launcher.xml delete mode 100644 app/src/main/res/mipmap-hdpi/ic_launcher_round.webp create mode 100644 app/src/main/res/mipmap-hdpi/ic_launcher_round.xml delete mode 100644 app/src/main/res/mipmap-mdpi/ic_launcher.webp create mode 100644 app/src/main/res/mipmap-mdpi/ic_launcher.xml delete mode 100644 app/src/main/res/mipmap-mdpi/ic_launcher_round.webp create mode 100644 app/src/main/res/mipmap-mdpi/ic_launcher_round.xml delete mode 100644 app/src/main/res/mipmap-xhdpi/ic_launcher.webp create mode 100644 app/src/main/res/mipmap-xhdpi/ic_launcher.xml delete mode 100644 app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp create mode 100644 app/src/main/res/mipmap-xhdpi/ic_launcher_round.xml delete mode 100644 app/src/main/res/mipmap-xxhdpi/ic_launcher.webp create mode 100644 app/src/main/res/mipmap-xxhdpi/ic_launcher.xml delete mode 100644 app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp create mode 100644 app/src/main/res/mipmap-xxhdpi/ic_launcher_round.xml delete mode 100644 app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp create mode 100644 app/src/main/res/mipmap-xxxhdpi/ic_launcher.xml delete mode 100644 app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp create mode 100644 app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.xml diff --git a/app/src/main/ic_launcher-playstore.png b/app/src/main/ic_launcher-playstore.png index 96a36cfc6d5eb4fdf77b09c27c594fe7f03812a6..e8303294d0bad277c74b49d0f3057ba302ec3c2f 100644 GIT binary patch literal 19990 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 OLVA~twVz>}V*U?_8E>rs diff --git a/app/src/main/res/drawable/ic_launcher_foreground.xml b/app/src/main/res/drawable/ic_launcher_foreground.xml index 4756bd38..87299d0a 100644 --- a/app/src/main/res/drawable/ic_launcher_foreground.xml +++ b/app/src/main/res/drawable/ic_launcher_foreground.xml @@ -1,67 +1,32 @@ - - - - - - - - - - - - - - + android:viewportWidth="48" + android:viewportHeight="48"> + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/drawable/icon1.xml b/app/src/main/res/drawable/icon1.xml new file mode 100644 index 00000000..bf7665a0 --- /dev/null +++ b/app/src/main/res/drawable/icon1.xml @@ -0,0 +1,23 @@ + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml index 4428a0f2..0b0d585e 100644 --- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml +++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml @@ -1,6 +1,6 @@ + - diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml index d0750202..0b0d585e 100644 --- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml +++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml @@ -1,5 +1,6 @@ + diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.webp b/app/src/main/res/mipmap-hdpi/ic_launcher.webp deleted file mode 100644 index 868bc7375d3c99bbf26595bd24c20c621fefedfe..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1532 zcmV#jNvQ?3Wj2sm&YK(SgVq(_x)77R8v`r{23)7P!feOHOuGkFRwv8jD-F7Xz03lH{j4U5nWC+$YNs>76M8Zw1Sw#3El#IL< zMMGpW3ln#tX-r@M=Wq(Lr9S)y&qkRgag4D=C=@jz6r=1RnZZ?@hLdC4n*xf5B!%xd zYiUC$t#EE*$Y2C#;b?04fthJ~-*H#bhESR30zfPjAh&&%|Uo~w7woa@uNSA8JdD83r$9NfSBb<1233m&wBRyVtAzujQJLm zZ=yITw?(Nj#$Ip3?)B`43{L|;k7$y(8O664n5?f2+oCu~i|Vtw5#dtfwHRG-oNYbY zO!0bzM@uL}b$Y^LpeT;BJ&LfHs4nn_ER-aR-J2Pc5!$dL$|+FU5!%3Hcdcj1YIID@ z?e#V&Wk-)w1s(OBQIvRnF>pFUQz%P2a-obJy{s|DLK$?7WoYk>YJ)aoBN>z+3jUzf z_!bkn=oB?d#xpQq&v6`sY!?%Bcs+#!au}cCO$d<9e}?}Z(3_)))hNhd81NdO!v_I5 znx6q)p|9}pjNmlDxo<&$rtjbg!0-dj6wU%1e;ZupLma^wY}y}z%eq|%YZ6Gjt8f5L z;!|+W-D`OC08tdJN1n?${|w;Z3R1u^fi}cJ_#hWQtSD4kb(eGV5FpyW0!JSl2xWK; zQ7r!aBa)#I>9O?dA8Qpg=mm;2IR|k08xX)h!7QR!SJg7ZAM_zX-8N#Z~p1LwSDMT@1kAHtUo1a=k$wiZ+a+l#`N4=sKCQn8Lg zIS~g^BpBiZL^<736w4nzg)VFhY%Ne3y0~rm%eP_)MU3c1bhMwY90{IXGjsDyV1L=~ z1P+$XTssjwz3Qi{$D(t)0GXqJ(QRVk@w33`HG%B~!NXYG}P;V6H#c`ir)< z4iB*Y4mdX(Ai)Cn{)@%M0yWsUjd>`{;s#u0$RI8hVl`y@@N;n*;L55d?{l2MMf`Uh z6)yW0z~$|5fo`t`0XLp`u4x`_LI>!$( z3Y*OaB6liN{a^Z{Y>T4f|7A48rlL2Be*e2|Jzj0YNCqXZw86I+^7^nnN{vynA?E|G zE~Uh12~NQn6Bd&lz0l_;J9-r8^OK1wRQb}*D0RxRvxkx|y}p=G=1WQJSR?^Uu&xIYY`%B zYHaU^jOH6{V2ss}@lBLXCI4@(rwf~soSBnzgr^wG7|r13{Q|?y(S~}tAEmDs9-3le z4tXw~SuQdCqg1tlYA|<-1Tg(0KMxS|T%r1F9@Jkuje){N_18vugqYzJ*?*kERkSs@ zh#yBo_8)t=g1E=FUC030pY4UE-e+*M1Z)heSrWlscDe&pwU8(h%7n?E`1WcAq^3w> zq+y$80cXt{z$z{&`J%Sa*(-A!Qy{ro?}`o@b?2nB7o(jZI`mfxp! zj@KK!U8Q}Uj_fr$hS5>xYn%Y~WIESrchB+qKCQC#G)+PQfKYsjF2V$1mM}+{*WFfu iFusLuLeT(yit1Jdo?>JRW4c>jD;g+Ue}KlnC=CEX2HF7t diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.xml b/app/src/main/res/mipmap-hdpi/ic_launcher.xml new file mode 100644 index 00000000..0b0d585e --- /dev/null +++ b/app/src/main/res/mipmap-hdpi/ic_launcher.xml @@ -0,0 +1,6 @@ + + + + + + diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp deleted file mode 100644 index b64b2720977818b97f522e771562aa4c889bbd08..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2976 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 diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_round.xml b/app/src/main/res/mipmap-hdpi/ic_launcher_round.xml new file mode 100644 index 00000000..0b0d585e --- /dev/null +++ b/app/src/main/res/mipmap-hdpi/ic_launcher_round.xml @@ -0,0 +1,6 @@ + + + + + + diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher.webp b/app/src/main/res/mipmap-mdpi/ic_launcher.webp deleted file mode 100644 index a0d39c4f7b94a182c50e22299978b2565c24ecfe..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1148 zcmV-?1cUohNk&F=1ONb6MM6+kP&iCz1ONapFTe{B4+kNVB*j+l-un#x6@4Aw05fiV z5+OU1WY>yv?&S;rT_NxQW3<-0Q*aweawJ9X`tR0xaq_>&*^)`PwQZ|b<~?6<&n$8+ zfeI|61FwyYj6U3Ach~dQ0ZcwfTBGyk9?&HvLaefBf9m-%as)P=q2B(zb0o<7jHzw!OA(+qN~e-L7lf zo!U*;?%Mt>O`iA7;`{p~5&d`IHj*Ma#|#61Q2Z|$8H&ybX3UT>>d(dy^>y_`CZht4 zfuq4AGjq|&k0mq~dSYt%2g0Xnd`9SRV`*(+1?4zx)ycC=n&k+66boxpzr70Hiy7hy zJ4-8s3fz89Io5?8q0oo1GW9K2$b9>3VY3e_g~>BvHvobY=OuX+mH8KyP-luOF?X2@ z-!&qSl0gpp;+1gm{fNUwo^)IaImGTbC8^kM4zbXc%F;m&JEN84BD**oT1+LE@+e7B zT^!z~Qpt7mjx-m0xGFk*aZ1`^`>LrFgKt!tk&P1gKKV2zA5#h?)-<)MWUNh;gk79N z77C4~^!hf$Rzz%I&e`z3c)268ol;vZ z;L3D@)zGUowWYC_&qn1}EUB%jR48IC!AU@ts%>q+yKg_gN&#zBt(kzM1ZM$P+gg{u z`S9iU=l5@yx2UoK$EjtuwjKEN{l_m^`gl;qvZzni!8fPA7)3;Uo($i-fneSx_-Q+R z+!1|bsjW^a6h4>0Z5JS^p{<3jSw+qfg z7b(W=x%r~!MP{}H&WpHWx_Q?htE4TiznXSlN75cUI665Tc12N%XB^(5vUr%ou1K28 z0~`)6qvBe~A@;@+#dINJfeYQb>RB{Iv98AUBMugLTk??Cd6&gGRn^6(K^OC@<(rFK zi0k}*!ag$NFf^JL!u!H?J|ir1GKKf4u&tLP#tPp(1>C1hLfRFF`1_#7YX=ikgtDBp z^2kxPagIIoQB2Wgv!-z0RDZB(LQt?IDp?x8<)J#TF>C7F8@VI0k^4HD;KqMfOIvg( OGX>b8^`bk3|49hbLPj$H diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher.xml b/app/src/main/res/mipmap-mdpi/ic_launcher.xml new file mode 100644 index 00000000..0b0d585e --- /dev/null +++ b/app/src/main/res/mipmap-mdpi/ic_launcher.xml @@ -0,0 +1,6 @@ + + + + + + diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp deleted file mode 100644 index c7cfa59243d3a3c07dab275ecaa055d71f55752a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1830 zcmV+>2if>iNk&E<2LJ$9MM6+kP&iBx2LJ#sFTe{B)zFi+PjMUdC6>;>c!0eD^X@ga z^5=rt%M4+T?VuE9W@ZqCIbwqbx@s)-jBfA?YV2_ZI+c!Qqm)5owl}4+stlcsB}tOx z$c;Y-pV8usqXw?(nRtW-$nHH%%`}ajkRwS_B)R@_oCwSe!rVQn+bSpN+}d_*bLRCs zwry25I@`9b&Ynr~18k?Zt#SXUj_o|pb#Di5+eVU{&gH!~b>|JBDog=W!c@8-PF;GJ z0SO9I#FU{{n0A=nn8AI6ccE4$PxuHk0<#12sLUr4O%mV9{L+1;cev|nQ(^}?z+KE1 znRjLWkRgEz2*MA`?x&P?FeNZB`z0D0DV0dogqzq#IEh(AcheIWQAJ23 zO6g6^egjNH16=@^DKa-3sYHlmB5@jv;lLckDEsgv1VZnlROIGWfG#Zqb6h5u&?l19 zD2`x0EP~qa3!ox-AC<`^j;mJ}fW*U%q15J)Y|WOmYDDYW|7DTo#Ku{zt*f`B=HM&| zQ65z*4j}PTRcc91{J7gu(3ZTmD#T-tz=#J^28m;hS!J-1HD;&g zK!aLFuE7`^SX>hVe4GT6@P9{{ERzRAjZ6h1Ri@W%D%?F)mu_tTdY`DuSQT+QZ<6un#nH@m_c?}({6X7Xms%R3hl_2jqZ?=8ke?lX|FoXXNm%jekk2xprwh;a2 zX(^;Lzz+IG`POz4M1BP4M-UDdUcY%C-?@*^xlhh{Up`%U{nF?H=Rbjng9stOcVid? zu!W%lKl?F@AW{Tgh=Jg4bM2oxw0A<$oj}_Lvb+RDx&sLEO9i63nDUd;JVPT93t^Eo3OdisfD30Z;6`nqkoOBy z;WR|-=0!xs#8eQ4T^yzo$s1{IAok%O$Oq@V2wBd#{wL~4ID;#aOsd8rP9X|PAC6;O zl;5a8?4D&2Yb3Pwxg+cfQKHw!@5M|-v|3IXQvgJ}b9_WavMAQiQkh4opHKqhX6goc zYHyg;rPG6ais%TKf?}-V$aRU7Sv6v0jRfauUCYW5A_ximZ zH*y^h*n^+@%9qvfg>}4v7}8TliM&qLBZjW#b>91DXxO;JL(8*}@(`z4zi(j=GgVr5hjoe`s_aM?p+ z1QesUns5_a2xT3gO{`C2|7=9k=3M$5 z^-JgvBM3W$8qoeKT;SJTd^(EL*8j@?tyM-E(HhYcG4f*;jpN)ZUfsvdV>F%Rn@jwd zOdY3bKR0_W=Mbap&h%Fl6T5RkR1h8PjyumW;VtI8&D^v;c&Ed@*JE->P{#0Hs%2Dr UIuUIV?c0)_Jy$W6Vf8lw0NBuEs{jB1 diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_round.xml b/app/src/main/res/mipmap-mdpi/ic_launcher_round.xml new file mode 100644 index 00000000..0b0d585e --- /dev/null +++ b/app/src/main/res/mipmap-mdpi/ic_launcher_round.xml @@ -0,0 +1,6 @@ + + + + + + diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher.webp b/app/src/main/res/mipmap-xhdpi/ic_launcher.webp deleted file mode 100644 index 19dc110a95a8457d0facfc727ba3c7645e985386..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1906 zcmV-&2aWhrNk&F$2LJ$9MM6+kP&iCp2LJ#sU%(d-wT6PWZ6t?3?A^;CA|}9Ljh0Yx za_ZOG`1?+xW2C=w~ZW0oIJDXwm|)W z+O}OZE85BdCZia3%*=F-^dFpi-kpIQNs=PT^_OEAUT61b<`aUMue+zK`tQJP z8%L66u-SHfTJ8sY!3t4`b^$g9t=UGpyn4hiBNip7LZxE2fB!MxQ-3cb0}EKkJ>Kwo zr<7%0zUXVF9o{pVaD-rj09W8PM`sqkCmo-#%&}X189(CJ1^jz+pG_vYtSS8}A{gJ| z|HhJ2LIhZ2i5W5r$XqF$VxaVj@9(f!B7`U&#*3!g_`R`GVUHEY8Ds#~^JR8PVqko` z+3c240P!K;FDS+F#`v@H!~qMGL|RMpTxAgW5q3^(CizYSa>gPaRyyJjhVV(%f9DFr z-m}%~$OF`b)k;ZL5g=E1fnfL1NKFqZHF@thKqv00=McOw*J~k!rP?_M5NA zSt3V??3}d5QXHk2rdpeN41h9oXEOfVF=1diXlfhYQ(-4Bl z%aY01I%#ASEVeQ+QOFjnK!v;rsaEDyGBH_bsWg=0Uj!Ad)*ZDnk0wZE9?VgTs|{4F zw9Y)MAeMR35*gs;jBenRq-xP;yJF^!5KXM$kPO!l;GVjV4qEw`cc^~CMJ)&J#VbT4 znN0#lFJJK%P9zx3t1syRIu6AW2}za_Ao^+Ib?mfOnlS~)84?h1#45o05e?XXV=fCU zw*@q({0^|bgAMRqfaNz%!4hB)Sp5(QhWm6e!T0>YBu3q41cs#mNDf&*fUuaeuQ0*` zBE(2p4>C-iIcW)y^CZEsO9@2rRqPaR@+(Zl1lI-T!HTfW4k$9fNBj~d{tceaDA&wY zW#BCt3<~4GnsY&Agb4iMv-iksU zeDoS^J@n~2^y*!C{So^79UXd2`S}-vAE0i`4g|=3Fv!4Y!A{Xl1kS6Qm#?-?Y{`3T zd3oepoxI#SxxIPgCfbAZdd*JR3XI>u0KEGnRHorPGVgmAFXXj}yfk8z*C%_|uA@We zd<>P(0p5&Z1{h46{sGQ+&tKfg%i|l3d)KZwUq$6TfSnUL@1o*`KfHA>@66VAXOHjR z@0{9I**&}W_~xy=Ih7AC9zA@F;Xxl3f$=FS6Y$MbyEpRk$bV=pZ%$R#wx(-)>zkXc zbH}`(@+ssyK47$>(nY9s|KSba#x$+|>1HT3a2 zm@p5t2Zn<*m|*StE$ozoMBr(y4})meLz%&Z;V5$^Qh@vlrqBL~C~5npYF*_^fL9)6 zqWaZ8$AIrXu4I%}ZTF$IMH= z;62{ub5QfrXMSG&%&!an3G15Y#k$PZ21hM=tt+Kc+^tjbR}ZNcz1GE2t@0wMNG4|~ zx~=PvAj?a%PMThMiPrsQ5TM!BE3YE=pyQPGNz*4U)H!K{c_HIz(kZX?Jju%$MzwP~ zQ0EmdluYux=vnghsF3AF9koieS{;)nFXAlelGi;>8$CR&t9e`35L1zGCL@`=uB&yq z_d^Kt#zgTnp9y6qGM046OH(EB0Apf|7?`{|sUe5OxxgTV4{}E)G7SX(>w}cqO~%RA zxkf)TX(OFrVAwdkrh)R;|H~;1SAhP^@_gEo|OB%bofFE0|(f#p8x;= diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher.xml b/app/src/main/res/mipmap-xhdpi/ic_launcher.xml new file mode 100644 index 00000000..0b0d585e --- /dev/null +++ b/app/src/main/res/mipmap-xhdpi/ic_launcher.xml @@ -0,0 +1,6 @@ + + + + + + diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp deleted file mode 100644 index 5eab8981fe7356dc10d21f6ee69de493d1b9f3c8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4042 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 diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_round.xml b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.xml new file mode 100644 index 00000000..0b0d585e --- /dev/null +++ b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.xml @@ -0,0 +1,6 @@ + + + + + + diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp b/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp deleted file mode 100644 index 55a90039079ce8983025f0c7538208a0b0b9ecb4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3228 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 OrMHlZ+(6I2DCq%>U?1B6 diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher.xml b/app/src/main/res/mipmap-xxhdpi/ic_launcher.xml new file mode 100644 index 00000000..0b0d585e --- /dev/null +++ b/app/src/main/res/mipmap-xxhdpi/ic_launcher.xml @@ -0,0 +1,6 @@ + + + + + + diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp deleted file mode 100644 index 486f6bcf846440daf006779ae0630b603fb5d385..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6568 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 aO3ch>W6{2+woo=5rx;ey4w%i_j@1EYRg!@K diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.xml b/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.xml new file mode 100644 index 00000000..0b0d585e --- /dev/null +++ b/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.xml @@ -0,0 +1,6 @@ + + + + + + diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp deleted file mode 100644 index 6b2ea78d032f18fd3965905eb385b644cc4a44a1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4234 zcmV;55OwcTNk&G35C8yIMM6+kP&iC=5C8x#zrZgL)rR7>ZJcobz0>hsn1;@V2uDc&~7*~8;&=Rcf?(U9Mkh(_J z^Q{vy>Cj0_DiR~fjUy@TUnlQO7!lM<0&vte zk|3EsyTfv?t?ucPD+>StIdf~Bjo7wryH00Tw(|q(?JDVP+p6sPuzIo}$&TBm7l>fd zBzz<7|7|=JvfGAXA%tkF?3SCS-~*6e>B*L?oAZQC{ur~i!Hws9m**?!$W zxc|3JBnl*g5+RAO>Jz%wj`vLHn%hO>TBseT<+ewnMxuvAFV)A_=C%i+ArVNr-4f#^ z4oKXU_#)9Lk(Ovtc{~zLkz4oLPyZaC|Ejp%5~C%qOK21u)Sl?+^mMr0*PyGFozZAi zB5NaSCF=rWCD+uXN2Ae`?1C*xxBFf+`i70X6)q!I@-|wc`aupc3fxJ!ttDgqQHgx7 z?owhUd+!9Q*dI%_LkY!>Ggd;>UR_Ly)?*pdVj-wUHzQ!=kTy zeFpPlO9;c5PKXga#bNB{64h9a3J3)$#WI{lUcEQDh-3cggkU}n514rnwUI?_ZN*dw z#hHW)9#qG$oEMBl_@4w|9_P}=%D1SMEMjXLra(BA3S2k|JT|h4)%;AQyFZOEgj^y6 zs~Kpc8BuZu;=;+qr(qxPR<>aa&CfAz;4z{Q%84=}3mGPnj#|iJ{daM@0s;uWsLw%pt_;UkE6P(qDz3Mw93Gc!YuD^Ndk!Zz2%I7kl4J=?C+WUtio%gM?89b z9vboRh{s1f9gz_uXO0)<$cV@|M`4vfNI_TnjI;>HWJkPoj*5HDd6$ODD}Y2|q`G4e z63+7o%po$9<=Y9e5-0!peYi=9D5w%B$?r-TVQ{mOpxX(W$*=+S51B{dhgS3-fQ=T>Q_en!bjj&hLk}^jcYSi(WcCVA5L1~?QFGE4i z%M!@Rt=denG}M2NnEX7K$ueWg^BBt8v=$oE?v5MH)cmJ2hUOafhOfyG9>DwhD1Ze&IXo_aVrP zoCrhdXis!uc7&yip7rbaWZO4|AXU6_#{528)}g29TF&-LuhWuy(bGY^3Xzx9DdV9L z7En`}<&&xTc?7}Sm1$ntz7I8XzQ^DSIIKZ?p_`fs_u_XXQ_1!-^>zHRirCr4zdCcZ8a>U=wjmoG^!~cf->fi-BG9C55d)tM*Hz7Kt9g(w;~mCGR^^C z^Y9$fFb-od8jTWf54xM-2hj96h-m04l;mNP@%zTIS&zzEuEi z+bg}Y66p4!9H>jmjIcN>E{Zd_(q^Q1<1boQ^Eh2H4F6!$)*k(e?S_7 z96-;U$Fvy&P%z2!G`1k5C>!w<_tP)6TlIw z0H7zpF$ow@zd0#=ZDVsKm**r~1VlD4bwW}9A7_$1B3BoToweN8ZoJ$upai@hF`!cT za2$dFG!`5?5r`H=b#V?t8)zCKDFQbjb8EXBipoHnzjywjD3QE*g(kngWk45a#zNVUax-a)(qN0CARS`QqZkfXjFilN@w==b}Csutxg zp{Sw=O(RN=kkx+wzcMj&aYRON^aEN2>Y5`m%-d6eYq9Dx6N<>%cvtWgp=M11P=e_`%RJsKjpeyuBP_!@-Ypxei$0?^mDtC9 zttfwV;@APm;~gAXXaJ)9as|G{lMF$D75j?ejqDI6qIsdZdG+2!Q<5 zH&hJHhQ?tp5cT11KZeTW5OEL20%f&k^5bTE(lOhB*Qz@nC$%h#xD~wP$O6y-Anmu5 z1LZ|)1<;9p!4(6JAy(j7Vu~k05s76$dF9jaJ2*9L*BO9&G8O#LE zZsUr5bR_$`@~Z&lAj!!rIA;cUU*AQ@Q&@+(u$<^B+Xr&w=k2*agw1fq2JnuZ-D?Ik zDeDB#j@v9-M*xO;2@=sN$n*;&PP0O`0{!9GWUN1M5i zfppw*piP;z;I@-N0mszL-A6+_?pj+_ScP`ncqRtr)nXb_z(0T34`_TuL44wFxDV|C$UyrmDkL z$mgxrW{qzkj~+Y<1?R2qiW0^MyQ=yG zWIrz;1%$2}DQ$cj4Z5Y-Q3ZQbcYn~S>vsADWXiiLt2CVmU8`&^3ea4C3S*(ny{B&b&euw;gy5!yx%V<088;%D4aJL=a^J z&XDiOV>I^c98?)zheH3>zvt&5%Lu6DzPT48sL7ebx%(Dr-oO6pIjAYS7yrJ|{6ZD? zjaJ-?n%Upu^6%T-v=3*_47vm8<$%o02h~~Bm_h%(^~;?G-$Tbor$#qji~PI+0Yk?4 zYtgf9pD{bFnaQ{2+vzG=J;%0 zM<>XPm(O9yX81Ch>NR8)UQ44$-&^&_2&yHdpguODE=wm#U;aHKk1%ADGCp~ENNg>j zVBVxv>yVwdYRbJ7Oflun%|oDe8uF&SPl77_1SZ{!V7aWIj`)41-0Nhclc2OrxtD@@ z+q`e#YEO+}$QpITwC6bqoiN>urSH?HpuB@xI~B~Ew{o3?PKmO9UYwy|{JDuZONRV- zC&v19%+P63zS5?3O0M!$dxQ}_Bl|c)AlRkiBd+{XtKjfEoPtu zPCr{#wYf^iij`dNdYZ>DBk^+*5PnFEkxZednI97H=w@tzbKRPnqN>IF9BOnti6#8` zDMJ~l9}ow?2z-Tzmr;3?r*?=rg*T@{xq_^D>(p0az7>p(TxbUG81>#S6Ac4kgdU)% zuZE+&R&vPi+p-7CQ3geOi4*r(zUvq?9aS|7xX||iMR!4bhvGgH3r|9Vg*^8A<{Zb_ zl~{;!aBtk3-ZeLC$vy{~6F`68oD~?y>b`GK0wH$y3nUp8jJDf(60nlibo7{U1cy+I zUD$-xXj+3e_u<}Qoan-T<08#Q`kaZkj1KY7k-8fLzz8zpU#E)EDvd?eNLa|}6odQR zwR!kAYr4Kl^;JIzM(h)mewtQ{PGua~j#K0>X|APO$uC7FXFJ;m7%>R$FeAb!`Yd&f z_Kcn-T-=D`u#t{vF5(GIi@bfl<5@2CHh+ftV0Rb;j>~^$%ljA{>p#nA@HBdad0<2tg^bFs577DZ^kMXQAN}4( z|MxQN`z-i5i+;&cwdWTs^S2G(?HD-M-_>`C5p{Tk71Xv^rt==y$oeUiSPrT>>0@FfPSJhz)aNuThA zPDWc_++OWl0W58d6r+?;#i(brVYIv0$>^;5bY6V(Rx%Jtv^A=L#m|T^;+G=v0HfBI zRDFCsfq3N7)o#B-g?zGm*qaD8F-nGpA}Y?%&`?t_;T`U7{48*Zh5dIK;qJD!VU?$? gt$X0EKO8$ + + + + + diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp deleted file mode 100644 index 8066990e58575fa82ec172752bd604f9a25ef243..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 9262 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 QBrPmwQd&}QK2G}N0Mi^}CIA2c diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.xml b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.xml new file mode 100644 index 00000000..0b0d585e --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.xml @@ -0,0 +1,6 @@ + + + + + + From 6d43f94be8253bda22d9a7288bd15ca4f8e7eccf Mon Sep 17 00:00:00 2001 From: suqi8 <3383787570@qq.com> Date: Sun, 16 Jun 2024 12:35:43 +0800 Subject: [PATCH 014/875] Update AndroidManifest.xml to remove obsolete attributes and adjust activities orientation --- app/src/main/AndroidManifest.xml | 10 +++++----- app/src/main/res/drawable/icon1.xml | 5 ++++- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 75869ba5..74ba513b 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -4,13 +4,11 @@ + android:enableOnBackInvokedCallback="true"> + android:screenOrientation="behind" + tools:ignore="DiscouragedApi"> @@ -42,7 +41,8 @@ android:exported="true" android:label="@string/app_name" android:screenOrientation="behind" - android:targetActivity=".ui.activity.MainActivity"> + android:targetActivity=".ui.activity.MainActivity" + tools:ignore="DiscouragedApi"> diff --git a/app/src/main/res/drawable/icon1.xml b/app/src/main/res/drawable/icon1.xml index bf7665a0..f562d60e 100644 --- a/app/src/main/res/drawable/icon1.xml +++ b/app/src/main/res/drawable/icon1.xml @@ -1,4 +1,7 @@ - + From 2486d6a156280ae9429c331b07bcf209597b2ae1 Mon Sep 17 00:00:00 2001 From: suqi8 <3383787570@qq.com> Date: Sun, 16 Jun 2024 13:50:54 +0800 Subject: [PATCH 015/875] (Update AndroidManifest.xml to remove obsolete attributes and adjust activities orientation) --- .../res/drawable/ic_launcher_background.xml | 170 ------------------ .../res/drawable/ic_launcher_foreground.xml | 22 +-- app/src/main/res/drawable/icon1.xml | 22 +-- app/src/main/res/layout/activity_main.xml | 38 +--- app/src/main/res/mipmap-hdpi/ic_launcher.xml | 6 - .../res/mipmap-hdpi/ic_launcher_round.xml | 6 - app/src/main/res/mipmap-mdpi/ic_launcher.xml | 6 - .../res/mipmap-mdpi/ic_launcher_round.xml | 6 - app/src/main/res/mipmap-xhdpi/ic_launcher.xml | 6 - .../res/mipmap-xhdpi/ic_launcher_round.xml | 6 - .../main/res/mipmap-xxhdpi/ic_launcher.xml | 6 - .../res/mipmap-xxhdpi/ic_launcher_round.xml | 6 - .../main/res/mipmap-xxxhdpi/ic_launcher.xml | 6 - .../res/mipmap-xxxhdpi/ic_launcher_round.xml | 6 - app/src/main/res/values/colors.xml | 5 +- .../res/values/ic_launcher_background.xml | 33 +++- 16 files changed, 56 insertions(+), 294 deletions(-) delete mode 100644 app/src/main/res/drawable/ic_launcher_background.xml delete mode 100644 app/src/main/res/mipmap-hdpi/ic_launcher.xml delete mode 100644 app/src/main/res/mipmap-hdpi/ic_launcher_round.xml delete mode 100644 app/src/main/res/mipmap-mdpi/ic_launcher.xml delete mode 100644 app/src/main/res/mipmap-mdpi/ic_launcher_round.xml delete mode 100644 app/src/main/res/mipmap-xhdpi/ic_launcher.xml delete mode 100644 app/src/main/res/mipmap-xhdpi/ic_launcher_round.xml delete mode 100644 app/src/main/res/mipmap-xxhdpi/ic_launcher.xml delete mode 100644 app/src/main/res/mipmap-xxhdpi/ic_launcher_round.xml delete mode 100644 app/src/main/res/mipmap-xxxhdpi/ic_launcher.xml delete mode 100644 app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.xml diff --git a/app/src/main/res/drawable/ic_launcher_background.xml b/app/src/main/res/drawable/ic_launcher_background.xml deleted file mode 100644 index 3c152dde..00000000 --- a/app/src/main/res/drawable/ic_launcher_background.xml +++ /dev/null @@ -1,170 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_launcher_foreground.xml b/app/src/main/res/drawable/ic_launcher_foreground.xml index 87299d0a..812206a1 100644 --- a/app/src/main/res/drawable/ic_launcher_foreground.xml +++ b/app/src/main/res/drawable/ic_launcher_foreground.xml @@ -7,26 +7,26 @@ android:scaleY="0.55" android:translateX="10.8" android:translateY="10.8"> - + - + - + - + - + - + - + - + - + - + - + diff --git a/app/src/main/res/drawable/icon1.xml b/app/src/main/res/drawable/icon1.xml index f562d60e..3ed493af 100644 --- a/app/src/main/res/drawable/icon1.xml +++ b/app/src/main/res/drawable/icon1.xml @@ -2,25 +2,25 @@ xmlns:tools="http://schemas.android.com/tools" android:height="1024dp" android:viewportHeight="48" android:viewportWidth="48" android:width="1024dp" tools:ignore="VectorRaster"> - + - + - + - + - + - + - + - + - + - + - + diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index 582f1c79..12bdd995 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -26,15 +26,6 @@ android:textColor="@color/colorTextGray" android:textSize="25sp" android:textStyle="bold" /> - - - - - - - - \ No newline at end of file + diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.xml b/app/src/main/res/mipmap-hdpi/ic_launcher.xml deleted file mode 100644 index 0b0d585e..00000000 --- a/app/src/main/res/mipmap-hdpi/ic_launcher.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_round.xml b/app/src/main/res/mipmap-hdpi/ic_launcher_round.xml deleted file mode 100644 index 0b0d585e..00000000 --- a/app/src/main/res/mipmap-hdpi/ic_launcher_round.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher.xml b/app/src/main/res/mipmap-mdpi/ic_launcher.xml deleted file mode 100644 index 0b0d585e..00000000 --- a/app/src/main/res/mipmap-mdpi/ic_launcher.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_round.xml b/app/src/main/res/mipmap-mdpi/ic_launcher_round.xml deleted file mode 100644 index 0b0d585e..00000000 --- a/app/src/main/res/mipmap-mdpi/ic_launcher_round.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher.xml b/app/src/main/res/mipmap-xhdpi/ic_launcher.xml deleted file mode 100644 index 0b0d585e..00000000 --- a/app/src/main/res/mipmap-xhdpi/ic_launcher.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_round.xml b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.xml deleted file mode 100644 index 0b0d585e..00000000 --- a/app/src/main/res/mipmap-xhdpi/ic_launcher_round.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher.xml b/app/src/main/res/mipmap-xxhdpi/ic_launcher.xml deleted file mode 100644 index 0b0d585e..00000000 --- a/app/src/main/res/mipmap-xxhdpi/ic_launcher.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.xml b/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.xml deleted file mode 100644 index 0b0d585e..00000000 --- a/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.xml b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.xml deleted file mode 100644 index 0b0d585e..00000000 --- a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.xml b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.xml deleted file mode 100644 index 0b0d585e..00000000 --- a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index e756d88d..6a2c5014 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -1,7 +1,6 @@ #FF656565 - #FF000000 - #FFFFFFFF #00000000 - \ No newline at end of file + #555555 + diff --git a/app/src/main/res/values/ic_launcher_background.xml b/app/src/main/res/values/ic_launcher_background.xml index c5d5899f..796f9e73 100644 --- a/app/src/main/res/values/ic_launcher_background.xml +++ b/app/src/main/res/values/ic_launcher_background.xml @@ -1,4 +1,33 @@ - #FFFFFF - \ No newline at end of file + #FF000000 + #FFFFFFFF + + #FF000000 + #F1FFFFFF + #0D84FF + + #1A000000 + #FF000000 + #FFFFFFFF + #50000000 + + #80000000 + #ccffffff + + #e6ffffff + #5cffffff + #bf000000 + #4c000000 + #DC9A9B9D + #FAFCFCFC + #FC5B8D + + #fff0f0f0 + #66000000 + + #ff0d84ff + #990d84ff + + #9E9E9E + From fa0b367b10c4d53725913d198e1496e1b8241480 Mon Sep 17 00:00:00 2001 From: suqi8 <3383787570@qq.com> Date: Sun, 16 Jun 2024 16:23:33 +0800 Subject: [PATCH 016/875] (Update AndroidManifest.xml to remove obsolete attributes and adjust activities orientation) --- .gitignore | 3 +- .idea/inspectionProfiles/Project_Default.xml | 36 +++ .idea/other.xml | 263 ------------------ app/build.gradle.kts | 23 ++ app/src/main/AndroidManifest.xml | 60 ++-- app/src/main/ic_launcher1-playstore.png | Bin 0 -> 23802 bytes .../io/github/suqi8/opatch/MainActivity.kt | 47 ++++ .../io/github/suqi8/opatch/ui/theme/Color.kt | 11 + .../io/github/suqi8/opatch/ui/theme/Theme.kt | 56 ++++ .../io/github/suqi8/opatch/ui/theme/Type.kt | 34 +++ .../res/drawable/ic_launcher1_foreground.xml | 76 +++++ .../res/drawable/ic_launcher_foreground.xml | 85 ++++-- app/src/main/res/drawable/icon2.xml | 71 +++++ .../res/mipmap-anydpi-v26/ic_launcher.xml | 2 +- app/src/main/res/mipmap-xxhdpi/ic_github.png | Bin 5987 -> 0 bytes app/src/main/res/mipmap-xxhdpi/ic_home.png | Bin 4999 -> 0 bytes .../main/res/mipmap-xxhdpi/ic_launcher1.webp | Bin 0 -> 2860 bytes .../res/mipmap-xxhdpi/ic_launcher1_round.webp | Bin 0 -> 6210 bytes app/src/main/res/mipmap-xxhdpi/ic_success.png | Bin 4948 -> 0 bytes app/src/main/res/mipmap-xxhdpi/ic_warn.png | Bin 4102 -> 0 bytes .../main/res/mipmap-xxhdpi/ic_yukihookapi.png | Bin 8490 -> 0 bytes .../main/res/mipmap-xxxhdpi/ic_launcher1.webp | Bin 0 -> 3876 bytes .../mipmap-xxxhdpi/ic_launcher1_round.webp | Bin 0 -> 8798 bytes .../res/values/ic_launcher1_background.xml | 4 + .../res/values/ic_launcher_background.xml | 2 +- app/src/main/res/values/strings.xml | 3 +- build.gradle.kts | 2 +- how | 54 ---- 28 files changed, 458 insertions(+), 374 deletions(-) delete mode 100644 .idea/other.xml create mode 100644 app/src/main/ic_launcher1-playstore.png create mode 100644 app/src/main/java/io/github/suqi8/opatch/MainActivity.kt create mode 100644 app/src/main/java/io/github/suqi8/opatch/ui/theme/Color.kt create mode 100644 app/src/main/java/io/github/suqi8/opatch/ui/theme/Theme.kt create mode 100644 app/src/main/java/io/github/suqi8/opatch/ui/theme/Type.kt create mode 100644 app/src/main/res/drawable/ic_launcher1_foreground.xml create mode 100644 app/src/main/res/drawable/icon2.xml create mode 100644 app/src/main/res/mipmap-xxhdpi/ic_launcher1.webp create mode 100644 app/src/main/res/mipmap-xxhdpi/ic_launcher1_round.webp create mode 100644 app/src/main/res/mipmap-xxxhdpi/ic_launcher1.webp create mode 100644 app/src/main/res/mipmap-xxxhdpi/ic_launcher1_round.webp create mode 100644 app/src/main/res/values/ic_launcher1_background.xml delete mode 100644 how diff --git a/.gitignore b/.gitignore index f7415cfd..19408d07 100644 --- a/.gitignore +++ b/.gitignore @@ -10,6 +10,7 @@ .DS_Store /build /captures +/app/release .externalNativeBuild .cxx -local.properties \ No newline at end of file +local.properties diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml index 47c3e245..eb41648b 100644 --- a/.idea/inspectionProfiles/Project_Default.xml +++ b/.idea/inspectionProfiles/Project_Default.xml @@ -1,6 +1,42 @@ From 8fe4b4bac3a1abd0a6a5eb0407fa0c2f6fda86cd Mon Sep 17 00:00:00 2001 From: suqi8 <3383787570@qq.com> Date: Mon, 24 Jun 2024 15:17:48 +0800 Subject: [PATCH 037/875] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20Main=5FFunction.kt?= =?UTF-8?q?=20=E5=92=8C=20apkinfo.kt=20=E4=BB=A5=E5=AE=9E=E7=8E=B0?= =?UTF-8?q?=E6=96=B0=E7=9A=84=E5=BA=94=E7=94=A8=E5=9B=BE=E6=A0=87=E8=8E=B7?= =?UTF-8?q?=E5=8F=96=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../io/github/suqi8/opatch/Main_Function.kt | 40 ++++++++++++------- .../java/io/github/suqi8/opatch/apkinfo.kt | 9 +++++ 2 files changed, 35 insertions(+), 14 deletions(-) create mode 100644 app/src/main/java/io/github/suqi8/opatch/apkinfo.kt diff --git a/app/src/main/java/io/github/suqi8/opatch/Main_Function.kt b/app/src/main/java/io/github/suqi8/opatch/Main_Function.kt index 65c59f38..612d1d01 100644 --- a/app/src/main/java/io/github/suqi8/opatch/Main_Function.kt +++ b/app/src/main/java/io/github/suqi8/opatch/Main_Function.kt @@ -1,21 +1,33 @@ package io.github.suqi8.opatch -import android.os.Bundle -import androidx.activity.ComponentActivity -import androidx.activity.compose.setContent -import androidx.activity.enableEdgeToEdge -import androidx.compose.foundation.layout.fillMaxSize -import androidx.compose.foundation.layout.padding -import androidx.compose.material3.Scaffold -import androidx.compose.material3.Text +import android.content.pm.PackageManager +import android.graphics.drawable.Drawable +import androidx.compose.foundation.layout.Column import androidx.compose.runtime.Composable -import androidx.compose.ui.Modifier -import androidx.compose.ui.tooling.preview.Preview -import io.github.suqi8.opatch.ui.theme.OPatchTheme + @Composable fun Main_Function() { - Text( - text = "Hello0" - ) + Column { + + } +} + +private fun getIcon(pakgename: String): Drawable? { + val pm: PackageManager = getPackageManager() + try { + appInfo = pm.getApplicationInfo(pakgename, PackageManager.GET_META_DATA) + + // +// +// 应用名称 +// pm.getApplicationLabel(appInfo) + +//应用图标 + appIcon = pm.getApplicationIcon(appInfo) + return appIcon + } catch (e: PackageManager.NameNotFoundException) { + e.printStackTrace() + } + return null } diff --git a/app/src/main/java/io/github/suqi8/opatch/apkinfo.kt b/app/src/main/java/io/github/suqi8/opatch/apkinfo.kt new file mode 100644 index 00000000..8504e2a9 --- /dev/null +++ b/app/src/main/java/io/github/suqi8/opatch/apkinfo.kt @@ -0,0 +1,9 @@ +package io.github.suqi8.opatch + +import android.content.Context +import android.content.pm.PackageManager + + +class apkinfo { + +} From fe1d1d858dfe069eefe72e68699b219fb78813da Mon Sep 17 00:00:00 2001 From: suqi8 <3383787570@qq.com> Date: Mon, 24 Jun 2024 15:20:56 +0800 Subject: [PATCH 038/875] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20AndroidManifest.xm?= =?UTF-8?q?l=20=E4=BB=A5=E6=B7=BB=E5=8A=A0=E6=96=B0=E7=9A=84=E6=9D=83?= =?UTF-8?q?=E9=99=90=E5=A3=B0=E6=98=8E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/main/AndroidManifest.xml | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 14532482..d72f87a3 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -2,6 +2,25 @@ + + + + + + + + + + + + + + + + + + Date: Mon, 24 Jun 2024 15:24:21 +0800 Subject: [PATCH 039/875] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20Main=5FHome.kt=20?= =?UTF-8?q?=E5=92=8C=20Main=5FFunction.kt=20=E4=BB=A5=E5=AE=9E=E7=8E=B0?= =?UTF-8?q?=E6=96=B0=E7=9A=84=E5=BA=94=E7=94=A8=E5=9B=BE=E6=A0=87=E8=8E=B7?= =?UTF-8?q?=E5=8F=96=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../io/github/suqi8/opatch/Main_Function.kt | 18 ---------- .../java/io/github/suqi8/opatch/Main_Home.kt | 36 ++++++++++++++++++- 2 files changed, 35 insertions(+), 19 deletions(-) diff --git a/app/src/main/java/io/github/suqi8/opatch/Main_Function.kt b/app/src/main/java/io/github/suqi8/opatch/Main_Function.kt index 612d1d01..23d8aa05 100644 --- a/app/src/main/java/io/github/suqi8/opatch/Main_Function.kt +++ b/app/src/main/java/io/github/suqi8/opatch/Main_Function.kt @@ -13,21 +13,3 @@ fun Main_Function() { } } -private fun getIcon(pakgename: String): Drawable? { - val pm: PackageManager = getPackageManager() - try { - appInfo = pm.getApplicationInfo(pakgename, PackageManager.GET_META_DATA) - - // -// -// 应用名称 -// pm.getApplicationLabel(appInfo) - -//应用图标 - appIcon = pm.getApplicationIcon(appInfo) - return appIcon - } catch (e: PackageManager.NameNotFoundException) { - e.printStackTrace() - } - return null -} diff --git a/app/src/main/java/io/github/suqi8/opatch/Main_Home.kt b/app/src/main/java/io/github/suqi8/opatch/Main_Home.kt index 7881f67b..931d03cd 100644 --- a/app/src/main/java/io/github/suqi8/opatch/Main_Home.kt +++ b/app/src/main/java/io/github/suqi8/opatch/Main_Home.kt @@ -1,5 +1,6 @@ package io.github.suqi8.opatch +import android.content.pm.PackageManager import android.os.Build import androidx.compose.foundation.Image import androidx.compose.foundation.background @@ -22,9 +23,15 @@ import androidx.compose.runtime.Composable import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.graphics.Color +import androidx.compose.ui.graphics.asImageBitmap +import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.res.painterResource import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp +import androidx.core.app.ActivityCompat.requestPermissions +import androidx.core.content.PermissionChecker +import androidx.core.content.PermissionChecker.checkSelfPermission +import androidx.core.graphics.drawable.toBitmap import com.highcapable.yukihookapi.YukiHookAPI import com.highcapable.yukihookapi.hook.param.PackageParam @@ -48,7 +55,8 @@ fun Main_Home() { } } } - OutlinedCard(modifier = Modifier.padding(start = 20.dp, top = 20.dp, end = 20.dp ,bottom = 20.dp) + OutlinedCard(modifier = Modifier + .padding(start = 20.dp, top = 20.dp, end = 20.dp, bottom = 20.dp) .fillMaxWidth()) { Column(modifier = Modifier.padding(start = 30.dp, end = 30.dp, top = 30.dp, bottom = 30.dp)) { Text(text = "SOC 型号") @@ -79,5 +87,31 @@ fun Main_Home() { Text(text = Build.FINGERPRINT, fontSize = 13.sp, color = Color.Gray) } } + AppIconAndName(packageName = "android") + } +} + +@Composable +fun AppIconAndName(packageName: String) { + val context = LocalContext.current + val packageManager = context.packageManager + val applicationInfo = try { + packageManager.getApplicationInfo(packageName, 0) + } catch (e: PackageManager.NameNotFoundException) { + null + } + + applicationInfo?.let { + val icon = it.loadIcon(packageManager) + val appName = packageManager.getApplicationLabel(it).toString() + + Column { + Image( + bitmap = icon.toBitmap().asImageBitmap(), + contentDescription = "App Icon", + modifier = Modifier.size(48.dp) + ) + Text(text = appName) + } } } From 3ef5c90c33d3934f12c1091e03c0dd479633a868 Mon Sep 17 00:00:00 2001 From: suqi8 <3383787570@qq.com> Date: Mon, 24 Jun 2024 21:22:32 +0800 Subject: [PATCH 040/875] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20app/src/main/java/?= =?UTF-8?q?io/github/suqi8/opatch/apkinfo.kt=20=E4=BB=A5=E5=88=A0=E9=99=A4?= =?UTF-8?q?=E6=97=A0=E7=94=A8=E7=B1=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/main/java/io/github/suqi8/opatch/apkinfo.kt | 9 --------- 1 file changed, 9 deletions(-) delete mode 100644 app/src/main/java/io/github/suqi8/opatch/apkinfo.kt diff --git a/app/src/main/java/io/github/suqi8/opatch/apkinfo.kt b/app/src/main/java/io/github/suqi8/opatch/apkinfo.kt deleted file mode 100644 index 8504e2a9..00000000 --- a/app/src/main/java/io/github/suqi8/opatch/apkinfo.kt +++ /dev/null @@ -1,9 +0,0 @@ -package io.github.suqi8.opatch - -import android.content.Context -import android.content.pm.PackageManager - - -class apkinfo { - -} From 0a7b3452eee5f675246e65f06fca0b683fbac0fc Mon Sep 17 00:00:00 2001 From: suqi8 <3383787570@qq.com> Date: Mon, 24 Jun 2024 21:23:43 +0800 Subject: [PATCH 041/875] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20Main=5FHome.kt=20?= =?UTF-8?q?=E5=92=8C=20Main=5FFunction.kt=20=E4=BB=A5=E5=AE=9E=E7=8E=B0?= =?UTF-8?q?=E6=96=B0=E7=9A=84=E5=BA=94=E7=94=A8=E5=9B=BE=E6=A0=87=E8=8E=B7?= =?UTF-8?q?=E5=8F=96=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../io/github/suqi8/opatch/Main_Function.kt | 18 +++++++++- .../java/io/github/suqi8/opatch/Main_Home.kt | 34 +++++++++---------- 2 files changed, 34 insertions(+), 18 deletions(-) diff --git a/app/src/main/java/io/github/suqi8/opatch/Main_Function.kt b/app/src/main/java/io/github/suqi8/opatch/Main_Function.kt index 23d8aa05..b701a5b6 100644 --- a/app/src/main/java/io/github/suqi8/opatch/Main_Function.kt +++ b/app/src/main/java/io/github/suqi8/opatch/Main_Function.kt @@ -2,14 +2,30 @@ package io.github.suqi8.opatch import android.content.pm.PackageManager import android.graphics.drawable.Drawable +import androidx.compose.foundation.Image +import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.Row +import androidx.compose.foundation.layout.padding +import androidx.compose.material3.Text import androidx.compose.runtime.Composable +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier +import androidx.compose.ui.unit.dp @Composable fun Main_Function() { Column { - + GetAppIconAndName(packageName = "android") { appName, icon -> + Row(modifier = Modifier.padding(16.dp),verticalAlignment = Alignment.CenterVertically) { + Image(bitmap = icon, contentDescription = "App Icon") + Column(verticalArrangement = Arrangement.Center, modifier = Modifier.padding(start = 16.dp)) { + Text(text = appName) + Text(text = "Package Name: android") + } + } + } } } diff --git a/app/src/main/java/io/github/suqi8/opatch/Main_Home.kt b/app/src/main/java/io/github/suqi8/opatch/Main_Home.kt index 931d03cd..21e55366 100644 --- a/app/src/main/java/io/github/suqi8/opatch/Main_Home.kt +++ b/app/src/main/java/io/github/suqi8/opatch/Main_Home.kt @@ -20,9 +20,13 @@ import androidx.compose.material3.MaterialTheme import androidx.compose.material3.OutlinedCard import androidx.compose.material3.Text import androidx.compose.runtime.Composable +import androidx.compose.runtime.LaunchedEffect +import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.remember import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.graphics.Color +import androidx.compose.ui.graphics.ImageBitmap import androidx.compose.ui.graphics.asImageBitmap import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.res.painterResource @@ -87,31 +91,27 @@ fun Main_Home() { Text(text = Build.FINGERPRINT, fontSize = 13.sp, color = Color.Gray) } } - AppIconAndName(packageName = "android") } } @Composable -fun AppIconAndName(packageName: String) { +fun GetAppIconAndName(packageName: String, onAppInfoLoaded: @Composable (String, ImageBitmap) -> Unit) { val context = LocalContext.current val packageManager = context.packageManager - val applicationInfo = try { - packageManager.getApplicationInfo(packageName, 0) - } catch (e: PackageManager.NameNotFoundException) { - null + val applicationInfo = remember { mutableStateOf(null) } + + LaunchedEffect(packageName) { + try { + applicationInfo.value = packageManager.getApplicationInfo(packageName, 0) + } catch (e: PackageManager.NameNotFoundException) { + // 应用未找到，可以处理异常情况 + } } - applicationInfo?.let { - val icon = it.loadIcon(packageManager) - val appName = packageManager.getApplicationLabel(it).toString() + applicationInfo.value?.let { info -> + val icon = info.loadIcon(packageManager) + val appName = packageManager.getApplicationLabel(info).toString() - Column { - Image( - bitmap = icon.toBitmap().asImageBitmap(), - contentDescription = "App Icon", - modifier = Modifier.size(48.dp) - ) - Text(text = appName) - } + onAppInfoLoaded(appName, icon.toBitmap().asImageBitmap()) } } From 42227a1403e15cfbb72e0d219ea5a431d1ed87de Mon Sep 17 00:00:00 2001 From: suqi8 <3383787570@qq.com> Date: Mon, 24 Jun 2024 21:23:49 +0800 Subject: [PATCH 042/875] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20.idea/inspectionPr?= =?UTF-8?q?ofiles/Project=5FDefault.xml=20=E4=BB=A5=E9=85=8D=E7=BD=AE?= =?UTF-8?q?=E6=96=B0=E7=9A=84=E4=BB=A3=E7=A0=81=E6=A3=80=E6=9F=A5=E5=B7=A5?= =?UTF-8?q?=E5=85=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .idea/inspectionProfiles/Project_Default.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml index eb41648b..bee1f194 100644 --- a/.idea/inspectionProfiles/Project_Default.xml +++ b/.idea/inspectionProfiles/Project_Default.xml @@ -1,6 +1,7 @@

+ + + + + + diff --git a/app/src/main/res/menu/bottom_bar.xml b/app/src/main/res/menu/bottom_bar.xml new file mode 100644 index 00000000..fd29a4e2 --- /dev/null +++ b/app/src/main/res/menu/bottom_bar.xml @@ -0,0 +1,21 @@ + + + + + + + + From 8ce0cc1695d820f11a468d8ffb604769a82082fa Mon Sep 17 00:00:00 2001 From: suqi8 <3383787570@qq.com> Date: Wed, 2 Oct 2024 12:53:50 +0800 Subject: [PATCH 072/875] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20build.gradle.kts?= =?UTF-8?q?=20=E6=96=87=E4=BB=B6=EF=BC=8C=E4=BC=98=E5=8C=96=E5=BA=94?= =?UTF-8?q?=E7=94=A8=E5=8A=9F=E8=83=BD=E5=92=8C=E6=80=A7=E8=83=BD=EF=BC=8C?= =?UTF-8?q?=E6=8F=90=E5=8D=87=E7=94=A8=E6=88=B7=E4=BD=93=E9=AA=8C=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/build.gradle.kts | 18 +++++++++++++----- build.gradle.kts | 1 + 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 35d2d030..bdb55f46 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -10,7 +10,7 @@ android { defaultConfig { applicationId = property.project.app.packageName - minSdk = property.project.android.minSdk + minSdkVersion(rootProject.extra["defaultMinSdkVersion"] as Int) targetSdk = property.project.android.targetSdk versionName = property.project.app.versionName versionCode = property.project.app.versionCode @@ -54,10 +54,6 @@ android { excludes += "/META-INF/{AL2.0,LGPL2.1}" } } - namespace = "io.github.suqi8.opatch" - buildFeatures { - buildConfig = true - } // TODO Please visit https://highcapable.github.io/YukiHookAPI/en/api/special-features/host-inject // TODO 请参考 https://highcapable.github.io/YukiHookAPI/zh-cn/api/special-features/host-inject @@ -65,6 +61,17 @@ android { } dependencies { + // https://mvnrepository.com/artifact/dev.chrisbanes.haze/haze-jetpack-compose + implementation("dev.chrisbanes.haze:haze:0.9.0-beta01") + implementation(libs.androidx.datastore.core.android) + implementation(libs.androidx.datastore.preferences.core.jvm) + // https://mvnrepository.com/artifact/androidx.datastore/datastore-preferences + implementation("androidx.datastore:datastore-preferences:1.1.1") + implementation("top.yukonga.miuix.kmp:miuix:0.2.2") + implementation("com.google.code.gson:gson:2.11.0") + implementation("com.valentinilk.shimmer:compose-shimmer:1.3.0") + implementation("com.github.st235:expandablebottombar:1.5.3") + implementation("me.nikhilchaudhari:composeNeumorphism:1.0.0-alpha02") implementation("androidx.navigation:navigation-compose:2.7.7") implementation("androidx.lifecycle:lifecycle-runtime-ktx:2.8.2") implementation("androidx.activity:activity-compose:1.9.0") @@ -74,6 +81,7 @@ dependencies { implementation("androidx.compose.ui:ui-tooling-preview") implementation("androidx.compose.material3:material3") implementation("androidx.navigation:navigation-runtime-ktx:2.7.7") + implementation(libs.firebase.crashlytics.buildtools) androidTestImplementation(platform("androidx.compose:compose-bom:2024.06.00")) androidTestImplementation("androidx.compose.ui:ui-test-junit4") compileOnly(de.robv.android.xposed.api) diff --git a/build.gradle.kts b/build.gradle.kts index 2e002480..015bfc5b 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -3,3 +3,4 @@ plugins { autowire(libs.plugins.kotlin.android) apply false autowire(libs.plugins.kotlin.ksp) apply false } +val defaultMinSdkVersion by extra(31) From 88d12ea80b4678f9dc6ac369ba21a9ba3839e288 Mon Sep 17 00:00:00 2001 From: suqi8 <3383787570@qq.com> Date: Wed, 2 Oct 2024 12:54:00 +0800 Subject: [PATCH 073/875] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20.idea/deploymentTa?= =?UTF-8?q?rgetSelector.xml=20=E5=92=8C=20color.xml=20=E6=96=87=E4=BB=B6?= =?UTF-8?q?=EF=BC=8C=E4=BC=98=E5=8C=96=E8=AE=BE=E5=A4=87=E9=80=89=E6=8B=A9?= =?UTF-8?q?=E5=92=8C=E9=A2=9C=E8=89=B2=E9=85=8D=E7=BD=AE=EF=BC=8C=E5=A2=9E?= =?UTF-8?q?=E5=BC=BA=E4=BB=A3=E7=A0=81=E5=81=A5=E5=A3=AE=E6=80=A7=EF=BC=8C?= =?UTF-8?q?=E6=8F=90=E5=8D=87=E7=94=A8=E6=88=B7=E4=BD=93=E9=AA=8C=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .idea/deploymentTargetSelector.xml | 4 ++-- app/src/main/res/values/color.xml | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.idea/deploymentTargetSelector.xml b/.idea/deploymentTargetSelector.xml index 83115409..a24403f4 100644 --- a/.idea/deploymentTargetSelector.xml +++ b/.idea/deploymentTargetSelector.xml @@ -4,10 +4,10 @@ + + \ No newline at end of file From a073324f7eff165eef2fc4fd8bad6cb4ec6cefad Mon Sep 17 00:00:00 2001 From: suqi8 <3383787570@qq.com> Date: Thu, 3 Oct 2024 13:23:52 +0800 Subject: [PATCH 103/875] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20Main=5FAbout.kt=20?= =?UTF-8?q?=E6=96=87=E4=BB=B6=EF=BC=8C=E4=BC=98=E5=8C=96=E5=BA=94=E7=94=A8?= =?UTF-8?q?=E5=8A=9F=E8=83=BD=E5=92=8C=E7=94=A8=E6=88=B7=E4=BD=93=E9=AA=8C?= =?UTF-8?q?=EF=BC=8C=E5=A2=9E=E5=BC=BA=E4=BB=A3=E7=A0=81=E5=81=A5=E5=A3=AE?= =?UTF-8?q?=E6=80=A7=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/io/github/suqi8/opatch/Main_About.kt | 24 +++++++++++++++++- .../drawable/qq_pic_merged_1727926207595.jpg | Bin 0 -> 42528 bytes 2 files changed, 23 insertions(+), 1 deletion(-) create mode 100644 app/src/main/res/drawable/qq_pic_merged_1727926207595.jpg diff --git a/app/src/main/java/io/github/suqi8/opatch/Main_About.kt b/app/src/main/java/io/github/suqi8/opatch/Main_About.kt index 7fbfa148..0eceeee7 100644 --- a/app/src/main/java/io/github/suqi8/opatch/Main_About.kt +++ b/app/src/main/java/io/github/suqi8/opatch/Main_About.kt @@ -69,6 +69,7 @@ import java.lang.reflect.Method import java.time.Instant import java.time.ZoneId import java.time.format.DateTimeFormatter +import android.content.ActivityNotFoundException @SuppressLint("UnusedMaterial3ScaffoldPaddingParameter") @Composable @@ -162,7 +163,7 @@ fun Main_About(topAppBarScrollBehavior: ScrollBehavior, padding: PaddingValues, } } } - SmallTitle(text = showDeviceNameDialog.value.toString()) + SmallTitle(text = "软件设置") Card(modifier = Modifier.fillMaxWidth() .padding(horizontal = 12.dp) .padding(bottom = 6.dp)) { @@ -183,6 +184,27 @@ fun Main_About(topAppBarScrollBehavior: ScrollBehavior, padding: PaddingValues, } ) } + SmallTitle(text = "题外话") + Card(modifier = Modifier.fillMaxWidth() + .padding(horizontal = 12.dp) + .padding(bottom = 6.dp)) { + Card(Modifier.padding(10.dp)) { + Image(painter = painterResource(R.drawable.qq_pic_merged_1727926207595), contentDescription = null, modifier = Modifier.fillMaxWidth()) + } + SuperArrow(title = "前往他的主页", onClick = { + val coolApkUri = Uri.parse("coolmarket://u/894238") + val intent = Intent(Intent.ACTION_VIEW, coolApkUri) + + try { + // 尝试启动酷安应用 + context.startActivity(intent) + } catch (e: ActivityNotFoundException) { + // 如果酷安未安装，则提示用户 + Toast.makeText(context, "请先安装酷安应用", Toast.LENGTH_SHORT).show() + } + }) + } + SmallTitle(text = stringResource(R.string.about)) Card(modifier = Modifier.fillMaxWidth() .padding(horizontal = 12.dp) .padding(bottom = 6.dp)) { diff --git a/app/src/main/res/drawable/qq_pic_merged_1727926207595.jpg b/app/src/main/res/drawable/qq_pic_merged_1727926207595.jpg new file mode 100644 index 0000000000000000000000000000000000000000..63197153f5566acf8e71fe8fb92e65a1e2bb6e94 GIT binary patch literal 42528 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�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 Date: Thu, 3 Oct 2024 13:24:02 +0800 Subject: [PATCH 104/875] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20gradle/sweet-depen?= =?UTF-8?q?dency/sweet-dependency-config.yaml=20=E6=96=87=E4=BB=B6?= =?UTF-8?q?=EF=BC=8C=E4=BC=98=E5=8C=96=E5=BA=94=E7=94=A8=E4=BE=9D=E8=B5=96?= =?UTF-8?q?=E5=92=8C=E5=BA=93=E7=89=88=E6=9C=AC=EF=BC=8C=E5=A2=9E=E5=BC=BA?= =?UTF-8?q?=E4=BB=A3=E7=A0=81=E5=81=A5=E5=A3=AE=E6=80=A7=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gradle/sweet-dependency/sweet-dependency-config.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/gradle/sweet-dependency/sweet-dependency-config.yaml b/gradle/sweet-dependency/sweet-dependency-config.yaml index d0ef6c33..af34d173 100644 --- a/gradle/sweet-dependency/sweet-dependency-config.yaml +++ b/gradle/sweet-dependency/sweet-dependency-config.yaml @@ -23,10 +23,10 @@ plugins: version: 8.5.0 org.jetbrains.kotlin.android: alias: kotlin-android - version: 1.9.24 + version: 2.0.20 com.google.devtools.ksp: alias: kotlin-ksp - version: 1.9.24-1.0.20 + version: 2.0.20-1.0.25 libraries: de.robv.android.xposed: @@ -36,7 +36,7 @@ libraries: rovo89-xposed-api com.highcapable.yukihookapi: api: - version: 1.2.0 + version: 1.2.1 ksp-xposed: version-ref: ::api com.github.duanhong169: @@ -62,4 +62,4 @@ libraries: version: 3.5.1 junit: junit: - version: 4.13.2 \ No newline at end of file + version: 4.13.2 From e18522822826f79e8fc655dce5a9c291c2f2d644 Mon Sep 17 00:00:00 2001 From: suqi8 <3383787570@qq.com> Date: Thu, 3 Oct 2024 13:24:08 +0800 Subject: [PATCH 105/875] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20version.properties?= =?UTF-8?q?=20=E6=96=87=E4=BB=B6=EF=BC=8C=E4=BC=98=E5=8C=96=E5=BA=94?= =?UTF-8?q?=E7=94=A8=E5=8A=9F=E8=83=BD=E5=92=8C=E7=94=A8=E6=88=B7=E4=BD=93?= =?UTF-8?q?=E9=AA=8C=EF=BC=8C=E5=A2=9E=E5=BC=BA=E4=BB=A3=E7=A0=81=E5=81=A5?= =?UTF-8?q?=E5=A3=AE=E6=80=A7=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/version.properties | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/version.properties b/app/version.properties index 48b9316f..b8427b9c 100644 --- a/app/version.properties +++ b/app/version.properties @@ -1,2 +1,2 @@ -#Wed Oct 02 22:41:28 CST 2024 -BUILD_NUMBER=616 +#Thu Oct 03 13:21:21 CST 2024 +BUILD_NUMBER=638 From b662d2bd6144175ea1bb9df6f95fde3dd0087d93 Mon Sep 17 00:00:00 2001 From: suqi8 <3383787570@qq.com> Date: Thu, 3 Oct 2024 22:45:08 +0800 Subject: [PATCH 106/875] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20AnimTools.kt=20?= =?UTF-8?q?=E6=96=87=E4=BB=B6=EF=BC=8C=E4=BC=98=E5=8C=96=E5=BA=94=E7=94=A8?= =?UTF-8?q?=E5=8A=9F=E8=83=BD=E5=92=8C=E7=94=A8=E6=88=B7=E4=BD=93=E9=AA=8C?= =?UTF-8?q?=EF=BC=8C=E5=A2=9E=E5=BC=BA=E4=BB=A3=E7=A0=81=E5=81=A5=E5=A3=AE?= =?UTF-8?q?=E6=80=A7=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../io/github/suqi8/opatch/tools/AnimTools.kt | 22 +++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 app/src/main/java/io/github/suqi8/opatch/tools/AnimTools.kt diff --git a/app/src/main/java/io/github/suqi8/opatch/tools/AnimTools.kt b/app/src/main/java/io/github/suqi8/opatch/tools/AnimTools.kt new file mode 100644 index 00000000..3a0fa3a6 --- /dev/null +++ b/app/src/main/java/io/github/suqi8/opatch/tools/AnimTools.kt @@ -0,0 +1,22 @@ +package io.github.suqi8.opatch.tools + +import androidx.compose.animation.EnterTransition +import androidx.compose.animation.ExitTransition +import androidx.compose.animation.core.CubicBezierEasing +import androidx.compose.animation.core.tween +import androidx.compose.animation.fadeIn +import androidx.compose.animation.fadeOut +import androidx.compose.animation.scaleIn +import androidx.compose.animation.scaleOut + +class AnimTools { + fun enterTransition(delayMillis: Int = 0): EnterTransition { + val easing = CubicBezierEasing(0.36f, 1.44f, 0.48f, 1f) + return fadeIn(animationSpec = tween(400, delayMillis, easing)) + scaleIn(initialScale = 0.95f, animationSpec = tween(400, delayMillis, easing)) + } + + fun exitTransition(delayMillis: Int = 0): ExitTransition { + val easing = CubicBezierEasing(0.36f, 1.44f, 0.48f, 1f) + return fadeOut(animationSpec = tween(300, delayMillis, easing)) + scaleOut(targetScale = 0.95f, animationSpec = tween(300, delayMillis, easing)) + } +} From 4003b0be16971a349b2620fd171de70e2634ec66 Mon Sep 17 00:00:00 2001 From: suqi8 <3383787570@qq.com> Date: Thu, 3 Oct 2024 22:45:39 +0800 Subject: [PATCH 107/875] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20res/values/array.x?= =?UTF-8?q?ml=20=E6=96=87=E4=BB=B6=EF=BC=8C=E4=BC=98=E5=8C=96=E5=BA=94?= =?UTF-8?q?=E7=94=A8=E5=8A=9F=E8=83=BD=E5=92=8C=E7=94=A8=E6=88=B7=E4=BD=93?= =?UTF-8?q?=E9=AA=8C=EF=BC=8C=E5=A2=9E=E5=BC=BA=E4=BB=A3=E7=A0=81=E5=81=A5?= =?UTF-8?q?=E5=A3=AE=E6=80=A7=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/main/res/values/array.xml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/app/src/main/res/values/array.xml b/app/src/main/res/values/array.xml index d9780391..b19ab60f 100644 --- a/app/src/main/res/values/array.xml +++ b/app/src/main/res/values/array.xml @@ -2,5 +2,7 @@ android + com.android.settings + com.android.systemui - \ No newline at end of file + From 93b1eff47a5df7dc03c7f3b19b1d3d786efbc051 Mon Sep 17 00:00:00 2001 From: suqi8 <3383787570@qq.com> Date: Thu, 3 Oct 2024 22:45:46 +0800 Subject: [PATCH 108/875] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20Fun=5Fandroid.kt?= =?UTF-8?q?=20=E6=96=87=E4=BB=B6=EF=BC=8C=E4=BC=98=E5=8C=96=E5=BA=94?= =?UTF-8?q?=E7=94=A8=E7=95=8C=E9=9D=A2=E5=B8=83=E5=B1=80=EF=BC=8C=E5=A2=9E?= =?UTF-8?q?=E5=BC=BA=E7=94=A8=E6=88=B7=E4=BD=93=E9=AA=8C=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/main/java/io/github/suqi8/opatch/Fun_android.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/java/io/github/suqi8/opatch/Fun_android.kt b/app/src/main/java/io/github/suqi8/opatch/Fun_android.kt index 5b5f5564..3e6a6942 100644 --- a/app/src/main/java/io/github/suqi8/opatch/Fun_android.kt +++ b/app/src/main/java/io/github/suqi8/opatch/Fun_android.kt @@ -93,7 +93,7 @@ fun Fun_android(navController: NavController) { Card( modifier = Modifier.fillMaxWidth() .padding(horizontal = 12.dp) - .padding(bottom = 6.dp) + .padding(bottom = 6.dp,top = 15.dp) ) { SuperArrow(title = stringResource(id = R.string.package_manager_services), onClick = { From d8694b66e4469b046a485dc89befb54b48e89dac Mon Sep 17 00:00:00 2001 From: suqi8 <3383787570@qq.com> Date: Thu, 3 Oct 2024 22:45:54 +0800 Subject: [PATCH 109/875] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20Fun=5Fcom=5Fandroi?= =?UTF-8?q?d=5Fsystemui.kt=20=E6=96=87=E4=BB=B6=EF=BC=8C=E4=BC=98=E5=8C=96?= =?UTF-8?q?=E5=BA=94=E7=94=A8=E5=8A=9F=E8=83=BD=E5=92=8C=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E4=BD=93=E9=AA=8C=EF=BC=8C=E5=A2=9E=E5=BC=BA=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=E5=81=A5=E5=A3=AE=E6=80=A7=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../suqi8/opatch/Fun_com_android_systemui.kt | 81 +++++++++++++++++++ 1 file changed, 81 insertions(+) create mode 100644 app/src/main/java/io/github/suqi8/opatch/Fun_com_android_systemui.kt diff --git a/app/src/main/java/io/github/suqi8/opatch/Fun_com_android_systemui.kt b/app/src/main/java/io/github/suqi8/opatch/Fun_com_android_systemui.kt new file mode 100644 index 00000000..ec49589b --- /dev/null +++ b/app/src/main/java/io/github/suqi8/opatch/Fun_com_android_systemui.kt @@ -0,0 +1,81 @@ +package io.github.suqi8.opatch + +import androidx.compose.foundation.background +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.PaddingValues +import androidx.compose.foundation.layout.WindowInsets +import androidx.compose.foundation.layout.WindowInsetsSides +import androidx.compose.foundation.layout.displayCutout +import androidx.compose.foundation.layout.fillMaxSize +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.navigationBars +import androidx.compose.foundation.layout.only +import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.layout.windowInsetsPadding +import androidx.compose.material.icons.Icons +import androidx.compose.material.icons.outlined.Refresh +import androidx.compose.material3.ExperimentalMaterial3Api +import androidx.compose.material3.Icon +import androidx.compose.material3.IconButton +import androidx.compose.runtime.Composable +import androidx.compose.runtime.getValue +import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.remember +import androidx.compose.runtime.setValue +import androidx.compose.ui.Modifier +import androidx.compose.ui.platform.LocalContext +import androidx.compose.ui.res.stringResource +import androidx.compose.ui.unit.dp +import androidx.navigation.NavController +import io.github.suqi8.opatch.application.RestartApp +import top.yukonga.miuix.kmp.basic.Card +import top.yukonga.miuix.kmp.basic.LazyColumn +import top.yukonga.miuix.kmp.basic.MiuixScrollBehavior +import top.yukonga.miuix.kmp.basic.Scaffold +import top.yukonga.miuix.kmp.basic.SmallTitle +import top.yukonga.miuix.kmp.basic.TopAppBar +import top.yukonga.miuix.kmp.extra.SuperArrow +import top.yukonga.miuix.kmp.extra.SuperSwitch +import top.yukonga.miuix.kmp.icon.MiuixIcons +import top.yukonga.miuix.kmp.icon.icons.ArrowBack +import top.yukonga.miuix.kmp.theme.MiuixTheme + +@Composable +fun Fun_com_android_systemui(navController: NavController) { + val context = LocalContext.current + val one = MiuixScrollBehavior(top.yukonga.miuix.kmp.basic.rememberTopAppBarState()) + Scaffold(topBar = { GetAppIconAndName(packageName = "com.android.systemui") { appName, icon -> + TopAppBar( + title = appName, + scrollBehavior = one, + navigationIcon = { + IconButton(onClick = { + navController.popBackStack() + }, + modifier = Modifier.padding(start = 18.dp)) { + Icon( + imageVector = MiuixIcons.ArrowBack, + contentDescription = null, + tint = MiuixTheme.colorScheme.onBackground + ) + } + }, + ) + } }) {padding -> + LazyColumn(contentPadding = PaddingValues(top = padding.calculateTopPadding()), + topAppBarScrollBehavior = one, modifier = Modifier.fillMaxSize()) { + item { + Card( + modifier = Modifier.fillMaxWidth() + .padding(horizontal = 12.dp) + .padding(bottom = 6.dp,top = 15.dp) + ) { + SuperArrow(title = stringResource(id = R.string.status_bar_clock), + onClick = { + navController.navigate("Fun_com_android_systemui_status_bar_clock") + }) + } + } + } + } +} From 7a5456df916104772321336f8f26ea1ab78cdb4e Mon Sep 17 00:00:00 2001 From: suqi8 <3383787570@qq.com> Date: Thu, 3 Oct 2024 22:46:04 +0800 Subject: [PATCH 110/875] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20Fun=5Fcom=5Fandroi?= =?UTF-8?q?d=5Fsystemui=5Fstatus=5Fbar=5Fclock.kt=20=E6=96=87=E4=BB=B6?= =?UTF-8?q?=EF=BC=8C=E4=BC=98=E5=8C=96=E5=BA=94=E7=94=A8=E5=8A=9F=E8=83=BD?= =?UTF-8?q?=E5=92=8C=E7=94=A8=E6=88=B7=E4=BD=93=E9=AA=8C=EF=BC=8C=E5=A2=9E?= =?UTF-8?q?=E5=BC=BA=E4=BB=A3=E7=A0=81=E5=81=A5=E5=A3=AE=E6=80=A7=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...n_com_android_systemui_status_bar_clock.kt | 308 ++++++++++++++++++ 1 file changed, 308 insertions(+) create mode 100644 app/src/main/java/io/github/suqi8/opatch/Fun_com_android_systemui_status_bar_clock.kt diff --git a/app/src/main/java/io/github/suqi8/opatch/Fun_com_android_systemui_status_bar_clock.kt b/app/src/main/java/io/github/suqi8/opatch/Fun_com_android_systemui_status_bar_clock.kt new file mode 100644 index 00000000..f96bd52e --- /dev/null +++ b/app/src/main/java/io/github/suqi8/opatch/Fun_com_android_systemui_status_bar_clock.kt @@ -0,0 +1,308 @@ +package io.github.suqi8.opatch + +import android.content.Context +import androidx.compose.animation.AnimatedVisibility +import androidx.compose.foundation.background +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.PaddingValues +import androidx.compose.foundation.layout.WindowInsets +import androidx.compose.foundation.layout.WindowInsetsSides +import androidx.compose.foundation.layout.displayCutout +import androidx.compose.foundation.layout.fillMaxSize +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.navigationBars +import androidx.compose.foundation.layout.only +import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.layout.windowInsetsPadding +import androidx.compose.material.icons.Icons +import androidx.compose.material.icons.outlined.Refresh +import androidx.compose.material3.Icon +import androidx.compose.material3.IconButton +import androidx.compose.runtime.Composable +import androidx.compose.runtime.LaunchedEffect +import androidx.compose.runtime.getValue +import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.remember +import androidx.compose.runtime.setValue +import androidx.compose.ui.Modifier +import androidx.compose.ui.graphics.Color +import androidx.compose.ui.platform.LocalContext +import androidx.compose.ui.res.stringResource +import androidx.compose.ui.unit.dp +import androidx.navigation.NavController +import com.highcapable.yukihookapi.hook.factory.prefs +import io.github.suqi8.opatch.application.RestartApp +import io.github.suqi8.opatch.tools.AnimTools +import kotlinx.coroutines.CoroutineScope +import kotlinx.coroutines.Dispatchers +import kotlinx.coroutines.launch +import top.yukonga.miuix.kmp.basic.BasicComponent +import top.yukonga.miuix.kmp.basic.Card +import top.yukonga.miuix.kmp.basic.LazyColumn +import top.yukonga.miuix.kmp.basic.MiuixScrollBehavior +import top.yukonga.miuix.kmp.basic.Scaffold +import top.yukonga.miuix.kmp.basic.Slider +import top.yukonga.miuix.kmp.basic.TopAppBar +import top.yukonga.miuix.kmp.extra.SuperArrow +import top.yukonga.miuix.kmp.extra.SuperDropdown +import top.yukonga.miuix.kmp.extra.SuperSwitch +import top.yukonga.miuix.kmp.icon.MiuixIcons +import top.yukonga.miuix.kmp.icon.icons.ArrowBack +import top.yukonga.miuix.kmp.theme.MiuixTheme + +@Composable +fun Fun_com_android_systemui_status_bar_clock(navController: NavController) { + val context = LocalContext.current + val topappbarzt = MiuixScrollBehavior(top.yukonga.miuix.kmp.basic.rememberTopAppBarState()) + val ClockStyle = listOf(stringResource(R.string.preset), + stringResource(R.string.geek)) + val ClockStyleSelectedOption = remember { mutableStateOf(0) } + val ShowYears = remember { mutableStateOf(false) } + val ShowMonth = remember { mutableStateOf(false) } + val ShowDay = remember { mutableStateOf(false) } + val ShowWeek = remember { mutableStateOf(false) } + val ShowCNHour = remember { mutableStateOf(false) } + val Showtime_period = remember { mutableStateOf(false) } + val ShowSeconds = remember { mutableStateOf(false) } + val HideSpace = remember { mutableStateOf(false) } + val DualRow = remember { mutableStateOf(false) } + var com_android_systemui_status_bar_clock by remember { + mutableStateOf(false) + } + var ClockSize by remember { mutableStateOf(0) } + + LaunchedEffect(Unit) { + ClockStyleSelectedOption.value = context.prefs("settings").getInt("ClockStyleSelectedOption") + com_android_systemui_status_bar_clock = context.prefs("settings").getBoolean("com_android_systemui_status_bar_clock") + ShowYears.value = context.prefs("settings").getBoolean("Status_Bar_Time_ShowYears") + ShowMonth.value = context.prefs("settings").getBoolean("Status_Bar_Time_ShowMonth") + ShowDay.value = context.prefs("settings").getBoolean("Status_Bar_Time_ShowDay") + ShowWeek.value = context.prefs("settings").getBoolean("Status_Bar_Time_ShowWeek") + ShowCNHour.value = context.prefs("settings").getBoolean("Status_Bar_Time_ShowCNHour") + Showtime_period.value = context.prefs("settings").getBoolean("Status_Bar_Time_Showtime_period") + ShowSeconds.value = context.prefs("settings").getBoolean("Status_Bar_Time_ShowSeconds") + HideSpace.value = context.prefs("settings").getBoolean("Status_Bar_Time_"+"HideSpace") + DualRow.value = context.prefs("settings").getBoolean("Status_Bar_Time_"+"DualRow") + ClockSize = context.prefs("settings").getInt("Status_Bar_Time_ClockSize") + } + Scaffold(topBar = { + TopAppBar( + scrollBehavior = topappbarzt, + title = stringResource(id = R.string.status_bar_clock), + navigationIcon = { + IconButton(onClick = { + navController.popBackStack() + }, + modifier = Modifier.padding(start = 18.dp)) { + Icon( + imageVector = MiuixIcons.ArrowBack, + contentDescription = null, + tint = MiuixTheme.colorScheme.onBackground + ) + } + }, + actions = { + // 如果你有其他操作按钮，这里可以添加 + IconButton(onClick = { + RestartApp(context,"com.tencent.mobileqq") + }, + modifier = Modifier.padding(end = 18.dp)) { + Icon( + imageVector = Icons.Outlined.Refresh, + contentDescription = null, + tint = MiuixTheme.colorScheme.onBackground + ) + } + } + ) + }) { padding -> + LazyColumn( + modifier = Modifier + .fillMaxSize() + .background(MiuixTheme.colorScheme.background) + .windowInsetsPadding(WindowInsets.displayCutout.only(WindowInsetsSides.Horizontal)) + .windowInsetsPadding(WindowInsets.navigationBars.only(WindowInsetsSides.Horizontal)), + contentPadding = PaddingValues(top = padding.calculateTopPadding()), + topAppBarScrollBehavior = topappbarzt + ) { + item { + Column { + Card( + modifier = Modifier.fillMaxWidth() + .padding(horizontal = 12.dp) + .padding(bottom = 6.dp,top = 15.dp) + ) { + SuperSwitch( + title = stringResource(R.string.status_bar_clock), + onCheckedChange = { + com_android_systemui_status_bar_clock = it + context.prefs("settings").edit { putBoolean("com_android_systemui_status_bar_clock", it) } + }, + checked = com_android_systemui_status_bar_clock + ) + } + AnimatedVisibility( + visible = !com_android_systemui_status_bar_clock + ) { + Column { + Card( + modifier = Modifier + .fillMaxWidth() + .padding(horizontal = 12.dp, vertical = 6.dp), + color = Color.Red.copy(alpha = 0.1f) + ) { + BasicComponent( + title = stringResource(R.string.no_start_func), + titleColor = Color.Red + ) + } + } + } + AnimatedVisibility( + visible = com_android_systemui_status_bar_clock, + enter = AnimTools().enterTransition(0), + exit = AnimTools().exitTransition(100) + ) { + Column { + Card( + modifier = Modifier + .fillMaxWidth() + .padding(horizontal = 12.dp, vertical = 6.dp) + ) { + SuperDropdown( + title = stringResource(R.string.clock_style), + items = ClockStyle, + selectedIndex = ClockStyleSelectedOption.value, + onSelectedIndexChange = { newOption -> + ClockStyleSelectedOption.value = newOption + CoroutineScope(Dispatchers.IO).launch { + context.prefs("settings").edit { putInt("ClockStyleSelectedOption", newOption) } + } + } + ) + Column { + SuperArrow(title = stringResource(R.string.clock_size), + summary = stringResource(R.string.clock_size_summary), + onClick = { + + }, rightText = "${ClockSize}dp") + Slider( + progress = (ClockSize/15.0).toFloat(), + onProgressChange = { newProgress -> ClockSize = (newProgress*15.0).toInt() + context.prefs("settings").edit { putInt("Status_Bar_Time_ClockSize", (newProgress*15.0).toInt()) } + }, + modifier = Modifier.padding(horizontal = 12.dp, vertical = 12.dp) + ) + } + } + } + } + AnimatedVisibility(visible = ClockStyleSelectedOption.value == 0 && com_android_systemui_status_bar_clock == true) { + Column { + Card( + modifier = Modifier + .fillMaxWidth() + .padding(horizontal = 12.dp, vertical = 6.dp) + ) { + SuperSwitch( + title = "显示年份", + checked = ShowYears.value, + onCheckedChange = { + ShowYears.value = it + CoroutineScope(Dispatchers.IO).launch { + context.prefs("settings").edit { putBoolean("Status_Bar_Time_ShowYears", it) } + } + } + ) + SuperSwitch( + title = "显示月份", + checked = ShowMonth.value, + onCheckedChange = { + ShowMonth.value = it + CoroutineScope(Dispatchers.IO).launch { + context.prefs("settings").edit { putBoolean("Status_Bar_Time_"+"ShowMonth", it) } + } + } + ) + SuperSwitch( + title = "显示日期", + checked = ShowDay.value, + onCheckedChange = { + ShowDay.value = it + CoroutineScope(Dispatchers.IO).launch { + context.prefs("settings").edit { putBoolean("Status_Bar_Time_"+"ShowDay", it) } + } + } + ) + SuperSwitch( + title = "显示星期", + checked = ShowWeek.value, + onCheckedChange = { + ShowWeek.value = it + CoroutineScope(Dispatchers.IO).launch { + context.prefs("settings").edit { putBoolean("Status_Bar_Time_"+"ShowWeek", it) } + } + } + ) + SuperSwitch( + title = "显示时辰", + checked = ShowCNHour.value, + onCheckedChange = { + ShowCNHour.value = it + CoroutineScope(Dispatchers.IO).launch { + context.prefs("settings").edit { putBoolean("Status_Bar_Time_"+"ShowCNHour", it) } + } + } + ) + SuperSwitch( + title = "显示时段", + checked = Showtime_period.value, + onCheckedChange = { + Showtime_period.value = it + CoroutineScope(Dispatchers.IO).launch { + context.prefs("settings").edit { putBoolean("Status_Bar_Time_"+"Showtime_period", it) } + } + } + ) + SuperSwitch( + title = "显示秒数", + checked = ShowSeconds.value, + onCheckedChange = { + ShowSeconds.value = it + CoroutineScope(Dispatchers.IO).launch { + context.prefs("settings").edit { putBoolean("Status_Bar_Time_"+"ShowSeconds", it) } + } + } + ) + SuperSwitch( + title = "隐藏间隔", + checked = HideSpace.value, + onCheckedChange = { + HideSpace.value = it + CoroutineScope(Dispatchers.IO).launch { + context.prefs("settings").edit { putBoolean("Status_Bar_Time_"+"HideSpace", it) } + } + } + ) + SuperSwitch( + title = "双排显示", + checked = DualRow.value, + onCheckedChange = { + DualRow.value = it + CoroutineScope(Dispatchers.IO).launch { + context.prefs("settings").edit { putBoolean("Status_Bar_Time_"+"DualRow", it) } + } + } + ) + } + } + } + AnimatedVisibility(visible = ClockStyleSelectedOption.value == 1 && com_android_systemui_status_bar_clock == true, + enter = AnimTools().enterTransition(0), + exit = AnimTools().exitTransition(100)) { } + } + } + } + } +} + From 0ad5d89e6a5de76f964acf6909dfa50ab2fb9d1c Mon Sep 17 00:00:00 2001 From: suqi8 <3383787570@qq.com> Date: Thu, 3 Oct 2024 22:46:24 +0800 Subject: [PATCH 111/875] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20HookEntry.kt=20?= =?UTF-8?q?=E6=96=87=E4=BB=B6=EF=BC=8C=E4=BC=98=E5=8C=96=E5=BA=94=E7=94=A8?= =?UTF-8?q?=E5=8A=9F=E8=83=BD=E5=92=8C=E7=94=A8=E6=88=B7=E4=BD=93=E9=AA=8C?= =?UTF-8?q?=EF=BC=8C=E5=A2=9E=E5=BC=BA=E4=BB=A3=E7=A0=81=E5=81=A5=E5=A3=AE?= =?UTF-8?q?=E6=80=A7=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../io/github/suqi8/opatch/hook/HookEntry.kt | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/io/github/suqi8/opatch/hook/HookEntry.kt b/app/src/main/java/io/github/suqi8/opatch/hook/HookEntry.kt index 472b9c50..37ea9090 100644 --- a/app/src/main/java/io/github/suqi8/opatch/hook/HookEntry.kt +++ b/app/src/main/java/io/github/suqi8/opatch/hook/HookEntry.kt @@ -3,7 +3,10 @@ package io.github.suqi8.opatch.hook import com.highcapable.yukihookapi.annotation.xposed.InjectYukiHookWithXposed import com.highcapable.yukihookapi.hook.factory.configs import com.highcapable.yukihookapi.hook.factory.encase +import com.highcapable.yukihookapi.hook.factory.method +import com.highcapable.yukihookapi.hook.type.java.StringClass import com.highcapable.yukihookapi.hook.xposed.proxy.IYukiHookXposedInit +import io.github.suqi8.opatch.hook.StatusBar.StatusBarClock @InjectYukiHookWithXposed(entryClassName = "opatch", isUsingResourcesHook = true) class HookEntry : IYukiHookXposedInit { @@ -14,5 +17,17 @@ class HookEntry : IYukiHookXposedInit { override fun onHook() = encase { // Your code here. + loadApp(name = "com.android.settings") { + "com.oplus.settings.feature.deviceinfo.controller.OplusDeviceModelPreferenceController".toClass().apply { + method{ + name = "getStatusText" + emptyParam() + returnType = StringClass + }.hook { + replaceTo("原神手机酸奶独家定制版"+prefs("settings").getBoolean("com_android_systemui_status_bar_clock").toString()) + } + } + } + loadApp(hooker = StatusBarClock()) } -} \ No newline at end of file +} From 5c05ace84380d0c29093e0328bc81a1cddd803da Mon Sep 17 00:00:00 2001 From: suqi8 <3383787570@qq.com> Date: Thu, 3 Oct 2024 22:46:31 +0800 Subject: [PATCH 112/875] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20.idea/kotlinc.xml?= =?UTF-8?q?=20=E6=96=87=E4=BB=B6=EF=BC=8C=E4=BC=98=E5=8C=96=20Kotlin=20?= =?UTF-8?q?=E6=8F=92=E4=BB=B6=E8=AE=BE=E7=BD=AE=EF=BC=8C=E5=A2=9E=E5=BC=BA?= =?UTF-8?q?=E4=BB=A3=E7=A0=81=E5=81=A5=E5=A3=AE=E6=80=A7=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .idea/kotlinc.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.idea/kotlinc.xml b/.idea/kotlinc.xml index 148fdd24..d4b7accb 100644 --- a/.idea/kotlinc.xml +++ b/.idea/kotlinc.xml @@ -1,6 +1,6 @@ - \ No newline at end of file From f1fc0c3c6f7eddbec63b6088022fc91752a2c91a Mon Sep 17 00:00:00 2001 From: suqi8 <3383787570@qq.com> Date: Thu, 3 Oct 2024 22:47:54 +0800 Subject: [PATCH 113/875] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20Main=5FFunction.kt?= =?UTF-8?q?=20=E6=96=87=E4=BB=B6=EF=BC=8C=E4=BC=98=E5=8C=96=E5=BA=94?= =?UTF-8?q?=E7=94=A8=E5=8A=9F=E8=83=BD=E5=92=8C=E7=94=A8=E6=88=B7=E4=BD=93?= =?UTF-8?q?=E9=AA=8C=EF=BC=8C=E5=A2=9E=E5=BC=BA=E4=BB=A3=E7=A0=81=E5=81=A5?= =?UTF-8?q?=E5=A3=AE=E6=80=A7=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../io/github/suqi8/opatch/Main_Function.kt | 27 +++++++++++-------- 1 file changed, 16 insertions(+), 11 deletions(-) diff --git a/app/src/main/java/io/github/suqi8/opatch/Main_Function.kt b/app/src/main/java/io/github/suqi8/opatch/Main_Function.kt index 4e61d732..aa9e35af 100644 --- a/app/src/main/java/io/github/suqi8/opatch/Main_Function.kt +++ b/app/src/main/java/io/github/suqi8/opatch/Main_Function.kt @@ -27,6 +27,7 @@ import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.graphics.BlendMode import androidx.compose.ui.graphics.BlendModeColorFilter +import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.res.stringResource import androidx.compose.ui.unit.dp import androidx.navigation.NavController @@ -49,6 +50,7 @@ fun Main_Function( navController: NavController, padding: PaddingValues ) { + val context = LocalContext.current val features = listOf( Feature(stringResource(R.string.downgr), stringResource(R.string.downgr_summary), "Fun_android_package_manager_services"), Feature(stringResource(R.string.authcreak), stringResource(R.string.authcreak_summary), "Fun_android_package_manager_services"), @@ -114,7 +116,7 @@ fun Main_Function( modifier = Modifier.fillMaxWidth() .padding(bottom = 6.dp, top = 6.dp) ) { - LazyColumn { + LazyColumn(topAppBarScrollBehavior = topAppBarScrollBehavior) { if (filteredFeatures.isEmpty()) { item { Box( @@ -156,19 +158,22 @@ fun Main_Function( // 如果 expanded 为 true，则显示搜索结果 } else { + // 如果 expanded 为 false，则显示 Card - Column(Modifier.fillMaxSize()) { - Card( - modifier = Modifier.fillMaxWidth() - .padding(horizontal = 12.dp) - .padding(bottom = 6.dp) - ) { - Column { - FunctionApp("android", "Fun_android", navController) - FunctionApp("com.android.systemui", "Fun_com_android_systemui", navController) + LazyColumn(Modifier.fillMaxSize(),topAppBarScrollBehavior = topAppBarScrollBehavior) { + item { + Card( + modifier = Modifier.fillMaxWidth() + .padding(horizontal = 12.dp) + .padding(bottom = 6.dp) + ) { + Column() { + FunctionApp("android", "Fun_android", navController) + FunctionApp("com.android.systemui", "Fun_com_android_systemui", navController) + } } + Spacer(Modifier.size(65.dp)) } - Spacer(Modifier.size(65.dp)) } } } From 33952abbef069531c243af4bcd2f70fdf9ce948d Mon Sep 17 00:00:00 2001 From: suqi8 <3383787570@qq.com> Date: Thu, 3 Oct 2024 22:48:04 +0800 Subject: [PATCH 114/875] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20MainActivity.kt=20?= =?UTF-8?q?=E6=96=87=E4=BB=B6=EF=BC=8C=E4=BC=98=E5=8C=96=E5=BA=94=E7=94=A8?= =?UTF-8?q?=E5=8A=9F=E8=83=BD=E5=92=8C=E7=94=A8=E6=88=B7=E4=BD=93=E9=AA=8C?= =?UTF-8?q?=EF=BC=8C=E5=A2=9E=E5=BC=BA=E4=BB=A3=E7=A0=81=E5=81=A5=E5=A3=AE?= =?UTF-8?q?=E6=80=A7=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../io/github/suqi8/opatch/MainActivity.kt | 20 +++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/app/src/main/java/io/github/suqi8/opatch/MainActivity.kt b/app/src/main/java/io/github/suqi8/opatch/MainActivity.kt index 32d5aa8a..1b740609 100644 --- a/app/src/main/java/io/github/suqi8/opatch/MainActivity.kt +++ b/app/src/main/java/io/github/suqi8/opatch/MainActivity.kt @@ -42,6 +42,7 @@ import androidx.datastore.core.DataStore import androidx.datastore.preferences.core.Preferences import androidx.datastore.preferences.core.edit import androidx.datastore.preferences.core.intPreferencesKey +import androidx.datastore.preferences.core.stringPreferencesKey import androidx.datastore.preferences.preferencesDataStore import androidx.navigation.NavController import androidx.navigation.compose.NavHost @@ -57,6 +58,7 @@ import kotlinx.coroutines.FlowPreview import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.collectLatest import kotlinx.coroutines.flow.debounce +import kotlinx.coroutines.flow.first import kotlinx.coroutines.flow.map import kotlinx.coroutines.launch import top.yukonga.miuix.kmp.basic.Box @@ -94,8 +96,11 @@ class MainActivity : ComponentActivity() { onDispose {} } + AppTheme(colorMode = colorMode.intValue) { Main0(colorMode = colorMode, context = context, modifier = Modifier) + val settingsManager = SettingsManager(context) + } } @@ -135,6 +140,8 @@ fun Main0(modifier: Modifier,context: Context,colorMode: MutableState = rem composable("Main") { Main1(modifier = modifier, context = context,navController,colorMode) } composable("Fun_android") { Fun_android(navController) } composable("Fun_android_package_manager_services") { Fun_android_package_manager_services(navController = navController)} + composable("Fun_com_android_systemui") { Fun_com_android_systemui(navController = navController)} + composable("Fun_com_android_systemui_status_bar_clock") { Fun_com_android_systemui_status_bar_clock(navController = navController) } } } } @@ -297,4 +304,17 @@ fun getColorMode(context: Context): Flow { } } +suspend fun saveSetting(context: Context, name: String, data: String) { + context.dataStore.edit { preferences -> + val KEY = stringPreferencesKey(name) + preferences[KEY] = data + } +} + +suspend fun getSetting(context: Context, name: String): String? { + val preferences = context.dataStore.data.first() + val KEY = stringPreferencesKey(name) + return preferences[KEY] +} + val Context.dataStore: DataStore by preferencesDataStore(name = "settings") From f63d2f9b58e029cd69229fa0c6e0f869a58b22ef Mon Sep 17 00:00:00 2001 From: suqi8 <3383787570@qq.com> Date: Thu, 3 Oct 2024 22:48:11 +0800 Subject: [PATCH 115/875] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20SettingsManager.kt?= =?UTF-8?q?=20=E6=96=87=E4=BB=B6=EF=BC=8C=E4=BC=98=E5=8C=96=E5=BA=94?= =?UTF-8?q?=E7=94=A8=E5=8A=9F=E8=83=BD=E5=92=8C=E7=94=A8=E6=88=B7=E4=BD=93?= =?UTF-8?q?=E9=AA=8C=EF=BC=8C=E5=A2=9E=E5=BC=BA=E4=BB=A3=E7=A0=81=E5=81=A5?= =?UTF-8?q?=E5=A3=AE=E6=80=A7=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../io/github/suqi8/opatch/SettingsManager.kt | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 app/src/main/java/io/github/suqi8/opatch/SettingsManager.kt diff --git a/app/src/main/java/io/github/suqi8/opatch/SettingsManager.kt b/app/src/main/java/io/github/suqi8/opatch/SettingsManager.kt new file mode 100644 index 00000000..ab936a9c --- /dev/null +++ b/app/src/main/java/io/github/suqi8/opatch/SettingsManager.kt @@ -0,0 +1,16 @@ +package io.github.suqi8.opatch + +import android.content.Context +import androidx.datastore.preferences.core.stringPreferencesKey +import kotlinx.coroutines.flow.first + +class SettingsManager(private val context: Context) { + + private val dataStore = context.dataStore // 初始化一次 + + suspend fun getSetting(name: String): String? { + val preferences = dataStore.data.first() + val KEY = stringPreferencesKey(name) + return preferences[KEY] + } +} From 2066fe75a9faa6341db0cbd01ad2e3aef11cc67c Mon Sep 17 00:00:00 2001 From: suqi8 <3383787570@qq.com> Date: Thu, 3 Oct 2024 23:05:30 +0800 Subject: [PATCH 116/875] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20StatusBarClock.kt?= =?UTF-8?q?=20=E6=96=87=E4=BB=B6=EF=BC=8C=E4=BC=98=E5=8C=96=E5=BA=94?= =?UTF-8?q?=E7=94=A8=E5=8A=9F=E8=83=BD=E5=92=8C=E7=94=A8=E6=88=B7=E4=BD=93?= =?UTF-8?q?=E9=AA=8C=EF=BC=8C=E5=A2=9E=E5=BC=BA=E4=BB=A3=E7=A0=81=E5=81=A5?= =?UTF-8?q?=E5=A3=AE=E6=80=A7=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../hook/appilcations/StatusBarClock.kt | 225 ++++++++++++++++++ 1 file changed, 225 insertions(+) create mode 100644 app/src/main/java/io/github/suqi8/opatch/hook/appilcations/StatusBarClock.kt diff --git a/app/src/main/java/io/github/suqi8/opatch/hook/appilcations/StatusBarClock.kt b/app/src/main/java/io/github/suqi8/opatch/hook/appilcations/StatusBarClock.kt new file mode 100644 index 00000000..5e2328cc --- /dev/null +++ b/app/src/main/java/io/github/suqi8/opatch/hook/appilcations/StatusBarClock.kt @@ -0,0 +1,225 @@ +package io.github.suqi8.opatch.hook.appilcations + +import android.annotation.SuppressLint +import android.content.Context +import android.os.Handler +import android.provider.Settings +import android.util.TypedValue +import android.view.Gravity +import android.widget.TextView +import com.highcapable.yukihookapi.hook.core.annotation.LegacyHookApi +import com.highcapable.yukihookapi.hook.entity.YukiBaseHooker +import com.highcapable.yukihookapi.hook.type.java.CharSequenceType +import java.lang.reflect.Method +import java.text.SimpleDateFormat +import java.util.Calendar +import java.util.Date +import java.util.Timer +import java.util.TimerTask + +class StatusBarClock : YukiBaseHooker() { + val ClockStyleSelectedOption = prefs("settings").getInt("ClockStyleSelectedOption", 0) + val ShowYears = prefs("settings").getBoolean("Status_Bar_Time_ShowYears", false) + val ShowMonth = prefs("settings").getBoolean("Status_Bar_Time_ShowMonth", false) + val ShowDay = prefs("settings").getBoolean("Status_Bar_Time_ShowDay", false) + val ShowWeek = prefs("settings").getBoolean("Status_Bar_Time_ShowWeek", false) + val ShowCNHour = prefs("settings").getBoolean("Status_Bar_Time_ShowCNHour", false) + val Showtime_period = prefs("settings").getBoolean("Status_Bar_Time_Showtime_period", false) + val ShowSeconds = prefs("settings").getBoolean("Status_Bar_Time_ShowSeconds", false) + val HideSpace = prefs("settings").getBoolean("Status_Bar_Time_HideSpace", false) + val DualRow = prefs("settings").getBoolean("Status_Bar_Time_DualRow", false) + var nowTime: Date? = null + var FontSize = prefs("settings").getInt("Status_Bar_Time_fontsize", 0) + var newline = "" + + @OptIn(LegacyHookApi::class) + override fun onHook() { + var context: Context? = null + "com.android.systemui.statusbar.policy.Clock".toClass().hook { + if (ClockStyleSelectedOption == 0) { + injectMember { + constructor { + paramCount = 3 + } + afterHook { + context = args(0).cast() + val clockView = instance() + clockView.apply { + if (this.resources.getResourceEntryName(id) != "clock") return@afterHook + isSingleLine = false + gravity = Gravity.CENTER + if (DualRow) { + newline = "\n" + var defaultSize = 8F + if (FontSize != 0) defaultSize = FontSize.toFloat() + setTextSize(TypedValue.COMPLEX_UNIT_DIP, defaultSize) + setLineSpacing(0F, 0.8F) + } else { + if (FontSize != 0) { + setTextSize( + TypedValue.COMPLEX_UNIT_DIP, + FontSize.toFloat() + ) + } + } + } + + val d: Method = clockView.javaClass.superclass.getDeclaredMethod("updateClock") + val r = Runnable { + d.isAccessible = true + d.invoke(clockView) + } + + class T : TimerTask() { + override fun run() { + Handler(clockView.context.mainLooper).post(r) + } + } + Timer().scheduleAtFixedRate(T(), 1000 - System.currentTimeMillis() % 1000, 1000) + } + } + injectMember { + method { + name = "getSmallTime" + returnType = CharSequenceType + } + afterHook { + instance().apply { + if (this.resources.getResourceEntryName(id) != "clock") return@afterHook + } + nowTime = Calendar.getInstance().time + result = getDate(context!!) + newline + getTime(context!!) + } + } + } else { + + } + } + } + + private fun getDate(context: Context): String { + var dateFormat = "" + if (isZh(context)) { + if (ShowYears) dateFormat += "YY年" + if (ShowMonth) dateFormat += "M月" + if (ShowDay) dateFormat += "d日" + if (ShowWeek) dateFormat += "E" + if (!HideSpace && !DualRow) dateFormat += " " + } else { + if (ShowYears) { + dateFormat += "YY" + if (ShowMonth || ShowDay) dateFormat += "/" + } + if (ShowMonth) { + dateFormat += "M" + if (ShowDay) dateFormat += "/" + } + if (ShowDay) dateFormat += "d" + if (!HideSpace && !DualRow) dateFormat += " " + if (ShowWeek) dateFormat += "E" + if (!HideSpace && !DualRow) dateFormat += " " + } + return SimpleDateFormat(dateFormat).format(nowTime!!) + } + + private fun getTime(context: Context): String { + var timeFormat = "" + timeFormat += if (is24(context)) "HH:mm" else "hh:mm" + if (ShowSeconds) timeFormat += ":ss" + timeFormat = SimpleDateFormat(timeFormat).format(nowTime!!) + if (isZh(context)) timeFormat = + getPeriod(context) + timeFormat else timeFormat += getPeriod(context) + timeFormat = getDoubleHour() + timeFormat + return timeFormat + } + + @SuppressLint("SimpleDateFormat") + fun getDoubleHour(): String { + var doubleHour = "" + if (ShowCNHour) { + when (SimpleDateFormat("HH").format(nowTime!!)) { + "23", "00" -> { + doubleHour = "子时" + } + "01", "02" -> { + doubleHour = "丑时" + } + "03", "04" -> { + doubleHour = "寅时" + } + "05", "06" -> { + doubleHour = "卯时" + } + "07", "08" -> { + doubleHour = "辰时" + } + "09", "10" -> { + doubleHour = "巳时" + } + "11", "12" -> { + doubleHour = "午时" + } + "13", "14" -> { + doubleHour = "未时" + } + "15", "16" -> { + doubleHour = "申时" + } + "17", "18" -> { + doubleHour = "酉时" + } + "19", "20" -> { + doubleHour = "戌时" + } + "21", "22" -> { + doubleHour = "亥时" + } + } + if (!HideSpace) doubleHour = "$doubleHour " + } + return doubleHour + } + + private fun getPeriod(context: Context): String { + var period = "" + if (Showtime_period) { + if (isZh(context)) { + when (SimpleDateFormat("HH").format(nowTime!!)) { + "00", "01", "02", "03", "04", "05" -> { + period = "凌晨" + } + "06", "07", "08", "09", "10", "11" -> { + period = "上午" + } + "12" -> { + period = "中午" + } + "13", "14", "15", "16", "17" -> { + period = "下午" + } + "18" -> { + period = "傍晚" + } + "19", "20", "21", "22", "23" -> { + period = "晚上" + } + } + if (!HideSpace) period += " " + } else { + period = " " + SimpleDateFormat("a").format(nowTime!!) + } + } + return period + } + + private fun isZh(context: Context): Boolean { + val locale = context.resources.configuration.locales[0] + val language = locale.language + return language.endsWith("zh") + } + + private fun is24(context: Context): Boolean { + val t = Settings.System.getString(context.contentResolver, Settings.System.TIME_12_24) + return t == "24" + } +} From 153342810542a8899e943bc9e59b6099e82f29b0 Mon Sep 17 00:00:00 2001 From: suqi8 <3383787570@qq.com> Date: Thu, 3 Oct 2024 23:10:23 +0800 Subject: [PATCH 117/875] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20StatusBarClock.kt?= =?UTF-8?q?=20=E6=96=87=E4=BB=B6=EF=BC=8C=E4=BC=98=E5=8C=96=E5=BA=94?= =?UTF-8?q?=E7=94=A8=E5=8A=9F=E8=83=BD=E5=92=8C=E7=94=A8=E6=88=B7=E4=BD=93?= =?UTF-8?q?=E9=AA=8C=EF=BC=8C=E5=A2=9E=E5=BC=BA=E4=BB=A3=E7=A0=81=E5=81=A5?= =?UTF-8?q?=E5=A3=AE=E6=80=A7=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../opatch/hook/StatusBar/StatusBarClock.kt | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 app/src/main/java/io/github/suqi8/opatch/hook/StatusBar/StatusBarClock.kt diff --git a/app/src/main/java/io/github/suqi8/opatch/hook/StatusBar/StatusBarClock.kt b/app/src/main/java/io/github/suqi8/opatch/hook/StatusBar/StatusBarClock.kt new file mode 100644 index 00000000..cce03aea --- /dev/null +++ b/app/src/main/java/io/github/suqi8/opatch/hook/StatusBar/StatusBarClock.kt @@ -0,0 +1,17 @@ +package io.github.suqi8.opatch.hook.StatusBar + +import androidx.compose.ui.platform.LocalContext +import com.highcapable.yukihookapi.hook.entity.YukiBaseHooker +import io.github.suqi8.opatch.hook.appilcations.StatusBarClock +import io.github.suqi8.opatch.getSetting + +class StatusBarClock: YukiBaseHooker() { + override fun onHook() { + loadApp("com.android.systemui"){ + //状态栏时钟 + if (prefs("settings").getBoolean("com_android_systemui_status_bar_clock", false)) { + loadHooker(StatusBarClock()) + } + } + } +} From c1843061942172d84b0a94155b5e1cae88373907 Mon Sep 17 00:00:00 2001 From: suqi8 <3383787570@qq.com> Date: Thu, 3 Oct 2024 23:10:29 +0800 Subject: [PATCH 118/875] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20app/src/main/res/v?= =?UTF-8?q?alues/strings.xml=20=E6=96=87=E4=BB=B6=EF=BC=8C=E4=BC=98?= =?UTF-8?q?=E5=8C=96=E5=BA=94=E7=94=A8=E5=8A=9F=E8=83=BD=E5=92=8C=E7=94=A8?= =?UTF-8?q?=E6=88=B7=E4=BD=93=E9=AA=8C=EF=BC=8C=E5=A2=9E=E5=BC=BA=E4=BB=A3?= =?UTF-8?q?=E7=A0=81=E5=81=A5=E5=A3=AE=E6=80=A7=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/main/res/values/strings.xml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 864fc248..60e7ef7f 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -52,4 +52,11 @@ Function Home About + Status bar clock + This function is not enabled~ + Clock style + Preset + Geek + Clock size + Adjust the size of the status bar clock; 0 means no size setting From c1fa43437ec403789828bd729ce7df128a42def7 Mon Sep 17 00:00:00 2001 From: suqi8 <3383787570@qq.com> Date: Thu, 3 Oct 2024 23:13:43 +0800 Subject: [PATCH 119/875] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20app/src/main/res/v?= =?UTF-8?q?alues-zh-rCN/strings.xml=20=E6=96=87=E4=BB=B6=EF=BC=8C=E4=BC=98?= =?UTF-8?q?=E5=8C=96=E5=BA=94=E7=94=A8=E5=8A=9F=E8=83=BD=E5=92=8C=E7=94=A8?= =?UTF-8?q?=E6=88=B7=E4=BD=93=E9=AA=8C=EF=BC=8C=E5=A2=9E=E5=BC=BA=E4=BB=A3?= =?UTF-8?q?=E7=A0=81=E5=81=A5=E5=A3=AE=E6=80=A7=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/main/res/values-zh-rCN/strings.xml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index fd3a4e23..7b1685cf 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -39,4 +39,11 @@ 功能 主页 关于 + 状态栏时钟 + 还未开启此项功能~ + 时钟样式 + 预设 + 极客 + 时钟大小 + 调整状态栏时钟大小，0为不设置大小 From bdd407dd9965a8c398f4d8c8387144b1aa888916 Mon Sep 17 00:00:00 2001 From: suqi8 <3383787570@qq.com> Date: Thu, 3 Oct 2024 23:13:47 +0800 Subject: [PATCH 120/875] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20app/src/main/res/v?= =?UTF-8?q?alues-zh-rCN/strings.xml=20=E6=96=87=E4=BB=B6=EF=BC=8C=E4=BC=98?= =?UTF-8?q?=E5=8C=96=E5=BA=94=E7=94=A8=E5=8A=9F=E8=83=BD=E5=92=8C=E7=94=A8?= =?UTF-8?q?=E6=88=B7=E4=BD=93=E9=AA=8C=EF=BC=8C=E5=A2=9E=E5=BC=BA=E4=BB=A3?= =?UTF-8?q?=E7=A0=81=E5=81=A5=E5=A3=AE=E6=80=A7=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/version.properties | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/version.properties b/app/version.properties index b8427b9c..b48677d2 100644 --- a/app/version.properties +++ b/app/version.properties @@ -1,2 +1,2 @@ -#Thu Oct 03 13:21:21 CST 2024 -BUILD_NUMBER=638 +#Thu Oct 03 22:44:07 CST 2024 +BUILD_NUMBER=710 From 3643f4e754e6ab9c5eb92e2ddf764a3509d8a01d Mon Sep 17 00:00:00 2001 From: suqi8 <3383787570@qq.com> Date: Fri, 4 Oct 2024 09:49:33 +0800 Subject: [PATCH 121/875] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20README.md=20?= =?UTF-8?q?=E6=96=87=E4=BB=B6=EF=BC=8C=E4=BC=98=E5=8C=96=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E5=B1=95=E7=A4=BA=E5=92=8C=E8=AF=B4=E6=98=8E=EF=BC=8C=E5=A2=9E?= =?UTF-8?q?=E5=BC=BA=E7=A4=BE=E5=8C=BA=E4=BA=92=E5=8A=A8=E6=80=A7=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 58 ++++++++++++++++++++++++++++++++++++++++++------------- 1 file changed, 45 insertions(+), 13 deletions(-) diff --git a/README.md b/README.md index dd1127b3..349d45d1 100644 --- a/README.md +++ b/README.md @@ -1,23 +1,22 @@ +

+ # OPatch - ColorOS辅助模块 -![OPatch](https://github.com/suqi8/OPatch/blob/e9cb9e2af53b728e5e2d2d00429a90f10a3384dc/app/src/main/ic_launcher1-playstore.png?raw=true) +icon + +![OPatch](https://socialify.git.ci/suqi8/OPatch/image?font=Rokkitt&forks=1&issues=1&language=1&name=1&owner=1&pattern=Brick%20Wall&pulls=1&stargazers=1&theme=Auto) + +
## 简介 OPatch是一个专为ColorOS系统设计的辅助模块，旨在增强和定制用户的操作系统体验。该模块允许用户轻松地应用补丁，以实现特定的功能或优化。 +## 支持的版本 +基于 Android 14 的 ColorOS 14 / RealmeUI 5.0 / OxygenOS 14 + ## 名称的由来 仓库的名称"OPatch"来源于"OPPO OnePlus Patch"，主要应用场景是OPPO和OnePlus设备上的ColorOS系统。 -## 特点 -- **兼容性**：专为OPPO和OnePlus设备设计，确保与ColorOS系统的兼容性。 -- **易用性**：用户界面友好，使得应用补丁变得简单快捷。 -- **定制性**：允许用户根据自己的需求定制系统功能。 - -## 使用方法 -1. 克隆或下载本仓库。 -2. 按照文档说明配置您的开发环境。 -3. 根据需要应用相应的补丁。 - ## 贡献 我们欢迎社区的贡献，如果您有改进意见或想要添加新功能，请提交Pull Request或创建Issue。 @@ -29,8 +28,41 @@ OPatch是一个专为ColorOS系统设计的辅助模块，旨在增强和定制 - GitHub Issues - 电子邮件：[3383787570@qq.com] +## 感谢 + +> OPatch 使用了以下开源项目的部分或全部内容，感谢这些项目的开发者（排名顺序不分先后） + +- [「Android」 by Android Open Source Project, Google Inc.](https://source.android.google.cn/license) +- [「AndroidX」 by Android Open Source Project, Google Inc.](https://github.com/androidx/androidx) +- [「CorePatch」 by LSPosed](https://github.com/LSPosed/CorePatch) +- [「Gson」 by Android Open Source Project, Google Inc.](https://github.com/google/gson) +- [「Kotlin」 by JetBrains](https://github.com/JetBrains/kotlin) +- [「Xposed」 by rovo89, Tungstwenty](https://github.com/rovo89/XposedBridge) +- [「YukiHookAPI」 by HighCapable](https://github.com/HighCapable/YukiHookAPI) +- [「Compose」 by JetBrains](https://github.com/JetBrains/compose)] +- [「Miuix」 by YuKongA](https://github.com/miuix-kotlin-multiplatform/miuix) +- [「LuckyTool」 by luckyzyx](https://github.com/Xposed-Modules-Repo/com.luckyzyx.luckytool) + --- -该项目使用**YukiHookAPI** +## 贡献者 + +感谢以下贡献者 + + + + + + +![Alt](https://repobeats.axiom.co/api/embed/076d597ede41432208435f233d18cb20052fb90a.svg "Repobeats analytics image") + +## Star History + +[![Star History Chart](https://api.star-history.com/svg?repos=suqi8/OPatch&type=Date)](https://star-history.com/#ikechan8370/chatgpt-plugin&Date) + +## 工具支持 + + + -感谢您的关注和支持！ +Android Studio是开发Android应用程序的官方IDE，它提供了丰富的工具和功能，帮助开发者更高效地构建应用程序。 From 42607b3c3bba6e6f26a219007f302573476ee607 Mon Sep 17 00:00:00 2001 From: suqi8 <3383787570@qq.com> Date: Fri, 4 Oct 2024 09:55:56 +0800 Subject: [PATCH 122/875] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20README.md=20?= =?UTF-8?q?=E6=96=87=E4=BB=B6=EF=BC=8C=E4=BC=98=E5=8C=96=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E5=B1=95=E7=A4=BA=E5=92=8C=E8=AF=B4=E6=98=8E=EF=BC=8C=E5=A2=9E?= =?UTF-8?q?=E5=BC=BA=E7=A4=BE=E5=8C=BA=E4=BA=92=E5=8A=A8=E6=80=A7=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 349d45d1..fc1282b1 100644 --- a/README.md +++ b/README.md @@ -17,8 +17,9 @@ OPatch是一个专为ColorOS系统设计的辅助模块，旨在增强和定制 ## 名称的由来 仓库的名称"OPatch"来源于"OPPO OnePlus Patch"，主要应用场景是OPPO和OnePlus设备上的ColorOS系统。 -## 贡献 -我们欢迎社区的贡献，如果您有改进意见或想要添加新功能，请提交Pull Request或创建Issue。 +> [!警告] +> +> 该应用需要 Magisk、KernelSU 和 APatch 来获取 root 权限，并且需要 XPosed/LSPosed 框架。任何替代方法都将无效。 ## 许可 本项目采用[GPL许可证](LICENSE)，详情请参阅LICENSE文件。 @@ -39,9 +40,10 @@ OPatch是一个专为ColorOS系统设计的辅助模块，旨在增强和定制 - [「Kotlin」 by JetBrains](https://github.com/JetBrains/kotlin) - [「Xposed」 by rovo89, Tungstwenty](https://github.com/rovo89/XposedBridge) - [「YukiHookAPI」 by HighCapable](https://github.com/HighCapable/YukiHookAPI) -- [「Compose」 by JetBrains](https://github.com/JetBrains/compose)] +- [「Compose」 by JetBrains](https://github.com/JetBrains/compose) - [「Miuix」 by YuKongA](https://github.com/miuix-kotlin-multiplatform/miuix) - [「LuckyTool」 by luckyzyx](https://github.com/Xposed-Modules-Repo/com.luckyzyx.luckytool) +- --- From eb2b00e17724187341942ab71c1823d20a22da38 Mon Sep 17 00:00:00 2001 From: suqi8 <3383787570@qq.com> Date: Fri, 4 Oct 2024 10:03:12 +0800 Subject: [PATCH 123/875] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20README.md=20?= =?UTF-8?q?=E6=96=87=E4=BB=B6=EF=BC=8C=E4=BC=98=E5=8C=96=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E5=B1=95=E7=A4=BA=E5=92=8C=E8=AF=B4=E6=98=8E=EF=BC=8C=E5=A2=9E?= =?UTF-8?q?=E5=BC=BA=E7=A4=BE=E5=8C=BA=E4=BA=92=E5=8A=A8=E6=80=A7=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index fc1282b1..76ec65be 100644 --- a/README.md +++ b/README.md @@ -17,7 +17,7 @@ OPatch是一个专为ColorOS系统设计的辅助模块，旨在增强和定制 ## 名称的由来 仓库的名称"OPatch"来源于"OPPO OnePlus Patch"，主要应用场景是OPPO和OnePlus设备上的ColorOS系统。 -> [!警告] +> [!CAUTION] > > 该应用需要 Magisk、KernelSU 和 APatch 来获取 root 权限，并且需要 XPosed/LSPosed 框架。任何替代方法都将无效。 From 345992f294afd08052b6eeef22a6abf0e54b67a8 Mon Sep 17 00:00:00 2001 From: suqi8 <3383787570@qq.com> Date: Fri, 4 Oct 2024 17:02:09 +0800 Subject: [PATCH 124/875] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=BA=94=E7=94=A8?= =?UTF-8?q?=E5=8A=9F=E8=83=BD=E5=92=8C=E7=94=A8=E6=88=B7=E4=BD=93=E9=AA=8C?= =?UTF-8?q?=EF=BC=8C=E5=A2=9E=E5=BC=BA=E4=BB=A3=E7=A0=81=E5=81=A5=E5=A3=AE?= =?UTF-8?q?=E6=80=A7=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 21 +- app/build.gradle.kts | 24 ++ .../io/github/suqi8/opatch/Fun_android.kt | 19 +- .../Fun_android_package_manager_services.kt | 19 +- .../suqi8/opatch/Fun_com_android_systemui.kt | 19 +- ...n_com_android_systemui_status_bar_clock.kt | 244 +++++++++++++++--- .../io/github/suqi8/opatch/MainActivity.kt | 14 +- .../java/io/github/suqi8/opatch/Main_About.kt | 29 +-- .../io/github/suqi8/opatch/Main_Function.kt | 242 +++++++++++++++-- .../java/io/github/suqi8/opatch/Main_Home.kt | 65 +++-- .../hook/appilcations/StatusBarClock.kt | 182 ++++++++++--- .../github/suqi8/opatch/ui/tools/resetApp.kt | 103 ++++++++ app/src/main/res/drawable/about.xml | 9 + app/src/main/res/drawable/func.xml | 9 + app/src/main/res/drawable/home.xml | 9 + app/src/main/res/values-zh-rCN/strings.xml | 76 ++++++ app/src/main/res/values/strings.xml | 79 ++++++ app/version.properties | 4 +- 18 files changed, 1015 insertions(+), 152 deletions(-) create mode 100644 app/src/main/java/io/github/suqi8/opatch/ui/tools/resetApp.kt create mode 100644 app/src/main/res/drawable/about.xml create mode 100644 app/src/main/res/drawable/func.xml create mode 100644 app/src/main/res/drawable/home.xml diff --git a/README.md b/README.md index 76ec65be..f91f9759 100644 --- a/README.md +++ b/README.md @@ -21,6 +21,26 @@ OPatch是一个专为ColorOS系统设计的辅助模块，旨在增强和定制 > > 该应用需要 Magisk、KernelSU 和 APatch 来获取 root 权限，并且需要 XPosed/LSPosed 框架。任何替代方法都将无效。 +## TODO + +- **功耗显示器** + - [ ] 电流 (进行中) + - [ ] 功率 (进行中) +- **温度显示器** + - [ ] 电池 + - [ ] CPU +- **调整桌面 APP 图标间距** + - [ ] 完成 +- **一键移除 60/90，强制 120** + - [ ] 完成 +- **状态栏双排信号** + - [ ] 完成 +- **调整桌面 APP 图标大小** + - [ ] 完成 +- **插帧助手** + - [ ] 完成 + - [ ] 竖屏插帧 + ## 许可 本项目采用[GPL许可证](LICENSE)，详情请参阅LICENSE文件。 @@ -43,7 +63,6 @@ OPatch是一个专为ColorOS系统设计的辅助模块，旨在增强和定制 - [「Compose」 by JetBrains](https://github.com/JetBrains/compose) - [「Miuix」 by YuKongA](https://github.com/miuix-kotlin-multiplatform/miuix) - [「LuckyTool」 by luckyzyx](https://github.com/Xposed-Modules-Repo/com.luckyzyx.luckytool) -- --- diff --git a/app/build.gradle.kts b/app/build.gradle.kts index ef1507b3..9d2c696e 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -47,6 +47,30 @@ android { namespace = property.project.app.packageName compileSdk = 34 + splits { + abi { + isEnable = true + reset() + include("arm64-v8a", "armeabi-v7a", "x86", "x86_64") + isUniversalApk = true + } + } + + applicationVariants.all { + val variant = this + variant.outputs + .map { it as com.android.build.gradle.internal.api.BaseVariantOutputImpl } + .forEach { output -> + val name = "OPatch" + var abi = output.getFilter(com.android.build.OutputFile.ABI) + if (abi == null) abi = "all" //兼容 + val version = variant.versionName + val versionCode = variant.versionCode + val outputFileName = "${name}_${abi}_${"v"}${version}(${versionCode}).apk" + output.outputFileName = outputFileName + } + } + val number = getAndIncrementBuildNumber() defaultConfig { applicationId = property.project.app.packageName diff --git a/app/src/main/java/io/github/suqi8/opatch/Fun_android.kt b/app/src/main/java/io/github/suqi8/opatch/Fun_android.kt index 3e6a6942..89e2cb99 100644 --- a/app/src/main/java/io/github/suqi8/opatch/Fun_android.kt +++ b/app/src/main/java/io/github/suqi8/opatch/Fun_android.kt @@ -40,6 +40,7 @@ import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.size import androidx.compose.material.icons.automirrored.filled.ArrowForward import androidx.compose.material.icons.filled.ArrowForward +import androidx.compose.material.icons.outlined.Refresh import androidx.compose.material3.Button import androidx.compose.material3.Surface import androidx.compose.runtime.* @@ -54,6 +55,7 @@ import androidx.compose.ui.unit.sp import androidx.core.content.FileProvider import androidx.navigation.NavController import io.github.suqi8.opatch.hook.corepatch.SettingsActivity +import io.github.suqi8.opatch.ui.tools.resetApp import top.yukonga.miuix.kmp.basic.Card import top.yukonga.miuix.kmp.basic.LazyColumn import top.yukonga.miuix.kmp.basic.MiuixScrollBehavior @@ -69,6 +71,10 @@ import java.io.File fun Fun_android(navController: NavController) { val context = LocalContext.current val one = MiuixScrollBehavior(top.yukonga.miuix.kmp.basic.rememberTopAppBarState()) + val appList = listOf("android") + val RestartAPP = remember { mutableStateOf(false) } + val resetApp = resetApp() + resetApp.AppRestartScreen(appList,RestartAPP) Scaffold(topBar = { GetAppIconAndName(packageName = "android") { appName, icon -> TopAppBar( title = appName, @@ -84,7 +90,18 @@ fun Fun_android(navController: NavController) { tint = MiuixTheme.colorScheme.onBackground ) } - }, + }, actions = { + IconButton(onClick = { + RestartAPP.value = true + }, + modifier = Modifier.padding(end = 18.dp)) { + Icon( + imageVector = Icons.Outlined.Refresh, + contentDescription = null, + tint = MiuixTheme.colorScheme.onBackground + ) + } + } ) } }) {padding -> LazyColumn(contentPadding = PaddingValues(top = padding.calculateTopPadding()), diff --git a/app/src/main/java/io/github/suqi8/opatch/Fun_android_package_manager_services.kt b/app/src/main/java/io/github/suqi8/opatch/Fun_android_package_manager_services.kt index 5a80ecd5..ee6338fa 100644 --- a/app/src/main/java/io/github/suqi8/opatch/Fun_android_package_manager_services.kt +++ b/app/src/main/java/io/github/suqi8/opatch/Fun_android_package_manager_services.kt @@ -28,6 +28,7 @@ import androidx.compose.ui.res.stringResource import androidx.compose.ui.unit.dp import androidx.navigation.NavController import io.github.suqi8.opatch.application.RestartApp +import io.github.suqi8.opatch.ui.tools.resetApp import top.yukonga.miuix.kmp.basic.Card import top.yukonga.miuix.kmp.basic.LazyColumn import top.yukonga.miuix.kmp.basic.MiuixScrollBehavior @@ -51,6 +52,11 @@ fun Fun_android_package_manager_services(navController: NavController) { var disable_verification_agent by remember { mutableStateOf(false) } val context = LocalContext.current val topappbarzt = MiuixScrollBehavior(top.yukonga.miuix.kmp.basic.rememberTopAppBarState()) + val appList = listOf("android") + val RestartAPP = remember { mutableStateOf(false) } + val resetApp = resetApp() + resetApp.AppRestartScreen(appList,RestartAPP) + Scaffold(topBar = { TopAppBar( scrollBehavior = topappbarzt, @@ -70,7 +76,7 @@ fun Fun_android_package_manager_services(navController: NavController) { actions = { // 如果你有其他操作按钮，这里可以添加 IconButton(onClick = { - RestartApp(context,"com.tencent.mobileqq") + RestartAPP.value = true }, modifier = Modifier.padding(end = 18.dp)) { Icon( @@ -94,7 +100,7 @@ fun Fun_android_package_manager_services(navController: NavController) { item { Column { SmallTitle( - text = "常用设置" + text = stringResource(R.string.common_settings) ) Card( modifier = Modifier.fillMaxWidth() @@ -104,6 +110,7 @@ fun Fun_android_package_manager_services(navController: NavController) { SuperSwitch( title = stringResource(R.string.downgr), summary = stringResource(R.string.downgr_summary), + enabled = false, onCheckedChange = { downgr = it }, @@ -112,6 +119,7 @@ fun Fun_android_package_manager_services(navController: NavController) { SuperSwitch( title = stringResource(R.string.authcreak), summary = stringResource(R.string.authcreak_summary), + enabled = false, onCheckedChange = { authcreak = it }, @@ -120,6 +128,7 @@ fun Fun_android_package_manager_services(navController: NavController) { SuperSwitch( title = stringResource(R.string.digestCreak), summary = stringResource(R.string.digestCreak_summary), + enabled = false, onCheckedChange = { digestCreak = it }, @@ -128,6 +137,7 @@ fun Fun_android_package_manager_services(navController: NavController) { SuperSwitch( title = stringResource(R.string.UsePreSig), summary = stringResource(R.string.UsePreSig_summary), + enabled = false, onCheckedChange = { UsePreSig = it }, @@ -136,6 +146,7 @@ fun Fun_android_package_manager_services(navController: NavController) { SuperSwitch( title = stringResource(R.string.enhancedMode), summary = stringResource(R.string.enhancedMode_summary), + enabled = false, onCheckedChange = { enhancedMode = it }, @@ -143,7 +154,7 @@ fun Fun_android_package_manager_services(navController: NavController) { ) } SmallTitle( - text = "其他设置" + text = stringResource(R.string.other_settings) ) Card( modifier = Modifier.fillMaxWidth() @@ -153,6 +164,7 @@ fun Fun_android_package_manager_services(navController: NavController) { SuperSwitch( title = stringResource(R.string.bypassBlock), summary = stringResource(R.string.bypassBlock_summary), + enabled = false, onCheckedChange = { bypassBlock = it }, @@ -161,6 +173,7 @@ fun Fun_android_package_manager_services(navController: NavController) { SuperSwitch( title = stringResource(R.string.disable_verification_agent_title), summary = stringResource(R.string.disable_verification_agent_summary), + enabled = false, onCheckedChange = { disable_verification_agent = it }, diff --git a/app/src/main/java/io/github/suqi8/opatch/Fun_com_android_systemui.kt b/app/src/main/java/io/github/suqi8/opatch/Fun_com_android_systemui.kt index ec49589b..6a8fbea8 100644 --- a/app/src/main/java/io/github/suqi8/opatch/Fun_com_android_systemui.kt +++ b/app/src/main/java/io/github/suqi8/opatch/Fun_com_android_systemui.kt @@ -28,6 +28,7 @@ import androidx.compose.ui.res.stringResource import androidx.compose.ui.unit.dp import androidx.navigation.NavController import io.github.suqi8.opatch.application.RestartApp +import io.github.suqi8.opatch.ui.tools.resetApp import top.yukonga.miuix.kmp.basic.Card import top.yukonga.miuix.kmp.basic.LazyColumn import top.yukonga.miuix.kmp.basic.MiuixScrollBehavior @@ -44,6 +45,10 @@ import top.yukonga.miuix.kmp.theme.MiuixTheme fun Fun_com_android_systemui(navController: NavController) { val context = LocalContext.current val one = MiuixScrollBehavior(top.yukonga.miuix.kmp.basic.rememberTopAppBarState()) + val appList = listOf("com.android.systemui") + val RestartAPP = remember { mutableStateOf(false) } + val resetApp = resetApp() + Scaffold(topBar = { GetAppIconAndName(packageName = "com.android.systemui") { appName, icon -> TopAppBar( title = appName, @@ -59,7 +64,18 @@ fun Fun_com_android_systemui(navController: NavController) { tint = MiuixTheme.colorScheme.onBackground ) } - }, + }, actions = { + IconButton(onClick = { + RestartAPP.value = true + }, + modifier = Modifier.padding(end = 18.dp)) { + Icon( + imageVector = Icons.Outlined.Refresh, + contentDescription = null, + tint = MiuixTheme.colorScheme.onBackground + ) + } + } ) } }) {padding -> LazyColumn(contentPadding = PaddingValues(top = padding.calculateTopPadding()), @@ -78,4 +94,5 @@ fun Fun_com_android_systemui(navController: NavController) { } } } + resetApp.AppRestartScreen(appList,RestartAPP) } diff --git a/app/src/main/java/io/github/suqi8/opatch/Fun_com_android_systemui_status_bar_clock.kt b/app/src/main/java/io/github/suqi8/opatch/Fun_com_android_systemui_status_bar_clock.kt index f96bd52e..928ea954 100644 --- a/app/src/main/java/io/github/suqi8/opatch/Fun_com_android_systemui_status_bar_clock.kt +++ b/app/src/main/java/io/github/suqi8/opatch/Fun_com_android_systemui_status_bar_clock.kt @@ -1,25 +1,35 @@ package io.github.suqi8.opatch +import android.annotation.SuppressLint import android.content.Context +import android.view.Gravity import androidx.compose.animation.AnimatedVisibility import androidx.compose.foundation.background +import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.PaddingValues +import androidx.compose.foundation.layout.Row +import androidx.compose.foundation.layout.Spacer import androidx.compose.foundation.layout.WindowInsets import androidx.compose.foundation.layout.WindowInsetsSides import androidx.compose.foundation.layout.displayCutout import androidx.compose.foundation.layout.fillMaxSize import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.height import androidx.compose.foundation.layout.navigationBars import androidx.compose.foundation.layout.only import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.layout.width import androidx.compose.foundation.layout.windowInsetsPadding +import androidx.compose.foundation.text.KeyboardActions +import androidx.compose.foundation.text.KeyboardOptions import androidx.compose.material.icons.Icons import androidx.compose.material.icons.outlined.Refresh import androidx.compose.material3.Icon import androidx.compose.material3.IconButton import androidx.compose.runtime.Composable import androidx.compose.runtime.LaunchedEffect +import androidx.compose.runtime.MutableState import androidx.compose.runtime.getValue import androidx.compose.runtime.mutableStateOf import androidx.compose.runtime.remember @@ -27,29 +37,40 @@ import androidx.compose.runtime.setValue import androidx.compose.ui.Modifier import androidx.compose.ui.graphics.Color import androidx.compose.ui.platform.LocalContext +import androidx.compose.ui.platform.LocalFocusManager import androidx.compose.ui.res.stringResource +import androidx.compose.ui.text.input.ImeAction +import androidx.compose.ui.unit.DpSize import androidx.compose.ui.unit.dp import androidx.navigation.NavController import com.highcapable.yukihookapi.hook.factory.prefs import io.github.suqi8.opatch.application.RestartApp import io.github.suqi8.opatch.tools.AnimTools +import io.github.suqi8.opatch.ui.tools.resetApp import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.launch import top.yukonga.miuix.kmp.basic.BasicComponent +import top.yukonga.miuix.kmp.basic.Button import top.yukonga.miuix.kmp.basic.Card import top.yukonga.miuix.kmp.basic.LazyColumn import top.yukonga.miuix.kmp.basic.MiuixScrollBehavior import top.yukonga.miuix.kmp.basic.Scaffold import top.yukonga.miuix.kmp.basic.Slider +import top.yukonga.miuix.kmp.basic.SmallTitle +import top.yukonga.miuix.kmp.basic.TextField import top.yukonga.miuix.kmp.basic.TopAppBar import top.yukonga.miuix.kmp.extra.SuperArrow +import top.yukonga.miuix.kmp.extra.SuperDialog import top.yukonga.miuix.kmp.extra.SuperDropdown import top.yukonga.miuix.kmp.extra.SuperSwitch import top.yukonga.miuix.kmp.icon.MiuixIcons import top.yukonga.miuix.kmp.icon.icons.ArrowBack import top.yukonga.miuix.kmp.theme.MiuixTheme +import top.yukonga.miuix.kmp.utils.MiuixPopupUtil.Companion.dismissDialog +import top.yukonga.miuix.kmp.utils.MiuixPopupUtil.Companion.showDialog +@SuppressLint("RtlHardcoded") @Composable fun Fun_com_android_systemui_status_bar_clock(navController: NavController) { val context = LocalContext.current @@ -66,25 +87,54 @@ fun Fun_com_android_systemui_status_bar_clock(navController: NavController) { val ShowSeconds = remember { mutableStateOf(false) } val HideSpace = remember { mutableStateOf(false) } val DualRow = remember { mutableStateOf(false) } + val ShowMillisecond = remember { mutableStateOf(false) } var com_android_systemui_status_bar_clock by remember { mutableStateOf(false) } var ClockSize by remember { mutableStateOf(0) } + var ClockUpdateSpeed by remember { mutableStateOf(0) } + val appList = listOf("com.android.systemui") + val RestartAPP = remember { mutableStateOf(false) } + val resetApp = resetApp() + val Status_Bar_Time_gravitySelectedOption = remember { mutableStateOf(0) } + val showCustomClockDialog = remember { mutableStateOf(false) } + val customClockCache = remember { mutableStateOf("HH:mm") } + val customClock = remember { mutableStateOf("HH:mm") } + val focusManager = LocalFocusManager.current LaunchedEffect(Unit) { - ClockStyleSelectedOption.value = context.prefs("settings").getInt("ClockStyleSelectedOption") - com_android_systemui_status_bar_clock = context.prefs("settings").getBoolean("com_android_systemui_status_bar_clock") - ShowYears.value = context.prefs("settings").getBoolean("Status_Bar_Time_ShowYears") - ShowMonth.value = context.prefs("settings").getBoolean("Status_Bar_Time_ShowMonth") - ShowDay.value = context.prefs("settings").getBoolean("Status_Bar_Time_ShowDay") - ShowWeek.value = context.prefs("settings").getBoolean("Status_Bar_Time_ShowWeek") - ShowCNHour.value = context.prefs("settings").getBoolean("Status_Bar_Time_ShowCNHour") - Showtime_period.value = context.prefs("settings").getBoolean("Status_Bar_Time_Showtime_period") - ShowSeconds.value = context.prefs("settings").getBoolean("Status_Bar_Time_ShowSeconds") - HideSpace.value = context.prefs("settings").getBoolean("Status_Bar_Time_"+"HideSpace") - DualRow.value = context.prefs("settings").getBoolean("Status_Bar_Time_"+"DualRow") - ClockSize = context.prefs("settings").getInt("Status_Bar_Time_ClockSize") + ClockStyleSelectedOption.value = context.prefs("settings").getInt("ClockStyleSelectedOption", 0) + com_android_systemui_status_bar_clock = context.prefs("settings").getBoolean("com_android_systemui_status_bar_clock", false) + ShowYears.value = context.prefs("settings").getBoolean("Status_Bar_Time_ShowYears", false) + ShowMonth.value = context.prefs("settings").getBoolean("Status_Bar_Time_ShowMonth", false) + ShowDay.value = context.prefs("settings").getBoolean("Status_Bar_Time_ShowDay", false) + ShowWeek.value = context.prefs("settings").getBoolean("Status_Bar_Time_ShowWeek", false) + ShowCNHour.value = context.prefs("settings").getBoolean("Status_Bar_Time_ShowCNHour", false) + Showtime_period.value = context.prefs("settings").getBoolean("Status_Bar_Time_Showtime_period", false) + ShowSeconds.value = context.prefs("settings").getBoolean("Status_Bar_Time_ShowSeconds", false) + ShowMillisecond.value = context.prefs("settings").getBoolean("Status_Bar_Time_ShowMillisecond", false) + HideSpace.value = context.prefs("settings").getBoolean("Status_Bar_Time_"+"HideSpace", false) + DualRow.value = context.prefs("settings").getBoolean("Status_Bar_Time_"+"DualRow", false) + ClockSize = context.prefs("settings").getInt("Status_Bar_Time_ClockSize",0) + ClockUpdateSpeed = context.prefs("settings").getInt("Status_Bar_Time_ClockUpdateSpeed",0) + Status_Bar_Time_gravitySelectedOption.value = context.prefs("settings").getInt("Status_Bar_Time_alignment", 0) + customClock.value = context.prefs("settings").getString("Status_Bar_Time_CustomClockStyle", "HH:mm") + customClockCache.value = context.prefs("settings").getString("Status_Bar_Time_CustomClockStyle", "HH:mm") } + val Status_Bar_Time_gravityOptions = listOf( + "CENTER 居中对齐", + "TOP 顶部对齐", + "BOTTOM 底部对齐", + "LEFT 左侧对齐", + "RIGHT 右侧对齐", + "START 起始位置对齐", + "END 结束位置对齐", + "CENTER_HORIZONTAL 水平居中", + "CENTER_VERTICAL 垂直居中", + "FILL 填满整个空间", + "FILL_HORIZONTAL 水平填满", + "FILL_VERTICAL 垂直填满" + ) Scaffold(topBar = { TopAppBar( scrollBehavior = topappbarzt, @@ -104,7 +154,7 @@ fun Fun_com_android_systemui_status_bar_clock(navController: NavController) { actions = { // 如果你有其他操作按钮，这里可以添加 IconButton(onClick = { - RestartApp(context,"com.tencent.mobileqq") + RestartAPP.value = true }, modifier = Modifier.padding(end = 18.dp)) { Icon( @@ -181,16 +231,34 @@ fun Fun_com_android_systemui_status_bar_clock(navController: NavController) { } ) Column { - SuperArrow(title = stringResource(R.string.clock_size), + SuperArrow( + title = stringResource(R.string.clock_size), summary = stringResource(R.string.clock_size_summary), - onClick = { - - }, rightText = "${ClockSize}dp") + onClick = {}, + rightText = "${ClockSize}dp" + ) + Slider( + progress = (ClockSize / 20.0).toFloat(), + onProgressChange = { newProgress -> + ClockSize = (newProgress * 20.0).toInt() + context.prefs("settings").edit { putInt("Status_Bar_Time_ClockSize", (newProgress * 20.0).toInt()) } + }, + modifier = Modifier.padding(horizontal = 12.dp, vertical = 12.dp) + ) + } + Column { + SuperArrow( + title = stringResource(R.string.clock_update_time_title), + summary = stringResource(R.string.clock_update_time_summary), + onClick = {}, + rightText = "${ClockUpdateSpeed}ms" + ) Slider( - progress = (ClockSize/15.0).toFloat(), - onProgressChange = { newProgress -> ClockSize = (newProgress*15.0).toInt() - context.prefs("settings").edit { putInt("Status_Bar_Time_ClockSize", (newProgress*15.0).toInt()) } - }, + progress = (ClockUpdateSpeed / 2000.000).toFloat(), + onProgressChange = { newProgress -> + ClockUpdateSpeed = (newProgress * 2000).toInt() + context.prefs("settings").edit { putInt("Status_Bar_Time_ClockUpdateSpeed", (newProgress * 2000).toInt()) } + }, modifier = Modifier.padding(horizontal = 12.dp, vertical = 12.dp) ) } @@ -205,7 +273,8 @@ fun Fun_com_android_systemui_status_bar_clock(navController: NavController) { .padding(horizontal = 12.dp, vertical = 6.dp) ) { SuperSwitch( - title = "显示年份", + title = stringResource(R.string.show_years_title), + summary = stringResource(R.string.show_years_summary), checked = ShowYears.value, onCheckedChange = { ShowYears.value = it @@ -215,82 +284,101 @@ fun Fun_com_android_systemui_status_bar_clock(navController: NavController) { } ) SuperSwitch( - title = "显示月份", + title = stringResource(R.string.show_month_title), + summary = stringResource(R.string.show_month_summary), checked = ShowMonth.value, onCheckedChange = { ShowMonth.value = it CoroutineScope(Dispatchers.IO).launch { - context.prefs("settings").edit { putBoolean("Status_Bar_Time_"+"ShowMonth", it) } + context.prefs("settings").edit { putBoolean("Status_Bar_Time_ShowMonth", it) } } } ) SuperSwitch( - title = "显示日期", + title = stringResource(R.string.show_day_title), + summary = stringResource(R.string.show_day_summary), checked = ShowDay.value, onCheckedChange = { ShowDay.value = it CoroutineScope(Dispatchers.IO).launch { - context.prefs("settings").edit { putBoolean("Status_Bar_Time_"+"ShowDay", it) } + context.prefs("settings").edit { putBoolean("Status_Bar_Time_ShowDay", it) } } } ) SuperSwitch( - title = "显示星期", + title = stringResource(R.string.show_week_title), + summary = stringResource(R.string.show_week_summary), checked = ShowWeek.value, onCheckedChange = { ShowWeek.value = it CoroutineScope(Dispatchers.IO).launch { - context.prefs("settings").edit { putBoolean("Status_Bar_Time_"+"ShowWeek", it) } + context.prefs("settings").edit { putBoolean("Status_Bar_Time_ShowWeek", it) } } } ) SuperSwitch( - title = "显示时辰", + title = stringResource(R.string.show_cn_hour_title), + summary = stringResource(R.string.show_cn_hour_summary), checked = ShowCNHour.value, onCheckedChange = { ShowCNHour.value = it CoroutineScope(Dispatchers.IO).launch { - context.prefs("settings").edit { putBoolean("Status_Bar_Time_"+"ShowCNHour", it) } + context.prefs("settings").edit { putBoolean("Status_Bar_Time_ShowCNHour", it) } } } ) SuperSwitch( - title = "显示时段", + title = stringResource(R.string.showtime_period_title), + summary = stringResource(R.string.showtime_period_summary), checked = Showtime_period.value, onCheckedChange = { Showtime_period.value = it CoroutineScope(Dispatchers.IO).launch { - context.prefs("settings").edit { putBoolean("Status_Bar_Time_"+"Showtime_period", it) } + context.prefs("settings").edit { putBoolean("Status_Bar_Time_Showtime_period", it) } } } ) SuperSwitch( - title = "显示秒数", + title = stringResource(R.string.show_seconds_title), + summary = stringResource(R.string.show_seconds_summary), checked = ShowSeconds.value, onCheckedChange = { ShowSeconds.value = it CoroutineScope(Dispatchers.IO).launch { - context.prefs("settings").edit { putBoolean("Status_Bar_Time_"+"ShowSeconds", it) } + context.prefs("settings").edit { putBoolean("Status_Bar_Time_ShowSeconds", it) } } } ) SuperSwitch( - title = "隐藏间隔", + title = stringResource(R.string.show_millisecond_title), + summary = stringResource(R.string.show_millisecond_summary), + checked = ShowMillisecond.value, + onCheckedChange = { + ShowMillisecond.value = it + CoroutineScope(Dispatchers.IO).launch { + context.prefs("settings").edit { putBoolean("Status_Bar_Time_ShowMillisecond", it) } + } + } + ) + SuperSwitch( + title = stringResource(R.string.hide_space_title), + summary = stringResource(R.string.hide_space_summary), checked = HideSpace.value, onCheckedChange = { HideSpace.value = it CoroutineScope(Dispatchers.IO).launch { - context.prefs("settings").edit { putBoolean("Status_Bar_Time_"+"HideSpace", it) } + context.prefs("settings").edit { putBoolean("Status_Bar_Time_HideSpace", it) } } } ) SuperSwitch( - title = "双排显示", + title = stringResource(R.string.dual_row_title), + summary = stringResource(R.string.dual_row_summary), checked = DualRow.value, onCheckedChange = { DualRow.value = it CoroutineScope(Dispatchers.IO).launch { - context.prefs("settings").edit { putBoolean("Status_Bar_Time_"+"DualRow", it) } + context.prefs("settings").edit { putBoolean("Status_Bar_Time_DualRow", it) } } } ) @@ -299,10 +387,88 @@ fun Fun_com_android_systemui_status_bar_clock(navController: NavController) { } AnimatedVisibility(visible = ClockStyleSelectedOption.value == 1 && com_android_systemui_status_bar_clock == true, enter = AnimTools().enterTransition(0), - exit = AnimTools().exitTransition(100)) { } + exit = AnimTools().exitTransition(100)) { + + Column { + Card( + modifier = Modifier + .fillMaxWidth() + .padding(horizontal = 12.dp, vertical = 6.dp) + ) { + SuperDropdown( + title = stringResource(R.string.alignment), + items = Status_Bar_Time_gravityOptions, + selectedIndex = Status_Bar_Time_gravitySelectedOption.value, + onSelectedIndexChange = { newOption -> + Status_Bar_Time_gravitySelectedOption.value = newOption + CoroutineScope(Dispatchers.IO).launch { + context.prefs("settings").edit { putInt("Status_Bar_Time_alignment", newOption) } + } + } + ) + SuperArrow(title = stringResource(R.string.clock_format) + , rightText = customClock.value, onClick = { + showCustomClockDialog.value = true + }) + SmallTitle(text = stringResource(R.string.status_bar_clock_custom_tips), insideMargin = DpSize(18.dp, 8.dp)) + } + } + } } } } } + resetApp.AppRestartScreen(appList,RestartAPP) + CustomClockDialog(showCustomClockDialog,customClockCache,customClock,focusManager) } +@Composable +fun CustomClockDialog(showCustomClockDialog: MutableState, customClockCache: MutableState, CustomClock: MutableState, focusManager: androidx.compose.ui.focus.FocusManager) { + val context = LocalContext.current + if (!showCustomClockDialog.value) return + showDialog(content = { + SuperDialog(title = stringResource(R.string.clock_format), + show = showCustomClockDialog, + onDismissRequest = { + showCustomClockDialog.value = false + }) { + TextField( + value = customClockCache.value, + onValueChange = { customClockCache.value = it }, + backgroundColor = MiuixTheme.colorScheme.secondaryContainer, + label = "", + modifier = Modifier.padding(), + keyboardActions = KeyboardActions(onDone = { focusManager.clearFocus() }), + keyboardOptions = KeyboardOptions(imeAction = ImeAction.Default), + singleLine = false + ) + Spacer(Modifier.height(12.dp)) + Row( + modifier = Modifier + .fillMaxWidth(), + horizontalArrangement = Arrangement.SpaceBetween + ) { + Button( + modifier = Modifier.weight(1f), + text = stringResource(R.string.cancel), + onClick = { + dismissDialog() + showCustomClockDialog.value = false + } + ) + Spacer(Modifier.width(12.dp)) + Button( + modifier = Modifier.weight(1f), + text = stringResource(R.string.ok), + submit = true, + onClick = { + dismissDialog() + CustomClock.value = customClockCache.value + context.prefs("settings").edit { putString("Status_Bar_Time_CustomClockStyle", customClockCache.value) } + showCustomClockDialog.value = false + } + ) + } + } + }) +} diff --git a/app/src/main/java/io/github/suqi8/opatch/MainActivity.kt b/app/src/main/java/io/github/suqi8/opatch/MainActivity.kt index 1b740609..0b99559e 100644 --- a/app/src/main/java/io/github/suqi8/opatch/MainActivity.kt +++ b/app/src/main/java/io/github/suqi8/opatch/MainActivity.kt @@ -35,6 +35,7 @@ import androidx.compose.ui.graphics.Color import androidx.compose.ui.graphics.vector.ImageVector import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.res.painterResource +import androidx.compose.ui.res.stringResource import androidx.compose.ui.res.vectorResource import androidx.compose.ui.unit.Dp import androidx.compose.ui.unit.dp @@ -163,7 +164,6 @@ fun Main1(modifier: Modifier,context: Context,navController: NavController,color noiseFactor = noiseFactor ) } - //val items = listOf("功能", "主页", "关于") val topAppBarScrollBehavior0 = MiuixScrollBehavior(top.yukonga.miuix.kmp.basic.rememberTopAppBarState()) val topAppBarScrollBehavior1 = MiuixScrollBehavior(top.yukonga.miuix.kmp.basic.rememberTopAppBarState()) val topAppBarScrollBehavior2 = MiuixScrollBehavior(top.yukonga.miuix.kmp.basic.rememberTopAppBarState()) @@ -182,9 +182,9 @@ fun Main1(modifier: Modifier,context: Context,navController: NavController,color } val items = listOf( - NavigationItem("功能", ImageVector.vectorResource(id = R.drawable.twotone_widgets_24)), - NavigationItem("主页", ImageVector.vectorResource(id = R.drawable.twotone_home_24)), - NavigationItem("关于", ImageVector.vectorResource(id = R.drawable.twotone_pending_24)) + NavigationItem(stringResource(R.string.func), ImageVector.vectorResource(id = R.drawable.func)), + NavigationItem(stringResource(R.string.home), ImageVector.vectorResource(id = R.drawable.home)), + NavigationItem(stringResource(R.string.about), ImageVector.vectorResource(id = R.drawable.about)) ) LaunchedEffect(pagerState) { @@ -218,9 +218,9 @@ fun Main1(modifier: Modifier,context: Context,navController: NavController,color state = hazeState, style = hazeStyle)) { TopAppBar(scrollBehavior = currentScrollBehavior,color = Color.Transparent,title = when (pagerState.currentPage) { - 0 -> "功能" - 1 -> "主页" - else -> "关于" + 0 -> stringResource(R.string.func) + 1 -> stringResource(R.string.home) + else -> stringResource(R.string.about) },navigationIcon = { IconButton(onClick = { /* do something */ }) { Image(painter = painterResource(id = R.drawable.ic_launcher_foreground), contentDescription = null) diff --git a/app/src/main/java/io/github/suqi8/opatch/Main_About.kt b/app/src/main/java/io/github/suqi8/opatch/Main_About.kt index 0eceeee7..30503fee 100644 --- a/app/src/main/java/io/github/suqi8/opatch/Main_About.kt +++ b/app/src/main/java/io/github/suqi8/opatch/Main_About.kt @@ -111,7 +111,7 @@ fun Main_About(topAppBarScrollBehavior: ScrollBehavior, padding: PaddingValues, Button( modifier = Modifier.padding(start = 20.dp, end = 20.dp) .fillMaxWidth(), - text = "有新版本", + text = stringResource(R.string.check_update), submit = true, onClick = { } @@ -151,28 +151,22 @@ fun Main_About(topAppBarScrollBehavior: ScrollBehavior, padding: PaddingValues, } Column(Modifier.padding( bottom = 10.dp)) { Text(YukiHookAPI.VERSION, fontSize = 14.sp) - Text("YukiHookAPI版本", fontSize = 12.sp, color = Color.Gray) + Text(stringResource(R.string.yuki_hook_api_version), fontSize = 12.sp, color = Color.Gray) } Column(Modifier.padding( bottom = 10.dp)) { Text(YukiHookAPI_Impl.compiledTimestamp.toString(), fontSize = 14.sp) - Text("编译时间戳", fontSize = 12.sp, color = Color.Gray) + Text(stringResource(R.string.compiled_timestamp), fontSize = 12.sp, color = Color.Gray) } Column(Modifier.padding( bottom = 10.dp)) { Text(timestampToDateTime(YukiHookAPI_Impl.compiledTimestamp), fontSize = 14.sp) - Text("编译时间", fontSize = 12.sp, color = Color.Gray) + Text(stringResource(R.string.compiled_time), fontSize = 12.sp, color = Color.Gray) } } } - SmallTitle(text = "软件设置") + SmallTitle(text = stringResource(R.string.app_settings)) Card(modifier = Modifier.fillMaxWidth() .padding(horizontal = 12.dp) .padding(bottom = 6.dp)) { - SuperArrow( - title = "神隐模式", - onClick = { - navController.navigate("fuzhu") - } - ) SuperDropdown( title = stringResource(R.string.Color_Mode), items = listOf(stringResource(R.string.Auto_Mode),stringResource(R.string.Light_Mode), stringResource(R.string.Night_Mode)), @@ -184,14 +178,15 @@ fun Main_About(topAppBarScrollBehavior: ScrollBehavior, padding: PaddingValues, } ) } - SmallTitle(text = "题外话") + SmallTitle(text = stringResource(R.string.by_the_way)) Card(modifier = Modifier.fillMaxWidth() .padding(horizontal = 12.dp) .padding(bottom = 6.dp)) { Card(Modifier.padding(10.dp)) { Image(painter = painterResource(R.drawable.qq_pic_merged_1727926207595), contentDescription = null, modifier = Modifier.fillMaxWidth()) } - SuperArrow(title = "前往他的主页", onClick = { + val toastMessage = stringResource(R.string.please_install_cool_apk) + SuperArrow(title = stringResource(R.string.go_to_his_homepage), onClick = { val coolApkUri = Uri.parse("coolmarket://u/894238") val intent = Intent(Intent.ACTION_VIEW, coolApkUri) @@ -200,7 +195,7 @@ fun Main_About(topAppBarScrollBehavior: ScrollBehavior, padding: PaddingValues, context.startActivity(intent) } catch (e: ActivityNotFoundException) { // 如果酷安未安装，则提示用户 - Toast.makeText(context, "请先安装酷安应用", Toast.LENGTH_SHORT).show() + Toast.makeText(context, toastMessage, Toast.LENGTH_SHORT).show() } }) } @@ -217,7 +212,7 @@ fun Main_About(topAppBarScrollBehavior: ScrollBehavior, padding: PaddingValues, } ) SuperArrow( - title = "官方频道", + title = stringResource(R.string.official_channel), summary = "Telegram、QQ", onClick = { val intent = Intent(Intent.ACTION_VIEW, Uri.parse("https://t.me/OPatch")) @@ -225,8 +220,8 @@ fun Main_About(topAppBarScrollBehavior: ScrollBehavior, padding: PaddingValues, } ) SuperArrow( - title = "参与翻译", - summary = "前往 Crowdin 贡献您的语言翻译", + title = stringResource(R.string.contribute_translation), + summary = stringResource(R.string.crowdin_contribute_summary), onClick = { } ) diff --git a/app/src/main/java/io/github/suqi8/opatch/Main_Function.kt b/app/src/main/java/io/github/suqi8/opatch/Main_Function.kt index aa9e35af..b2480cca 100644 --- a/app/src/main/java/io/github/suqi8/opatch/Main_Function.kt +++ b/app/src/main/java/io/github/suqi8/opatch/Main_Function.kt @@ -1,15 +1,22 @@ package io.github.suqi8.opatch +import android.content.Context +import android.graphics.Rect +import android.view.ViewTreeObserver +import android.view.WindowManager import androidx.compose.animation.AnimatedVisibility import androidx.compose.animation.core.tween import androidx.compose.animation.fadeIn import androidx.compose.animation.fadeOut import androidx.compose.foundation.Image +import androidx.compose.foundation.Indication import androidx.compose.foundation.clickable +import androidx.compose.foundation.interaction.MutableInteractionSource import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.PaddingValues import androidx.compose.foundation.layout.Row +import androidx.compose.foundation.layout.RowScope import androidx.compose.foundation.layout.Spacer import androidx.compose.foundation.layout.fillMaxSize import androidx.compose.foundation.layout.fillMaxWidth @@ -18,6 +25,8 @@ import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.size import androidx.compose.material3.MaterialTheme import androidx.compose.runtime.Composable +import androidx.compose.runtime.DisposableEffect +import androidx.compose.runtime.LaunchedEffect import androidx.compose.runtime.getValue import androidx.compose.runtime.mutableStateOf import androidx.compose.runtime.remember @@ -25,11 +34,23 @@ import androidx.compose.runtime.saveable.rememberSaveable import androidx.compose.runtime.setValue import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier +import androidx.compose.ui.focus.onFocusChanged import androidx.compose.ui.graphics.BlendMode import androidx.compose.ui.graphics.BlendModeColorFilter +import androidx.compose.ui.graphics.Color +import androidx.compose.ui.layout.onGloballyPositioned import androidx.compose.ui.platform.LocalContext +import androidx.compose.ui.platform.LocalWindowInfo import androidx.compose.ui.res.stringResource +import androidx.compose.ui.text.AnnotatedString +import androidx.compose.ui.text.SpanStyle +import androidx.compose.ui.text.buildAnnotatedString +import androidx.compose.ui.text.font.FontWeight +import androidx.compose.ui.text.withStyle +import androidx.compose.ui.unit.DpSize import androidx.compose.ui.unit.dp +import androidx.core.view.ViewCompat +import androidx.core.view.WindowInsetsCompat import androidx.navigation.NavController import com.highcapable.yukihookapi.YukiHookAPI import top.yukonga.miuix.kmp.basic.BasicComponent @@ -43,6 +64,7 @@ import top.yukonga.miuix.kmp.basic.Text import top.yukonga.miuix.kmp.icon.MiuixIcons import top.yukonga.miuix.kmp.icon.icons.Search import top.yukonga.miuix.kmp.theme.MiuixTheme +import top.yukonga.miuix.kmp.utils.createRipple @Composable fun Main_Function( @@ -52,21 +74,111 @@ fun Main_Function( ) { val context = LocalContext.current val features = listOf( + Feature(stringResource(R.string.package_manager_services), null, "Fun_android_package_manager_services"), Feature(stringResource(R.string.downgr), stringResource(R.string.downgr_summary), "Fun_android_package_manager_services"), Feature(stringResource(R.string.authcreak), stringResource(R.string.authcreak_summary), "Fun_android_package_manager_services"), Feature(stringResource(R.string.digestCreak), stringResource(R.string.digestCreak_summary), "Fun_android_package_manager_services"), Feature(stringResource(R.string.UsePreSig), stringResource(R.string.UsePreSig_summary), "Fun_android_package_manager_services"), Feature(stringResource(R.string.enhancedMode), stringResource(R.string.enhancedMode_summary), "Fun_android_package_manager_services"), Feature(stringResource(R.string.bypassBlock), stringResource(R.string.bypassBlock_summary), "Fun_android_package_manager_services"), - Feature(stringResource(R.string.disable_verification_agent_title), stringResource(R.string.disable_verification_agent_summary), "Fun_android_package_manager_services") + Feature(stringResource(R.string.disable_verification_agent_title), stringResource(R.string.disable_verification_agent_summary), "Fun_android_package_manager_services"), + Feature(stringResource(R.string.status_bar_clock), null, "Fun_com_android_systemui_status_bar_clock"), + Feature( + stringResource(R.string.clock_style_title), + stringResource(R.string.clock_style_summary), + "Fun_com_android_systemui_status_bar_clock" + ), + Feature( + stringResource(R.string.clock_size), + stringResource(R.string.clock_size_summary), + "Fun_com_android_systemui_status_bar_clock" + ), + Feature( + stringResource(R.string.clock_update_time_title), + stringResource(R.string.clock_update_time_summary), + "Fun_com_android_systemui_status_bar_clock" + ), + Feature( + stringResource(R.string.show_years_title), + stringResource(R.string.show_years_summary), + "Fun_com_android_systemui_status_bar_clock" + ), + Feature( + stringResource(R.string.show_month_title), + stringResource(R.string.show_month_summary), + "Fun_com_android_systemui_status_bar_clock" + ), + Feature( + stringResource(R.string.show_day_title), + stringResource(R.string.show_day_summary), + "Fun_com_android_systemui_status_bar_clock" + ), + Feature( + stringResource(R.string.show_week_title), + stringResource(R.string.show_week_summary), + "Fun_com_android_systemui_status_bar_clock" + ), + Feature( + stringResource(R.string.show_cn_hour_title), + stringResource(R.string.show_cn_hour_summary), + "Fun_com_android_systemui_status_bar_clock" + ), + Feature( + stringResource(R.string.showtime_period_title), + stringResource(R.string.showtime_period_summary), + "Fun_com_android_systemui_status_bar_clock" + ), + Feature( + stringResource(R.string.show_seconds_title), + stringResource(R.string.show_seconds_summary), + "Fun_com_android_systemui_status_bar_clock" + ), + Feature( + stringResource(R.string.show_millisecond_title), + stringResource(R.string.show_millisecond_summary), + "Fun_com_android_systemui_status_bar_clock" + ), + Feature( + stringResource(R.string.hide_space_title), + stringResource(R.string.hide_space_summary), + "Fun_com_android_systemui_status_bar_clock" + ), + Feature( + stringResource(R.string.dual_row_title), + stringResource(R.string.dual_row_summary), + "Fun_com_android_systemui_status_bar_clock" + ), + Feature( + stringResource(R.string.alignment),null, + "Fun_com_android_systemui_status_bar_clock" + ), + Feature( + stringResource(R.string.clock_format),null, + "Fun_com_android_systemui_status_bar_clock" + ) ) var miuixSearchValue by remember { mutableStateOf("") } var expanded by rememberSaveable { mutableStateOf(false) } + var isKeyboardVisible by remember { mutableStateOf(false) } + + DisposableEffect(context) { + val rootView = (context as MainActivity).window.decorView + val listener = ViewTreeObserver.OnGlobalLayoutListener { + val insets = ViewCompat.getRootWindowInsets(rootView) + isKeyboardVisible = insets?.isVisible(WindowInsetsCompat.Type.ime()) == true + } + + rootView.viewTreeObserver.addOnGlobalLayoutListener(listener) + + onDispose { + rootView.viewTreeObserver.removeOnGlobalLayoutListener(listener) + } + } // 过滤符合搜索条件的功能 val filteredFeatures = features.filter { it.nickname.contains(miuixSearchValue, ignoreCase = true) || - it.description.contains(miuixSearchValue, ignoreCase = true) + it.description?.contains(miuixSearchValue, ignoreCase = true) ?: false } Column( @@ -94,7 +206,7 @@ fun Main_Function( ), contentDescription = stringResource(R.string.Search) ) - }, + } ) }, outsideRightAction = { @@ -114,7 +226,7 @@ fun Main_Function( ) { Card( modifier = Modifier.fillMaxWidth() - .padding(bottom = 6.dp, top = 6.dp) + .padding(bottom = (if (isKeyboardVisible) 6 else 65).dp, top = 6.dp) ) { LazyColumn(topAppBarScrollBehavior = topAppBarScrollBehavior) { if (filteredFeatures.isEmpty()) { @@ -122,23 +234,24 @@ fun Main_Function( Box( modifier = Modifier .fillMaxWidth() - .height(200.dp), // 设置高度以帮助居中 - contentAlignment = Alignment.Center // 设置内容居中 + .height(200.dp), + contentAlignment = Alignment.Center ) { Text(text = "空空如也~") } } } + filteredFeatures.forEach { feature -> item { AnimatedVisibility( - visible = true, // 控制动画显示或隐藏的条件 + visible = true, enter = fadeIn(animationSpec = tween(durationMillis = 300)), exit = fadeOut(animationSpec = tween(durationMillis = 300)) ) { BasicComponent( - title = feature.nickname, - summary = feature.description, + title = highlightMatches(feature.nickname, miuixSearchValue), + summary = feature.description?.let { highlightMatches(it, miuixSearchValue) }, modifier = Modifier.fillMaxWidth(), onClick = { miuixSearchValue = feature.nickname @@ -151,16 +264,13 @@ fun Main_Function( } } } - Spacer(Modifier.size(65.dp)) } - // 根据展开状态添加搜索结果 + if (expanded) { // 如果 expanded 为 true，则显示搜索结果 - } else { - // 如果 expanded 为 false，则显示 Card - LazyColumn(Modifier.fillMaxSize(),topAppBarScrollBehavior = topAppBarScrollBehavior) { + LazyColumn(Modifier.fillMaxSize(), topAppBarScrollBehavior = topAppBarScrollBehavior) { item { Card( modifier = Modifier.fillMaxWidth() @@ -179,6 +289,104 @@ fun Main_Function( } } +// 高亮匹配内容的函数 +fun highlightMatches(text: String, query: String): AnnotatedString { + if (query.isBlank()) return AnnotatedString(text) // 如果查询为空，则返回原始文本 + + val regex = Regex("($query)", RegexOption.IGNORE_CASE) // 匹配查询字符串的正则表达式 + val annotatedStringBuilder = AnnotatedString.Builder() + + var lastIndex = 0 + for (match in regex.findAll(text)) { + // 添加匹配前的文本 + annotatedStringBuilder.append(text.substring(lastIndex, match.range.first)) + // 添加高亮部分 + annotatedStringBuilder.pushStyle(SpanStyle(color = Color.Red)) + annotatedStringBuilder.append(match.value) + annotatedStringBuilder.pop() + lastIndex = match.range.last + 1 + } + // 添加剩余的文本 + annotatedStringBuilder.append(text.substring(lastIndex)) + + return annotatedStringBuilder.toAnnotatedString() +} + +@Composable +fun BasicComponent( + modifier: Modifier = Modifier, + insideMargin: DpSize? = null, + title: AnnotatedString? = null, // 修改为 AnnotatedString + titleColor: Color = MiuixTheme.colorScheme.onSurface, + summary: AnnotatedString? = null, // 修改为 AnnotatedString + summaryColor: Color = MiuixTheme.colorScheme.onSurfaceVariantSummary, + leftAction: @Composable (() -> Unit?)? = null, + rightActions: @Composable RowScope.() -> Unit = {}, + onClick: (() -> Unit)? = null, + interactionSource: MutableInteractionSource? = null, + indication: Indication? = null +) { + val interactionSource = interactionSource ?: remember { MutableInteractionSource() } + val indication = indication ?: createRipple() + val insideMargin = remember { insideMargin } ?: remember { DpSize(16.dp, 16.dp) } + val paddingModifier = remember(insideMargin) { + Modifier.padding(horizontal = insideMargin.width, vertical = insideMargin.height) + } + + Row( + modifier = if (onClick != null) { + modifier + .clickable( + interactionSource = interactionSource, + indication = indication + ) { + onClick.invoke() + } + } else { + modifier + } + .fillMaxWidth() + .then(paddingModifier), + verticalAlignment = Alignment.CenterVertically, + horizontalArrangement = Arrangement.SpaceBetween + ) { + leftAction?.let { + Box( + modifier = Modifier.padding(end = 16.dp) + ) { + it() + } + } + Column( + modifier = Modifier.weight(1f) + ) { + title?.let { + Text( + text = it, + color = titleColor, + fontWeight = FontWeight.Medium + ) + } + summary?.let { + Text( + text = it, + color = summaryColor, // 这里使用传入的颜色 + fontSize = MiuixTheme.textStyles.title.fontSize, + ) + } + } + Box( + modifier = Modifier.padding(start = 16.dp) + ) { + Row( + horizontalArrangement = Arrangement.End, + verticalAlignment = Alignment.CenterVertically, + content = rightActions + ) + } + } +} + @Composable fun FunctionApp(packageName: String, activityName: String, navController: NavController) { GetAppIconAndName(packageName = packageName) { appName, icon -> @@ -187,7 +395,7 @@ fun FunctionApp(packageName: String, activityName: String, navController: NavCon .clickable { navController.navigate(activityName) } - .fillMaxWidth(),verticalAlignment = Alignment.CenterVertically) { + .fillMaxWidth(), verticalAlignment = Alignment.CenterVertically) { Card(color = if (YukiHookAPI.Status.isModuleActive) MiuixTheme.colorScheme.primary else MaterialTheme.colorScheme.errorContainer, modifier = Modifier.padding(start = 16.dp, top = 16.dp, bottom = 16.dp) .drawColoredShadow( @@ -202,7 +410,7 @@ fun FunctionApp(packageName: String, activityName: String, navController: NavCon Image(bitmap = icon, contentDescription = "App Icon", modifier = Modifier .size(48.dp)) } - Column(verticalArrangement = Arrangement.Center, modifier = Modifier.padding(start = 16.dp)) { + Column(verticalArrangement = Arrangement.Center, modifier = Modifier.padding(start = 16.dp)) { Text(text = appName) Text(text = packageName) } @@ -215,6 +423,6 @@ fun FunctionApp(packageName: String, activityName: String, navController: NavCon data class Feature( val nickname: String, - val description: String, + val description: String?, val page: String ) diff --git a/app/src/main/java/io/github/suqi8/opatch/Main_Home.kt b/app/src/main/java/io/github/suqi8/opatch/Main_Home.kt index 4205f71b..2d72abf7 100644 --- a/app/src/main/java/io/github/suqi8/opatch/Main_Home.kt +++ b/app/src/main/java/io/github/suqi8/opatch/Main_Home.kt @@ -13,6 +13,7 @@ import androidx.compose.foundation.layout.PaddingValues import androidx.compose.foundation.layout.Row import androidx.compose.foundation.layout.Spacer import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.height import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.size import androidx.compose.material3.MaterialTheme @@ -30,7 +31,10 @@ import androidx.compose.ui.graphics.asImageBitmap import androidx.compose.ui.graphics.drawscope.drawIntoCanvas import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.res.painterResource +import androidx.compose.ui.res.stringResource +import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.unit.Dp +import androidx.compose.ui.unit.DpSize import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp import androidx.core.graphics.drawable.toBitmap @@ -38,6 +42,7 @@ import com.highcapable.yukihookapi.YukiHookAPI import top.yukonga.miuix.kmp.basic.Card import top.yukonga.miuix.kmp.basic.LazyColumn import top.yukonga.miuix.kmp.basic.ScrollBehavior +import top.yukonga.miuix.kmp.basic.SmallTitle import top.yukonga.miuix.kmp.basic.Text import top.yukonga.miuix.kmp.theme.MiuixTheme @@ -162,14 +167,14 @@ fun Main_Home(padding: PaddingValues,topAppBarScrollBehavior: ScrollBehavior) { ) { Text( text = if (YukiHookAPI.Status.isModuleActive) - "模块已激活" - else "模块未激活", + stringResource(R.string.module_is_activated) + else stringResource(R.string.module_not_activated), color = Color.Black ) Text( text = if (YukiHookAPI.Status.isModuleActive) "${YukiHookAPI.Status.Executor.name}-v${YukiHookAPI.Status.Executor.apiLevel}" - else "请到LSPosed中激活本模块", + else stringResource(R.string.please_activate), color = Color.Black ) } @@ -189,33 +194,49 @@ fun Main_Home(padding: PaddingValues,topAppBarScrollBehavior: ScrollBehavior) { .padding(start = 20.dp, top = 20.dp, end = 20.dp, bottom = 20.dp) .fillMaxWidth() ) { - Column(modifier = Modifier.padding(start = 30.dp, end = 30.dp, top = 30.dp, bottom = 30.dp)) { - Text(text = "SOC 型号") - Text(text = Build.SOC_MODEL, fontSize = 13.sp, color = Color.Gray) + Column(modifier = Modifier.padding(start = 20.dp, end = 20.dp, top = 20.dp, bottom = 20.dp)) { + Text(text = stringResource(id = R.string.soc_model)) + SmallTitle(text = Build.SOC_MODEL, insideMargin = DpSize(0.dp,0.dp)) - Text(text = "Android 版本", modifier = Modifier.padding(top = 10.dp)) - Text(text = Build.VERSION.RELEASE, fontSize = 13.sp, color = Color.Gray) + Spacer(modifier = Modifier.height(10.dp)) - Text(text = "Android API 版本", modifier = Modifier.padding(top = 10.dp)) - Text(text = Build.VERSION.SDK_INT.toString(), fontSize = 13.sp, color = Color.Gray) + Text(text = stringResource(id = R.string.android_version)) + SmallTitle(text = Build.VERSION.RELEASE, insideMargin = DpSize(0.dp,0.dp)) - Text(text = "系统版本", modifier = Modifier.padding(top = 10.dp)) - Text(text = Build.DISPLAY, fontSize = 13.sp, color = Color.Gray) + Spacer(modifier = Modifier.height(10.dp)) - Text(text = "CPU 代号", modifier = Modifier.padding(top = 10.dp)) - Text(text = Build.BOARD.substringAfter("_"), fontSize = 13.sp, color = Color.Gray) + Text(text = stringResource(id = R.string.android_api_version)) + SmallTitle(text = Build.VERSION.SDK_INT.toString(), insideMargin = DpSize(0.dp,0.dp)) - Text(text = "设备制造商", modifier = Modifier.padding(top = 10.dp)) - Text(text = Build.MANUFACTURER, fontSize = 13.sp, color = Color.Gray) + Spacer(modifier = Modifier.height(10.dp)) - Text(text = "支持的 Abi", modifier = Modifier.padding(top = 10.dp)) - Text(text = Build.SUPPORTED_ABIS.joinToString(), fontSize = 13.sp, color = Color.Gray) + Text(text = stringResource(id = R.string.system_version)) + SmallTitle(text = Build.DISPLAY, insideMargin = DpSize(0.dp,0.dp)) - Text(text = "Android 安全补丁", modifier = Modifier.padding(top = 10.dp)) - Text(text = Build.VERSION.SECURITY_PATCH, fontSize = 13.sp, color = Color.Gray) + Spacer(modifier = Modifier.height(10.dp)) - Text(text = "设备指纹", modifier = Modifier.padding(top = 10.dp)) - Text(text = Build.FINGERPRINT, fontSize = 13.sp, color = Color.Gray) + Text(text = stringResource(id = R.string.cpu_codename)) + SmallTitle(text = Build.BOARD.substringAfter("_"), insideMargin = DpSize(0.dp,0.dp)) + + Spacer(modifier = Modifier.height(10.dp)) + + Text(text = stringResource(id = R.string.device_manufacturer)) + SmallTitle(text = Build.MANUFACTURER, insideMargin = DpSize(0.dp,0.dp)) + + Spacer(modifier = Modifier.height(10.dp)) + + Text(text = stringResource(id = R.string.supported_abi)) + SmallTitle(text = Build.SUPPORTED_ABIS.joinToString(), insideMargin = DpSize(0.dp,0.dp)) + + Spacer(modifier = Modifier.height(10.dp)) + + Text(text = stringResource(id = R.string.android_security_patch)) + SmallTitle(text = Build.VERSION.SECURITY_PATCH, insideMargin = DpSize(0.dp,0.dp)) + + Spacer(modifier = Modifier.height(10.dp)) + + Text(text = stringResource(id = R.string.device_fingerprint)) + SmallTitle(text = Build.FINGERPRINT, insideMargin = DpSize(0.dp,0.dp)) } } } diff --git a/app/src/main/java/io/github/suqi8/opatch/hook/appilcations/StatusBarClock.kt b/app/src/main/java/io/github/suqi8/opatch/hook/appilcations/StatusBarClock.kt index 5e2328cc..4f24b2ef 100644 --- a/app/src/main/java/io/github/suqi8/opatch/hook/appilcations/StatusBarClock.kt +++ b/app/src/main/java/io/github/suqi8/opatch/hook/appilcations/StatusBarClock.kt @@ -4,12 +4,17 @@ import android.annotation.SuppressLint import android.content.Context import android.os.Handler import android.provider.Settings +import android.text.TextUtils.replace import android.util.TypedValue import android.view.Gravity import android.widget.TextView import com.highcapable.yukihookapi.hook.core.annotation.LegacyHookApi import com.highcapable.yukihookapi.hook.entity.YukiBaseHooker +import com.highcapable.yukihookapi.hook.factory.field +import com.highcapable.yukihookapi.hook.factory.method import com.highcapable.yukihookapi.hook.type.java.CharSequenceType +import com.highcapable.yukihookapi.hook.type.java.IntClass +import com.highcapable.yukihookapi.hook.type.java.StringClass import java.lang.reflect.Method import java.text.SimpleDateFormat import java.util.Calendar @@ -26,35 +31,113 @@ class StatusBarClock : YukiBaseHooker() { val ShowCNHour = prefs("settings").getBoolean("Status_Bar_Time_ShowCNHour", false) val Showtime_period = prefs("settings").getBoolean("Status_Bar_Time_Showtime_period", false) val ShowSeconds = prefs("settings").getBoolean("Status_Bar_Time_ShowSeconds", false) + val ShowMillisecond = prefs("settings").getBoolean("Status_Bar_Time_ShowMillisecond", false) val HideSpace = prefs("settings").getBoolean("Status_Bar_Time_HideSpace", false) val DualRow = prefs("settings").getBoolean("Status_Bar_Time_DualRow", false) var nowTime: Date? = null var FontSize = prefs("settings").getInt("Status_Bar_Time_fontsize", 0) + var updateSpeed = prefs("settings").getInt("Status_Bar_Time_ClockUpdateSpeed", 0) var newline = "" + var customClockStyle = prefs("settings").getString("Status_Bar_Time_CustomClockStyle", "HH:mm") + var customAlignment = prefs("settings").getInt("Status_Bar_Time_alignment", 0) @OptIn(LegacyHookApi::class) override fun onHook() { var context: Context? = null - "com.android.systemui.statusbar.policy.Clock".toClass().hook { - if (ClockStyleSelectedOption == 0) { - injectMember { - constructor { - paramCount = 3 + "com.android.systemui.statusbar.policy.Clock".toClass().apply { + hook { + if (ClockStyleSelectedOption == 0) { + injectMember { + constructor { + paramCount = 3 + } + afterHook { + context = args(0).cast() + val clockView = instance() + clockView.apply { + if (this.resources.getResourceEntryName(id) != "clock") return@afterHook + isSingleLine = false + gravity = Gravity.CENTER + if (DualRow) { + newline = "\n" + var defaultSize = 8F + if (FontSize != 0) defaultSize = FontSize.toFloat() + setTextSize(TypedValue.COMPLEX_UNIT_DIP, defaultSize) + setLineSpacing(0F, 0.8F) + } else { + if (FontSize != 0) { + setTextSize( + TypedValue.COMPLEX_UNIT_DIP, + FontSize.toFloat() + ) + } + } + } + + if (updateSpeed != 0) { + // 获取 updateClock 方法并设置定时器 + val updateClockMethod: Method = clockView.javaClass.superclass.getDeclaredMethod("updateClock") + val runnable = Runnable { + updateClockMethod.isAccessible = true + updateClockMethod.invoke(clockView) + } + + // 自定义定时器任务 + class CustomTimerTask : TimerTask() { + override fun run() { + Handler(clockView.context.mainLooper).post(runnable) + } + } + + // 使用 Timer 控制刷新频率，改为 500 毫秒 + Timer().schedule(CustomTimerTask(), 1000 - System.currentTimeMillis() % 1000, updateSpeed.toLong()) + } + } } - afterHook { - context = args(0).cast() - val clockView = instance() - clockView.apply { - if (this.resources.getResourceEntryName(id) != "clock") return@afterHook - isSingleLine = false - gravity = Gravity.CENTER - if (DualRow) { - newline = "\n" - var defaultSize = 8F - if (FontSize != 0) defaultSize = FontSize.toFloat() - setTextSize(TypedValue.COMPLEX_UNIT_DIP, defaultSize) - setLineSpacing(0F, 0.8F) - } else { + + // Hook getSmallTime 方法自定义显示格式 + injectMember { + method { + name = "getSmallTime" + returnType = CharSequenceType + } + afterHook { + instance().apply { + if (this.resources.getResourceEntryName(id) != "clock") return@afterHook + } + nowTime = Calendar.getInstance().time + result = getDate(context!!) + newline + getTime(context!!) + } + } + + } else { + // 其他样式选择逻辑 + injectMember { + constructor { + paramCount = 3 + } + afterHook { + context = args(0).cast() + val clockView = instance() + clockView.apply { + isSingleLine = false + if (this.resources.getResourceEntryName(id) != "clock") return@afterHook + gravity = when (customAlignment) { + 0 -> Gravity.CENTER // 居中对齐 + 1 -> Gravity.TOP // 顶部对齐 + 2 -> Gravity.BOTTOM // 底部对齐 + 3 -> Gravity.LEFT // 左侧对齐 + 4 -> Gravity.RIGHT // 右侧对齐 + 5 -> Gravity.START // 起始位置对齐 + 6 -> Gravity.END // 结束位置对齐 + 7 -> Gravity.CENTER_HORIZONTAL // 水平居中 + 8 -> Gravity.CENTER_VERTICAL // 垂直居中 + 9 -> Gravity.FILL // 填满整个空间 + 10 -> Gravity.FILL_HORIZONTAL // 水平填满 + 11 -> Gravity.FILL_VERTICAL // 垂直填满 + else -> Gravity.CENTER // 默认居中对齐 + } + if (FontSize != 0) { setTextSize( TypedValue.COMPLEX_UNIT_DIP, @@ -62,41 +145,53 @@ class StatusBarClock : YukiBaseHooker() { ) } } - } - val d: Method = clockView.javaClass.superclass.getDeclaredMethod("updateClock") - val r = Runnable { - d.isAccessible = true - d.invoke(clockView) - } + if (updateSpeed != 0) { + // 获取 updateClock 方法并设置定时器 + val updateClockMethod: Method = clockView.javaClass.superclass.getDeclaredMethod("updateClock") + val runnable = Runnable { + updateClockMethod.isAccessible = true + updateClockMethod.invoke(clockView) + } + + // 自定义定时器任务 + class CustomTimerTask : TimerTask() { + override fun run() { + Handler(clockView.context.mainLooper).post(runnable) + } + } - class T : TimerTask() { - override fun run() { - Handler(clockView.context.mainLooper).post(r) + // 使用 Timer 控制刷新频率，改为 500 毫秒 + Timer().schedule(CustomTimerTask(), 1000 - System.currentTimeMillis() % 1000, updateSpeed.toLong()) } } - Timer().scheduleAtFixedRate(T(), 1000 - System.currentTimeMillis() % 1000, 1000) } - } - injectMember { - method { - name = "getSmallTime" - returnType = CharSequenceType - } - afterHook { - instance().apply { - if (this.resources.getResourceEntryName(id) != "clock") return@afterHook + injectMember { + method { + name = "getSmallTime" + returnType = CharSequenceType + } + afterHook { + instance().apply { + if (this.resources.getResourceEntryName(id) != "clock") return@afterHook + } + nowTime = Calendar.getInstance().time + result = getCustomDate(context!!, customClockStyle).replace("\\n", "\n") } - nowTime = Calendar.getInstance().time - result = getDate(context!!) + newline + getTime(context!!) } } - } else { - } } } + + @SuppressLint("SimpleDateFormat") + private fun getCustomDate(context: Context,format: String): String { + return SimpleDateFormat(format).format(nowTime!!) + } + + + @SuppressLint("SimpleDateFormat") private fun getDate(context: Context): String { var dateFormat = "" if (isZh(context)) { @@ -122,10 +217,12 @@ class StatusBarClock : YukiBaseHooker() { return SimpleDateFormat(dateFormat).format(nowTime!!) } + @SuppressLint("SimpleDateFormat") private fun getTime(context: Context): String { var timeFormat = "" timeFormat += if (is24(context)) "HH:mm" else "hh:mm" if (ShowSeconds) timeFormat += ":ss" + if (ShowMillisecond) timeFormat += ":SSS" timeFormat = SimpleDateFormat(timeFormat).format(nowTime!!) if (isZh(context)) timeFormat = getPeriod(context) + timeFormat else timeFormat += getPeriod(context) @@ -180,6 +277,7 @@ class StatusBarClock : YukiBaseHooker() { return doubleHour } + @SuppressLint("SimpleDateFormat") private fun getPeriod(context: Context): String { var period = "" if (Showtime_period) { diff --git a/app/src/main/java/io/github/suqi8/opatch/ui/tools/resetApp.kt b/app/src/main/java/io/github/suqi8/opatch/ui/tools/resetApp.kt new file mode 100644 index 00000000..7f86472c --- /dev/null +++ b/app/src/main/java/io/github/suqi8/opatch/ui/tools/resetApp.kt @@ -0,0 +1,103 @@ +package io.github.suqi8.opatch.ui.tools + +import android.annotation.SuppressLint +import android.app.ActivityManager +import android.content.Context +import androidx.compose.foundation.layout.* +import androidx.compose.foundation.text.KeyboardActions +import androidx.compose.foundation.text.KeyboardOptions +import androidx.compose.runtime.* +import androidx.compose.ui.Modifier +import androidx.compose.ui.unit.dp +import androidx.compose.ui.platform.LocalContext +import androidx.compose.ui.res.stringResource +import androidx.compose.ui.text.input.ImeAction +import io.github.suqi8.opatch.R +import io.github.suqi8.opatch.saveDeviceName +import kotlinx.coroutines.CoroutineScope +import kotlinx.coroutines.Dispatchers +import kotlinx.coroutines.launch +import top.yukonga.miuix.kmp.basic.Button +import top.yukonga.miuix.kmp.basic.Text +import top.yukonga.miuix.kmp.basic.TextField +import top.yukonga.miuix.kmp.extra.SuperDialog +import top.yukonga.miuix.kmp.theme.MiuixTheme +import top.yukonga.miuix.kmp.utils.MiuixPopupUtil.Companion.dismissDialog +import top.yukonga.miuix.kmp.utils.MiuixPopupUtil.Companion.showDialog + +class resetApp { + @Composable + fun AppRestartScreen(appList: List,showresetAppDialog: MutableState) { + if (showresetAppDialog.value) { + ConfirmationDialog( + appPackage = appList.joinToString(separator = "\n"), + onConfirm = { + appList.forEach { + restartApp(it) + } + dismissDialog() + showresetAppDialog.value = false + }, + show = showresetAppDialog, + onDismiss = { showresetAppDialog.value = false + dismissDialog() + } + ) + } + } + + @SuppressLint("UnrememberedMutableState") + @Composable + fun ConfirmationDialog(appPackage: String,show: MutableState, onConfirm: () -> Unit, onDismiss: () -> Unit) { + if (!show.value) return + showDialog(content = { + SuperDialog(title = stringResource(R.string.Researt_app), + show = show, + onDismissRequest = { + onDismiss() + }) { + Text(text = """${stringResource(R.string.confirm_restart_applications)} + |$appPackage""".trimMargin()) + Spacer(Modifier.height(12.dp)) + Row( + modifier = Modifier + .fillMaxWidth(), + horizontalArrangement = Arrangement.SpaceBetween + ) { + Button( + modifier = Modifier.weight(1f), + text = stringResource(R.string.cancel), + onClick = { + onDismiss() + } + ) + Spacer(Modifier.width(12.dp)) + Button( + modifier = Modifier.weight(1f), + text = stringResource(R.string.ok), + submit = true, + onClick = { + onConfirm() + } + ) + } + } + }) + } + + private fun restartApp(packageName: String) { + CoroutineScope(Dispatchers.IO).launch { + try { + val command = "pkill -f " + packageName + // 使用 su 执行命令 + val process = Runtime.getRuntime().exec(arrayOf("su", "-c", command)) + + // 等待命令执行完成 + process.waitFor() + } catch (e: Exception) { + e.printStackTrace() + // 处理错误 + } + } + } +} diff --git a/app/src/main/res/drawable/about.xml b/app/src/main/res/drawable/about.xml new file mode 100644 index 00000000..9f88640f --- /dev/null +++ b/app/src/main/res/drawable/about.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/func.xml b/app/src/main/res/drawable/func.xml new file mode 100644 index 00000000..9b2e3e34 --- /dev/null +++ b/app/src/main/res/drawable/func.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/home.xml b/app/src/main/res/drawable/home.xml new file mode 100644 index 00000000..9c842efc --- /dev/null +++ b/app/src/main/res/drawable/home.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index 7b1685cf..820b6be8 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -46,4 +46,80 @@ 极客 时钟大小 调整状态栏时钟大小，0为不设置大小 + 时钟更新频率 + + 时钟样式 + 选择时钟的显示样式 + SOC 型号 + Android 版本 + Android API 版本 + 系统版本 + CPU 代号 + 设备制造商 + 支持的 Abi + Android 安全补丁 + 设备指纹 + YukiHookAPI版本 + 编译时间戳 + 编译时间 + 官方频道 + 参与翻译 + 前往 Crowdin 贡献您的语言翻译 + 前往他的主页 + 请先安装酷安应用 + + 时钟更新时间 + 设置时钟更新的频率，单位毫秒，0为不设置更新频率 + + + 显示年份 + 例如: 24年 + + + 显示月份 + 例如: 4月 + + + 显示日期 + 例如: 5日 + + + 显示星期 + 例如: 周一 + + + 显示时辰 + 例如: 寅时 + + + 显示时段 + 例如: 上午 + + + 显示秒数 + 例如: xx:xx:41 + + + 显示毫秒 + 例如: xx:xx:xx.919 + + + 隐藏间隔 + 隐藏时间内的空格 + + + 双排显示 + 双排显示时间 + 重启应用 + 确认重启以下应用吗？ + 常用设置 + 其他设置 + 模块已激活 + 请到LSPosed中激活本模块 + 软件设置 + 检查更新 + 题外话 + 对齐方式 + 年、月、日：\n y 年\n yy 两位数年份（例如 23 表示 2023 年）\n yyyy 四位数年份（例如 2023）\n M 月\n MM 两位数的月份（01-12）\n MMM 月份缩写（如 Jan）\n MMMM 月份全称（如 January）\n d 月中的天数（1-31）\n D 年中的天数（1-366）\n E 星期\n E 星期的缩写（如 Tue）\n EEEE 星期的全称（如 Tuesday）\n F 月中的第几周的星期几（1-7）\n w 年中的周数（1-53）\n W 月中的周数（1-5）\n ---\n 时、分、秒：\n h 12 小时制的小时数（1-12）\n H 24 小时制的小时数（0-23）\n m 分钟数（0-59）\n s 秒数（0-59）\n S 毫秒数（0-999）\n K 12 小时制的小时数（0-11）\n k 24 小时制的小时数（1-24）\n ---\n 上午/下午：\n a AM/PM 标记（如 AM 或 PM）\n ---\n 时区：\n z 时区\n z 时区缩写（如 PST）\n zzzz 时区全称（如 Pacific Standard Time）\n Z RFC 822 时区格式（如 -0800）\n X ISO 8601 时区\n X -08 或 +08\n XX -0800 或 +0800\n XXX -08:00 或 +08:00 + 时钟格式 diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 60e7ef7f..883433f1 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -50,6 +50,23 @@ Disable Package Verification Agent e.g. Google Play Protection Function + SOC Model + Android Version + Android API Version + System Version + CPU Codename + Device Manufacturer + Supported ABI + Android Security Patch + Device Fingerprint + YukiHookAPI Version + Compiled Timestamp + Compiled Time + Official Channel + Contribute to Translation + Go to Crowdin to contribute your language translation + Go to His Homepage + Please install the CoolAPK app first Home About Status bar clock @@ -59,4 +76,66 @@ Geek Clock size Adjust the size of the status bar clock; 0 means no size setting + Clock update time + + Clock Style + Choose the display style of the clock + + + + + Clock Update Time + Set the clock update frequency in milliseconds; 0 means no update frequency is set + + + Show Years + e.g., 2023 + + + Show Month + e.g., April + + + Show Day + e.g., 5th + + + Show Week + e.g., Monday + + + Show Chinese Hour + e.g., Yin Hour + + + Show Time Period + e.g., Morning + + + Show Seconds + e.g., xx:xx:41 + + + Show Milliseconds + e.g., xx:xx:xx.919 + + + Hide Space + Hide spaces within the time display + + + Dual Row Display + Display time in two rows + Researt app + Confirm to restart the following applications? + Common Settings + Other Settings + Module Activated + Please activate this module in LSPosed + App settings + Check for Updates + By the way + Alignment + Year, Month, Day:\n y Year\n yy Two-digit year (e.g., 23 for 2023)\n yyyy Four-digit year (e.g., 2023)\n M Month\n MM Two-digit month (01-12)\n MMM Month abbreviation (e.g., Jan)\n MMMM Full month name (e.g., January)\n d Day of the month (1-31)\n D Day of the year (1-366)\n E Day of the week\n E Abbreviated day of the week (e.g., Tue)\n EEEE Full day of the week (e.g., Tuesday)\n F Day of the week in the month (1-7)\n w Week of the year (1-53)\n W Week of the month (1-5)\n ---\n Hour, Minute, Second:\n h Hour in 12-hour format (1-12)\n H Hour in 24-hour format (0-23)\n m Minute (0-59)\n s Second (0-59)\n S Millisecond (0-999)\n K Hour in 12-hour format (0-11)\n k Hour in 24-hour format (1-24)\n ---\n AM/PM:\n a AM/PM marker (e.g., AM or PM)\n ---\n Time Zone:\n z Time zone\n z Time zone abbreviation (e.g., PST)\n zzzz Full time zone name (e.g., Pacific Standard Time)\n Z RFC 822 time zone format (e.g., -0800)\n X ISO 8601 time zone\n X -08 or +08\n XX -0800 or +0800\n XXX -08:00 or +08:00 + Clock format diff --git a/app/version.properties b/app/version.properties index b48677d2..8e630088 100644 --- a/app/version.properties +++ b/app/version.properties @@ -1,2 +1,2 @@ -#Thu Oct 03 22:44:07 CST 2024 -BUILD_NUMBER=710 +#Fri Oct 04 16:24:09 CST 2024 +BUILD_NUMBER=801 From 6a82a1273c482c20139f158432e2123b176eae6d Mon Sep 17 00:00:00 2001 From: suqi8 <3383787570@qq.com> Date: Fri, 4 Oct 2024 17:55:07 +0800 Subject: [PATCH 125/875] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=B0=83=E6=95=B4?= =?UTF-8?q?=E6=97=B6=E9=97=B4=E5=A4=A7=E5=B0=8F=EF=BC=8C=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?Debug=E6=A8=A1=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Fun_com_android_systemui_status_bar_clock.kt | 1 + .../main/java/io/github/suqi8/opatch/Main_About.kt | 12 ++++++++++++ .../suqi8/opatch/hook/appilcations/StatusBarClock.kt | 2 +- 3 files changed, 14 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/io/github/suqi8/opatch/Fun_com_android_systemui_status_bar_clock.kt b/app/src/main/java/io/github/suqi8/opatch/Fun_com_android_systemui_status_bar_clock.kt index 928ea954..29330c6b 100644 --- a/app/src/main/java/io/github/suqi8/opatch/Fun_com_android_systemui_status_bar_clock.kt +++ b/app/src/main/java/io/github/suqi8/opatch/Fun_com_android_systemui_status_bar_clock.kt @@ -101,6 +101,7 @@ fun Fun_com_android_systemui_status_bar_clock(navController: NavController) { val customClockCache = remember { mutableStateOf("HH:mm") } val customClock = remember { mutableStateOf("HH:mm") } val focusManager = LocalFocusManager.current + var isDebug = context.prefs("settings").getBoolean("Debug", false) LaunchedEffect(Unit) { ClockStyleSelectedOption.value = context.prefs("settings").getInt("ClockStyleSelectedOption", 0) diff --git a/app/src/main/java/io/github/suqi8/opatch/Main_About.kt b/app/src/main/java/io/github/suqi8/opatch/Main_About.kt index 30503fee..ea9243e0 100644 --- a/app/src/main/java/io/github/suqi8/opatch/Main_About.kt +++ b/app/src/main/java/io/github/suqi8/opatch/Main_About.kt @@ -70,6 +70,8 @@ import java.time.Instant import java.time.ZoneId import java.time.format.DateTimeFormatter import android.content.ActivityNotFoundException +import com.highcapable.yukihookapi.hook.factory.prefs +import top.yukonga.miuix.kmp.extra.SuperSwitch @SuppressLint("UnusedMaterial3ScaffoldPaddingParameter") @Composable @@ -79,6 +81,8 @@ fun Main_About(topAppBarScrollBehavior: ScrollBehavior, padding: PaddingValues, val deviceNameCache: MutableState = remember { mutableStateOf(deviceName.value) } val physicalTotalStorage = formatSize(getPhysicalTotalStorage(context)) val usedStorage = formatSize(getUsedStorage()) + val context = LocalContext.current + var isDebug = context.prefs("settings").getBoolean("Debug", false) val focusManager = LocalFocusManager.current LaunchedEffect(Unit) { val cachedName = getDeviceName(context) // 获取保存的设备名称 @@ -177,6 +181,14 @@ fun Main_About(topAppBarScrollBehavior: ScrollBehavior, padding: PaddingValues, } } ) + SuperSwitch( + title = "Debug", + checked = isDebug, + onCheckedChange = { + isDebug = it + context.prefs("settings").edit { putBoolean("Debug", it) } + } + ) } SmallTitle(text = stringResource(R.string.by_the_way)) Card(modifier = Modifier.fillMaxWidth() diff --git a/app/src/main/java/io/github/suqi8/opatch/hook/appilcations/StatusBarClock.kt b/app/src/main/java/io/github/suqi8/opatch/hook/appilcations/StatusBarClock.kt index 4f24b2ef..b9e56d6b 100644 --- a/app/src/main/java/io/github/suqi8/opatch/hook/appilcations/StatusBarClock.kt +++ b/app/src/main/java/io/github/suqi8/opatch/hook/appilcations/StatusBarClock.kt @@ -35,7 +35,7 @@ class StatusBarClock : YukiBaseHooker() { val HideSpace = prefs("settings").getBoolean("Status_Bar_Time_HideSpace", false) val DualRow = prefs("settings").getBoolean("Status_Bar_Time_DualRow", false) var nowTime: Date? = null - var FontSize = prefs("settings").getInt("Status_Bar_Time_fontsize", 0) + var FontSize = prefs("settings").getInt("Status_Bar_Time_ClockSize", 0) var updateSpeed = prefs("settings").getInt("Status_Bar_Time_ClockUpdateSpeed", 0) var newline = "" var customClockStyle = prefs("settings").getString("Status_Bar_Time_CustomClockStyle", "HH:mm") From 0e6ab3a76229c1b9a1cae48113a9a43b15559f08 Mon Sep 17 00:00:00 2001 From: suqi8 <157949748+suqi8@users.noreply.github.com> Date: Sat, 5 Oct 2024 12:32:30 +0800 Subject: [PATCH 126/875] Create ci-build.yml --- .github/workflows/ci-build.yml | 36 ++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) create mode 100644 .github/workflows/ci-build.yml diff --git a/.github/workflows/ci-build.yml b/.github/workflows/ci-build.yml new file mode 100644 index 00000000..0bf2b204 --- /dev/null +++ b/.github/workflows/ci-build.yml @@ -0,0 +1,36 @@ +name: Android CI Build + +on: + push: + branches: + - main + pull_request: + +jobs: + build: + runs-on: ubuntu-latest + + steps: + - name: Checkout code + uses: actions/checkout@v2 + + - name: Set up JDK 17 + uses: actions/setup-java@v2 + with: + java-version: '17' + + - name: Cache Gradle packages + uses: actions/cache@v2 + with: + path: | + ~/.gradle/caches + ~/.gradle/wrapper + key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }} + restore-keys: | + ${{ runner.os }}-gradle + + - name: Build with Gradle + run: ./gradlew build + + - name: Run Unit Tests + run: ./gradlew test From 75dab5468dc3c984fd89b306cbf598eabffe1ffc Mon Sep 17 00:00:00 2001 From: suqi8 <3383787570@qq.com> Date: Sat, 5 Oct 2024 12:34:17 +0800 Subject: [PATCH 127/875] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=A1=AC=E4=BB=B6?= =?UTF-8?q?=E6=8C=87=E7=A4=BA=E5=99=A8UI?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/main/AndroidManifest.xml | 9 +- .../suqi8/opatch/Fun_com_android_systemui.kt | 80 ++++-- ...com_android_systemui_hardware_indicator.kt | 265 ++++++++++++++++++ .../io/github/suqi8/opatch/MainActivity.kt | 1 + .../java/io/github/suqi8/opatch/Main_About.kt | 9 +- .../hook/appilcations/StatusBarClock.kt | 31 ++ app/src/main/res/values-zh-rCN/strings.xml | 8 + app/src/main/res/values/strings.xml | 8 + app/version.properties | 4 +- 9 files changed, 391 insertions(+), 24 deletions(-) create mode 100644 app/src/main/java/io/github/suqi8/opatch/Fun_com_android_systemui_hardware_indicator.kt diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 533ed6b5..36ee28f0 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -8,8 +8,13 @@ - - + + + + + + var isDebug = context.prefs("settings").getBoolean("Debug", false) + Scaffold(topBar = { GetAppIconAndName(packageName = "com.android.systemui") { appName, icon -> TopAppBar( title = appName, scrollBehavior = one, @@ -82,14 +80,62 @@ fun Fun_com_android_systemui(navController: NavController) { topAppBarScrollBehavior = one, modifier = Modifier.fillMaxSize()) { item { Card( - modifier = Modifier.fillMaxWidth() + modifier = Modifier + .fillMaxWidth() .padding(horizontal = 12.dp) - .padding(bottom = 6.dp,top = 15.dp) + .padding(bottom = 6.dp, top = 15.dp) ) { SuperArrow(title = stringResource(id = R.string.status_bar_clock), onClick = { navController.navigate("Fun_com_android_systemui_status_bar_clock") }) + SuperArrow(title = stringResource(id = R.string.hardware_indicator), + onClick = { + navController.navigate("Fun_com_android_systemui_hardware_indicator") + }) + } + + + if (isDebug) { + val launcher = rememberLauncherForActivityResult(ActivityResultContracts.StartActivityForResult()) { result -> + if (result.resultCode == Activity.RESULT_OK) { + result.data?.data?.let { uri -> + // 在这里处理返回的 URI，例如读取文件 + Log.d("FilePicker", "Selected file URI: $uri") + } + } + } + var fis: FileInputStream? = null + var currentNow = remember { mutableStateOf(0.0) } + var errorMessage = remember { mutableStateOf(null) } + Button(onClick = { + val intent = Intent(Intent.ACTION_OPEN_DOCUMENT).apply { + addCategory(Intent.CATEGORY_OPENABLE) + type = "*/*" // 可以指定特定类型，例如 "image/*" 或 "video/*" + } + launcher.launch(intent) + }, + text = "a") + + LaunchedEffect(Unit) { + try { + val fis = FileInputStream("/sys/class/power_supply/battery/uevent") + val props = Properties() + props.load(fis) + val currentNowString = props.getProperty("POWER_SUPPLY_CURRENT_NOW") + currentNow.value = currentNowString?.toDoubleOrNull() ?: 0.0 + } catch (e: Exception) { + errorMessage.value = e.message // 捕获异常并保存错误信息 + } finally { + fis?.close() + } + } + var rawCurr = 0 + /* + rawCurr = + (-1 * Math.round(props.getProperty("POWER_SUPPLY_CURRENT_NOW").toInt() / 1000f)).toInt()*/ + // UI 组件 + SmallTitle("Error: ${errorMessage.value} ${currentNow.value}") } } } diff --git a/app/src/main/java/io/github/suqi8/opatch/Fun_com_android_systemui_hardware_indicator.kt b/app/src/main/java/io/github/suqi8/opatch/Fun_com_android_systemui_hardware_indicator.kt new file mode 100644 index 00000000..5d6249ae --- /dev/null +++ b/app/src/main/java/io/github/suqi8/opatch/Fun_com_android_systemui_hardware_indicator.kt @@ -0,0 +1,265 @@ +package io.github.suqi8.opatch + +import android.annotation.SuppressLint +import android.content.Context +import android.view.Gravity +import androidx.compose.animation.AnimatedVisibility +import androidx.compose.foundation.background +import androidx.compose.foundation.layout.Arrangement +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.PaddingValues +import androidx.compose.foundation.layout.Row +import androidx.compose.foundation.layout.Spacer +import androidx.compose.foundation.layout.WindowInsets +import androidx.compose.foundation.layout.WindowInsetsSides +import androidx.compose.foundation.layout.displayCutout +import androidx.compose.foundation.layout.fillMaxSize +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.height +import androidx.compose.foundation.layout.navigationBars +import androidx.compose.foundation.layout.only +import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.layout.width +import androidx.compose.foundation.layout.windowInsetsPadding +import androidx.compose.foundation.text.KeyboardActions +import androidx.compose.foundation.text.KeyboardOptions +import androidx.compose.material.icons.Icons +import androidx.compose.material.icons.outlined.Refresh +import androidx.compose.material3.Icon +import androidx.compose.material3.IconButton +import androidx.compose.runtime.Composable +import androidx.compose.runtime.LaunchedEffect +import androidx.compose.runtime.MutableState +import androidx.compose.runtime.getValue +import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.remember +import androidx.compose.runtime.setValue +import androidx.compose.ui.Modifier +import androidx.compose.ui.graphics.Color +import androidx.compose.ui.platform.LocalContext +import androidx.compose.ui.platform.LocalFocusManager +import androidx.compose.ui.res.stringResource +import androidx.compose.ui.text.input.ImeAction +import androidx.compose.ui.unit.DpSize +import androidx.compose.ui.unit.dp +import androidx.navigation.NavController +import com.highcapable.yukihookapi.hook.factory.prefs +import io.github.suqi8.opatch.application.RestartApp +import io.github.suqi8.opatch.tools.AnimTools +import io.github.suqi8.opatch.ui.tools.resetApp +import kotlinx.coroutines.CoroutineScope +import kotlinx.coroutines.Dispatchers +import kotlinx.coroutines.launch +import top.yukonga.miuix.kmp.basic.BasicComponent +import top.yukonga.miuix.kmp.basic.Button +import top.yukonga.miuix.kmp.basic.Card +import top.yukonga.miuix.kmp.basic.LazyColumn +import top.yukonga.miuix.kmp.basic.MiuixScrollBehavior +import top.yukonga.miuix.kmp.basic.Scaffold +import top.yukonga.miuix.kmp.basic.Slider +import top.yukonga.miuix.kmp.basic.SmallTitle +import top.yukonga.miuix.kmp.basic.TextField +import top.yukonga.miuix.kmp.basic.TopAppBar +import top.yukonga.miuix.kmp.extra.SuperArrow +import top.yukonga.miuix.kmp.extra.SuperDialog +import top.yukonga.miuix.kmp.extra.SuperDropdown +import top.yukonga.miuix.kmp.extra.SuperSwitch +import top.yukonga.miuix.kmp.icon.MiuixIcons +import top.yukonga.miuix.kmp.icon.icons.ArrowBack +import top.yukonga.miuix.kmp.theme.MiuixTheme +import top.yukonga.miuix.kmp.utils.MiuixPopupUtil.Companion.dismissDialog +import top.yukonga.miuix.kmp.utils.MiuixPopupUtil.Companion.showDialog + +@SuppressLint("RtlHardcoded") +@Composable +fun Fun_com_android_systemui_hardware_indicator(navController: NavController) { + val context = LocalContext.current + val topappbarzt = MiuixScrollBehavior(top.yukonga.miuix.kmp.basic.rememberTopAppBarState()) + val RestartAPP = remember { mutableStateOf(false) } + val resetApp = resetApp() + val focusManager = LocalFocusManager.current + var isDebug = context.prefs("settings").getBoolean("Debug", false) + var com_android_systemui_power_consumption_indicator = remember { mutableStateOf(false) } + var com_android_systemui_temperature_indicator = remember { mutableStateOf(false) } + val appList = listOf("com.android.systemui") + val powerDisplay = listOf(stringResource(R.string.both), stringResource(R.string.power), stringResource(R.string.current)) + val powerDisplaySelect = remember { mutableStateOf(0) } + val hidePowerUnit = remember { mutableStateOf(false) } + val hideCurrentUnit = remember { mutableStateOf(false) } + LaunchedEffect(Unit) { + com_android_systemui_power_consumption_indicator.value = context.prefs("settings").getBoolean("com_android_systemui_power_consumption_indicator", false) + com_android_systemui_temperature_indicator.value = context.prefs("settings").getBoolean("com_android_systemui_temperature_indicator", false) + powerDisplaySelect.value = context.prefs("settings").getInt("com_android_systemui_powerDisplaySelect", 0) + hidePowerUnit.value = context.prefs("settings").getBoolean("com_android_systemui_hidePowerUnit", false) + hideCurrentUnit.value = context.prefs("settings").getBoolean("com_android_systemui_hideCurrentUnit", false) + } + Scaffold(topBar = { + TopAppBar( + scrollBehavior = topappbarzt, + title = stringResource(id = R.string.hardware_indicator), + navigationIcon = { + IconButton(onClick = { + navController.popBackStack() + }, + modifier = Modifier.padding(start = 18.dp)) { + Icon( + imageVector = MiuixIcons.ArrowBack, + contentDescription = null, + tint = MiuixTheme.colorScheme.onBackground + ) + } + }, + actions = { + // 如果你有其他操作按钮，这里可以添加 + IconButton(onClick = { + RestartAPP.value = true + }, + modifier = Modifier.padding(end = 18.dp)) { + Icon( + imageVector = Icons.Outlined.Refresh, + contentDescription = null, + tint = MiuixTheme.colorScheme.onBackground + ) + } + } + ) + }) { padding -> + LazyColumn( + modifier = Modifier + .fillMaxSize() + .background(MiuixTheme.colorScheme.background) + .windowInsetsPadding(WindowInsets.displayCutout.only(WindowInsetsSides.Horizontal)) + .windowInsetsPadding(WindowInsets.navigationBars.only(WindowInsetsSides.Horizontal)), + contentPadding = PaddingValues(top = padding.calculateTopPadding()), + topAppBarScrollBehavior = topappbarzt + ) { + item { + Column { + Card( + modifier = Modifier.fillMaxWidth() + .padding(horizontal = 12.dp) + .padding(bottom = 6.dp,top = 15.dp) + ) { + SuperSwitch( + title = stringResource(R.string.power_consumption_indicator), + onCheckedChange = { + com_android_systemui_power_consumption_indicator.value = it + context.prefs("settings").edit { putBoolean("com_android_systemui_power_consumption_indicator", it) } + }, + checked = com_android_systemui_power_consumption_indicator.value + ) + } + AnimatedVisibility( + visible = !com_android_systemui_power_consumption_indicator.value + ) { + Column { + Card( + modifier = Modifier + .fillMaxWidth() + .padding(horizontal = 12.dp, vertical = 6.dp), + color = Color.Red.copy(alpha = 0.1f) + ) { + BasicComponent( + title = stringResource(R.string.no_start_func), + titleColor = Color.Red + ) + } + } + } + AnimatedVisibility( + visible = com_android_systemui_power_consumption_indicator.value, + enter = AnimTools().enterTransition(0), + exit = AnimTools().exitTransition(100) + ) { + Column { + Card( + modifier = Modifier + .fillMaxWidth() + .padding(horizontal = 12.dp, vertical = 6.dp) + ) { + SuperDropdown( + title = stringResource(R.string.display_content), + items = powerDisplay, + selectedIndex = powerDisplaySelect.value + ) { + powerDisplaySelect.value = it + context.prefs("settings").edit { putInt("com_android_systemui_powerDisplaySelect", it) } + } + } + SmallTitle(stringResource(R.string.hide_unit)) + Card( + modifier = Modifier + .fillMaxWidth() + .padding(horizontal = 12.dp, vertical = 6.dp) + ) { + SuperSwitch( + title = stringResource(R.string.power), + onCheckedChange = { + hidePowerUnit.value = it + context.prefs("settings").edit { putBoolean("com_android_systemui_hidePowerUnit", it) } + }, + checked = hidePowerUnit.value + ) + SuperSwitch( + title = stringResource(R.string.current), + onCheckedChange = { + hideCurrentUnit.value = it + context.prefs("settings").edit { putBoolean("com_android_systemui_hideCurrentUnit", it) } + }, + checked = hideCurrentUnit.value + ) + } + } + } + Card( + modifier = Modifier.fillMaxWidth() + .padding(horizontal = 12.dp) + .padding(bottom = 6.dp,top = 15.dp) + ) { + SuperSwitch( + title = stringResource(R.string.temperature_indicator), + onCheckedChange = { + com_android_systemui_temperature_indicator.value = it + context.prefs("settings").edit { putBoolean("com_android_systemui_temperature_indicator", it) } + }, + checked = com_android_systemui_temperature_indicator.value + ) + } + AnimatedVisibility( + visible = !com_android_systemui_temperature_indicator.value + ) { + Column { + Card( + modifier = Modifier + .fillMaxWidth() + .padding(horizontal = 12.dp, vertical = 6.dp), + color = Color.Red.copy(alpha = 0.1f) + ) { + BasicComponent( + title = stringResource(R.string.no_start_func), + titleColor = Color.Red + ) + } + } + } + AnimatedVisibility( + visible = com_android_systemui_temperature_indicator.value, + enter = AnimTools().enterTransition(0), + exit = AnimTools().exitTransition(100) + ) { + Column { + Card( + modifier = Modifier + .fillMaxWidth() + .padding(horizontal = 12.dp, vertical = 6.dp) + ) { + } + } + } + } + } + } + } + resetApp.AppRestartScreen(appList,RestartAPP) + //CustomClockDialog(showCustomClockDialog,customClockCache,customClock,focusManager) +} diff --git a/app/src/main/java/io/github/suqi8/opatch/MainActivity.kt b/app/src/main/java/io/github/suqi8/opatch/MainActivity.kt index 0b99559e..1bab258c 100644 --- a/app/src/main/java/io/github/suqi8/opatch/MainActivity.kt +++ b/app/src/main/java/io/github/suqi8/opatch/MainActivity.kt @@ -143,6 +143,7 @@ fun Main0(modifier: Modifier,context: Context,colorMode: MutableState = rem composable("Fun_android_package_manager_services") { Fun_android_package_manager_services(navController = navController)} composable("Fun_com_android_systemui") { Fun_com_android_systemui(navController = navController)} composable("Fun_com_android_systemui_status_bar_clock") { Fun_com_android_systemui_status_bar_clock(navController = navController) } + composable("Fun_com_android_systemui_hardware_indicator") { Fun_com_android_systemui_hardware_indicator(navController = navController) } } } } diff --git a/app/src/main/java/io/github/suqi8/opatch/Main_About.kt b/app/src/main/java/io/github/suqi8/opatch/Main_About.kt index ea9243e0..af7bb1af 100644 --- a/app/src/main/java/io/github/suqi8/opatch/Main_About.kt +++ b/app/src/main/java/io/github/suqi8/opatch/Main_About.kt @@ -70,6 +70,8 @@ import java.time.Instant import java.time.ZoneId import java.time.format.DateTimeFormatter import android.content.ActivityNotFoundException +import androidx.compose.runtime.getValue +import androidx.compose.runtime.setValue import com.highcapable.yukihookapi.hook.factory.prefs import top.yukonga.miuix.kmp.extra.SuperSwitch @@ -82,7 +84,7 @@ fun Main_About(topAppBarScrollBehavior: ScrollBehavior, padding: PaddingValues, val physicalTotalStorage = formatSize(getPhysicalTotalStorage(context)) val usedStorage = formatSize(getUsedStorage()) val context = LocalContext.current - var isDebug = context.prefs("settings").getBoolean("Debug", false) + var isDebug = remember { mutableStateOf(false) } val focusManager = LocalFocusManager.current LaunchedEffect(Unit) { val cachedName = getDeviceName(context) // 获取保存的设备名称 @@ -90,6 +92,7 @@ fun Main_About(topAppBarScrollBehavior: ScrollBehavior, padding: PaddingValues, deviceName.value = cachedName deviceNameCache.value = cachedName } + isDebug.value = context.prefs("settings").getBoolean("Debug", false) } Scaffold() { LazyColumn(contentPadding = PaddingValues(top = padding.calculateTopPadding()), @@ -183,9 +186,9 @@ fun Main_About(topAppBarScrollBehavior: ScrollBehavior, padding: PaddingValues, ) SuperSwitch( title = "Debug", - checked = isDebug, + checked = isDebug.value, onCheckedChange = { - isDebug = it + isDebug.value = it context.prefs("settings").edit { putBoolean("Debug", it) } } ) diff --git a/app/src/main/java/io/github/suqi8/opatch/hook/appilcations/StatusBarClock.kt b/app/src/main/java/io/github/suqi8/opatch/hook/appilcations/StatusBarClock.kt index b9e56d6b..3d9a9538 100644 --- a/app/src/main/java/io/github/suqi8/opatch/hook/appilcations/StatusBarClock.kt +++ b/app/src/main/java/io/github/suqi8/opatch/hook/appilcations/StatusBarClock.kt @@ -7,6 +7,8 @@ import android.provider.Settings import android.text.TextUtils.replace import android.util.TypedValue import android.view.Gravity +import android.view.View +import android.widget.LinearLayout import android.widget.TextView import com.highcapable.yukihookapi.hook.core.annotation.LegacyHookApi import com.highcapable.yukihookapi.hook.entity.YukiBaseHooker @@ -179,6 +181,35 @@ class StatusBarClock : YukiBaseHooker() { result = getCustomDate(context!!, customClockStyle).replace("\\n", "\n") } } + injectMember { + method { + name = "updateClock" + } + + beforeHook { + val clockView = instance() + val parentLayout = clockView.parent as LinearLayout + + // 检查是否已经添加了自定义 TextView，避免重复添加 + val customTextView = parentLayout.findViewWithTag("customText") + + if (customTextView == null) { + // 创建新的 TextView + val newTextView = TextView(clockView.context).apply { + text = "新的文本" // 显示的文本 + textSize = 13f + tag = "customText" // 用标签标识 + layoutParams = LinearLayout.LayoutParams( + LinearLayout.LayoutParams.WRAP_CONTENT, + LinearLayout.LayoutParams.WRAP_CONTENT + ).apply { + marginStart = 8 // 与时间的距离 + } + } + parentLayout.addView(newTextView) + } + } + } } } } diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index 820b6be8..e25d63b4 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -16,6 +16,7 @@ 确定 储存空间 搜索 + 隐藏单位 取消 颜色模式 夜间模式 @@ -121,5 +122,12 @@ 题外话 对齐方式 年、月、日：\n y 年\n yy 两位数年份（例如 23 表示 2023 年）\n yyyy 四位数年份（例如 2023）\n M 月\n MM 两位数的月份（01-12）\n MMM 月份缩写（如 Jan）\n MMMM 月份全称（如 January）\n d 月中的天数（1-31）\n D 年中的天数（1-366）\n E 星期\n E 星期的缩写（如 Tue）\n EEEE 星期的全称（如 Tuesday）\n F 月中的第几周的星期几（1-7）\n w 年中的周数（1-53）\n W 月中的周数（1-5）\n ---\n 时、分、秒：\n h 12 小时制的小时数（1-12）\n H 24 小时制的小时数（0-23）\n m 分钟数（0-59）\n s 秒数（0-59）\n S 毫秒数（0-999）\n K 12 小时制的小时数（0-11）\n k 24 小时制的小时数（1-24）\n ---\n 上午/下午：\n a AM/PM 标记（如 AM 或 PM）\n ---\n 时区：\n z 时区\n z 时区缩写（如 PST）\n zzzz 时区全称（如 Pacific Standard Time）\n Z RFC 822 时区格式（如 -0800）\n X ISO 8601 时区\n X -08 或 +08\n XX -0800 或 +0800\n XXX -08:00 或 +08:00 + 两者 + 功率 + 电流 时钟格式 + 硬件指示器 + 功耗指示器 + 温度指示器 + 显示内容 diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 883433f1..1ce2bddf 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -20,6 +20,7 @@ OK Device Memory Search + Hide Unit Cancel Ignore Configuration initialization failed @@ -138,4 +139,11 @@ Alignment Year, Month, Day:\n y Year\n yy Two-digit year (e.g., 23 for 2023)\n yyyy Four-digit year (e.g., 2023)\n M Month\n MM Two-digit month (01-12)\n MMM Month abbreviation (e.g., Jan)\n MMMM Full month name (e.g., January)\n d Day of the month (1-31)\n D Day of the year (1-366)\n E Day of the week\n E Abbreviated day of the week (e.g., Tue)\n EEEE Full day of the week (e.g., Tuesday)\n F Day of the week in the month (1-7)\n w Week of the year (1-53)\n W Week of the month (1-5)\n ---\n Hour, Minute, Second:\n h Hour in 12-hour format (1-12)\n H Hour in 24-hour format (0-23)\n m Minute (0-59)\n s Second (0-59)\n S Millisecond (0-999)\n K Hour in 12-hour format (0-11)\n k Hour in 24-hour format (1-24)\n ---\n AM/PM:\n a AM/PM marker (e.g., AM or PM)\n ---\n Time Zone:\n z Time zone\n z Time zone abbreviation (e.g., PST)\n zzzz Full time zone name (e.g., Pacific Standard Time)\n Z RFC 822 time zone format (e.g., -0800)\n X ISO 8601 time zone\n X -08 or +08\n XX -0800 or +0800\n XXX -08:00 or +08:00 Clock format + Both + Power + Current + Hardware Indicator + Power Consumption Indicator + Temperature Indicator + Display Content diff --git a/app/version.properties b/app/version.properties index 8e630088..0bea2fb3 100644 --- a/app/version.properties +++ b/app/version.properties @@ -1,2 +1,2 @@ -#Fri Oct 04 16:24:09 CST 2024 -BUILD_NUMBER=801 +#Sat Oct 05 12:23:31 CST 2024 +BUILD_NUMBER=832 From 3425ab809e220c7f094f0fc82afd91494937730f Mon Sep 17 00:00:00 2001 From: suqi8 <157949748+suqi8@users.noreply.github.com> Date: Sat, 5 Oct 2024 12:36:29 +0800 Subject: [PATCH 128/875] Create android-build-ci.yml --- .github/workflows/android.yml | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) create mode 100644 .github/workflows/android.yml diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml new file mode 100644 index 00000000..c8ec0e8b --- /dev/null +++ b/.github/workflows/android.yml @@ -0,0 +1,26 @@ +name: Android CI + +on: + push: + branches: [ "master" ] + pull_request: + branches: [ "master" ] + +jobs: + build: + + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v4 + - name: set up JDK 17 + uses: actions/setup-java@v4 + with: + java-version: '17' + distribution: 'temurin' + cache: gradle + + - name: Grant execute permission for gradlew + run: chmod +x gradlew + - name: Build with Gradle + run: ./gradlew build From faf033a9d15e53d241f8d82cd901cb2a64d5e52b Mon Sep 17 00:00:00 2001 From: suqi8 <3383787570@qq.com> Date: Sat, 5 Oct 2024 12:37:34 +0800 Subject: [PATCH 129/875] =?UTF-8?q?=E5=88=A0=E9=99=A4=20Android=20CI=20?= =?UTF-8?q?=E6=9E=84=E5=BB=BA=E5=B7=A5=E4=BD=9C=E6=B5=81=E7=A8=8B=EF=BC=8C?= =?UTF-8?q?=E4=B8=8E=E6=9C=80=E6=96=B0=E6=8F=90=E4=BA=A4=E4=BF=9D=E6=8C=81?= =?UTF-8?q?=E4=B8=80=E8=87=B4=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/ci-build.yml | 36 ---------------------------------- 1 file changed, 36 deletions(-) delete mode 100644 .github/workflows/ci-build.yml diff --git a/.github/workflows/ci-build.yml b/.github/workflows/ci-build.yml deleted file mode 100644 index 0bf2b204..00000000 --- a/.github/workflows/ci-build.yml +++ /dev/null @@ -1,36 +0,0 @@ -name: Android CI Build - -on: - push: - branches: - - main - pull_request: - -jobs: - build: - runs-on: ubuntu-latest - - steps: - - name: Checkout code - uses: actions/checkout@v2 - - - name: Set up JDK 17 - uses: actions/setup-java@v2 - with: - java-version: '17' - - - name: Cache Gradle packages - uses: actions/cache@v2 - with: - path: | - ~/.gradle/caches - ~/.gradle/wrapper - key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }} - restore-keys: | - ${{ runner.os }}-gradle - - - name: Build with Gradle - run: ./gradlew build - - - name: Run Unit Tests - run: ./gradlew test From ac26ad399143d166b697247a4d1ffac3479d566e Mon Sep 17 00:00:00 2001 From: suqi8 <3383787570@qq.com> Date: Sat, 5 Oct 2024 12:46:26 +0800 Subject: [PATCH 130/875] =?UTF-8?q?=E4=BC=98=E5=8C=96=20AndroidManifest.xm?= =?UTF-8?q?l=EF=BC=8C=E5=88=A0=E9=99=A4=E6=97=A0=E7=94=A8=20activity?= =?UTF-8?q?=EF=BC=8C=E6=8F=90=E9=AB=98=E5=BA=94=E7=94=A8=E6=80=A7=E8=83=BD?= =?UTF-8?q?=E5=92=8C=E5=8F=AF=E7=BB=B4=E6=8A=A4=E6=80=A7=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/main/AndroidManifest.xml | 19 ------------------- 1 file changed, 19 deletions(-) diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 36ee28f0..c669ecb8 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -29,30 +29,11 @@ android:supportsRtl="true" android:theme="@style/Theme.AppDefault" tools:targetApi="tiramisu"> - - - - - - - Date: Sat, 5 Oct 2024 13:40:07 +0800 Subject: [PATCH 131/875] =?UTF-8?q?=E4=BC=98=E5=8C=96=20AndroidManifest.xm?= =?UTF-8?q?l=EF=BC=8C=E5=88=A0=E9=99=A4=E6=97=A0=E7=94=A8=20activity?= =?UTF-8?q?=EF=BC=8C=E6=8F=90=E9=AB=98=E5=BA=94=E7=94=A8=E6=80=A7=E8=83=BD?= =?UTF-8?q?=E5=92=8C=E5=8F=AF=E7=BB=B4=E6=8A=A4=E6=80=A7=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/main/AndroidManifest.xml | 6 ------ .../suqi8/opatch/hook/corepatch/SettingsActivity1.java | 3 --- app/src/main/res/values-zh-rCN/strings.xml | 6 ++++++ app/src/main/res/values/strings.xml | 6 ------ app/version.properties | 4 ++-- 5 files changed, 8 insertions(+), 17 deletions(-) diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index c669ecb8..71e8f1c9 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -29,12 +29,6 @@ android:supportsRtl="true" android:theme="@style/Theme.AppDefault" tools:targetApi="tiramisu"> - - diff --git a/app/src/main/java/io/github/suqi8/opatch/hook/corepatch/SettingsActivity1.java b/app/src/main/java/io/github/suqi8/opatch/hook/corepatch/SettingsActivity1.java index 5a539900..91e0e91c 100644 --- a/app/src/main/java/io/github/suqi8/opatch/hook/corepatch/SettingsActivity1.java +++ b/app/src/main/java/io/github/suqi8/opatch/hook/corepatch/SettingsActivity1.java @@ -79,9 +79,6 @@ public void onSharedPreferenceChanged(SharedPreferences sharedPreferences, Strin try { @SuppressLint("PrivateApi") Class c = Class.forName("android.os.SystemProperties"); Method get = c.getMethod("get", String.class); - if (!((String) Objects.requireNonNull(get.invoke(c, "ro.miui.ui.version.code"))).isEmpty()) { - new AlertDialog.Builder(getActivity()).setMessage(R.string.miui_usepresig_warn).setPositiveButton(android.R.string.ok, null).show(); - } } catch (Exception ignored) { } diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index e25d63b4..f86f9c13 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -16,6 +16,12 @@ 确定 储存空间 搜索 + 忽略 + 配置初始化失败 + 您似乎正在使用过时版本的 LSPosed，或者 LSPosed 未激活，请更新 LSPosed 或在激活后重试。 + !! 任何 APK 都可以覆盖已安装的 APK !!\n安装未知 APK 时请小心 + 设置 + 此版本仅适用于 Android 9–14。\n请使用最新版本的 LSPosed。 隐藏单位 取消 颜色模式 diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 1ce2bddf..c874ba81 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -25,15 +25,9 @@ Ignore Configuration initialization failed It seems that you are using an out dated version of LSPosed or LSPosed is not activated, please update LSPosed or try again after activated. - UsePreSig won\'t work on MiUI because its framework changes too much.\nWe don\'t have time to track the case. !! Any apk can override the installed one !!\nBe carefully when installing unknown apk Settings This version is for Android 9–14 only.\nPlease use the latest version of the LSPosed. - Hello blank fragment - home - Main_Home - MainActivity2 - Fun_android Allow downgrade Allow downgrade applications. Disable digest verify diff --git a/app/version.properties b/app/version.properties index 0bea2fb3..f3161988 100644 --- a/app/version.properties +++ b/app/version.properties @@ -1,2 +1,2 @@ -#Sat Oct 05 12:23:31 CST 2024 -BUILD_NUMBER=832 +#Sat Oct 05 13:39:25 CST 2024 +BUILD_NUMBER=842 From bbbb8876bd4676cf46fd93ae25e68c970e2c8a3b Mon Sep 17 00:00:00 2001 From: suqi8 <3383787570@qq.com> Date: Sat, 5 Oct 2024 13:51:41 +0800 Subject: [PATCH 132/875] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E7=89=88=E6=9C=AC?= =?UTF-8?q?=E5=8F=B7=E5=92=8C=E6=9E=84=E5=BB=BA=E9=85=8D=E7=BD=AE=EF=BC=8C?= =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=9E=84=E5=BB=BA=E6=B5=81=E7=A8=8B=E5=92=8C?= =?UTF-8?q?=E4=BB=A3=E7=A0=81=E5=81=A5=E5=A3=AE=E6=80=A7=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/build.gradle.kts | 4 ++++ app/version.properties | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 9d2c696e..9d613e93 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -47,6 +47,10 @@ android { namespace = property.project.app.packageName compileSdk = 34 + lint { + baseline = file("lint-baseline.xml") + } + splits { abi { isEnable = true diff --git a/app/version.properties b/app/version.properties index f3161988..e9620a4a 100644 --- a/app/version.properties +++ b/app/version.properties @@ -1,2 +1,2 @@ -#Sat Oct 05 13:39:25 CST 2024 -BUILD_NUMBER=842 +#Sat Oct 05 13:48:53 CST 2024 +BUILD_NUMBER=843 From b3755931056d20f3066f86b9af8cf37bfed480cb Mon Sep 17 00:00:00 2001 From: suqi8 <3383787570@qq.com> Date: Sat, 5 Oct 2024 14:00:33 +0800 Subject: [PATCH 133/875] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E7=89=88=E6=9C=AC?= =?UTF-8?q?=E5=8F=B7=E5=92=8C=E6=9E=84=E5=BB=BA=E9=85=8D=E7=BD=AE=EF=BC=8C?= =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=9E=84=E5=BB=BA=E6=B5=81=E7=A8=8B=E5=92=8C?= =?UTF-8?q?=E4=BB=A3=E7=A0=81=E5=81=A5=E5=A3=AE=E6=80=A7=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/io/github/suqi8/opatch/Fun_com_android_systemui.kt | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/io/github/suqi8/opatch/Fun_com_android_systemui.kt b/app/src/main/java/io/github/suqi8/opatch/Fun_com_android_systemui.kt index 4f80c739..bc877a32 100644 --- a/app/src/main/java/io/github/suqi8/opatch/Fun_com_android_systemui.kt +++ b/app/src/main/java/io/github/suqi8/opatch/Fun_com_android_systemui.kt @@ -1,5 +1,6 @@ package io.github.suqi8.opatch +import android.annotation.SuppressLint import android.app.Activity import android.content.Intent import android.util.Log @@ -39,6 +40,7 @@ import top.yukonga.miuix.kmp.theme.MiuixTheme import java.io.FileInputStream import java.util.Properties +@SuppressLint("SuspiciousIndentation") @Composable fun Fun_com_android_systemui(navController: NavController) { val context = LocalContext.current @@ -46,8 +48,8 @@ fun Fun_com_android_systemui(navController: NavController) { val appList = listOf("com.android.systemui") val RestartAPP = remember { mutableStateOf(false) } val resetApp = resetApp() - var isDebug = context.prefs("settings").getBoolean("Debug", false) - Scaffold(topBar = { GetAppIconAndName(packageName = "com.android.systemui") { appName, icon -> + val isDebug = context.prefs("settings").getBoolean("Debug", false) + Scaffold(topBar = { GetAppIconAndName(packageName = "com.android.systemui") { appName, icon -> TopAppBar( title = appName, scrollBehavior = one, From ba50b9aef24ef9811cd187d7de2cff8a8b8d8745 Mon Sep 17 00:00:00 2001 From: suqi8 <3383787570@qq.com> Date: Sat, 5 Oct 2024 14:22:24 +0800 Subject: [PATCH 134/875] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=AF=B9=E9=BD=90?= =?UTF-8?q?=E6=96=B9=E5=BC=8F=EF=BC=8C=E7=A7=BB=E9=99=A4=E6=97=A0=E7=94=A8?= =?UTF-8?q?=E5=AF=B9=E9=BD=90=E6=96=B9=E5=BC=8F=EF=BC=8C=E6=8F=90=E9=AB=98?= =?UTF-8?q?=E4=BB=A3=E7=A0=81=E5=8F=AF=E8=AF=BB=E6=80=A7=E5=92=8C=E5=8F=AF?= =?UTF-8?q?=E7=BB=B4=E6=8A=A4=E6=80=A7=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../suqi8/opatch/Fun_com_android_systemui_status_bar_clock.kt | 3 --- 1 file changed, 3 deletions(-) diff --git a/app/src/main/java/io/github/suqi8/opatch/Fun_com_android_systemui_status_bar_clock.kt b/app/src/main/java/io/github/suqi8/opatch/Fun_com_android_systemui_status_bar_clock.kt index 29330c6b..b694ca0c 100644 --- a/app/src/main/java/io/github/suqi8/opatch/Fun_com_android_systemui_status_bar_clock.kt +++ b/app/src/main/java/io/github/suqi8/opatch/Fun_com_android_systemui_status_bar_clock.kt @@ -126,9 +126,6 @@ fun Fun_com_android_systemui_status_bar_clock(navController: NavController) { "CENTER 居中对齐", "TOP 顶部对齐", "BOTTOM 底部对齐", - "LEFT 左侧对齐", - "RIGHT 右侧对齐", - "START 起始位置对齐", "END 结束位置对齐", "CENTER_HORIZONTAL 水平居中", "CENTER_VERTICAL 垂直居中", From 6051068e989ca5d909c7ca155585e5660dcff000 Mon Sep 17 00:00:00 2001 From: suqi8 <3383787570@qq.com> Date: Sat, 5 Oct 2024 14:22:48 +0800 Subject: [PATCH 135/875] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E4=BE=9D=E8=B5=96?= =?UTF-8?q?=E5=BA=93=E7=89=88=E6=9C=AC=EF=BC=8C=E4=BC=98=E5=8C=96=E6=9E=84?= =?UTF-8?q?=E5=BB=BA=E9=85=8D=E7=BD=AE=EF=BC=8C=E6=8F=90=E9=AB=98=E4=BB=A3?= =?UTF-8?q?=E7=A0=81=E5=81=A5=E5=A3=AE=E6=80=A7=E5=92=8C=E6=9E=84=E5=BB=BA?= =?UTF-8?q?=E6=95=88=E7=8E=87=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gradle/libs.versions.toml | 20 +++----------------- 1 file changed, 3 insertions(+), 17 deletions(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index ec633d25..fdedb50e 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,42 +1,30 @@ [versions] activityComposeVersion = "1.9.2" -composeBomVersion = "2024.09.02" +composeBomVersion = "2024.09.03" composeneumorphism = "1.0.0-alpha02" composeShimmer = "1.3.0" datastorePreferences = "1.1.1" expandablebottombar = "1.5.3" gson = "2.11.0" haze = "0.9.0-beta01" -kotlin = "2.0.20" -lifecycleRuntimeKtx = "2.8.6" -activityCompose = "1.9.2" -composeBom = "2024.09.02" +composeBom = "2024.09.03" firebaseCrashlyticsBuildtools = "3.0.2" datastoreCoreAndroid = "1.1.1" datastorePreferencesCoreJvm = "1.1.1" lifecycleRuntimeKtxVersion = "2.8.6" miuix = "0.2.4" -navigationCompose = "2.8.1" +navigationCompose = "2.8.2" roomRuntime = "2.6.1" [libraries] androidx-activity-compose-v190 = { module = "androidx.activity:activity-compose", version.ref = "activityComposeVersion" } androidx-compose-bom-v20240600 = { module = "androidx.compose:compose-bom", version.ref = "composeBomVersion" } androidx-datastore-preferences = { module = "androidx.datastore:datastore-preferences", version.ref = "datastorePreferences" } -androidx-lifecycle-runtime-ktx = { group = "androidx.lifecycle", name = "lifecycle-runtime-ktx", version.ref = "lifecycleRuntimeKtx" } -androidx-activity-compose = { group = "androidx.activity", name = "activity-compose", version.ref = "activityCompose" } androidx-compose-bom = { group = "androidx.compose", name = "compose-bom", version.ref = "composeBom" } androidx-lifecycle-runtime-ktx-v282 = { module = "androidx.lifecycle:lifecycle-runtime-ktx", version.ref = "lifecycleRuntimeKtxVersion" } androidx-navigation-compose = { module = "androidx.navigation:navigation-compose", version.ref = "navigationCompose" } androidx-navigation-runtime-ktx = { module = "androidx.navigation:navigation-runtime-ktx", version.ref = "navigationCompose" } androidx-room-compiler = { module = "androidx.room:room-compiler", version.ref = "roomRuntime" } androidx-room-runtime = { module = "androidx.room:room-runtime", version.ref = "roomRuntime" } -androidx-ui = { group = "androidx.compose.ui", name = "ui" } -androidx-ui-graphics = { group = "androidx.compose.ui", name = "ui-graphics" } -androidx-ui-tooling = { group = "androidx.compose.ui", name = "ui-tooling" } -androidx-ui-tooling-preview = { group = "androidx.compose.ui", name = "ui-tooling-preview" } -androidx-ui-test-manifest = { group = "androidx.compose.ui", name = "ui-test-manifest" } -androidx-ui-test-junit4 = { group = "androidx.compose.ui", name = "ui-test-junit4" } -androidx-material3 = { group = "androidx.compose.material3", name = "material3" } compose-shimmer = { module = "com.valentinilk.shimmer:compose-shimmer", version.ref = "composeShimmer" } composeneumorphism = { module = "me.nikhilchaudhari:composeNeumorphism", version.ref = "composeneumorphism" } expandablebottombar = { module = "com.github.st235:expandablebottombar", version.ref = "expandablebottombar" } @@ -55,5 +43,3 @@ ui-tooling = { module = "androidx.compose.ui:ui-tooling" } ui-tooling-preview = { module = "androidx.compose.ui:ui-tooling-preview" } [plugins] -org-jetbrains-kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" } -compose-compiler = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" } From ba969acb565945f75e83dbe5b46f1e8541de26f2 Mon Sep 17 00:00:00 2001 From: suqi8 <3383787570@qq.com> Date: Sat, 5 Oct 2024 14:22:56 +0800 Subject: [PATCH 136/875] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E4=BE=9D=E8=B5=96?= =?UTF-8?q?=E5=BA=93=E7=89=88=E6=9C=AC=EF=BC=8C=E4=BC=98=E5=8C=96=E6=9E=84?= =?UTF-8?q?=E5=BB=BA=E9=85=8D=E7=BD=AE=EF=BC=8C=E6=8F=90=E9=AB=98=E4=BB=A3?= =?UTF-8?q?=E7=A0=81=E5=81=A5=E5=A3=AE=E6=80=A7=E5=92=8C=E6=9E=84=E5=BB=BA?= =?UTF-8?q?=E6=95=88=E7=8E=87=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/version.properties | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/version.properties b/app/version.properties index e9620a4a..e49c0246 100644 --- a/app/version.properties +++ b/app/version.properties @@ -1,2 +1,2 @@ -#Sat Oct 05 13:48:53 CST 2024 -BUILD_NUMBER=843 +#Sat Oct 05 14:22:45 CST 2024 +BUILD_NUMBER=849 From c02566932993019846e247d4c334961b4940bc2c Mon Sep 17 00:00:00 2001 From: suqi8 <3383787570@qq.com> Date: Sat, 5 Oct 2024 14:29:02 +0800 Subject: [PATCH 137/875] Update libraries and build configuration to improve robustness and efficiency --- app/lint-baseline.xml | 1388 +++++++++++++++++++++++++++++++++++++ app/version.properties | 4 +- gradle/libs.versions.toml | 14 + 3 files changed, 1404 insertions(+), 2 deletions(-) create mode 100644 app/lint-baseline.xml diff --git a/app/lint-baseline.xml b/app/lint-baseline.xml new file mode 100644 index 00000000..cb6dca8f --- /dev/null +++ b/app/lint-baseline.xml @@ -0,0 +1,1388 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/version.properties b/app/version.properties index e49c0246..f402c338 100644 --- a/app/version.properties +++ b/app/version.properties @@ -1,2 +1,2 @@ -#Sat Oct 05 14:22:45 CST 2024 -BUILD_NUMBER=849 +#Sat Oct 05 14:27:45 CST 2024 +BUILD_NUMBER=853 diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index fdedb50e..0b9558a0 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -7,6 +7,9 @@ datastorePreferences = "1.1.1" expandablebottombar = "1.5.3" gson = "2.11.0" haze = "0.9.0-beta01" +kotlin = "2.0.20" +lifecycleRuntimeKtx = "2.8.6" +activityCompose = "1.9.2" composeBom = "2024.09.03" firebaseCrashlyticsBuildtools = "3.0.2" datastoreCoreAndroid = "1.1.1" @@ -19,12 +22,21 @@ roomRuntime = "2.6.1" androidx-activity-compose-v190 = { module = "androidx.activity:activity-compose", version.ref = "activityComposeVersion" } androidx-compose-bom-v20240600 = { module = "androidx.compose:compose-bom", version.ref = "composeBomVersion" } androidx-datastore-preferences = { module = "androidx.datastore:datastore-preferences", version.ref = "datastorePreferences" } +androidx-lifecycle-runtime-ktx = { group = "androidx.lifecycle", name = "lifecycle-runtime-ktx", version.ref = "lifecycleRuntimeKtx" } +androidx-activity-compose = { group = "androidx.activity", name = "activity-compose", version.ref = "activityCompose" } androidx-compose-bom = { group = "androidx.compose", name = "compose-bom", version.ref = "composeBom" } androidx-lifecycle-runtime-ktx-v282 = { module = "androidx.lifecycle:lifecycle-runtime-ktx", version.ref = "lifecycleRuntimeKtxVersion" } androidx-navigation-compose = { module = "androidx.navigation:navigation-compose", version.ref = "navigationCompose" } androidx-navigation-runtime-ktx = { module = "androidx.navigation:navigation-runtime-ktx", version.ref = "navigationCompose" } androidx-room-compiler = { module = "androidx.room:room-compiler", version.ref = "roomRuntime" } androidx-room-runtime = { module = "androidx.room:room-runtime", version.ref = "roomRuntime" } +androidx-ui = { group = "androidx.compose.ui", name = "ui" } +androidx-ui-graphics = { group = "androidx.compose.ui", name = "ui-graphics" } +androidx-ui-tooling = { group = "androidx.compose.ui", name = "ui-tooling" } +androidx-ui-tooling-preview = { group = "androidx.compose.ui", name = "ui-tooling-preview" } +androidx-ui-test-manifest = { group = "androidx.compose.ui", name = "ui-test-manifest" } +androidx-ui-test-junit4 = { group = "androidx.compose.ui", name = "ui-test-junit4" } +androidx-material3 = { group = "androidx.compose.material3", name = "material3" } compose-shimmer = { module = "com.valentinilk.shimmer:compose-shimmer", version.ref = "composeShimmer" } composeneumorphism = { module = "me.nikhilchaudhari:composeNeumorphism", version.ref = "composeneumorphism" } expandablebottombar = { module = "com.github.st235:expandablebottombar", version.ref = "expandablebottombar" } @@ -43,3 +55,5 @@ ui-tooling = { module = "androidx.compose.ui:ui-tooling" } ui-tooling-preview = { module = "androidx.compose.ui:ui-tooling-preview" } [plugins] +org-jetbrains-kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" } +compose-compiler = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" } From c8642a5961a890e10332b7f6feee7d410c31ffe2 Mon Sep 17 00:00:00 2001 From: suqi8 <157949748+suqi8@users.noreply.github.com> Date: Sat, 5 Oct 2024 14:46:12 +0800 Subject: [PATCH 138/875] Update android.yml --- .github/workflows/android.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml index c8ec0e8b..be9f54ef 100644 --- a/.github/workflows/android.yml +++ b/.github/workflows/android.yml @@ -24,3 +24,9 @@ jobs: run: chmod +x gradlew - name: Build with Gradle run: ./gradlew build + - name: List APK files + run: | + echo "Debug APKs:" + ls app/build/outputs/apk/debug/ + echo "Release APKs:" + ls app/build/outputs/apk/release/ From 0e88d7de666f5299426e3a08faa20b7ed9a3986f Mon Sep 17 00:00:00 2001 From: suqi8 <3383787570@qq.com> Date: Sat, 5 Oct 2024 23:06:30 +0800 Subject: [PATCH 139/875] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E7=8A=B6=E6=80=81?= =?UTF-8?q?=E6=A0=8F=E6=97=B6=E9=97=B4=E6=8E=A7=E4=BB=B6=E8=BE=B9=E8=B7=9D?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=EF=BC=8C=E4=BF=AE=E6=94=B9=E9=87=8D=E5=90=AF?= =?UTF-8?q?=E5=BA=94=E7=94=A8=E5=BC=B9=E7=AA=97=E6=98=BE=E7=A4=BA=EF=BC=8C?= =?UTF-8?q?=E5=8D=87=E7=BA=A7=E4=BE=9D=E8=B5=96=EF=BC=8C=E5=8F=A6=E5=A4=96?= =?UTF-8?q?=EF=BC=8C=E4=B8=8A=E9=9D=A2=E5=87=A0=E4=B8=AA=E6=98=AF=E6=B5=8B?= =?UTF-8?q?=E8=AF=95=E8=87=AA=E5=8A=A8=E6=9E=84=E5=BB=BA=E7=9A=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .idea/deploymentTargetSelector.xml | 2 +- ...com_android_systemui_hardware_indicator.kt | 1 + ...n_com_android_systemui_status_bar_clock.kt | 189 ++++++++++++++++-- .../io/github/suqi8/opatch/MainActivity.kt | 50 ++--- .../java/io/github/suqi8/opatch/Main_About.kt | 3 +- .../hook/appilcations/StatusBarClock.kt | 95 +++++++-- .../github/suqi8/opatch/ui/tools/resetApp.kt | 7 +- app/src/main/res/values-zh-rCN/strings.xml | 5 + app/src/main/res/values/strings.xml | 5 + app/version.properties | 4 +- gradle/libs.versions.toml | 2 +- 11 files changed, 292 insertions(+), 71 deletions(-) diff --git a/.idea/deploymentTargetSelector.xml b/.idea/deploymentTargetSelector.xml index e730cd5d..378e604f 100644 --- a/.idea/deploymentTargetSelector.xml +++ b/.idea/deploymentTargetSelector.xml @@ -4,7 +4,7 @@