From 1cf0f0d9d8ad982217b13373f554601f89b9cd67 Mon Sep 17 00:00:00 2001 From: canewsin Date: Sat, 14 Aug 2021 19:04:36 +0530 Subject: [PATCH] v 0.8.1 - beta 12 - Added LICENSE to the project. - Added Small Patch lib to patch file changes. - Updated ZeroNet core with tor v3 patch. - Added stringcontroller.dart to centralise all strings to one place. - Various Bug Fixes and Code Improvements. --- LICENSE | 674 ++++++++++++++ .../in/canews/zeronetmobile/MainActivity.kt | 3 + .../common/src/main/assets/zeronet_py3.zip | Bin 2419675 -> 2423445 bytes lib/controllers/purchasescontroller.dart | 2 +- lib/controllers/stringcontroller.dart | 853 ++++++++++++++++++ lib/controllers/uicontroller.dart | 4 +- lib/controllers/varcontroller.dart | 7 +- lib/imports.dart | 3 + lib/main.dart | 25 +- lib/models/enums.dart | 69 +- lib/others/common.dart | 85 +- lib/others/constants.dart | 180 ++-- lib/others/donation_const.dart | 1 - lib/others/utils.dart | 31 +- lib/others/zeronet_isolate.dart | 8 +- lib/others/zeronet_utils.dart | 142 ++- lib/widgets/about_page.dart | 52 +- lib/widgets/common.dart | 18 +- lib/widgets/home_page.dart | 43 +- lib/widgets/loading_page.dart | 10 +- lib/widgets/log_page.dart | 2 - lib/widgets/settings_page.dart | 22 +- lib/widgets/zerobrowser_page.dart | 234 +++-- pubspec.yaml | 1 + version.properties | 4 +- 25 files changed, 2075 insertions(+), 398 deletions(-) create mode 100644 LICENSE create mode 100644 lib/controllers/stringcontroller.dart diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..f288702 --- /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 +. diff --git a/android/app/src/main/kotlin/in/canews/zeronetmobile/MainActivity.kt b/android/app/src/main/kotlin/in/canews/zeronetmobile/MainActivity.kt index 0fe4ecb..7be949e 100644 --- a/android/app/src/main/kotlin/in/canews/zeronetmobile/MainActivity.kt +++ b/android/app/src/main/kotlin/in/canews/zeronetmobile/MainActivity.kt @@ -328,6 +328,9 @@ class MainActivity : FlutterActivity() { .intent shareIntent.data = contentUri shareIntent.addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION) + shareIntent.putExtra(Intent.EXTRA_TEXT,"Save this file to a Safe place.") + shareIntent.action = Intent.ACTION_SEND + shareIntent.putExtra(Intent.EXTRA_STREAM, contentUri) shareIntent.putExtra("finishActivityOnSaveCompleted", true) context.startActivityForResult(Intent.createChooser( shareIntent, "Backup Users.json File"), SAVE_USERJSON_FILE) diff --git a/android/common/src/main/assets/zeronet_py3.zip b/android/common/src/main/assets/zeronet_py3.zip index 6bbd76ea565b22857c412477abb7f58edf67b562..11f54bd0c12e783df14c4a678925b370839980d8 100644 GIT binary patch delta 28875 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 MUb~F%V%(4ZA6ji#T>t<8 delta 26026 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 IgEZy;0cT@>7XSbN diff --git a/lib/controllers/purchasescontroller.dart b/lib/controllers/purchasescontroller.dart index 1b59028..52c9ba7 100644 --- a/lib/controllers/purchasescontroller.dart +++ b/lib/controllers/purchasescontroller.dart @@ -1,5 +1,5 @@ -import 'package:get/get.dart'; import 'package:purchases_flutter/purchases_flutter.dart' as purchases_flutter; +import '../imports.dart'; final purchasesStore = Get.put(PurchaseController()); diff --git a/lib/controllers/stringcontroller.dart b/lib/controllers/stringcontroller.dart new file mode 100644 index 0000000..174c556 --- /dev/null +++ b/lib/controllers/stringcontroller.dart @@ -0,0 +1,853 @@ +import '../imports.dart'; + +final strController = Get.put(StrController()); + +class StrController extends GetxController { + get statusStr => 'Status'.obs; + + set statusStr(String str) { + statusStr.value = str; + } + + get statusNotRunningStr => 'Not Running'.obs; + + set statusNotRunningStr(String str) { + statusNotRunningStr.value = str; + } + + get statusInitializingStr => 'Initializing..'.obs; + + set statusInitializingStr(String str) { + statusInitializingStr.value = str; + } + + get statusStartingStr => 'Starting'.obs; + + set statusStartingStr(String str) { + statusStartingStr.value = str; + } + + get statusRunningStr => 'Running'.obs; + + set statusRunningStr(String str) { + statusRunningStr.value = str; + } + + get statusRunningWithTorStr => 'Running with Tor'.obs; + + set statusRunningWithTorStr(String str) { + statusRunningStr.value = str; + } + + get statusErrorStr => 'Error'.obs; + + set statusErrorStr(String str) { + statusErrorStr.value = str; + } + + get popularSitesStr => 'Popular Sites'.obs; + + set popularSitesStr(String str) { + popularSitesStr.value = str; + } + + get startZeroNetFirstStr => + 'Please Start ZeroNet First to Browse this Zite'.obs; + + set startZeroNetFirstStr(String str) { + startZeroNetFirstStr.value = str; + } + + get createStr => 'Create'.obs; + + set createStr(String str) { + createStr.value = str; + } + + get openStr => 'OPEN'.obs; + + set openStr(String str) { + openStr.value = str; + } + + get downloadStr => 'DOWNLOAD'.obs; + + set downloadStr(String str) { + downloadStr.value = str; + } + + get addToHomeScreenStr => 'Add to HomeScreen'.obs; + + set addToHomeScreenStr(String str) { + addToHomeScreenStr.value = str; + } + + get showLogStr => 'Show Log'.obs; + + set showLogStr(String str) { + showLogStr.value = str; + } + + get pauseStr => 'Pause'.obs; + + set pauseStr(String str) { + pauseStr.value = str; + } + + get resumeStr => 'Resume'.obs; + + set resumeStr(String str) { + resumeStr.value = str; + } + + get deleteZiteStr => 'Delete Zite'.obs; + + set deleteZiteStr(String str) { + deleteZiteStr.value = str; + } + + get shrtAddedToHomeScreenStr => 'shortcut added to HomeScreen'.obs; + + set shrtAddedToHomeScreenStr(String str) { + shrtAddedToHomeScreenStr.value = str; + } + + get startStr => 'Start'.obs; + + set startStr(String str) { + startStr.value = str; + } + + get restartStr => 'Restart'.obs; + + set restartStr(String str) { + restartStr.value = str; + } + + get pleaseWaitStr => 'Please Wait..!'.obs; + + set pleaseWaitStr(String str) { + pleaseWaitStr.value = str; + } + + get stopStr => 'Stop'.obs; + + set stopStr(String str) { + stopStr.value = str; + } + + get closeStr => 'Close'.obs; + + set closeStr(String str) { + closeStr.value = str; + } + + get viewLogStr => 'View Log'.obs; + + set viewLogStr(String str) { + viewLogStr.value = str; + } + + get aboutStr => 'About'.obs; + + set aboutStr(String str) { + aboutStr.value = str; + } + + get settingsStr => 'Settings'.obs; + + set settingsStr(String str) { + settingsStr.value = str; + } + + get browserStr => 'Browser'.obs; + + set browserStr(String str) { + browserStr.value = str; + } + + get logStr => 'Log'.obs; + + set logStr(String str) { + logStr.value = str; + } + + get updateStr => 'Update'.obs; + + set updateStr(String str) { + updateStr.value = str; + } + + get downloadingStr => 'Downloading'.obs; + + set downloadingStr(String str) { + downloadingStr.value = str; + } + + get downloadedStr => 'Downloaded'.obs; + + set downloadedStr(String str) { + downloadedStr.value = str; + } + + get installStr => 'Install'.obs; + + set installStr(String str) { + installStr.value = str; + } + + get restoreStr => 'Restore'.obs; + + set restoreStr(String str) { + restoreStr.value = str; + } + + get installingStr => 'Installing'.obs; + + set installingStr(String str) { + installingStr.value = str; + } + + get installationCompletedStr => 'Installation Completed'.obs; + + set installationCompletedStr(String str) { + installationCompletedStr.value = str; + } + + get notAvaliableStr => 'Not Available'.obs; + + set notAvaliableStr(String str) { + notAvaliableStr.value = str; + } + + get aboutAppDesStr => 'ZeroNet Mobile is a full native client for ZeroNet, ' + 'a platform for decentralized websites using Bitcoin ' + .obs; + + set aboutAppDesStr(String str) { + aboutAppDesStr.value = str; + } + + get aboutAppDes1Str => + 'crypto and the BitTorrent network. you can learn more about ZeroNet at ' + .obs; + + set aboutAppDes1Str(String str) { + aboutAppDes1Str.value = str; + } + + get developersStr => 'Developers'.obs; + + set developersStr(String str) { + developersStr.value = str; + } + + get donationAddrsStr => 'Donation Addresses'.obs; + + set donationAddrsStr(String str) { + donationAddrsStr.value = str; + } + + get clickAddrToCopyStr => '* Click on Address to copy'.obs; + + set clickAddrToCopyStr(String str) { + clickAddrToCopyStr.value = str; + } + + get donAddrCopiedStr => 'Donation Address Copied to Clipboard'.obs; + + set donAddrCopiedStr(String str) { + donAddrCopiedStr.value = str; + } + + get donationDes => "* Any Donation can activate all pro-features in app, " + "these are just an encouragement to me to work more on the app. " + "Pro-features will be made available to general public after certain time, " + "thus you don't need to worry about exclusiveness of a feature. " + "If you donate from any source other than Google Play Purchase, " + "just send your transaction id to canews.in@gmail.com / ZeroMail: zeromepro, " + "so than I can send activation code to activate pro-features." + .obs; + + set donationDes(String str) { + donationDes.value = str; + } + + get contributeStr => 'Contribute'.obs; + + set contributeStr(String str) { + contributeStr.value = str; + } + + get contributeDesStr => "If you want to support project's further development, " + "you can contribute your time or money, " + "If you want to contribute money you can send bitcoin or " + "other supported crypto currencies to above addresses or buy in-app purchases, " + "if want to contribute translations or code, visit official GitHub repo." + .obs; + + set contributeDesStr(String str) { + contributeDesStr.value = str; + } + + get googlePurchasesStr => 'Google Play Purchases'.obs; + + set googlePurchasesStr(String str) { + googlePurchasesStr.value = str; + } + + get googleFeeWarningStr => '(30% taken by Google) :'.obs; + + set googleFeeWarningStr(String str) { + googleFeeWarningStr.value = str; + } + + get oneTimeSubStr => 'One Time'.obs; + + set oneTimeSubStr(String str) { + oneTimeSubStr.value = str; + } + + get monthlySubStr => 'Monthly Subscriptions'.obs; + + set monthlySubStr(String str) { + monthlySubStr.value = str; + } + + get tipStr => 'Tip'.obs; + + set tipStr(String str) { + tipStr.value = str; + } + + get coffeeStr => 'Coffee'.obs; + + set coffeeStr(String str) { + coffeeStr.value = str; + } + + get lunchStr => 'Lunch'.obs; + + set lunchStr(String str) { + lunchStr.value = str; + } + + get usersFileCopied => 'Users.json content copied to Clipboard'.obs; + + set usersFileCopied(String str) { + usersFileCopied.value = str; + } + + get chkBckUpStr => + 'Please check yourself that file back up Successfully.'.obs; + + set chkBckUpStr(String str) { + chkBckUpStr.value = str; + } + + get zeroNetNotInitTitleStr => 'ZeroNet data folder not Exists.'.obs; + + set zeroNetNotInitTitleStr(String str) { + zeroNetNotInitTitleStr.value = str; + } + + get zeroNetNotInitDesStr => + "ZeroNet should be used atleast once (run it from home screen), " + "before using this option" + .obs; + + set zeroNetNotInitDesStr(String str) { + zeroNetNotInitDesStr.value = str; + } + + get loadingStr => 'Loading'.obs; + + set loadingStr(String str) { + loadingStr.value = str; + } + + get switchProfileToStr => 'Switch Profile to'.obs; + + set switchProfileToStr(String str) { + switchProfileToStr.value = str; + } + + get switchProfileToDesStr => 'this will delete the existing profile, ' + 'backup existing profile using backup button below' + .obs; + + set switchProfileToDesStr(String str) { + switchProfileToDesStr.value = str; + } + + get backupStr => 'Backup'.obs; + + set backupStr(String str) { + backupStr.value = str; + } + + get switchStr => 'Switch'.obs; + + set switchStr(String str) { + switchStr.value = str; + } + + get loadingPageWarningStr => """ + Please Wait! This may take a while, happens + only first time, Don't Press Back button. + If You Accidentally Pressed Back, + Clean App Storage in Settings or + Uninstall and Reinstall The App. + """ + .obs; + + set loadingPageWarningStr(String str) { + loadingPageWarningStr.value = str; + } + + get appUpdateAvailableStr => 'App Update Available : '.obs; + + set appUpdateAvailableStr(String str) { + appUpdateAvailableStr.value = str; + } + + get knowMoreStr => 'Know More'.obs; + + set knowMoreStr(String str) { + knowMoreStr.value = str; + } + + get ratingWgtStr => 'Give Your Rating/Feedback'.obs; + + set ratingWgtStr(String str) { + ratingWgtStr.value = str; + } + + get siteInfoStr => 'SiteInfo'.obs; + + set siteInfoStr(String str) { + siteInfoStr.value = str; + } + + get backupWarningStr => + 'Always remember to backup users.json before doing anything because, ' + 'we are not able to tell when a software will fail. ' + 'Click Backup below to backup your Existing users.json file.\n' + .obs; + + set backupWarningStr(String str) { + backupWarningStr.value = str; + } + + get usernameStr => 'Username'.obs; + + set usernameStr(String str) { + usernameStr.value = str; + } + + get usernamePhraseStr => 'Username Phrase :'.obs; + + set usernamePhraseStr(String str) { + usernamePhraseStr.value = str; + } + + get usrnameWarning1Str => 'username can\'t be Empty'.obs; + + set usrnameWarning1Str(String str) { + usrnameWarning1Str.value = str; + } + + get usrnameWarning2Str => 'username can\'t contain spaces'.obs; + + set usrnameWarning2Str(String str) { + usrnameWarning2Str.value = str; + } + + get usrnameWarning3Str => 'username can\'t be less than 6 characters.'.obs; + + set usrnameWarning3Str(String str) { + usrnameWarning3Str.value = str; + } + + get usrnameWarning4Str => + 'username already exists, choose different one.'.obs; + + set usrnameWarning4Str(String str) { + usrnameWarning4Str.value = str; + } + + get znNotiRunningTitleStr => 'ZeroNet Mobile is Running'.obs; + + set znNotiRunningTitleStr(String str) { + znNotiRunningTitleStr.value = str; + } + + get znNotiRunningDesStr => 'Click Here on this Notification to open app'.obs; + + set znNotiRunningDesStr(String str) { + znNotiRunningDesStr.value = str; + } + + get znNotiNotRunningTitleStr => 'ZeroNet Mobile is Not Running'.obs; + + set znNotiNotRunningTitleStr(String str) { + znNotiNotRunningTitleStr.value = str; + } + + get znNotiNotRunningDesStr => + 'Open ZeroNet Mobile App and click start to run ZeroNet'.obs; + + set znNotiNotRunningDesStr(String str) { + znNotiNotRunningDesStr.value = str; + } + + get znPluginInstallingTitleStr => 'Installing Plugin'.obs; + + set znPluginInstallingTitleStr(String str) { + znPluginInstallingTitleStr.value = str; + } + + get znPluginInstallingDesStr => + 'This Dialog will be automatically closed after installation, ' + 'After Installation Restart ZeroNet from Home page' + .obs; + + set znPluginInstallingDesStr(String str) { + znPluginInstallingDesStr.value = str; + } + + get zninstallAPluginTitleStr => 'Install A Plugin'.obs; + + set zninstallAPluginTitleStr(String str) { + zninstallAPluginTitleStr.value = str; + } + + get zninstallAPluginDesStr => 'This will load plugin to your ZeroNet repo, ' + '\nWarning : Loading Unknown/Untrusted plugins may compromise ZeroNet Installation.' + .obs; + + set zninstallAPluginDesStr(String str) { + zninstallAPluginDesStr.value = str; + } + + get restoreProfileTitleStr => 'Restore Profile ?'.obs; + + set restoreProfileTitleStr(String str) { + restoreProfileTitleStr.value = str; + } + + get restoreProfileDesStr => 'this will delete the existing profile, ' + 'backup existing profile using backup button below\n\n' + 'Selected Userfile : \n' + .obs; + + set restoreProfileDesStr(String str) { + restoreProfileDesStr.value = str; + } + + get restoreProfileDes1Str => + 'You can only select users.json file, outside zeronet data folder'.obs; + + set restoreProfileDes1Str(String str) { + restoreProfileDesStr.value = str; + } + + get existingProfileTitleStr => 'Provide A Name for Existing Profile'.obs; + + set existingProfileTitleStr(String str) { + existingProfileTitleStr.value = str; + } + + get createNewProfileStr => 'Create New Profile'.obs; + + set createNewProfileStr(String str) { + createNewProfileStr.value = str; + } + + get importProfileStr => 'Import Profile'.obs; + + set importProfileStr(String str) { + importProfileStr.value = str; + } + + get backupProfileStr => 'Backup Profile'.obs; + + set backupProfileStr(String str) { + backupProfileStr.value = str; + } + + get openPluginManagerStr => 'Open Plugin Manager'.obs; + + set openPluginManagerStr(String str) { + openPluginManagerStr.value = str; + } + + get loadPluginStr => 'Load Plugin'.obs; + + set loadPluginStr(String str) { + loadPluginStr.value = str; + } + + get zerohelloSiteDesStr => 'Say Hello to ZeroNet, a Dashboard to manage ' + 'all your ZeroNet Z(S)ites, You can view feed of other zites like ' + 'posts, comments of other users from ZeroTalk as well for your posts ' + 'and Stats like Total Requests sent and received from other peers on ZeroNet. ' + 'You can also pause, clone or favourite, delete Zites from single page.' + .obs; + + set zerohelloSiteDesStr(String str) { + zerohelloSiteDesStr.value = str; + } + + get zeronetMobileSiteDesStr => 'Forum to report ZeroNet Mobile app issues. ' + 'Want a new feature in the app, Request a Feature. ' + 'Facing any Bugs while using the app ? ' + 'Just report problem here, we will take care of it. ' + 'Want to Discuss any topic about app development ? ' + 'Just dive into to this Zite.' + .obs; + + set zeronetMobileSiteDesStr(String str) { + zeronetMobileSiteDesStr.value = str; + } + + get zeroTalkSiteDesStr => 'Need a forum to discuss something, ' + 'we got covered you here. ZeroTalk fits your need, ' + 'just post something to get opinion from others on Network. ' + 'Have some queries ? don\'t hesitate to ask here.' + 'Tired of Spam ? Who don\'t! You can mute individual users also.' + .obs; + + set zeroTalkSiteDesStr(String str) { + zeroTalkSiteDesStr.value = str; + } + + get zeroblogSiteDesStr => 'Want to Know Where ZeroNet is Going ? ' + 'ZeroBlog gives you latest changes and improvements ' + 'made to ZeroNet, including Bug Fixes, ' + 'Speed Improvements of ZeroNet Core Software. ' + 'Also Provides varies links to ZeroNet Protocol and ' + 'how ZeroNet works underhood and much more things to know.' + .obs; + + set zeroblogSiteDesStr(String str) { + zeroblogSiteDesStr.value = str; + } + + get zeromailSiteDesStr => 'So you need a mail service, use ZeroMail, ' + 'fully end-to-end encrypted mail service on ZeroNet, ' + 'don\'t let others scanning your mailbox for their profits ' + 'all your data is encrypted and can only opened by you. ' + 'Your all mails are backedup, so you can stay calm for your data.' + .obs; + + set zeromailSiteDesStr(String str) { + zeromailSiteDesStr.value = str; + } + + get zeromeSiteDesStr => 'Social Network is everywhere, so we made one here too. ' + 'Twitter like, Peer to Peer Social Networking in your hands without data-tracking, ' + 'Follow others and post your thoughts, like, comment on others posts, it\'s that easy-peasy. ' + 'Find Like minded people and increase your friend circle beyond the borders.' + .obs; + + set zeromeSiteDesStr(String str) { + zeromeSiteDesStr.value = str; + } + + get zeroSitesSiteDesStr => 'Want to know more sites on ZeroNet, ' + 'visit ZeroSites, listing of community contributed sites under various ' + 'categories like Blogs, Services, Forums, Chat, Video, Image, Guides, News and much more. ' + 'You can even filter those lists with your preferred language ' + 'to get more comprehensive list. Has a New Site to Show, Just Submit here.' + .obs; + + set zeroSitesSiteDesStr(String str) { + zeroSitesSiteDesStr.value = str; + } + + get themeSwitcherStr => 'Theme'.obs; + + set themeSwitcherStr(String str) { + themeSwitcherStr.value = str; + } + + get themeSwitcherDesStr => 'Switch App Theme between Light, Dark, Black'.obs; + + set themeSwitcherDesStr(String str) { + themeSwitcherDesStr.value = str; + } + + get profileSwitcherStr => 'Profile Switcher'.obs; + + set profileSwitcherStr(String str) { + profileSwitcherStr.value = str; + } + + get profileSwitcherDesStr => 'Create and Use different Profiles on ZeroNet, ' + 'Import Existing Profiles from other devices, or Backup your Profile. ' + '\nNote: If Backup Profile doesn\'t work. Long Press the "Backup Profile" Button, ' + 'it will copy users.json file contents to clipboard, so that you can save the private keys from this option.' + .obs; + + set profileSwitcherDesStr(String str) { + profileSwitcherDesStr.value = str; + } + + get debugZeroNetStr => 'Debug ZeroNet Code'.obs; + + set debugZeroNetStr(String str) { + debugZeroNetStr.value = str; + } + + get debugZeroNetDesStr => + 'Useful for Developers to find bugs and errors in the code.'.obs; + + set debugZeroNetDesStr(String str) { + debugZeroNetDesStr.value = str; + } + + get enableZeroNetConsoleStr => 'Enable ZeroNet Console'.obs; + + set enableZeroNetConsoleStr(String str) { + enableZeroNetConsoleStr.value = str; + } + + get enableZeroNetConsoleDesStr => + 'Useful for Developers to see the exec of ZeroNet Python code'.obs; + + set enableZeroNetConsoleDesStr(String str) { + enableZeroNetConsoleDesStr.value = str; + } + + get enableZeroNetFiltersStr => 'Enable ZeroNet Filters'.obs; + + set enableZeroNetFiltersStr(String str) { + enableZeroNetFiltersStr.value = str; + } + + get enableZeroNetFiltersDesStr => + 'Enabling ZeroNet Filters blocks known ametuer content sites and spam users.' + .obs; + + set enableZeroNetFiltersDesStr(String str) { + enableZeroNetFiltersDesStr.value = str; + } + + get enableAdditionalTrackersStr => 'Additional BitTorrent Trackers'.obs; + + set enableAdditionalTrackersStr(String str) { + enableAdditionalTrackersStr.value = str; + } + + get enableAdditionalTrackersDesStr => + 'Enabling External/Additional BitTorrent Trackers will give more ZeroNet Site Seeders or Clients.' + .obs; + + set enableAdditionalTrackersDesStr(String str) { + enableAdditionalTrackersDesStr.value = str; + } + + get pluginManagerStr => 'Plugin Manager'.obs; + + set pluginManagerStr(String str) { + pluginManagerStr.value = str; + } + + get pluginManagerDesStr => 'Enable/Disable ZeroNet Plugins'.obs; + + set pluginManagerDesStr(String str) { + pluginManagerDesStr.value = str; + } + + get vibrateOnZeroNetStartStr => 'Vibrate on ZeroNet Start'.obs; + + set vibrateOnZeroNetStartStr(String str) { + vibrateOnZeroNetStartStr.value = str; + } + + get vibrateOnZeroNetStartDesStr => 'Vibrates Phone When ZeroNet Starts'.obs; + + set vibrateOnZeroNetStartDesStr(String str) { + vibrateOnZeroNetStartDesStr.value = str; + } + + get enableFullScreenOnWebViewStr => 'FullScreen for ZeroNet Zites'.obs; + + set enableFullScreenOnWebViewStr(String str) { + enableFullScreenOnWebViewStr.value = str; + } + + get enableFullScreenOnWebViewDesStr => + 'This will Enable Full Screen for in app Webview of ZeroNet'.obs; + + set enableFullScreenOnWebViewDesStr(String str) { + enableFullScreenOnWebViewDesStr.value = str; + } + + get batteryOptimisationStr => 'Disable Battery Optimisation'.obs; + + set batteryOptimisationStr(String str) { + batteryOptimisationStr.value = str; + } + + get batteryOptimisationDesStr => + 'This will Helps to Run App even App is in Background for long time.'.obs; + + set batteryOptimisationDesStr(String str) { + batteryOptimisationDesStr.value = str; + } + + get publicDataFolderStr => 'Public DataFolder'.obs; + + set publicDataFolderStr(String str) { + publicDataFolderStr.value = str; + } + + get publicDataFolderDesStr => + 'This Will Make ZeroNet Data Folder Accessible via File Manager.'.obs; + + set publicDataFolderDesStr(String str) { + publicDataFolderDesStr.value = str; + } + + get autoStartZeroNetStr => 'AutoStart ZeroNet'.obs; + + set autoStartZeroNetStr(String str) { + autoStartZeroNetStr.value = str; + } + + get autoStartZeroNetDesStr => + 'This Will Make ZeroNet Auto Start on App Start, So you don\'t have to click Start Button Every Time on App Start.' + .obs; + + set autoStartZeroNetDesStr(String str) { + autoStartZeroNetDesStr.value = str; + } + + get autoStartZeroNetonBootStr => 'AutoStart ZeroNet on Boot'.obs; + + set autoStartZeroNetonBootStr(String str) { + autoStartZeroNetonBootStr.value = str; + } + + get autoStartZeroNetonBootDesStr => + 'This Will Make ZeroNet Auto Start on Device Boot.'.obs; + + set autoStartZeroNetonBootDesStr(String str) { + autoStartZeroNetonBootDesStr.value = str; + } + + get enableTorLogStr => 'Enable Tor Log'.obs; + + set enableTorLogStr(String str) { + enableTorLogStr.value = str; + } + + get enableTorLogDesStr => + 'This will Enable Tor Log in ZeroNet Console helpful for debugging.'.obs; + + set enableTorLogDesStr(String str) { + enableTorLogDesStr.value = str; + } +} diff --git a/lib/controllers/uicontroller.dart b/lib/controllers/uicontroller.dart index 6a30e2c..f536dba 100644 --- a/lib/controllers/uicontroller.dart +++ b/lib/controllers/uicontroller.dart @@ -1,5 +1,3 @@ -import 'package:get/get.dart'; - import '../imports.dart'; final uiStore = Get.put(UiController()); @@ -44,7 +42,7 @@ class UiController extends GetxController { void updateCurrentAppRoute(AppRoute appRoute) => currentAppRoute.value = appRoute; - var currentTheme = AppTheme.Black.obs; + var currentTheme = AppTheme.Light.obs; void setTheme(AppTheme theme) { currentTheme.value = theme; diff --git a/lib/controllers/varcontroller.dart b/lib/controllers/varcontroller.dart index a2b7228..93806e0 100644 --- a/lib/controllers/varcontroller.dart +++ b/lib/controllers/varcontroller.dart @@ -1,5 +1,4 @@ -import 'package:get/get.dart'; -import 'package:zeronet/imports.dart'; +import '../imports.dart'; final varStore = Get.put(VarController()); @@ -8,10 +7,10 @@ class VarController extends GetxController { var settings = {}.obs; var event = ObservableEvent.none.obs; var zeroNetLog = 'ZeroNet Mobile'.obs; - var zeroNetStatus = 'Not Running'.obs; + RxString zeroNetStatus = strController.statusNotRunningStr; var zeroNetInstalled = false.obs; var zeroNetDownloaded = false.obs; - var loadingStatus = 'Loading'.obs; + RxString loadingStatus = strController.loadingStr; var loadingPercent = 0.obs; updateSetting(Setting setting) { diff --git a/lib/imports.dart b/lib/imports.dart index 435631f..ce194c0 100644 --- a/lib/imports.dart +++ b/lib/imports.dart @@ -12,12 +12,14 @@ export 'package:flutter/services.dart'; export 'package:clipboard/clipboard.dart'; export 'package:crypto/crypto.dart'; export 'package:device_info/device_info.dart'; +export 'package:diff_match_patch/diff_match_patch.dart'; export 'package:equatable/equatable.dart'; export 'package:file_picker/file_picker.dart'; export 'package:flutter_absolute_path/flutter_absolute_path.dart'; export 'package:flutter_background_service/flutter_background_service.dart'; export 'package:flutter_downloader/flutter_downloader.dart'; export 'package:flutter_webview_plugin/flutter_webview_plugin.dart'; +export 'package:get/get.dart' hide HeaderValue, MultipartFile, Response; export 'package:google_fonts/google_fonts.dart'; export 'package:http/http.dart'; export 'package:in_app_purchase/in_app_purchase.dart'; @@ -35,6 +37,7 @@ export 'package:zeronet_ws/zeronet_ws.dart'; export 'controllers/varcontroller.dart'; export 'controllers/uicontroller.dart'; export 'controllers/purchasescontroller.dart'; +export 'controllers/stringcontroller.dart'; export 'core/site/site.dart'; export 'core/site/site_manager.dart'; export 'core/user/user.dart'; diff --git a/lib/main.dart b/lib/main.dart index 036e19d..851ddd6 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -1,4 +1,3 @@ -import 'package:get/get.dart'; import 'imports.dart'; //TODO:Remainder: Removed Half baked x86 bins, add them when we support x86 platform @@ -27,17 +26,7 @@ class MyApp extends StatelessWidget { home: Scaffold( body: Obx( () { - SystemChrome.setSystemUIOverlayStyle( - SystemUiOverlayStyle( - statusBarColor: Colors.transparent, - statusBarIconBrightness: - uiStore.currentTheme.value.iconBrightness, - systemNavigationBarColor: - uiStore.currentTheme.value.primaryColor, - systemNavigationBarIconBrightness: - uiStore.currentTheme.value.iconBrightness, - ), - ); + setSystemUiTheme(); if (varStore.zeroNetInstalled.value) { if (firstTime) { SystemChrome.setEnabledSystemUIOverlays(SystemUiOverlay.values); @@ -67,11 +56,21 @@ class MyApp extends StatelessWidget { } return Obx( () { + setSystemUiTheme(); switch (uiStore.currentAppRoute.value) { case AppRoute.AboutPage: return WillPopScope( onWillPop: () { - uiStore.updateCurrentAppRoute(AppRoute.Home); + if (fromBrowser) { + fromBrowser = false; + flutterWebViewPlugin.canGoBack().then( + (value) => value + ? flutterWebViewPlugin.goBack() + : null, + ); + uiStore.updateCurrentAppRoute(AppRoute.ZeroBrowser); + } else + uiStore.updateCurrentAppRoute(AppRoute.Home); return Future.value(false); }, child: AboutPage(), diff --git a/lib/models/enums.dart b/lib/models/enums.dart index 32a8502..a099769 100644 --- a/lib/models/enums.dart +++ b/lib/models/enums.dart @@ -1,5 +1,4 @@ -import 'package:zeronet/others/zeronet_isolate.dart'; - +import '../others/zeronet_isolate.dart'; import '../imports.dart'; enum ZeroNetStatus { @@ -14,19 +13,19 @@ extension ZeroNetStatusExt on ZeroNetStatus { get message { switch (this) { case ZeroNetStatus.NOT_RUNNING: - return 'Not Running'; + return strController.statusNotRunningStr.value; break; case ZeroNetStatus.INITIALISING: - return 'Initialising...'; + return strController.statusInitializingStr.value; break; case ZeroNetStatus.RUNNING: - return 'Running'; + return strController.statusRunningStr.value; break; case ZeroNetStatus.RUNNING_WITH_TOR: - return 'Running with Tor'; + return strController.statusRunningWithTorStr.value; break; case ZeroNetStatus.ERROR: - return 'Error'; + return strController.statusErrorStr.value; break; default: } @@ -35,17 +34,17 @@ extension ZeroNetStatusExt on ZeroNetStatus { get actionText { switch (this) { case ZeroNetStatus.NOT_RUNNING: - return 'Start'; + return strController.startStr.value; break; case ZeroNetStatus.INITIALISING: - return 'Please WAIT!'; + return strController.pleaseWaitStr.value; break; case ZeroNetStatus.RUNNING: case ZeroNetStatus.RUNNING_WITH_TOR: - return 'Stop'; + return strController.stopStr.value; break; case ZeroNetStatus.ERROR: - return 'View Log'; + return strController.viewLogStr.value; break; default: } @@ -56,6 +55,16 @@ extension ZeroNetStatusExt on ZeroNetStatus { case ZeroNetStatus.NOT_RUNNING: printOut('onAction()'); printOut('ZeroNetStatus.NOT_RUNNING'); + if (!patchChecked && checkPatchNeeded()) { + var zeroNetRevision = getZeroNetRevision(zeroNetDir); + downloadPatch('$zeroNetRevision').then((_) { + checkPatchAndApply( + tempDir.path + '/patches/$zeroNetRevision', + zeronetDir, + ); + }); + patchChecked = true; + } var autoStart = (varStore.settings[autoStartZeroNet] as ToggleSetting).value; runZeroNetService(autoStart: autoStart); @@ -63,7 +72,7 @@ extension ZeroNetStatusExt on ZeroNetStatus { case ZeroNetStatus.RUNNING: case ZeroNetStatus.RUNNING_WITH_TOR: shutDownZeronet(); - ZeroBrowser.flutterWebViewPlugin.close(); + flutterWebViewPlugin.close(); // FlutterBackgroundService().stopBackgroundService(); manuallyStoppedZeroNet = true; break; @@ -126,19 +135,19 @@ extension AppUpdateExt on AppUpdate { get text { switch (uiStore.appUpdate.value) { case AppUpdate.AVAILABLE: - return 'Update'; + return strController.updateStr.value; break; case AppUpdate.DOWNLOADING: - return 'Downloading'; + return strController.downloadingStr.value; break; case AppUpdate.DOWNLOADED: - return 'Downloaded'; + return strController.downloadedStr.value; break; case AppUpdate.INSTALLING: - return 'Installing'; + return strController.installingStr.value; break; default: - return 'Not Available'; + return strController.notAvaliableStr.value; } } @@ -178,19 +187,19 @@ extension AppRouteExt on AppRoute { get title { switch (this) { case AppRoute.AboutPage: - return 'About'; + return strController.aboutStr.value; break; case AppRoute.Home: return 'ZeroNet Mobile'; break; case AppRoute.Settings: - return 'Settings'; + return strController.settingsStr.value; break; case AppRoute.ZeroBrowser: - return 'ZeroBrowser'; + return 'Zero${strController.browserStr.value}'; break; case AppRoute.LogPage: - return 'ZeroNet Log'; + return 'ZeroNet ${strController.logStr.value}'; break; default: } @@ -284,7 +293,7 @@ extension AppThemeExt on AppTheme { return Colors.white; break; case AppTheme.Dark: - return Colors.grey[900]; + return Colors.grey[850]; break; case AppTheme.Black: return Colors.grey[900]; @@ -304,4 +313,20 @@ extension AppThemeExt on AppTheme { default: } } + + get browserBgColor { + switch (this) { + case AppTheme.Light: + return Color(0xFFEDF2F5); + break; + case AppTheme.Dark: + case AppTheme.Black: + return Color(0xFF22272d); + break; + default: + } + } + + get browserIconColor => + zeroBrowserTheme == 'light' ? Color(0xFF22272d) : Color(0xFFEDF2F5); } diff --git a/lib/others/common.dart b/lib/others/common.dart index 6bb7127..77c5fb5 100644 --- a/lib/others/common.dart +++ b/lib/others/common.dart @@ -1,4 +1,3 @@ -import 'package:get/get.dart'; import 'package:purchases_flutter/purchases_flutter.dart'; import '../imports.dart'; @@ -14,6 +13,8 @@ bool isZeroNetDownloadedm = false; bool isDownloadExec = false; bool canLaunchUrl = false; bool firstTime = false; +bool patchChecked = false; +bool fromBrowser = false; bool kIsPlayStoreInstall = false; bool kEnableInAppPurchases = !kDebugMode && kIsPlayStoreInstall; bool manuallyStoppedZeroNet = false; @@ -82,8 +83,19 @@ List trackerFileNames = [ 'trackers_all_ip.txt', ]; +void setSystemUiTheme() => SystemChrome.setSystemUIOverlayStyle( + SystemUiOverlayStyle( + statusBarColor: Colors.transparent, + statusBarIconBrightness: uiStore.currentTheme.value.iconBrightness, + systemNavigationBarColor: uiStore.currentTheme.value.primaryColor, + systemNavigationBarIconBrightness: + uiStore.currentTheme.value.iconBrightness, + ), + ); + init() async { getArch(); + await getPackageInfo(); kIsPlayStoreInstall = await isPlayStoreInstall(); zeroNetNativeDir = await getNativeDir(); tempDir = await getTemporaryDirectory(); @@ -100,6 +112,26 @@ init() async { Purchases.setup("ShCpAJsKdJrAAQawcMQSswqTyPWFMwXb"); } +List buildsRequirePatching = [60]; + +bool requiresPatching() { + return buildsRequirePatching.contains(int.parse(buildNumber)); +} + +Future getPackageInfo() async { + packageInfo = await PackageInfo.fromPlatform(); + appVersion = packageInfo.version; + buildNumber = packageInfo.buildNumber; +} + +void listMetaFiles() { + Directory metaDirs = Directory(metaDir.path); + var files = metaDirs.listSync(); + for (var item in files) { + print(item.path); + } +} + Future pickUserJsonFile() async { FilePickerResult result = await pickFile(fileExts: ['json']); if (result == null) return null; @@ -123,27 +155,37 @@ Future pickFile({List fileExts}) async { return result; } -Future backUpUserJsonFile(BuildContext context) async { +Future backUpUserJsonFile( + BuildContext context, { + bool copyToClipboard = false, +}) async { if (getZeroNetUsersFilePath().isNotEmpty) { - FlutterClipboard.copy(File(getZeroNetUsersFilePath()).readAsStringSync()) - .then( - (_) => printToConsole('Users.json content copied to Clipboard'), - ); - String result = await saveUserJsonFile(getZeroNetUsersFilePath()); - Get.showSnackbar(GetBar( - message: (result.contains('success')) - ? result - : "Please check yourself that file back up Successfully.", - )); + if (copyToClipboard) { + FlutterClipboard.copy(File(getZeroNetUsersFilePath()).readAsStringSync()) + .then( + (_) { + printToConsole(strController.usersFileCopied.value); + Get.showSnackbar(GetBar( + message: strController.usersFileCopied.value, + )); + }, + ); + } else { + String result = await saveUserJsonFile(getZeroNetUsersFilePath()); + Get.showSnackbar(GetBar( + message: (result.contains('success')) + ? result + : strController.chkBckUpStr.value, + )); + } } else zeronetNotInit(context); } void zeronetNotInit(BuildContext context) => showDialogC( context: context, - title: 'ZeroNet data folder not Exists.', - body: "ZeroNet should be used atleast once (run it from home screen), " - "before using this option", + title: strController.zeroNetNotInitTitleStr.value, + body: strController.zeroNetNotInitDesStr.value, ); saveDataFile() { @@ -219,9 +261,9 @@ String maptoStringList(Map map) { } String log = 'Click on Fab to Run ZeroNet\n'; -String logRunning = 'Running ZeroNet\n'; +String logRunning = '${strController.statusRunningStr.value} ZeroNet\n'; String uiServerLog = 'Ui.UiServer'; -String startZeroNetLog = 'Starting ZeroNet'; +String startZeroNetLog = '${strController.statusStartingStr.value} ZeroNet'; Process zero; printToConsole(Object object) { @@ -287,7 +329,7 @@ void showDialogC({ ), actions: [ TextButton( - child: Text('Close'), + child: Text(strController.closeStr.value), onPressed: () { Navigator.of(context).pop(); }, @@ -321,7 +363,7 @@ void showDialogW({ actions: [ actionOk, TextButton( - child: Text('Close'), + child: Text(strController.closeStr.value), onPressed: () { Navigator.of(context).pop(); }, @@ -422,12 +464,11 @@ void installPluginDialog(File file, BuildContext context) { installPlugin(file); showDialogW( context: context, - title: 'Installing Plugin', + title: strController.znPluginInstallingTitleStr.value, body: Column( children: [ Text( - "This Dialog will be automatically closed after installation, " - "After Installation Restart ZeroNet from Home page", + strController.znPluginInstallingDesStr.value, ), Padding(padding: EdgeInsets.all(12.0)), LinearProgressIndicator() diff --git a/lib/others/constants.dart b/lib/others/constants.dart index 05f8f06..bf4746a 100644 --- a/lib/others/constants.dart +++ b/lib/others/constants.dart @@ -17,8 +17,10 @@ const String twitterLink = 'https://twitter.com'; const String githubLink = 'https://github.com'; const String rawGithubLink = 'https://raw.githubusercontent.com'; const String canewsInRepo = '/canewsin/ZeroNet'; +const String zeromobileRepo = '/canewsin/zeronet_mobile'; const String releases = '$githubLink$canewsInRepo/releases/download/'; const String md5hashLink = '$rawGithubLink$canewsInRepo/py3-patches/md5.hashes'; +const String zpatches = '$githubLink$zeromobileRepo/releases/download/patches'; const String zeroNetNotiId = 'zeroNetNetiId'; const String zeroNetChannelName = 'ZeroNet Mobile'; const String zeroNetChannelDes = @@ -34,7 +36,6 @@ const bool kEnableDynamicModules = !kDebugMode; const List unImplementedFeatures = [ Feature.SITE_DELETE, Feature.SITE_PAUSE_RESUME, - // Feature.IN_APP_UPDATES, ]; const List binDirs = [ 'usr', @@ -75,44 +76,19 @@ const List appDevelopers = [ ]; const String themeSwitcher = 'Theme'; -const String themeSwitcherDes = 'Switch App Theme between Light, Dark, Black'; const String profileSwitcher = 'Profile Switcher'; -const String profileSwitcherDes = - 'Create and Use different Profiles on ZeroNet'; const String debugZeroNet = 'Debug ZeroNet Code'; -const String debugZeroNetDes = - 'Useful for Developers to find bugs and errors in the code.'; const String enableZeroNetConsole = 'Enable ZeroNet Console'; -const String enableZeroNetConsoleDes = - 'Useful for Developers to see the exec of ZeroNet Python code'; const String enableZeroNetFilters = 'Enable ZeroNet Filters'; -const String enableZeroNetFiltersDes = - 'Enabling ZeroNet Filters blocks known ametuer content sites and spam users.'; const String enableAdditionalTrackers = 'Additional BitTorrent Trackers'; -const String enableAdditionalTrackersDes = - 'Enabling External/Additional BitTorrent Trackers will give more ZeroNet Site Seeders or Clients.'; const String pluginManager = 'Plugin Manager'; -const String pluginManagerDes = 'Enable/Disable ZeroNet Plugins'; const String vibrateOnZeroNetStart = 'Vibrate on ZeroNet Start'; -const String vibrateOnZeroNetStartDes = 'Vibrates Phone When ZeroNet Starts'; const String enableFullScreenOnWebView = 'FullScreen for ZeroNet Zites'; -const String enableFullScreenOnWebViewDes = - 'This will Enable Full Screen for in app Webview of ZeroNet'; const String batteryOptimisation = 'Disable Battery Optimisation'; -const String batteryOptimisationDes = - 'This will Helps to Run App even App is in Background for long time.'; const String publicDataFolder = 'Public DataFolder'; -const String publicDataFolderDes = - 'This Will Make ZeroNet Data Folder Accessible via File Manager.'; const String autoStartZeroNet = 'AutoStart ZeroNet'; -const String autoStartZeroNetDes = - 'This Will Make ZeroNet Auto Start on App Start, So you don\'t have to click Start Button Every Time on App Start.'; const String autoStartZeroNetonBoot = 'AutoStart ZeroNet on Boot'; -const String autoStartZeroNetonBootDes = - 'This Will Make ZeroNet Auto Start on Device Boot.'; const String enableTorLog = 'Enable Tor Log'; -const String enableTorLogDes = - 'This will Enable Tor Log in ZeroNet Console helpful for debugging.'; class Utils { static const String urlHello = '1HeLLo4uzjaLetFx6NH3PMwFP3qbRbTf3D'; @@ -128,68 +104,39 @@ class Utils { static const String urlSites = 'Sites.ZeroNetwork.bit'; static const String btcUrlSites = '1SiTEs2D3rCBxeMoLHXei2UYqFcxctdwB'; - static const initialSites = const { + static var initialSites = { 'ZeroHello': { - 'description': 'Say Hello to ZeroNet, a Dashboard to manage ' + - 'all your ZeroNet Z(S)ites, You can view feed of other zites like ' + - 'posts, comments of other users from ZeroTalk as well for your posts ' + - 'and Stats like Total Requests sent and received from other peers on ZeroNet. ' + - 'You can also pause, clone or favourite, delete Zites from single page.', + 'description': (strController.zerohelloSiteDesStr as RxString).value, 'url': urlHello, 'btcAddress': urlHello, }, 'ZeroNetMobile': { - 'description': 'Forum to report ZeroNet Mobile app issues. ' + - 'Want a new feature in the app, Request a Feature. ' + - 'Facing any Bugs while using the app ? ' + - 'Just report problem here, we will take care of it. ' + - 'Want to Discuss any topic about app development ? ' + - 'Just dive into to this Zite.', + 'description': (strController.zeronetMobileSiteDesStr as RxString).value, 'url': urlZeroNetMob, 'btcAddress': urlZeroNetMob, }, 'ZeroTalk': { - 'description': 'Need a forum to discuss something, ' + - 'we got covered you here. ZeroTalk fits your need, ' + - 'just post something to get opinion from others on Network. ' + - 'Have some queries ? don\'t hesitate to ask here.' + - 'Tired of Spam ? Who don\'t! You can mute individual users also.', + 'description': (strController.zeroTalkSiteDesStr as RxString).value, 'url': urlTalk, 'btcAddress': btcUrlTalk, }, 'ZeroBlog': { - 'description': 'Want to Know Where ZeroNet is Going ? ' + - 'ZeroBlog gives you latest changes and improvements ' + - 'made to ZeroNet, including Bug Fixes, ' + - 'Speed Improvements of ZeroNet Core Software. ' + - 'Also Provides varies links to ZeroNet Protocol and ' + - 'how ZeroNet works underhood and much more things to know.', + 'description': (strController.zeroblogSiteDesStr as RxString).value, 'url': urlBlog, 'btcAddress': btcUrlBlog, }, 'ZeroMail': { - 'description': 'So you need a mail service, use ZeroMail, ' + - 'fully end-to-end encrypted mail service on ZeroNet, ' + - 'don\'t let others scanning your mailbox for their profits ' + - 'all your data is encrypted and can only opened by you. ' + - 'Your all mails are backedup, so you can stay calm for your data.', + 'description': (strController.zeromailSiteDesStr as RxString).value, 'url': urlMail, 'btcAddress': btcUrlMail, }, 'ZeroMe': { - 'description': 'Social Network is everywhere, so we made one here too. ' + - 'Twitter like, Peer to Peer Social Networking in your hands without data-tracking, ' + - 'Follow others and post your thoughts, like, comment on others posts, it\'s that easy-peasy. ' + - 'Find Like minded people and increase your friend circle beyond the borders.', + 'description': (strController.zeromeSiteDesStr as RxString).value, 'url': urlMe, 'btcAddress': btcUrlMe, }, 'ZeroSites': { - 'description': 'Want to know more sites on ZeroNet, ' + - 'visit ZeroSites, listing of community contributed sites under various ' + - 'categories like Blogs, Services, Forums, Chat, Video, Image, Guides, News and much more. ' + - 'You can even filter those lists with your preferred language ' + - 'to get more comprehensive list. Has a New Site to Show, Just Submit here.', + 'description': (strController.zeroSitesSiteDesStr as RxString).value, 'url': urlSites, 'btcAddress': btcUrlSites, }, @@ -197,27 +144,29 @@ class Utils { // 'ZeroName': '1Name2NXVi1RDPDgf5617UoW7xA6YrhM9F', - static const String createProfile = 'Create'; // New Profile - static const String importProfile = 'Import'; // Profile - static const String backupProfile = 'Backup'; // Profile + // static const String createProfile = 'Create'; // New Profile + // static const String importProfile = 'Import'; // Profile + // static const String backupProfile = 'Backup'; // Profile - static const String openPluginManager = 'Open Plugin Manager'; - static const String loadPlugin = 'Load Custom Plugin'; + // static const String openPluginManager = 'Open Plugin Manager'; + // static const String loadPlugin = 'Load Custom Plugin'; static Map defSettings = { themeSwitcher: MapSetting( - name: themeSwitcher, - description: themeSwitcherDes, + name: strController.themeSwitcherStr.value, + description: strController.themeSwitcherDesStr.value, map: {}, options: [ MapOptions.THEME_LIGHT, MapOptions.THEME_DARK, - MapOptions.THEME_BLACK, + //! Premium fEATURE. + // MapOptions.THEME_BLACK, + //TODO: Add more themes ], ), profileSwitcher: MapSetting( - name: profileSwitcher, - description: profileSwitcherDes, + name: strController.profileSwitcherStr.value, + description: strController.profileSwitcherDesStr.value, map: { "selected": '', "all": [], @@ -229,66 +178,66 @@ class Utils { ], ), pluginManager: MapSetting( - name: pluginManager, - description: pluginManagerDes, + name: strController.pluginManagerStr.value, + description: strController.pluginManagerDesStr.value, map: {}, options: [ MapOptions.OPEN_PLUGIN_MANAGER, MapOptions.LOAD_PLUGIN, ]), batteryOptimisation: ToggleSetting( - name: batteryOptimisation, - description: batteryOptimisationDes, + name: strController.batteryOptimisationStr.value, + description: strController.batteryOptimisationDesStr.value, value: false, ), enableAdditionalTrackers: ToggleSetting( - name: enableAdditionalTrackers, - description: enableAdditionalTrackersDes, + name: strController.enableAdditionalTrackersStr.value, + description: strController.enableAdditionalTrackersDesStr.value, value: true, ), enableZeroNetFilters: ToggleSetting( - name: enableZeroNetFilters, - description: enableZeroNetFiltersDes, + name: strController.enableZeroNetFiltersStr.value, + description: strController.enableZeroNetFiltersDesStr.value, value: true, ), publicDataFolder: ToggleSetting( - name: publicDataFolder, - description: publicDataFolderDes, + name: strController.publicDataFolderStr.value, + description: strController.publicDataFolderDesStr.value, value: false, ), vibrateOnZeroNetStart: ToggleSetting( - name: vibrateOnZeroNetStart, - description: vibrateOnZeroNetStartDes, + name: strController.vibrateOnZeroNetStartStr.value, + description: strController.vibrateOnZeroNetStartDesStr.value, value: false, ), enableFullScreenOnWebView: ToggleSetting( - name: enableFullScreenOnWebView, - description: enableFullScreenOnWebViewDes, + name: strController.enableFullScreenOnWebViewStr.value, + description: strController.enableFullScreenOnWebViewDesStr.value, value: false, ), autoStartZeroNet: ToggleSetting( - name: autoStartZeroNet, - description: autoStartZeroNetDes, + name: strController.autoStartZeroNetStr.value, + description: strController.autoStartZeroNetDesStr.value, value: true, ), autoStartZeroNetonBoot: ToggleSetting( - name: autoStartZeroNetonBoot, - description: autoStartZeroNetonBootDes, + name: strController.autoStartZeroNetonBootStr.value, + description: strController.autoStartZeroNetonBootDesStr.value, value: false, ), debugZeroNet: ToggleSetting( - name: debugZeroNet, - description: debugZeroNetDes, + name: strController.debugZeroNetStr.value, + description: strController.debugZeroNetDesStr.value, value: false, ), enableZeroNetConsole: ToggleSetting( - name: enableZeroNetConsole, - description: enableZeroNetConsoleDes, + name: strController.enableZeroNetConsoleStr.value, + description: strController.enableZeroNetConsoleDesStr.value, value: false, ), enableTorLog: ToggleSetting( - name: enableTorLog, - description: enableTorLogDes, + name: strController.enableTorLogStr.value, + description: strController.enableTorLogDesStr.value, value: false, ), }; @@ -311,19 +260,19 @@ extension MapOptionExt on MapOptions { get description { switch (this) { case MapOptions.CREATE_PROFILE: - return 'Create New Profile'; + return strController.createNewProfileStr.value; break; case MapOptions.IMPORT_PROFILE: - return 'Import Profile'; + return strController.importProfileStr.value; break; case MapOptions.BACKUP_PROFILE: - return 'Backup Profile'; + return strController.backupProfileStr.value; break; case MapOptions.OPEN_PLUGIN_MANAGER: - return 'Open Plugin Manager'; + return strController.openPluginManagerStr.value; break; case MapOptions.LOAD_PLUGIN: - return 'Load Plugin'; + return strController.loadPluginStr.value; break; case MapOptions.THEME_LIGHT: return 'Light'; @@ -344,12 +293,12 @@ extension MapOptionExt on MapOptions { if (isZeroNetUserDataExists()) { showDialogW( context: context, - title: 'Provide A Name for Existing Profile', + title: strController.existingProfileTitleStr.value, body: ProfileSwitcherUserNameEditText(), actionOk: Row( children: [ TextButton( - child: Text('Create'), + child: Text(strController.createStr.value), onPressed: () { if (username.isNotEmpty) { File file = File(getZeroNetUsersFilePath()); @@ -372,7 +321,7 @@ extension MapOptionExt on MapOptions { }, ), TextButton( - child: Text('Backup'), + child: Text(strController.backupStr.value), onPressed: () => backUpUserJsonFile(context), ), ], @@ -391,13 +340,11 @@ extension MapOptionExt on MapOptions { : false; showDialogW( context: context, - title: 'Restore Profile ?', + title: strController.restoreProfileTitleStr.value, body: Text( - 'this will delete the existing profile, ' - 'backup existing profile using backup button below\n\n' - 'Selected Userfile : \n' + '${strController.restoreProfileDesStr.value}' '$filePath' - '\n\n${isSameUser ? 'You can only select users.json file, outside zeronet data folder' : ''}', + '\n\n${isSameUser ? '${strController.restoreProfileDes1Str.value}' : ''}', ), actionOk: Row( children: [ @@ -422,11 +369,11 @@ extension MapOptionExt on MapOptions { } }, child: Text( - 'Restore', + strController.restoreStr.value, ), ), TextButton( - child: Text('Backup'), + child: Text(strController.backupStr.value), onPressed: () => backUpUserJsonFile(context), ), ], @@ -442,10 +389,9 @@ extension MapOptionExt on MapOptions { { showDialogW( context: context, - title: 'Install a Plugin', + title: strController.zninstallAPluginTitleStr.value, body: Text( - 'This will load plugin to your ZeroNet repo, ' - '\nWarning : Loading Unknown/Untrusted plugins may compromise ZeroNet Installation.', + strController.zninstallAPluginDesStr.value, style: TextStyle( color: uiStore.currentTheme.value.primaryTextColor, ), @@ -458,7 +404,7 @@ extension MapOptionExt on MapOptions { installPluginDialog(file, context); } }, - child: Text('Install'), + child: Text(strController.installStr.value), ), ); } @@ -474,7 +420,7 @@ extension MapOptionExt on MapOptions { service.sendData({'cmd': 'runZeroNet'}); Navigator.pop(context); }, - child: Text('Restart'), + child: Text(strController.restartStr.value), ), ); break; diff --git a/lib/others/donation_const.dart b/lib/others/donation_const.dart index 09a5793..41abfd9 100644 --- a/lib/others/donation_const.dart +++ b/lib/others/donation_const.dart @@ -1,4 +1,3 @@ -import 'package:get/get.dart'; import 'package:purchases_flutter/purchases_flutter.dart'; import '../imports.dart'; diff --git a/lib/others/utils.dart b/lib/others/utils.dart index eb613ef..54598bd 100644 --- a/lib/others/utils.dart +++ b/lib/others/utils.dart @@ -19,7 +19,7 @@ printOut(Object object, {int lineBreaks = 0, bool isNative = false}) { if (isNative) nativePrint(breaks + "$object" + breaks); else - print(breaks + object + breaks); + print(breaks + '$object' + breaks); } } @@ -59,9 +59,6 @@ initDownloadParams() async { bindDownloadIsolate(); bindUnZipIsolate(); FlutterDownloader.registerCallback(handleDownloads); - packageInfo = await PackageInfo.fromPlatform(); - appVersion = packageInfo.version; - buildNumber = packageInfo.buildNumber; } handleDownloads(String id, DownloadTaskStatus status, int progress) { @@ -128,7 +125,7 @@ bindUnZipIsolate() { int totalFiles = data[2]; var percent = (currentFile / totalFiles) * 100; if (percent.toInt() % 5 == 0) { - varStore.setLoadingStatus('Installing $name'); + varStore.setLoadingStatus('${strController.installingStr.value} $name'); varStore.setLoadingPercent(percent.toInt()); } if (percent == 100) { @@ -136,6 +133,12 @@ bindUnZipIsolate() { } var nooffiles = files(arch).length; if (percentUnZip == nooffiles * 100) { + if (requiresPatching()) { + var patchFile = File(dataDir + '/$buildNumber.patched'); + if (!patchFile.existsSync()) { + patchFile.createSync(recursive: true); + } + } printOut('Installation Completed', isNative: true); makeExecHelper().then((value) => isExecPermitted = value); uninstallModules(); @@ -208,11 +211,19 @@ unzip() async { zeroNetState = state.INSTALLING; if (!(f2.existsSync() && f3.existsSync())) { if (f.path.contains('usr')) - _unzipBytes(item, f.readAsBytesSync(), dest: 'usr/'); + unzipBytes( + item, + f.readAsBytesSync(), + dest: dataDir + '/' + 'usr/', + ); else if (f.path.contains('site-packages')) - _unzipBytes(item, f.readAsBytesSync(), dest: 'usr/lib/python3.8/'); + unzipBytes( + item, + f.readAsBytesSync(), + dest: dataDir + '/' + 'usr/lib/python3.8/', + ); else - _unzipBytes(item, f.readAsBytesSync()); + unzipBytes(item, f.readAsBytesSync(), dest: dataDir + '/'); f2.createSync(recursive: true); } } @@ -303,9 +314,9 @@ void _unzipBytesAsync(UnzipParams params) async { int percentUnZip = 0; -_unzipBytes(String name, List bytes, {String dest = ''}) async { +unzipBytes(String name, List bytes, {String dest = ''}) async { printOut("UnZippingFiles......."); - var out = dataDir + '/' + dest; + var out = dest; Archive archive = ZipDecoder().decodeBytes(bytes); for (ArchiveFile file in archive) { String filename = file.name; diff --git a/lib/others/zeronet_isolate.dart b/lib/others/zeronet_isolate.dart index 97e8e4c..1cf557d 100644 --- a/lib/others/zeronet_isolate.dart +++ b/lib/others/zeronet_isolate.dart @@ -198,15 +198,15 @@ void onBgServiceDataReceivedForIsolate(Map data) { void setZeroNetRunningNotification() { service.setNotificationInfo( - title: "ZeroNet Mobile is Running", - content: "Click Here on this Notification to open app", + title: strController.znNotiRunningTitleStr.value, + content: strController.znNotiRunningDesStr.value, ); } void setBgServiceRunningNotification() { service.setNotificationInfo( - title: "ZeroNet Mobile is Not Running", - content: "Open ZeroNet Mobile App and click start to run ZeroNet", + title: strController.znNotiNotRunningTitleStr.value, + content: strController.znNotiNotRunningDesStr.value, ); } diff --git a/lib/others/zeronet_utils.dart b/lib/others/zeronet_utils.dart index ffae5a5..1d157b3 100644 --- a/lib/others/zeronet_utils.dart +++ b/lib/others/zeronet_utils.dart @@ -1,5 +1,3 @@ -import 'package:in_app_update/in_app_update.dart'; - import '../imports.dart'; Future checkInitStatus() async { @@ -244,3 +242,143 @@ Future createTorDataDir() { if (!torDir.existsSync()) torDir.createSync(); return Future.value(true); } + +int getZeroNetRevision(String zeroNetDir) { + var file = File(zeroNetDir + '/src/Config.py'); + var content = file.readAsStringSync(); + var versionIndex = content.indexOf('self.rev = '); + var version = content.substring(versionIndex + 11, versionIndex + 15); + return int.parse(version); +} + +String getZeroNetVersion(String zeroNetDir) { + var file = File(zeroNetDir + '/src/Config.py'); + var content = file.readAsStringSync(); + var versionIndex = content.indexOf('self.version = "'); + content = content.substring(versionIndex + 16); + var endindex = content.indexOf('"'); + var version = content.substring(0, endindex); + return version; +} + +bool checkPatchNeeded() { + var zeroNetVersion = getZeroNetVersion(zeronetDir); + var zeroNetRevision = getZeroNetRevision(zeronetDir); + if (zeroNetRevision == 4555 && zeroNetVersion == '0.7.2') { + return true; + } else if (zeroNetRevision == 4556 && zeroNetVersion == '0.7.2-v3patched') { + return false; + } + return false; +} + +Future downloadPatch(String version) async { + File patchFile = File(tempDir.path + '/$version.zip'); + if (!patchFile.existsSync()) { + await downloadFile(zpatches, '$version.zip', tempDir.path); + } + Directory dir = Directory(tempDir.path + '/patches/$version'); + if (!dir.existsSync()) { + unzipBytes(version, patchFile.readAsBytesSync(), + dest: '${tempDir.path}/patches/$version/'); + } +} + +Future downloadFile(String url, String fileName, String dir) async { + HttpClient httpClient = HttpClient(); + File file; + String filePath = ''; + String myUrl = ''; + + try { + myUrl = url + '/' + fileName; + var request = await httpClient.getUrl(Uri.parse(myUrl)); + var response = await request.close(); + if (response.statusCode == 200) { + var bytes = await consolidateHttpClientResponseBytes(response); + filePath = '$dir/$fileName'; + file = File(filePath); + await file.writeAsBytes(bytes); + } else + filePath = 'Error code: ' + response.statusCode.toString(); + } catch (ex) { + filePath = 'Can not fetch url'; + } + + return filePath; +} + +void checkPatchAndApply(String patchPath, String zeroNetPath) { + var zeroNetVersion = getZeroNetVersion(zeroNetPath); + var zeroNetRevision = getZeroNetRevision(zeroNetPath); + + if (zeroNetRevision == 4555 && zeroNetVersion == '0.7.2') { + printOut('Applying patch for 0.7.2'); + applyPatch(patchPath, zeroNetPath); + } else if (zeroNetRevision == 4555 && zeroNetVersion == '0.7.2-torv3') { + printOut('Patch Already Applied for 0.7.2'); + } +} + +void applyPatch(String patchPath, String destination) { + var patchManifestFile = File( + patchPath + '/patch.manifest', + ).readAsStringSync(); + var contents = patchManifestFile.split('\n'); + for (var line in contents) { + if (line.startsWith('[{D_}]')) { + var filePath = line.replaceAll('[{D_}]', ''); + var file = File(destination + '/' + filePath); + try { + file.deleteSync(); + } catch (e) { + print(e); + } + } else if (line.startsWith('[{A_}]')) { + var name = line.replaceAll('[{A_}]', ''); + var file = File(patchPath + '/' + name); + if (!file.existsSync()) { + // throw Exception('File does not exist'); + } + var p = File(destination + '/' + name).parent; + if (!p.existsSync()) { + p.createSync(); + } + File(file.path).copySync(destination + '/' + name); + } else if (line.startsWith('[{R_}]')) { + var params = line.replaceAll('[{R_}]', '').split(']['); + var oldname = params[0].replaceAll('[', ''); + var newname = params[1].replaceAll(']', ''); + if (oldname.endsWith('/') && newname.endsWith('/')) { + try { + Directory(destination + '/' + oldname).renameSync( + destination + '/' + newname, + ); + } catch (e) { + print(e); + } + } else { + try { + File(destination + '/' + oldname).renameSync( + destination + '/' + newname, + ); + } catch (e) { + print(e); + } + } + } else if (line.startsWith('[{M_}]')) { + var path = line.replaceAll('[{M_}]', ''); + var patchFile = File(patchPath + '/' + path + '.patch'); + var destinationFile = File(destination + '/' + path); + var p = patchFromText(patchFile.readAsStringSync()); + + var dmp = DiffMatchPatch(); + // var diff = dmp.diff(orgContent, patchedContent); + var result = dmp.patch_apply(p, destinationFile.readAsStringSync()); + print('\n' + result[1].toString() + '\n'); + if (!(result[1] as List).contains(false)) { + destinationFile.writeAsString(result[0]); + } + } + } +} diff --git a/lib/widgets/about_page.dart b/lib/widgets/about_page.dart index 476865b..3b68f3f 100644 --- a/lib/widgets/about_page.dart +++ b/lib/widgets/about_page.dart @@ -1,6 +1,3 @@ -import 'dart:ui'; - -import 'package:get/get.dart'; import 'package:purchases_flutter/purchases_flutter.dart'; import '../imports.dart'; @@ -39,7 +36,7 @@ class AboutPage extends StatelessWidget { Flexible( child: Container( child: Text( - 'ZeroNet Mobile is a full native client for ZeroNet, a platform for decentralized websites using Bitcoin ', + strController.aboutAppDesStr.value, style: GoogleFonts.roboto( fontSize: 20.0, fontWeight: FontWeight.w500, @@ -55,8 +52,7 @@ class AboutPage extends StatelessWidget { Container( child: Text.rich( TextSpan( - text: - 'crypto and the BitTorrent network. you can learn more about ZeroNet at ', + text: strController.aboutAppDes1Str.value, style: GoogleFonts.roboto( fontSize: 20.0, fontWeight: FontWeight.w500, @@ -94,7 +90,7 @@ class AboutPage extends StatelessWidget { padding: const EdgeInsets.all(8.0), ), Text( - 'Contribute', + strController.contributeStr.value, style: GoogleFonts.roboto( fontSize: 20.0, fontWeight: FontWeight.bold, @@ -105,7 +101,7 @@ class AboutPage extends StatelessWidget { padding: const EdgeInsets.all(4.0), ), Text( - "If you want to support project's further development, you can contribute your time or money, If you want to contribute money you can send bitcoin or other supported crypto currencies to above addresses or buy in-app purchases, if want to contribute translations or code, visit official GitHub repo.", + strController.contributeDesStr.value, style: GoogleFonts.roboto( fontSize: 18.0, color: uiStore.currentTheme.value.primaryTextColor, @@ -133,7 +129,7 @@ class DonationWidget extends StatelessWidget { crossAxisAlignment: CrossAxisAlignment.start, children: [ Text( - 'Donation Addresses', + strController.donationAddrsStr.value, style: GoogleFonts.roboto( fontSize: 18.0, fontWeight: FontWeight.bold, @@ -175,8 +171,8 @@ class DonationWidget extends StatelessWidget { onClick: () { FlutterClipboard.copy(donationsAddressMap[crypto]); Get.showSnackbar(GetBar( - message: - '$crypto Donation Address Copied to Clipboard', + message: '$crypto ' + '${strController.donAddrCopiedStr.value}', )); }, ), @@ -195,7 +191,7 @@ class DonationWidget extends StatelessWidget { ), Flexible( child: Text( - "* Click on Address to copy", + strController.clickAddrToCopyStr.value, style: GoogleFonts.roboto( fontSize: 16.0, color: uiStore.currentTheme.value.primaryTextColor, @@ -211,13 +207,7 @@ class DonationWidget extends StatelessWidget { ), Flexible( child: Text( - "* Any Donation can activate all pro-features in app, " - "these are just an encouragement to me to work more on the app. " - "Pro-features will be made available to general public after certain time, " - "thus you don't need to worry about exclusiveness of a feature. " - "If you donate from any source other than Google Play Purchase, " - "just send your transaction id to canews.in@gmail.com / ZeroMail: zeromepro, " - "so than I can send activation code to activate pro-features.", + strController.donationDes.value, style: GoogleFonts.roboto( fontSize: 16.0, color: uiStore.currentTheme.value.primaryTextColor, @@ -236,7 +226,7 @@ class DeveloperWidget extends StatelessWidget { crossAxisAlignment: CrossAxisAlignment.start, children: [ Text( - 'Developers', + strController.developersStr.value, style: GoogleFonts.roboto( fontSize: 20.0, fontWeight: FontWeight.bold, @@ -287,9 +277,9 @@ class DeveloperWidget extends StatelessWidget { List children = []; final iconsPath = 'assets/icons'; List assets = [ - '$iconsPath/github_dark.png', - '$iconsPath/twitter_dark.png', - '$iconsPath/facebook_dark.png', + '$iconsPath/github${uiStore.currentTheme.value == AppTheme.Light ? '_dark' : ''}.png', + '$iconsPath/twitter${uiStore.currentTheme.value == AppTheme.Light ? '_dark' : ''}.png', + '$iconsPath/facebook${uiStore.currentTheme.value == AppTheme.Light ? '_dark' : ''}.png', ]; List links = [ developer.githubLink, @@ -344,10 +334,10 @@ class GooglePlayInAppPurchases extends StatelessWidget { children: [ Text.rich( TextSpan( - text: 'Google Play Purchases ', + text: strController.googlePurchasesStr.value, children: [ TextSpan( - text: '(30% taken by Google) :', + text: strController.googleFeeWarningStr.value, style: GoogleFonts.roboto( fontSize: 14.0, color: uiStore.currentTheme.value.primaryTextColor, @@ -364,8 +354,9 @@ class GooglePlayInAppPurchases extends StatelessWidget { Obx(() { List mChildren = []; Map> googlePurchasesTypes = { - 'One Time': purchasesStore.oneTimePurchases, - 'Monthly Subscriptions': purchasesStore.subscriptions, + strController.oneTimeSubStr.value: + purchasesStore.oneTimePurchases, + strController.monthlySubStr.value: purchasesStore.subscriptions, }; for (var item in googlePurchasesTypes.keys) { List purchases = googlePurchasesTypes[item]; @@ -391,15 +382,15 @@ class GooglePlayInAppPurchases extends StatelessWidget { String label = ''; switch (i) { case 0: - label = 'Tip'; + label = strController.tipStr.value; c = Color(0xFF06CAB6); break; case 1: - label = 'Coffee'; + label = strController.coffeeStr.value; c = Color(0xFF0696CA); break; case 2: - label = 'Lunch'; + label = strController.lunchStr.value; c = Color(0xFFCA067B); break; default: @@ -442,6 +433,7 @@ class GooglePlayInAppPurchases extends StatelessWidget { style: GoogleFonts.roboto( fontSize: 16.0, fontWeight: FontWeight.w500, + color: uiStore.currentTheme.value.primaryTextColor, ), ), Padding(padding: const EdgeInsets.all(8.0)), diff --git a/lib/widgets/common.dart b/lib/widgets/common.dart index 7c1f807..5d8c076 100644 --- a/lib/widgets/common.dart +++ b/lib/widgets/common.dart @@ -1,5 +1,3 @@ -import 'package:get/get.dart'; - import '../imports.dart'; class ZeroNetAppBar extends StatelessWidget { @@ -153,15 +151,13 @@ class _ProfileSwitcherUserNameEditTextState return ListBody( children: [ Text( - 'Always remember to backup users.json before doing anything because, ' - 'we are not able to tell when a software will fail. ' - 'Click Backup below to backup your Existing users.json file.\n', + strController.backupWarningStr.value, style: TextStyle( color: Colors.red, ), ), Text( - 'Username Phrase :', + strController.usernamePhraseStr.value, style: TextStyle( color: uiStore.currentTheme.value.primaryTextColor, ), @@ -177,18 +173,18 @@ class _ProfileSwitcherUserNameEditTextState var valid = text.isNotEmpty; if (valid) { if (text.contains(' ')) { - errorText = 'username can\'t contain spaces'; + errorText = strController.usrnameWarning2Str.value; valid = false; } else if (text.length < 6) { - errorText = 'username can\'t be less than 6 characters.'; + errorText = strController.usrnameWarning3Str.value; valid = false; } else if (File(getZeroNetDataDir().path + '/users-$text.json') .existsSync()) { - errorText = 'username already exists, choose different one.'; + errorText = strController.usrnameWarning4Str.value; valid = false; } } else { - errorText = 'username can\'t be Empty'; + errorText = strController.usrnameWarning1Str.value; } setState(() { validUsername = valid; @@ -199,7 +195,7 @@ class _ProfileSwitcherUserNameEditTextState color: uiStore.currentTheme.value.primaryTextColor, ), decoration: InputDecoration( - hintText: 'username', + hintText: strController.usernameStr.value.toLowerCase(), errorText: validUsername ? null : errorText, hintStyle: TextStyle( color: uiStore.currentTheme.value.primaryTextColor, diff --git a/lib/widgets/home_page.dart b/lib/widgets/home_page.dart index 9993b0f..a3c8789 100644 --- a/lib/widgets/home_page.dart +++ b/lib/widgets/home_page.dart @@ -1,5 +1,3 @@ -import 'package:get/get.dart'; - import '../imports.dart'; import 'package:time_ago_provider/time_ago_provider.dart' as timeAgo; @@ -64,7 +62,7 @@ class InAppUpdateWidget extends StatelessWidget { mainAxisAlignment: MainAxisAlignment.spaceEvenly, children: [ Text( - 'App Update Available : ', + strController.appUpdateAvailableStr.value, style: GoogleFonts.roboto( fontSize: 20.0, fontWeight: FontWeight.w500, @@ -116,7 +114,7 @@ class AboutButtonWidget extends StatelessWidget { EdgeInsets.only(top: 10, bottom: 10, left: 30, right: 30)), ), child: Text( - 'Know More', + strController.knowMoreStr.value, style: GoogleFonts.roboto( fontSize: 16.0, fontWeight: FontWeight.normal, @@ -151,7 +149,7 @@ class RatingButtonWidget extends StatelessWidget { EdgeInsets.only(top: 10, bottom: 10, left: 30, right: 30)), ), child: Text( - 'Give Your Rating/Feedback', + strController.ratingWgtStr.value, style: GoogleFonts.roboto( fontSize: 16.0, fontWeight: FontWeight.normal, @@ -170,7 +168,7 @@ class ZeroNetStatusWidget extends StatelessWidget { Row( children: [ Text( - 'Status', + strController.statusStr.value, style: GoogleFonts.roboto( fontSize: 20, fontWeight: FontWeight.bold, @@ -284,7 +282,7 @@ class PopularZeroNetSites extends StatelessWidget { Padding( padding: EdgeInsets.all(4.0), child: Text( - 'Popular Sites', + strController.popularSitesStr.value, style: GoogleFonts.roboto( fontSize: 20.0, fontWeight: FontWeight.w500, @@ -416,10 +414,12 @@ class SiteDetailCard extends StatelessWidget { onTap: uiStore.zeroNetStatus.value == ZeroNetStatus.NOT_RUNNING ? () { - Get.showSnackbar(GetBar( - message: - 'Please Start ZeroNet First to Browse this Zite', - )); + Get.showSnackbar( + GetBar( + message: + strController.startZeroNetFirstStr.value, + ), + ); } : () async { var url = zeroNetUrl; @@ -511,7 +511,7 @@ class SiteDetailsSheet extends StatelessWidget { ZeroNetStatus.NOT_RUNNING ? () { snackMessage = - 'Please Start ZeroNet First to Browse this Zite'; + strController.startZeroNetFirstStr.value; uiStore.updateShowSnackReply(true); } : () { @@ -523,7 +523,9 @@ class SiteDetailsSheet extends StatelessWidget { ); }, child: Text( - isZiteExists ? 'OPEN' : 'DOWNLOAD', + isZiteExists + ? strController.openStr.value + : strController.downloadStr.value, maxLines: 1, style: GoogleFonts.roboto( fontSize: 18.0, @@ -577,12 +579,13 @@ class SiteDetailsSheet extends StatelessWidget { logoPath, ); if (added) { - snackMessage = '$name shortcut added to HomeScreen'; + snackMessage = + '$name ${strController.shrtAddedToHomeScreenStr.value}'; uiStore.updateShowSnackReply(true); } }, child: Text( - 'Add to HomeScreen', + strController.addToHomeScreenStr.value, maxLines: 1, style: GoogleFonts.roboto( fontSize: 18.0, @@ -607,7 +610,7 @@ class SiteDetailsSheet extends StatelessWidget { uiStore.updateCurrentAppRoute(AppRoute.LogPage); }, child: Text( - 'Show Log', + strController.showLogStr.value, maxLines: 1, style: GoogleFonts.roboto( fontSize: 18.0, @@ -639,7 +642,9 @@ class SiteDetailsSheet extends StatelessWidget { sitesAvailable); }, child: Text( - currentSite.serving ? 'Pause' : 'Resume', + currentSite.serving + ? strController.pauseStr.value + : strController.resumeStr.value, maxLines: 1, style: GoogleFonts.roboto( fontSize: 18.0, @@ -664,7 +669,7 @@ class SiteDetailsSheet extends StatelessWidget { //TODO: Implement this function; }, child: Text( - 'Delete Zite', + strController.deleteZiteStr.value, maxLines: 1, style: GoogleFonts.roboto( fontSize: 18.0, @@ -763,7 +768,7 @@ class SiteInfoWidget extends StatelessWidget { crossAxisAlignment: CrossAxisAlignment.start, children: [ Text( - 'SiteInfo', + strController.siteInfoStr.value, style: GoogleFonts.roboto( fontSize: 21.0, fontWeight: FontWeight.w500, diff --git a/lib/widgets/loading_page.dart b/lib/widgets/loading_page.dart index 3670e39..2fb8a33 100644 --- a/lib/widgets/loading_page.dart +++ b/lib/widgets/loading_page.dart @@ -1,16 +1,8 @@ -import 'package:get/get.dart'; - import '../imports.dart'; class Loading extends StatelessWidget { // String data = 'Loading'; - final String warning = """ - Please Wait! This may take a while, happens - only first time, Don't Press Back button. - If You Accidentally Pressed Back, - Clean App Storage in Settings or - Uninstall and Reinstall The App. - """; + final String warning = strController.loadingPageWarningStr.value; @override Widget build(BuildContext context) { diff --git a/lib/widgets/log_page.dart b/lib/widgets/log_page.dart index f751bc7..7fe590e 100644 --- a/lib/widgets/log_page.dart +++ b/lib/widgets/log_page.dart @@ -1,5 +1,3 @@ -import 'package:get/get.dart'; - import '../imports.dart'; class ZeroNetLogPage extends StatelessWidget { diff --git a/lib/widgets/settings_page.dart b/lib/widgets/settings_page.dart index f00c73a..b0608f3 100644 --- a/lib/widgets/settings_page.dart +++ b/lib/widgets/settings_page.dart @@ -1,5 +1,3 @@ -import 'package:get/get.dart'; - import '../imports.dart'; class SettingsPage extends StatelessWidget { @@ -169,7 +167,7 @@ class SettingsCard extends StatelessWidget { if (setting is MapSetting) Obx(() { var i = uiStore.reload.value; - printOut(i.toString()); + var str = i.toString(); List children = []; var settingL = setting as MapSetting; settingL.options.forEach((element) { @@ -181,6 +179,14 @@ class SettingsCard extends StatelessWidget { settingL.options[settingL.options.indexOf(element)] .onClick(Get.context); }, + onLongPress: element == MapOptions.BACKUP_PROFILE + ? () { + backUpUserJsonFile( + context, + copyToClipboard: true, + ); + } + : null, child: Padding( padding: const EdgeInsets.only(left: 3.0, right: 3.0), child: Chip( @@ -214,10 +220,10 @@ class SettingsCard extends StatelessWidget { onTap: () { showDialogW( context: context, - title: 'Switch Profile to $profile ?', + title: + '${strController.switchProfileToStr.value} $profile ?', body: Text( - 'this will delete the existing profile, ' - 'backup existing profile using backup button below', + strController.switchProfileToDesStr.value, ), actionOk: profileSwitcherActionOk(profile, context), @@ -272,11 +278,11 @@ class SettingsCard extends StatelessWidget { } }, child: Text( - 'Switch', + strController.switchStr.value, ), ), TextButton( - child: Text('Backup'), + child: Text(strController.backupStr.value), onPressed: () => backUpUserJsonFile(context), ), ], diff --git a/lib/widgets/zerobrowser_page.dart b/lib/widgets/zerobrowser_page.dart index 337a6e1..bd82184 100644 --- a/lib/widgets/zerobrowser_page.dart +++ b/lib/widgets/zerobrowser_page.dart @@ -1,33 +1,35 @@ import '../imports.dart'; +final flutterWebViewPlugin = FlutterWebviewPlugin(); + +// ignore: must_be_immutable class ZeroBrowser extends StatelessWidget { - static final flutterWebViewPlugin = FlutterWebviewPlugin(); + Color browserBgColor = uiStore.currentTheme.value.browserBgColor; setTheme() { + Brightness brightness; switch (zeroBrowserTheme) { case 'dark': - SystemChrome.setSystemUIOverlayStyle( - SystemUiOverlayStyle( - statusBarIconBrightness: Brightness.light, - systemNavigationBarIconBrightness: Brightness.light, - statusBarBrightness: Brightness.light, - statusBarColor: Colors.blueGrey[900], - systemNavigationBarColor: Colors.blueGrey[900], - ), - ); + brightness = Brightness.light; + if (uiStore.currentTheme.value == AppTheme.Light) + browserBgColor = Color(0xFF22272d); break; case 'light': - SystemChrome.setSystemUIOverlayStyle( - SystemUiOverlayStyle( - statusBarIconBrightness: Brightness.dark, - systemNavigationBarIconBrightness: Brightness.dark, - statusBarBrightness: Brightness.dark, - statusBarColor: Colors.transparent, - systemNavigationBarColor: Colors.white, - ), - ); + brightness = Brightness.dark; + if (uiStore.currentTheme.value == AppTheme.Dark || + uiStore.currentTheme.value == AppTheme.Black) + browserBgColor = Color(0xFFEDF2F5); break; default: } + SystemChrome.setSystemUIOverlayStyle( + SystemUiOverlayStyle( + statusBarIconBrightness: brightness, + systemNavigationBarIconBrightness: brightness, + statusBarBrightness: brightness, + statusBarColor: browserBgColor, + systemNavigationBarColor: browserBgColor, + ), + ); } @override @@ -45,21 +47,23 @@ class ZeroBrowser extends StatelessWidget { }, ), ].toSet(); - flutterWebViewPlugin.onUrlChanged.listen((newUrl) => browserUrl = newUrl); + flutterWebViewPlugin.onUrlChanged.listen((newUrl) { + browserUrl = newUrl; + if (browserUrl.startsWith('https://blockchain.info/address/') || + browserUrl.startsWith('https://www.blockchain.com/btc/address/')) { + uiStore.updateCurrentAppRoute(AppRoute.AboutPage); + fromBrowser = true; + } + }); return WillPopScope( onWillPop: () { if (launchUrl.isNotEmpty) { return Future.value(true); } else { SystemChrome.setEnabledSystemUIOverlays(SystemUiOverlay.values); - SystemChrome.setSystemUIOverlayStyle( - SystemUiOverlayStyle( - statusBarColor: Colors.transparent, - systemNavigationBarColor: Colors.white, - statusBarIconBrightness: Brightness.dark, - systemNavigationBarIconBrightness: Brightness.dark, - ), - ); + loadUsersFromFileSystem(); + setZeroBrowserThemeValues(); + setSystemUiTheme(); uiStore.updateCurrentAppRoute(AppRoute.Home); return Future.value(false); } @@ -67,103 +71,97 @@ class ZeroBrowser extends StatelessWidget { child: SafeArea( child: Stack( children: [ - WebviewScaffold( - url: browserUrl, - javascriptChannels: jsChannels, - mediaPlaybackRequiresUserGesture: false, - appCacheEnabled: true, - withZoom: true, - useWideViewPort: true, - withLocalStorage: true, - hidden: true, - initialChild: Container( - color: zeroBrowserTheme == 'dark' - ? Colors.blueGrey[900] - : Colors.white, - child: Center( - child: Column( - mainAxisAlignment: MainAxisAlignment.center, + Theme( + data: zeroBrowserTheme == 'dark' + ? ThemeData.dark() + : ThemeData.light(), + child: WebviewScaffold( + url: browserUrl, + javascriptChannels: jsChannels, + mediaPlaybackRequiresUserGesture: false, + appCacheEnabled: true, + withZoom: true, + useWideViewPort: true, + withLocalStorage: true, + hidden: true, + initialChild: Container( + color: zeroBrowserTheme == 'dark' + ? Colors.blueGrey[900] + : Colors.white, + child: Center( + child: Column( + mainAxisAlignment: MainAxisAlignment.center, + children: [ + Padding( + padding: const EdgeInsets.all(8.0), + child: CircularProgressIndicator(), + ), + Text( + '${strController.loadingStr.value}.....', + style: TextStyle( + color: zeroBrowserTheme == 'light' + ? Colors.blueGrey[900] + : Colors.white, + ), + ), + ], + ), + ), + ), + bottomNavigationBar: BottomAppBar( + color: browserBgColor, + child: Row( + mainAxisAlignment: MainAxisAlignment.end, children: [ - Padding( - padding: const EdgeInsets.all(8.0), - child: CircularProgressIndicator(), + IconButton( + icon: const Icon(Icons.home), + color: uiStore.currentTheme.value.browserIconColor, + onPressed: () { + SystemChrome.setEnabledSystemUIOverlays( + SystemUiOverlay.values); + SystemChrome.setSystemUIOverlayStyle( + SystemUiOverlayStyle( + statusBarColor: Colors.transparent, + systemNavigationBarColor: Colors.white, + statusBarIconBrightness: Brightness.dark, + systemNavigationBarIconBrightness: + Brightness.dark, + ), + ); + uiStore.updateCurrentAppRoute(AppRoute.Home); + }, ), - Text( - 'Loading.....', - style: TextStyle( - color: zeroBrowserTheme == 'light' - ? Colors.blueGrey[900] - : Colors.white, - ), + Spacer(), + IconButton( + icon: const Icon(Icons.share), + color: uiStore.currentTheme.value.browserIconColor, + onPressed: () => Share.share(browserUrl), + ), + IconButton( + icon: const Icon(Icons.arrow_back_ios), + color: uiStore.currentTheme.value.browserIconColor, + onPressed: () { + flutterWebViewPlugin.goBack(); + }, + ), + IconButton( + icon: const Icon(Icons.arrow_forward_ios), + color: uiStore.currentTheme.value.browserIconColor, + onPressed: () { + flutterWebViewPlugin.goForward(); + }, + ), + IconButton( + icon: const Icon(Icons.autorenew), + color: uiStore.currentTheme.value.browserIconColor, + onPressed: () { + flutterWebViewPlugin.reload(); + }, ), ], ), ), ), - bottomNavigationBar: BottomAppBar( - color: zeroBrowserTheme == 'dark' - ? Colors.blueGrey[900] - : Colors.white, - child: Row( - mainAxisAlignment: MainAxisAlignment.end, - children: [ - IconButton( - icon: const Icon(Icons.home), - color: zeroBrowserTheme == 'light' - ? Colors.blueGrey[900] - : Colors.white, - onPressed: () { - SystemChrome.setEnabledSystemUIOverlays( - SystemUiOverlay.values); - SystemChrome.setSystemUIOverlayStyle( - SystemUiOverlayStyle( - statusBarColor: Colors.transparent, - systemNavigationBarColor: Colors.white, - statusBarIconBrightness: Brightness.dark, - systemNavigationBarIconBrightness: Brightness.dark, - ), - ); - uiStore.updateCurrentAppRoute(AppRoute.Home); - }, - ), - Spacer(), - IconButton( - icon: const Icon(Icons.share), - color: zeroBrowserTheme == 'light' - ? Colors.blueGrey[900] - : Colors.white, - onPressed: () => Share.share(browserUrl), - ), - IconButton( - icon: const Icon(Icons.arrow_back_ios), - color: zeroBrowserTheme == 'light' - ? Colors.blueGrey[900] - : Colors.white, - onPressed: () { - flutterWebViewPlugin.goBack(); - }, - ), - IconButton( - icon: const Icon(Icons.arrow_forward_ios), - color: zeroBrowserTheme == 'light' - ? Colors.blueGrey[900] - : Colors.white, - onPressed: () { - flutterWebViewPlugin.goForward(); - }, - ), - IconButton( - icon: const Icon(Icons.autorenew), - color: zeroBrowserTheme == 'light' - ? Colors.blueGrey[900] - : Colors.white, - onPressed: () { - flutterWebViewPlugin.reload(); - }, - ), - ], - ), - ), ), ], ), diff --git a/pubspec.yaml b/pubspec.yaml index fb28b80..4b33692 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -13,6 +13,7 @@ dependencies: crypto: 3.0.1 clipboard: ^0.1.3 device_info: ^2.0.2 + diff_match_patch: ^0.4.1 file_picker: ^3.0.4 flutter_absolute_path: # path: ../flutter_absolute_path diff --git a/version.properties b/version.properties index ff99eab..144a4d2 100644 --- a/version.properties +++ b/version.properties @@ -1,2 +1,2 @@ -flutter.versionName=v 0.8.1 - beta 5 -flutter.versionCode=55 +flutter.versionName=v 0.8.1 - beta 12 +flutter.versionCode=67