From d972ad7696ab875d97768f0835819c58b89a4458 Mon Sep 17 00:00:00 2001 From: KewbitXMR Date: Fri, 20 Sep 2024 18:16:54 +0100 Subject: [PATCH] testing fdroid --- .vscode/launch.json | 6 +- LICENSE | 661 ++++++++++++++++++ README.md | 2 +- android/app/build.gradle | 4 +- android/app/src/main/AndroidManifest.xml | 2 +- .../haveno_flutter_app/MainActivity.kt | 2 +- ios/Runner.xcodeproj/project.pbxproj | 12 +- ios/Runner/Info.plist | 2 +- .../account_service_client.dart | 4 +- lib/main.dart | 32 +- lib/providers/account_provider.dart | 4 +- lib/providers/get_version_provider.dart | 4 +- lib/providers/offers_provider.dart | 4 +- lib/providers/payment_accounts_provider.dart | 8 +- lib/providers/prices_provider.dart | 4 +- lib/providers/trades_provider.dart | 6 +- lib/providers/wallets_provider.dart | 4 +- .../active_buyer_trade_timeline_screen.dart | 6 +- .../active_seller_trade_timeline_screen.dart | 6 +- lib/screens/active_trade_chat_screen.dart | 4 +- lib/screens/active_trade_detail_screen.dart | 4 +- .../drawer/payment_accounts_screen.dart | 6 +- lib/screens/drawer/wallet_screen.dart | 4 +- lib/screens/my_offer_detail_screen.dart | 4 +- lib/screens/offer_detail_screen.dart | 12 +- lib/services/haveno_service.dart | 2 +- lib/tabs/buy/buy_market_offers_tab.dart | 8 +- lib/tabs/buy/buy_my_offers_tab.dart | 4 +- lib/tabs/buy_tab.dart | 12 +- lib/tabs/sell/sale_market_offers_tab.dart | 8 +- lib/tabs/sell/sale_my_offers_tab.dart | 4 +- lib/tabs/sell_tab.dart | 12 +- lib/tabs/trades/trades_active_tab.dart | 10 +- lib/tabs/trades/trades_completed_tab.dart | 2 +- lib/tabs/trades_tab.dart | 6 +- lib/widgets/add_payment_account_form.dart | 6 +- lib/widgets/add_payment_method_form.dart | 6 +- lib/widgets/new_trade_offer_form.dart | 4 +- lib/widgets/offer_card_widget.dart | 10 +- linux/CMakeLists.txt | 4 +- linux/flutter/generated_plugins.cmake | 1 - linux/my_application.cc | 4 +- macos/Runner.xcodeproj/project.pbxproj | 18 +- .../xcshareddata/xcschemes/Runner.xcscheme | 8 +- macos/Runner/Configs/AppInfo.xcconfig | 6 +- metadata/org.kewbit.havenoPlus.yml | 46 +- protoc | 0 pubspec.lock | 16 - pubspec.yaml | 18 +- test/widget_test.dart | 2 +- web/index.html | 4 +- web/manifest.json | 4 +- windows/CMakeLists.txt | 4 +- windows/flutter/generated_plugins.cmake | 1 - windows/runner/Runner.rc | 12 +- windows/runner/main.cpp | 2 +- 56 files changed, 864 insertions(+), 187 deletions(-) create mode 100644 LICENSE delete mode 100644 protoc diff --git a/.vscode/launch.json b/.vscode/launch.json index 0507f99..18435fb 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -5,18 +5,18 @@ "version": "0.2.0", "configurations": [ { - "name": "haveno_flutter_app", + "name": "haveno", "request": "launch", "type": "dart" }, { - "name": "haveno_flutter_app (profile mode)", + "name": "haveno (profile mode)", "request": "launch", "type": "dart", "flutterMode": "profile" }, { - "name": "haveno_flutter_app (release mode)", + "name": "haveno (release mode)", "request": "launch", "type": "dart", "flutterMode": "release" diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..bae94e1 --- /dev/null +++ b/LICENSE @@ -0,0 +1,661 @@ + GNU AFFERO GENERAL PUBLIC LICENSE + Version 3, 19 November 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 Affero General Public License is a free, copyleft license for +software and other kinds of works, specifically designed to ensure +cooperation with the community in the case of network server software. + + The licenses for most software and other practical works are designed +to take away your freedom to share and change the works. By contrast, +our General Public Licenses are 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. + + 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. + + Developers that use our General Public Licenses protect your rights +with two steps: (1) assert copyright on the software, and (2) offer +you this License which gives you legal permission to copy, distribute +and/or modify the software. + + A secondary benefit of defending all users' freedom is that +improvements made in alternate versions of the program, if they +receive widespread use, become available for other developers to +incorporate. Many developers of free software are heartened and +encouraged by the resulting cooperation. However, in the case of +software used on network servers, this result may fail to come about. +The GNU General Public License permits making a modified version and +letting the public access it on a server without ever releasing its +source code to the public. + + The GNU Affero General Public License is designed specifically to +ensure that, in such cases, the modified source code becomes available +to the community. It requires the operator of a network server to +provide the source code of the modified version running there to the +users of that server. Therefore, public use of a modified version, on +a publicly accessible server, gives the public access to the source +code of the modified version. + + An older license, called the Affero General Public License and +published by Affero, was designed to accomplish similar goals. This is +a different license, not a version of the Affero GPL, but Affero has +released a new version of the Affero GPL which permits relicensing under +this license. + + 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 Affero 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. Remote Network Interaction; Use with the GNU General Public License. + + Notwithstanding any other provision of this License, if you modify the +Program, your modified version must prominently offer all users +interacting with it remotely through a computer network (if your version +supports such interaction) an opportunity to receive the Corresponding +Source of your version by providing access to the Corresponding Source +from a network server at no charge, through some standard or customary +means of facilitating copying of software. This Corresponding Source +shall include the Corresponding Source for any work covered by version 3 +of the GNU General Public License that is incorporated pursuant to the +following paragraph. + + 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 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 work with which it is combined will remain governed by version +3 of the GNU General Public License. + + 14. Revised Versions of this License. + + The Free Software Foundation may publish revised and/or new versions of +the GNU Affero 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 Affero 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 Affero 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 Affero 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 Affero 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 Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . + +Also add information on how to contact you by electronic and paper mail. + + If your software can interact with users remotely through a computer +network, you should also make sure that it provides a way for users to +get its source. For example, if your program is a web application, its +interface could display a "Source" link that leads users to an archive +of the code. There are many ways you could offer source, and different +solutions will be better for different programs; see section 13 for the +specific requirements. + + 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 AGPL, see +. \ No newline at end of file diff --git a/README.md b/README.md index 09a05bb..abd0407 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# Haveno Plus (Mobile) +# Haveno **Repository for public pre-release builds of the Haveno mobile app for Android. This is not a mock, though its currently only on stagenet. This is a bounty-funded project.** diff --git a/android/app/build.gradle b/android/app/build.gradle index f3563f8..77168b5 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -24,7 +24,7 @@ if (flutterVersionName == null) { } android { - namespace = "com.example.haveno_flutter_app" + namespace = "com.haveno.haveno" compileSdk = flutter.compileSdkVersion ndkVersion = flutter.ndkVersion @@ -35,7 +35,7 @@ android { defaultConfig { // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html). - applicationId = "com.example.haveno_flutter_app" + applicationId = "com.haveno.haveno" // You can update the following values to match your application needs. // For more information, see: https://docs.flutter.dev/deployment/android#reviewing-the-gradle-build-configuration. minSdk = flutter.minSdkVersion diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml index 1a3ce2c..f102a89 100644 --- a/android/app/src/main/AndroidManifest.xml +++ b/android/app/src/main/AndroidManifest.xml @@ -1,6 +1,6 @@ diff --git a/android/app/src/main/kotlin/com/example/haveno_flutter_app/MainActivity.kt b/android/app/src/main/kotlin/com/example/haveno_flutter_app/MainActivity.kt index 499af71..a471477 100644 --- a/android/app/src/main/kotlin/com/example/haveno_flutter_app/MainActivity.kt +++ b/android/app/src/main/kotlin/com/example/haveno_flutter_app/MainActivity.kt @@ -1,4 +1,4 @@ -package com.example.haveno_flutter_app +package com.haveno.haveno import io.flutter.embedding.android.FlutterActivity diff --git a/ios/Runner.xcodeproj/project.pbxproj b/ios/Runner.xcodeproj/project.pbxproj index 01e08d3..d4d917a 100644 --- a/ios/Runner.xcodeproj/project.pbxproj +++ b/ios/Runner.xcodeproj/project.pbxproj @@ -368,7 +368,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - PRODUCT_BUNDLE_IDENTIFIER = com.example.havenoFlutterApp; + PRODUCT_BUNDLE_IDENTIFIER = com.haveno.havenoFlutterApp; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h"; SWIFT_VERSION = 5.0; @@ -384,7 +384,7 @@ CURRENT_PROJECT_VERSION = 1; GENERATE_INFOPLIST_FILE = YES; MARKETING_VERSION = 1.0; - PRODUCT_BUNDLE_IDENTIFIER = com.example.havenoFlutterApp.RunnerTests; + PRODUCT_BUNDLE_IDENTIFIER = com.haveno.havenoFlutterApp.RunnerTests; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; @@ -401,7 +401,7 @@ CURRENT_PROJECT_VERSION = 1; GENERATE_INFOPLIST_FILE = YES; MARKETING_VERSION = 1.0; - PRODUCT_BUNDLE_IDENTIFIER = com.example.havenoFlutterApp.RunnerTests; + PRODUCT_BUNDLE_IDENTIFIER = com.haveno.havenoFlutterApp.RunnerTests; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_VERSION = 5.0; TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Runner.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/Runner"; @@ -416,7 +416,7 @@ CURRENT_PROJECT_VERSION = 1; GENERATE_INFOPLIST_FILE = YES; MARKETING_VERSION = 1.0; - PRODUCT_BUNDLE_IDENTIFIER = com.example.havenoFlutterApp.RunnerTests; + PRODUCT_BUNDLE_IDENTIFIER = com.haveno.havenoFlutterApp.RunnerTests; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_VERSION = 5.0; TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Runner.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/Runner"; @@ -547,7 +547,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - PRODUCT_BUNDLE_IDENTIFIER = com.example.havenoFlutterApp; + PRODUCT_BUNDLE_IDENTIFIER = com.haveno.havenoFlutterApp; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h"; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; @@ -569,7 +569,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - PRODUCT_BUNDLE_IDENTIFIER = com.example.havenoFlutterApp; + PRODUCT_BUNDLE_IDENTIFIER = com.haveno.havenoFlutterApp; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h"; SWIFT_VERSION = 5.0; diff --git a/ios/Runner/Info.plist b/ios/Runner/Info.plist index 40e0034..1db0596 100644 --- a/ios/Runner/Info.plist +++ b/ios/Runner/Info.plist @@ -13,7 +13,7 @@ CFBundleInfoDictionaryVersion 6.0 CFBundleName - haveno_flutter_app + haveno CFBundlePackageType APPL CFBundleShortVersionString diff --git a/lib/haveno_service_clients/account_service_client.dart b/lib/haveno_service_clients/account_service_client.dart index 00fd517..ea046ba 100644 --- a/lib/haveno_service_clients/account_service_client.dart +++ b/lib/haveno_service_clients/account_service_client.dart @@ -1,5 +1,5 @@ -import 'package:haveno_flutter_app/proto/compiled/grpc.pbgrpc.dart'; -import 'package:haveno_flutter_app/services/haveno_service.dart'; +import 'package:haveno/proto/compiled/grpc.pbgrpc.dart'; +import 'package:haveno/services/haveno_service.dart'; class AccountServiceClient { final AccountClient _accountClient; diff --git a/lib/main.dart b/lib/main.dart index 1a7c656..4d54691 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -1,25 +1,25 @@ import 'dart:io'; import 'package:flutter/material.dart'; -import 'package:haveno_flutter_app/providers/offers_provider.dart'; -import 'package:haveno_flutter_app/providers/payment_accounts_provider.dart'; -import 'package:haveno_flutter_app/providers/prices_provider.dart'; -import 'package:haveno_flutter_app/providers/trades_provider.dart'; -import 'package:haveno_flutter_app/providers/wallets_provider.dart'; -import 'package:haveno_flutter_app/screens/drawer/payment_accounts_screen.dart'; -import 'package:haveno_flutter_app/screens/drawer/settings_screen.dart'; -import 'package:haveno_flutter_app/tabs/trades_tab.dart'; -import 'package:haveno_flutter_app/tabs/buy_tab.dart'; -import 'package:haveno_flutter_app/tabs/sell_tab.dart'; -import 'package:haveno_flutter_app/screens/drawer/wallet_screen.dart'; +import 'package:haveno/providers/offers_provider.dart'; +import 'package:haveno/providers/payment_accounts_provider.dart'; +import 'package:haveno/providers/prices_provider.dart'; +import 'package:haveno/providers/trades_provider.dart'; +import 'package:haveno/providers/wallets_provider.dart'; +import 'package:haveno/screens/drawer/payment_accounts_screen.dart'; +import 'package:haveno/screens/drawer/settings_screen.dart'; +import 'package:haveno/tabs/trades_tab.dart'; +import 'package:haveno/tabs/buy_tab.dart'; +import 'package:haveno/tabs/sell_tab.dart'; +import 'package:haveno/screens/drawer/wallet_screen.dart'; import 'package:logging/logging.dart'; import 'package:path_provider/path_provider.dart'; import 'package:provider/provider.dart'; -import 'package:haveno_flutter_app/services/haveno_service.dart'; -import 'package:haveno_flutter_app/services/http_service.dart'; -import 'package:haveno_flutter_app/services/monero_service.dart'; -import 'package:haveno_flutter_app/providers/get_version_provider.dart'; -import 'package:haveno_flutter_app/providers/account_provider.dart'; +import 'package:haveno/services/haveno_service.dart'; +import 'package:haveno/services/http_service.dart'; +import 'package:haveno/services/monero_service.dart'; +import 'package:haveno/providers/get_version_provider.dart'; +import 'package:haveno/providers/account_provider.dart'; import 'dart:async'; import 'package:badges/badges.dart' as badges; //import 'package:tor/tor.dart'; // Import the badges package diff --git a/lib/providers/account_provider.dart b/lib/providers/account_provider.dart index 8c2d1a7..a6bbb9b 100644 --- a/lib/providers/account_provider.dart +++ b/lib/providers/account_provider.dart @@ -1,6 +1,6 @@ import 'package:flutter/material.dart'; -import 'package:haveno_flutter_app/proto/compiled/grpc.pbgrpc.dart'; -import 'package:haveno_flutter_app/services/haveno_service.dart'; +import 'package:haveno/proto/compiled/grpc.pbgrpc.dart'; +import 'package:haveno/services/haveno_service.dart'; class AccountProvider with ChangeNotifier { final HavenoService _havenoService; diff --git a/lib/providers/get_version_provider.dart b/lib/providers/get_version_provider.dart index fb32135..f9ad77a 100644 --- a/lib/providers/get_version_provider.dart +++ b/lib/providers/get_version_provider.dart @@ -1,6 +1,6 @@ import 'package:flutter/material.dart'; -import 'package:haveno_flutter_app/proto/compiled/grpc.pbgrpc.dart'; -import 'package:haveno_flutter_app/services/haveno_service.dart'; +import 'package:haveno/proto/compiled/grpc.pbgrpc.dart'; +import 'package:haveno/services/haveno_service.dart'; class GetVersionProvider with ChangeNotifier { final HavenoService _havenoService; diff --git a/lib/providers/offers_provider.dart b/lib/providers/offers_provider.dart index 7771604..b9707fd 100644 --- a/lib/providers/offers_provider.dart +++ b/lib/providers/offers_provider.dart @@ -1,6 +1,6 @@ import 'package:flutter/material.dart'; -import 'package:haveno_flutter_app/proto/compiled/grpc.pbgrpc.dart'; -import 'package:haveno_flutter_app/services/haveno_service.dart'; +import 'package:haveno/proto/compiled/grpc.pbgrpc.dart'; +import 'package:haveno/services/haveno_service.dart'; import 'package:fixnum/fixnum.dart' as fixnum; class OffersProvider with ChangeNotifier { diff --git a/lib/providers/payment_accounts_provider.dart b/lib/providers/payment_accounts_provider.dart index 14a6313..ad87d67 100644 --- a/lib/providers/payment_accounts_provider.dart +++ b/lib/providers/payment_accounts_provider.dart @@ -5,10 +5,10 @@ import 'dart:io'; import 'package:flutter/material.dart'; import 'package:logging/logging.dart'; import 'package:path_provider/path_provider.dart'; -import 'package:haveno_flutter_app/proto/compiled/grpc.pbgrpc.dart'; -import 'package:haveno_flutter_app/proto/compiled/pb.pb.dart'; -import 'package:haveno_flutter_app/proto/compiled/grpc.pb.dart'; -import 'package:haveno_flutter_app/services/haveno_service.dart'; +import 'package:haveno/proto/compiled/grpc.pbgrpc.dart'; +import 'package:haveno/proto/compiled/pb.pb.dart'; +import 'package:haveno/proto/compiled/grpc.pb.dart'; +import 'package:haveno/services/haveno_service.dart'; class PaymentAccountsProvider with ChangeNotifier { final Logger _logger = Logger('PaymentAccountsProvider'); diff --git a/lib/providers/prices_provider.dart b/lib/providers/prices_provider.dart index 8774bc8..29590c1 100644 --- a/lib/providers/prices_provider.dart +++ b/lib/providers/prices_provider.dart @@ -1,6 +1,6 @@ import 'package:flutter/material.dart'; -import 'package:haveno_flutter_app/proto/compiled/grpc.pbgrpc.dart'; -import 'package:haveno_flutter_app/services/haveno_service.dart'; +import 'package:haveno/proto/compiled/grpc.pbgrpc.dart'; +import 'package:haveno/services/haveno_service.dart'; class PricesProvider with ChangeNotifier { final HavenoService _havenoService; diff --git a/lib/providers/trades_provider.dart b/lib/providers/trades_provider.dart index f428800..3df7822 100644 --- a/lib/providers/trades_provider.dart +++ b/lib/providers/trades_provider.dart @@ -1,8 +1,8 @@ import 'package:fixnum/fixnum.dart' as fixnum; import 'package:flutter/material.dart'; -import 'package:haveno_flutter_app/proto/compiled/grpc.pbgrpc.dart'; -import 'package:haveno_flutter_app/proto/compiled/pb.pb.dart'; -import 'package:haveno_flutter_app/services/haveno_service.dart'; +import 'package:haveno/proto/compiled/grpc.pbgrpc.dart'; +import 'package:haveno/proto/compiled/pb.pb.dart'; +import 'package:haveno/services/haveno_service.dart'; class TradesProvider with ChangeNotifier { final HavenoService _havenoService; diff --git a/lib/providers/wallets_provider.dart b/lib/providers/wallets_provider.dart index 99437e2..f1e8f9a 100644 --- a/lib/providers/wallets_provider.dart +++ b/lib/providers/wallets_provider.dart @@ -1,6 +1,6 @@ import 'package:flutter/material.dart'; -import 'package:haveno_flutter_app/proto/compiled/grpc.pbgrpc.dart'; -import 'package:haveno_flutter_app/services/haveno_service.dart'; +import 'package:haveno/proto/compiled/grpc.pbgrpc.dart'; +import 'package:haveno/services/haveno_service.dart'; class WalletsProvider with ChangeNotifier { final HavenoService _havenoService; diff --git a/lib/screens/active_buyer_trade_timeline_screen.dart b/lib/screens/active_buyer_trade_timeline_screen.dart index 815096d..44cf258 100644 --- a/lib/screens/active_buyer_trade_timeline_screen.dart +++ b/lib/screens/active_buyer_trade_timeline_screen.dart @@ -1,10 +1,10 @@ import 'dart:convert'; import 'package:fixnum/fixnum.dart'; import 'package:flutter/material.dart'; -import 'package:haveno_flutter_app/utils/payment_utils.dart'; +import 'package:haveno/utils/payment_utils.dart'; import 'package:provider/provider.dart'; -import 'package:haveno_flutter_app/providers/trades_provider.dart'; -import 'package:haveno_flutter_app/proto/compiled/grpc.pbgrpc.dart'; +import 'package:haveno/providers/trades_provider.dart'; +import 'package:haveno/proto/compiled/grpc.pbgrpc.dart'; import 'package:flutter/services.dart'; class ActiveBuyerTradeTimelineScreen extends StatefulWidget { diff --git a/lib/screens/active_seller_trade_timeline_screen.dart b/lib/screens/active_seller_trade_timeline_screen.dart index 1f02c54..69d3f58 100644 --- a/lib/screens/active_seller_trade_timeline_screen.dart +++ b/lib/screens/active_seller_trade_timeline_screen.dart @@ -1,10 +1,10 @@ import 'dart:convert'; import 'package:fixnum/fixnum.dart'; import 'package:flutter/material.dart'; -import 'package:haveno_flutter_app/utils/payment_utils.dart'; +import 'package:haveno/utils/payment_utils.dart'; import 'package:provider/provider.dart'; -import 'package:haveno_flutter_app/providers/trades_provider.dart'; -import 'package:haveno_flutter_app/proto/compiled/grpc.pbgrpc.dart'; +import 'package:haveno/providers/trades_provider.dart'; +import 'package:haveno/proto/compiled/grpc.pbgrpc.dart'; import 'package:flutter/services.dart'; class ActiveSellerTradeTimelineScreen extends StatefulWidget { diff --git a/lib/screens/active_trade_chat_screen.dart b/lib/screens/active_trade_chat_screen.dart index 982bdd3..9b390af 100644 --- a/lib/screens/active_trade_chat_screen.dart +++ b/lib/screens/active_trade_chat_screen.dart @@ -3,10 +3,10 @@ import 'dart:async'; import 'package:flutter/material.dart'; import 'package:flutter_chat_types/flutter_chat_types.dart' as types; import 'package:flutter_chat_ui/flutter_chat_ui.dart'; -import 'package:haveno_flutter_app/proto/compiled/grpc.pb.dart'; +import 'package:haveno/proto/compiled/grpc.pb.dart'; import 'package:provider/provider.dart'; import 'package:uuid/uuid.dart'; -import 'package:haveno_flutter_app/providers/trades_provider.dart'; +import 'package:haveno/providers/trades_provider.dart'; class ActiveTradeChatScreen extends StatefulWidget { final TradeInfo trade; diff --git a/lib/screens/active_trade_detail_screen.dart b/lib/screens/active_trade_detail_screen.dart index c0c3e59..7d55e23 100644 --- a/lib/screens/active_trade_detail_screen.dart +++ b/lib/screens/active_trade_detail_screen.dart @@ -3,10 +3,10 @@ import 'dart:async'; import 'package:flutter/material.dart'; import 'package:flutter_chat_types/flutter_chat_types.dart' as types; import 'package:flutter_chat_ui/flutter_chat_ui.dart'; -import 'package:haveno_flutter_app/proto/compiled/grpc.pb.dart'; +import 'package:haveno/proto/compiled/grpc.pb.dart'; import 'package:provider/provider.dart'; import 'package:uuid/uuid.dart'; -import 'package:haveno_flutter_app/providers/trades_provider.dart'; +import 'package:haveno/providers/trades_provider.dart'; class ActiveTradeDetailScreen extends StatefulWidget { final TradeInfo trade; diff --git a/lib/screens/drawer/payment_accounts_screen.dart b/lib/screens/drawer/payment_accounts_screen.dart index cf1f96d..44cf4d2 100644 --- a/lib/screens/drawer/payment_accounts_screen.dart +++ b/lib/screens/drawer/payment_accounts_screen.dart @@ -1,8 +1,8 @@ import 'package:flutter/material.dart'; -import 'package:haveno_flutter_app/utils/payment_utils.dart'; -import 'package:haveno_flutter_app/widgets/add_payment_method_form.dart'; +import 'package:haveno/utils/payment_utils.dart'; +import 'package:haveno/widgets/add_payment_method_form.dart'; import 'package:provider/provider.dart'; -import 'package:haveno_flutter_app/providers/payment_accounts_provider.dart'; +import 'package:haveno/providers/payment_accounts_provider.dart'; import 'package:badges/badges.dart' as badges; // Import the badges package class PaymentAccountsScreen extends StatefulWidget { diff --git a/lib/screens/drawer/wallet_screen.dart b/lib/screens/drawer/wallet_screen.dart index 702727a..6ea659c 100644 --- a/lib/screens/drawer/wallet_screen.dart +++ b/lib/screens/drawer/wallet_screen.dart @@ -3,8 +3,8 @@ import 'dart:async'; import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; import 'package:provider/provider.dart'; -import 'package:haveno_flutter_app/providers/wallets_provider.dart'; -import 'package:haveno_flutter_app/proto/compiled/grpc.pbgrpc.dart'; +import 'package:haveno/providers/wallets_provider.dart'; +import 'package:haveno/proto/compiled/grpc.pbgrpc.dart'; import 'package:fixnum/fixnum.dart'; import 'package:intl/intl.dart'; diff --git a/lib/screens/my_offer_detail_screen.dart b/lib/screens/my_offer_detail_screen.dart index 950f6f9..88a3d84 100644 --- a/lib/screens/my_offer_detail_screen.dart +++ b/lib/screens/my_offer_detail_screen.dart @@ -1,7 +1,7 @@ import 'package:flutter/material.dart'; -import 'package:haveno_flutter_app/proto/compiled/grpc.pbgrpc.dart'; +import 'package:haveno/proto/compiled/grpc.pbgrpc.dart'; import 'package:provider/provider.dart'; -import 'package:haveno_flutter_app/providers/offers_provider.dart'; +import 'package:haveno/providers/offers_provider.dart'; class MyOfferDetailScreen extends StatefulWidget { final String offerId; diff --git a/lib/screens/offer_detail_screen.dart b/lib/screens/offer_detail_screen.dart index 000b5dc..49ab54a 100644 --- a/lib/screens/offer_detail_screen.dart +++ b/lib/screens/offer_detail_screen.dart @@ -1,12 +1,12 @@ import 'package:fixnum/fixnum.dart' as fixnum; import 'package:flutter/material.dart'; -import 'package:haveno_flutter_app/proto/compiled/grpc.pbgrpc.dart'; -import 'package:haveno_flutter_app/proto/compiled/pb.pb.dart'; -import 'package:haveno_flutter_app/utils/xmr_math.dart'; +import 'package:haveno/proto/compiled/grpc.pbgrpc.dart'; +import 'package:haveno/proto/compiled/pb.pb.dart'; +import 'package:haveno/utils/xmr_math.dart'; import 'package:provider/provider.dart'; -import 'package:haveno_flutter_app/providers/offers_provider.dart'; -import 'package:haveno_flutter_app/providers/trades_provider.dart'; -import 'package:haveno_flutter_app/providers/payment_accounts_provider.dart'; +import 'package:haveno/providers/offers_provider.dart'; +import 'package:haveno/providers/trades_provider.dart'; +import 'package:haveno/providers/payment_accounts_provider.dart'; class OfferDetailScreen extends StatefulWidget { final OfferInfo offer; diff --git a/lib/services/haveno_service.dart b/lib/services/haveno_service.dart index fece76e..aec5ae7 100644 --- a/lib/services/haveno_service.dart +++ b/lib/services/haveno_service.dart @@ -1,5 +1,5 @@ import 'package:grpc/grpc.dart'; -import 'package:haveno_flutter_app/proto/compiled/grpc.pbgrpc.dart'; +import 'package:haveno/proto/compiled/grpc.pbgrpc.dart'; class HavenoService { final String host; diff --git a/lib/tabs/buy/buy_market_offers_tab.dart b/lib/tabs/buy/buy_market_offers_tab.dart index 134e8e7..043201b 100644 --- a/lib/tabs/buy/buy_market_offers_tab.dart +++ b/lib/tabs/buy/buy_market_offers_tab.dart @@ -1,11 +1,11 @@ import 'dart:convert'; import 'package:flutter/material.dart'; -import 'package:haveno_flutter_app/providers/prices_provider.dart'; -import 'package:haveno_flutter_app/widgets/offer_card_widget.dart'; +import 'package:haveno/providers/prices_provider.dart'; +import 'package:haveno/widgets/offer_card_widget.dart'; import 'package:provider/provider.dart'; -import 'package:haveno_flutter_app/providers/offers_provider.dart'; -import 'package:haveno_flutter_app/proto/compiled/grpc.pbgrpc.dart'; // Ensure you have the correct import for OfferInfo +import 'package:haveno/providers/offers_provider.dart'; +import 'package:haveno/proto/compiled/grpc.pbgrpc.dart'; // Ensure you have the correct import for OfferInfo class BuyMarketOffersTab extends StatelessWidget { @override diff --git a/lib/tabs/buy/buy_my_offers_tab.dart b/lib/tabs/buy/buy_my_offers_tab.dart index 0dfb8a6..37dbede 100644 --- a/lib/tabs/buy/buy_my_offers_tab.dart +++ b/lib/tabs/buy/buy_my_offers_tab.dart @@ -1,7 +1,7 @@ import 'package:flutter/material.dart'; -import 'package:haveno_flutter_app/widgets/offer_card_widget.dart'; +import 'package:haveno/widgets/offer_card_widget.dart'; import 'package:provider/provider.dart'; -import 'package:haveno_flutter_app/providers/offers_provider.dart'; +import 'package:haveno/providers/offers_provider.dart'; class BuyMyOffersTab extends StatelessWidget { @override diff --git a/lib/tabs/buy_tab.dart b/lib/tabs/buy_tab.dart index f553017..7c49f1a 100644 --- a/lib/tabs/buy_tab.dart +++ b/lib/tabs/buy_tab.dart @@ -1,11 +1,11 @@ import 'package:flutter/material.dart'; -import 'package:haveno_flutter_app/proto/compiled/pb.pb.dart'; +import 'package:haveno/proto/compiled/pb.pb.dart'; import 'package:provider/provider.dart'; -import 'package:haveno_flutter_app/providers/offers_provider.dart'; -import 'package:haveno_flutter_app/providers/payment_accounts_provider.dart'; -import 'package:haveno_flutter_app/tabs/buy/buy_market_offers_tab.dart'; -import 'package:haveno_flutter_app/tabs/buy/buy_my_offers_tab.dart'; -import 'package:haveno_flutter_app/widgets/new_trade_offer_form.dart'; +import 'package:haveno/providers/offers_provider.dart'; +import 'package:haveno/providers/payment_accounts_provider.dart'; +import 'package:haveno/tabs/buy/buy_market_offers_tab.dart'; +import 'package:haveno/tabs/buy/buy_my_offers_tab.dart'; +import 'package:haveno/widgets/new_trade_offer_form.dart'; class BuyTab extends StatefulWidget { @override diff --git a/lib/tabs/sell/sale_market_offers_tab.dart b/lib/tabs/sell/sale_market_offers_tab.dart index b81800c..e56bb34 100644 --- a/lib/tabs/sell/sale_market_offers_tab.dart +++ b/lib/tabs/sell/sale_market_offers_tab.dart @@ -1,11 +1,11 @@ import 'dart:convert'; import 'package:flutter/material.dart'; -import 'package:haveno_flutter_app/providers/prices_provider.dart'; -import 'package:haveno_flutter_app/widgets/offer_card_widget.dart'; +import 'package:haveno/providers/prices_provider.dart'; +import 'package:haveno/widgets/offer_card_widget.dart'; import 'package:provider/provider.dart'; -import 'package:haveno_flutter_app/providers/offers_provider.dart'; -import 'package:haveno_flutter_app/proto/compiled/grpc.pbgrpc.dart'; // Ensure you have the correct import for OfferInfo +import 'package:haveno/providers/offers_provider.dart'; +import 'package:haveno/proto/compiled/grpc.pbgrpc.dart'; // Ensure you have the correct import for OfferInfo class SaleMarketOffersTab extends StatelessWidget { @override diff --git a/lib/tabs/sell/sale_my_offers_tab.dart b/lib/tabs/sell/sale_my_offers_tab.dart index baf0e10..e119791 100644 --- a/lib/tabs/sell/sale_my_offers_tab.dart +++ b/lib/tabs/sell/sale_my_offers_tab.dart @@ -1,7 +1,7 @@ import 'package:flutter/material.dart'; -import 'package:haveno_flutter_app/widgets/offer_card_widget.dart'; +import 'package:haveno/widgets/offer_card_widget.dart'; import 'package:provider/provider.dart'; -import 'package:haveno_flutter_app/providers/offers_provider.dart'; +import 'package:haveno/providers/offers_provider.dart'; class SaleMyOffersTab extends StatelessWidget { @override diff --git a/lib/tabs/sell_tab.dart b/lib/tabs/sell_tab.dart index f7297f9..e6e8e87 100644 --- a/lib/tabs/sell_tab.dart +++ b/lib/tabs/sell_tab.dart @@ -1,11 +1,11 @@ import 'package:flutter/material.dart'; -import 'package:haveno_flutter_app/proto/compiled/pb.pb.dart'; -import 'package:haveno_flutter_app/tabs/sell/sale_market_offers_tab.dart'; -import 'package:haveno_flutter_app/tabs/sell/sale_my_offers_tab.dart'; +import 'package:haveno/proto/compiled/pb.pb.dart'; +import 'package:haveno/tabs/sell/sale_market_offers_tab.dart'; +import 'package:haveno/tabs/sell/sale_my_offers_tab.dart'; import 'package:provider/provider.dart'; -import 'package:haveno_flutter_app/providers/offers_provider.dart'; -import 'package:haveno_flutter_app/providers/payment_accounts_provider.dart'; -import 'package:haveno_flutter_app/widgets/new_trade_offer_form.dart'; +import 'package:haveno/providers/offers_provider.dart'; +import 'package:haveno/providers/payment_accounts_provider.dart'; +import 'package:haveno/widgets/new_trade_offer_form.dart'; class SellTab extends StatefulWidget { @override diff --git a/lib/tabs/trades/trades_active_tab.dart b/lib/tabs/trades/trades_active_tab.dart index 6d92c91..0d7b5d3 100644 --- a/lib/tabs/trades/trades_active_tab.dart +++ b/lib/tabs/trades/trades_active_tab.dart @@ -1,11 +1,11 @@ import 'package:flutter/material.dart'; -import 'package:haveno_flutter_app/providers/account_provider.dart'; -import 'package:haveno_flutter_app/screens/active_buyer_trade_timeline_screen.dart'; -import 'package:haveno_flutter_app/screens/active_seller_trade_timeline_screen.dart'; -import 'package:haveno_flutter_app/utils/payment_utils.dart'; +import 'package:haveno/providers/account_provider.dart'; +import 'package:haveno/screens/active_buyer_trade_timeline_screen.dart'; +import 'package:haveno/screens/active_seller_trade_timeline_screen.dart'; +import 'package:haveno/utils/payment_utils.dart'; import 'package:intl/intl.dart'; import 'package:provider/provider.dart'; -import 'package:haveno_flutter_app/providers/trades_provider.dart'; +import 'package:haveno/providers/trades_provider.dart'; import 'package:fixnum/fixnum.dart'; class TradesActiveTab extends StatelessWidget { diff --git a/lib/tabs/trades/trades_completed_tab.dart b/lib/tabs/trades/trades_completed_tab.dart index b77a530..1e9eb9c 100644 --- a/lib/tabs/trades/trades_completed_tab.dart +++ b/lib/tabs/trades/trades_completed_tab.dart @@ -1,6 +1,6 @@ import 'package:flutter/material.dart'; import 'package:provider/provider.dart'; -import 'package:haveno_flutter_app/providers/trades_provider.dart'; +import 'package:haveno/providers/trades_provider.dart'; class TradesCompletedTab extends StatelessWidget { @override diff --git a/lib/tabs/trades_tab.dart b/lib/tabs/trades_tab.dart index d865184..a637137 100644 --- a/lib/tabs/trades_tab.dart +++ b/lib/tabs/trades_tab.dart @@ -1,8 +1,8 @@ import 'package:flutter/material.dart'; -import 'package:haveno_flutter_app/tabs/trades/trades_active_tab.dart'; -import 'package:haveno_flutter_app/tabs/trades/trades_completed_tab.dart'; +import 'package:haveno/tabs/trades/trades_active_tab.dart'; +import 'package:haveno/tabs/trades/trades_completed_tab.dart'; import 'package:provider/provider.dart'; -import 'package:haveno_flutter_app/providers/trades_provider.dart'; +import 'package:haveno/providers/trades_provider.dart'; class TradesTab extends StatefulWidget { @override diff --git a/lib/widgets/add_payment_account_form.dart b/lib/widgets/add_payment_account_form.dart index 67ffb70..7d297c7 100644 --- a/lib/widgets/add_payment_account_form.dart +++ b/lib/widgets/add_payment_account_form.dart @@ -1,9 +1,9 @@ import 'package:flutter/material.dart'; -import 'package:haveno_flutter_app/proto/compiled/pb.pb.dart'; +import 'package:haveno/proto/compiled/pb.pb.dart'; import 'package:multi_select_flutter/multi_select_flutter.dart'; -import 'package:haveno_flutter_app/utils/salt.dart'; +import 'package:haveno/utils/salt.dart'; import 'package:provider/provider.dart'; -import 'package:haveno_flutter_app/providers/payment_accounts_provider.dart'; +import 'package:haveno/providers/payment_accounts_provider.dart'; class DynamicPaymentAccountForm extends StatefulWidget { final PaymentAccountForm paymentAccountForm; diff --git a/lib/widgets/add_payment_method_form.dart b/lib/widgets/add_payment_method_form.dart index 169433e..435b4fd 100644 --- a/lib/widgets/add_payment_method_form.dart +++ b/lib/widgets/add_payment_method_form.dart @@ -1,8 +1,8 @@ import 'package:flutter/material.dart'; -import 'package:haveno_flutter_app/utils/payment_utils.dart'; -import 'package:haveno_flutter_app/widgets/add_payment_account_form.dart'; +import 'package:haveno/utils/payment_utils.dart'; +import 'package:haveno/widgets/add_payment_account_form.dart'; import 'package:provider/provider.dart'; -import 'package:haveno_flutter_app/providers/payment_accounts_provider.dart';// Import the utils file +import 'package:haveno/providers/payment_accounts_provider.dart';// Import the utils file class PaymentMethodSelectionForm extends StatefulWidget { final String accountType; diff --git a/lib/widgets/new_trade_offer_form.dart b/lib/widgets/new_trade_offer_form.dart index 73f5ff9..2ee024a 100644 --- a/lib/widgets/new_trade_offer_form.dart +++ b/lib/widgets/new_trade_offer_form.dart @@ -1,7 +1,7 @@ import 'package:flutter/material.dart'; import 'package:provider/provider.dart'; -import 'package:haveno_flutter_app/providers/offers_provider.dart'; -import 'package:haveno_flutter_app/proto/compiled/pb.pb.dart'; +import 'package:haveno/providers/offers_provider.dart'; +import 'package:haveno/proto/compiled/pb.pb.dart'; import 'package:fixnum/fixnum.dart' as fixnum; import 'dart:convert'; // Import the dart:convert library diff --git a/lib/widgets/offer_card_widget.dart b/lib/widgets/offer_card_widget.dart index 02ec166..a13be4c 100644 --- a/lib/widgets/offer_card_widget.dart +++ b/lib/widgets/offer_card_widget.dart @@ -1,10 +1,10 @@ import 'package:flutter/material.dart'; -import 'package:haveno_flutter_app/utils/payment_utils.dart'; +import 'package:haveno/utils/payment_utils.dart'; import 'package:provider/provider.dart'; -import 'package:haveno_flutter_app/proto/compiled/grpc.pbgrpc.dart'; -import 'package:haveno_flutter_app/screens/my_offer_detail_screen.dart'; -import 'package:haveno_flutter_app/screens/offer_detail_screen.dart'; -import 'package:haveno_flutter_app/providers/offers_provider.dart'; +import 'package:haveno/proto/compiled/grpc.pbgrpc.dart'; +import 'package:haveno/screens/my_offer_detail_screen.dart'; +import 'package:haveno/screens/offer_detail_screen.dart'; +import 'package:haveno/providers/offers_provider.dart'; class OfferCard extends StatelessWidget { final OfferInfo offer; diff --git a/linux/CMakeLists.txt b/linux/CMakeLists.txt index cdd5def..def7043 100644 --- a/linux/CMakeLists.txt +++ b/linux/CMakeLists.txt @@ -4,10 +4,10 @@ project(runner LANGUAGES CXX) # The name of the executable created for the application. Change this to change # the on-disk name of your application. -set(BINARY_NAME "haveno_flutter_app") +set(BINARY_NAME "haveno") # The unique GTK application identifier for this application. See: # https://wiki.gnome.org/HowDoI/ChooseApplicationID -set(APPLICATION_ID "com.example.haveno_flutter_app") +set(APPLICATION_ID "com.haveno.haveno") # Explicitly opt in to modern CMake behaviors to avoid warnings with recent # versions of CMake. diff --git a/linux/flutter/generated_plugins.cmake b/linux/flutter/generated_plugins.cmake index 4aea231..f16b4c3 100644 --- a/linux/flutter/generated_plugins.cmake +++ b/linux/flutter/generated_plugins.cmake @@ -7,7 +7,6 @@ list(APPEND FLUTTER_PLUGIN_LIST ) list(APPEND FLUTTER_FFI_PLUGIN_LIST - tor ) set(PLUGIN_BUNDLED_LIBRARIES) diff --git a/linux/my_application.cc b/linux/my_application.cc index e1d52e2..20cfcf2 100644 --- a/linux/my_application.cc +++ b/linux/my_application.cc @@ -40,11 +40,11 @@ static void my_application_activate(GApplication* application) { if (use_header_bar) { GtkHeaderBar* header_bar = GTK_HEADER_BAR(gtk_header_bar_new()); gtk_widget_show(GTK_WIDGET(header_bar)); - gtk_header_bar_set_title(header_bar, "haveno_flutter_app"); + gtk_header_bar_set_title(header_bar, "haveno"); gtk_header_bar_set_show_close_button(header_bar, TRUE); gtk_window_set_titlebar(window, GTK_WIDGET(header_bar)); } else { - gtk_window_set_title(window, "haveno_flutter_app"); + gtk_window_set_title(window, "haveno"); } gtk_window_set_default_size(window, 1280, 720); diff --git a/macos/Runner.xcodeproj/project.pbxproj b/macos/Runner.xcodeproj/project.pbxproj index 40edec4..596ec3d 100644 --- a/macos/Runner.xcodeproj/project.pbxproj +++ b/macos/Runner.xcodeproj/project.pbxproj @@ -64,7 +64,7 @@ 331C80D7294CF71000263BE5 /* RunnerTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RunnerTests.swift; sourceTree = ""; }; 333000ED22D3DE5D00554162 /* Warnings.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Warnings.xcconfig; sourceTree = ""; }; 335BBD1A22A9A15E00E9071D /* GeneratedPluginRegistrant.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = GeneratedPluginRegistrant.swift; sourceTree = ""; }; - 33CC10ED2044A3C60003C045 /* haveno_flutter_app.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "haveno_flutter_app.app"; sourceTree = BUILT_PRODUCTS_DIR; }; + 33CC10ED2044A3C60003C045 /* haveno.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "haveno.app"; sourceTree = BUILT_PRODUCTS_DIR; }; 33CC10F02044A3C60003C045 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = ""; }; 33CC10F22044A3C60003C045 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; name = Assets.xcassets; path = Runner/Assets.xcassets; sourceTree = ""; }; 33CC10F52044A3C60003C045 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/MainMenu.xib; sourceTree = ""; }; @@ -131,7 +131,7 @@ 33CC10EE2044A3C60003C045 /* Products */ = { isa = PBXGroup; children = ( - 33CC10ED2044A3C60003C045 /* haveno_flutter_app.app */, + 33CC10ED2044A3C60003C045 /* haveno.app */, 331C80D5294CF71000263BE5 /* RunnerTests.xctest */, ); name = Products; @@ -217,7 +217,7 @@ ); name = Runner; productName = Runner; - productReference = 33CC10ED2044A3C60003C045 /* haveno_flutter_app.app */; + productReference = 33CC10ED2044A3C60003C045 /* haveno.app */; productType = "com.apple.product-type.application"; }; /* End PBXNativeTarget section */ @@ -385,10 +385,10 @@ CURRENT_PROJECT_VERSION = 1; GENERATE_INFOPLIST_FILE = YES; MARKETING_VERSION = 1.0; - PRODUCT_BUNDLE_IDENTIFIER = com.example.havenoFlutterApp.RunnerTests; + PRODUCT_BUNDLE_IDENTIFIER = com.haveno.havenoFlutterApp.RunnerTests; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_VERSION = 5.0; - TEST_HOST = "$(BUILT_PRODUCTS_DIR)/haveno_flutter_app.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/haveno_flutter_app"; + TEST_HOST = "$(BUILT_PRODUCTS_DIR)/haveno.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/haveno"; }; name = Debug; }; @@ -399,10 +399,10 @@ CURRENT_PROJECT_VERSION = 1; GENERATE_INFOPLIST_FILE = YES; MARKETING_VERSION = 1.0; - PRODUCT_BUNDLE_IDENTIFIER = com.example.havenoFlutterApp.RunnerTests; + PRODUCT_BUNDLE_IDENTIFIER = com.haveno.havenoFlutterApp.RunnerTests; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_VERSION = 5.0; - TEST_HOST = "$(BUILT_PRODUCTS_DIR)/haveno_flutter_app.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/haveno_flutter_app"; + TEST_HOST = "$(BUILT_PRODUCTS_DIR)/haveno.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/haveno"; }; name = Release; }; @@ -413,10 +413,10 @@ CURRENT_PROJECT_VERSION = 1; GENERATE_INFOPLIST_FILE = YES; MARKETING_VERSION = 1.0; - PRODUCT_BUNDLE_IDENTIFIER = com.example.havenoFlutterApp.RunnerTests; + PRODUCT_BUNDLE_IDENTIFIER = com.haveno.havenoFlutterApp.RunnerTests; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_VERSION = 5.0; - TEST_HOST = "$(BUILT_PRODUCTS_DIR)/haveno_flutter_app.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/haveno_flutter_app"; + TEST_HOST = "$(BUILT_PRODUCTS_DIR)/haveno.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/haveno"; }; name = Profile; }; diff --git a/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme b/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme index abf0de6..bd44e26 100644 --- a/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme +++ b/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme @@ -15,7 +15,7 @@ @@ -31,7 +31,7 @@ @@ -65,7 +65,7 @@ @@ -82,7 +82,7 @@ diff --git a/macos/Runner/Configs/AppInfo.xcconfig b/macos/Runner/Configs/AppInfo.xcconfig index 1f9e201..e1d45da 100644 --- a/macos/Runner/Configs/AppInfo.xcconfig +++ b/macos/Runner/Configs/AppInfo.xcconfig @@ -5,10 +5,10 @@ // 'flutter create' template. // The application's name. By default this is also the title of the Flutter window. -PRODUCT_NAME = haveno_flutter_app +PRODUCT_NAME = haveno // The application's bundle identifier -PRODUCT_BUNDLE_IDENTIFIER = com.example.havenoFlutterApp +PRODUCT_BUNDLE_IDENTIFIER = com.haveno.havenoFlutterApp // The copyright displayed in application information -PRODUCT_COPYRIGHT = Copyright © 2024 com.example. All rights reserved. +PRODUCT_COPYRIGHT = Copyright © 2024 com.haveno. All rights reserved. diff --git a/metadata/org.kewbit.havenoPlus.yml b/metadata/org.kewbit.havenoPlus.yml index cf49677..e36cfd2 100644 --- a/metadata/org.kewbit.havenoPlus.yml +++ b/metadata/org.kewbit.havenoPlus.yml @@ -12,12 +12,48 @@ RepoType: git Repo: https://github.com/KewbitXMR/haveno-plus.git Builds: - - versionName: '0.0.1' + - versionName: '0.2.2' versionCode: 1 + submodules: true commit: v0.0.1 - subdir: android - gradle: - - yes + output: build/app/outputs/apk/fdroid/release/app-fdroid-release.apk + srclibs: + - flutter@stable + # Deletes unrelated directories, + # remove those not needed from the list. + rm: + - ios + - linux + - macos + - web + - windows + prebuild: + - flutterVersion=$(sed -n -E "s/.*flutter-version:\ '(.*)'/\1/p" .github/workflows/release.yml) + - '[[ $flutterVersion ]] || exit 1' + - git -C $$flutter$$ checkout -f $flutterVersion + - export PUB_CACHE=$(pwd)/.pub-cache + - .flutter/bin/flutter config --no-analytics + - .flutter/bin/flutter pub get + scanignore: + - .flutter/bin/cache + scandelete: + - .flutter + - .pub-cache + + build: + # Make Flutter use the scanned cache + - export PUB_CACHE=$(pwd)/.pub-cache + # Split per abi to reduce the apk size. + # This is only for one abi. Please added other build blocks accordingly. + - .flutter/bin/flutter build apk --release --split-per-abi --target-platform="android-arm64" -AutoUpdateMode: Version v%v +AutoUpdateMode: Version UpdateCheckMode: Tags +VercodeOperation: + - '%c * 10 + 1' + - '%c * 10 + 2' + - '%c * 10 + 3' +UpdateCheckData: pubspec.yaml|version:\s.+\+(\d+)|.|version:\s(.+)\+ +CurrentVersion: '1.0' +CurrentVersionCode: 11 + diff --git a/protoc b/protoc deleted file mode 100644 index e69de29..0000000 diff --git a/pubspec.lock b/pubspec.lock index f739acf..e176d98 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -456,14 +456,6 @@ packages: url: "https://pub.dev" source: hosted version: "3.1.0" - protoc_plugin: - dependency: "direct main" - description: - name: protoc_plugin - sha256: fb0554851c9eca30bd18405fbbfe81e39166d4a2f0e5b770606fd69da3da0b2f - url: "https://pub.dev" - source: hosted - version: "21.1.2" provider: dependency: "direct main" description: @@ -549,14 +541,6 @@ packages: url: "https://pub.dev" source: hosted version: "2.0.0" - tor: - dependency: "direct main" - description: - name: tor - sha256: eeed80e5c912a1806c2f81825c12e84f4dc5a0b50aebedea59e3a8ba53df3142 - url: "https://pub.dev" - source: hosted - version: "0.0.8" typed_data: dependency: transitive description: diff --git a/pubspec.yaml b/pubspec.yaml index 914bc28..67c81ff 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -1,12 +1,17 @@ -name: haveno_flutter_app -description: "A new Flutter project." +name: haveno +description: "An interface for interacting with the Haveno Network" publish_to: 'none' -version: 0.0.1+2 +version: 0.0.2 environment: sdk: '>=3.4.3 <4.0.0' +homepage: https://haveno.com +repository: https://github.com/KewbitXMR/haveno-plus +issue_tracker: https://github.com/username/haveno-plus/issues +license: MIT + dependencies: flutter: sdk: flutter @@ -22,19 +27,12 @@ dependencies: flutter_chat_ui: ^1.6.14 flutter_chat_types: ^3.6.2 uuid: ^3.0.6 - # timelines_plus: ^1.0.2 google_fonts: ^6.2.1 - font_awesome_flutter: ^10.7.0 timeline_tile: ^2.0.0 - # Add your plugin dependency here - #tor_plugin: - # path: "../Flutter Plugins/tor_plugin" - protoc_plugin: ^21.1.2 fixnum: ^1.1.0 intl: ^0.17.0 badges: ^3.1.2 - tor: ^0.0.8 dev_dependencies: flutter_test: diff --git a/test/widget_test.dart b/test/widget_test.dart index b4c4dfb..fc102f1 100644 --- a/test/widget_test.dart +++ b/test/widget_test.dart @@ -8,7 +8,7 @@ import 'package:flutter/material.dart'; import 'package:flutter_test/flutter_test.dart'; -import 'package:haveno_flutter_app/main.dart'; +import 'package:haveno/main.dart'; void main() { testWidgets('Counter increments smoke test', (WidgetTester tester) async { diff --git a/web/index.html b/web/index.html index 6afb221..af7ff62 100644 --- a/web/index.html +++ b/web/index.html @@ -23,13 +23,13 @@ - + - haveno_flutter_app + haveno diff --git a/web/manifest.json b/web/manifest.json index 6f1251f..628c8eb 100644 --- a/web/manifest.json +++ b/web/manifest.json @@ -1,6 +1,6 @@ { - "name": "haveno_flutter_app", - "short_name": "haveno_flutter_app", + "name": "haveno", + "short_name": "haveno", "start_url": ".", "display": "standalone", "background_color": "#0175C2", diff --git a/windows/CMakeLists.txt b/windows/CMakeLists.txt index af7369c..8e9fd24 100644 --- a/windows/CMakeLists.txt +++ b/windows/CMakeLists.txt @@ -1,10 +1,10 @@ # Project-level configuration. cmake_minimum_required(VERSION 3.14) -project(haveno_flutter_app LANGUAGES CXX) +project(haveno LANGUAGES CXX) # The name of the executable created for the application. Change this to change # the on-disk name of your application. -set(BINARY_NAME "haveno_flutter_app") +set(BINARY_NAME "haveno") # Explicitly opt in to modern CMake behaviors to avoid warnings with recent # versions of CMake. diff --git a/windows/flutter/generated_plugins.cmake b/windows/flutter/generated_plugins.cmake index 5dd5c3d..88b22e5 100644 --- a/windows/flutter/generated_plugins.cmake +++ b/windows/flutter/generated_plugins.cmake @@ -7,7 +7,6 @@ list(APPEND FLUTTER_PLUGIN_LIST ) list(APPEND FLUTTER_FFI_PLUGIN_LIST - tor ) set(PLUGIN_BUNDLED_LIBRARIES) diff --git a/windows/runner/Runner.rc b/windows/runner/Runner.rc index 0aaed06..d86581e 100644 --- a/windows/runner/Runner.rc +++ b/windows/runner/Runner.rc @@ -89,13 +89,13 @@ BEGIN BEGIN BLOCK "040904e4" BEGIN - VALUE "CompanyName", "com.example" "\0" - VALUE "FileDescription", "haveno_flutter_app" "\0" + VALUE "CompanyName", "com.haveno" "\0" + VALUE "FileDescription", "haveno" "\0" VALUE "FileVersion", VERSION_AS_STRING "\0" - VALUE "InternalName", "haveno_flutter_app" "\0" - VALUE "LegalCopyright", "Copyright (C) 2024 com.example. All rights reserved." "\0" - VALUE "OriginalFilename", "haveno_flutter_app.exe" "\0" - VALUE "ProductName", "haveno_flutter_app" "\0" + VALUE "InternalName", "haveno" "\0" + VALUE "LegalCopyright", "Copyright (C) 2024 com.haveno. All rights reserved." "\0" + VALUE "OriginalFilename", "haveno.exe" "\0" + VALUE "ProductName", "haveno" "\0" VALUE "ProductVersion", VERSION_AS_STRING "\0" END END diff --git a/windows/runner/main.cpp b/windows/runner/main.cpp index 25ff1e0..39252fd 100644 --- a/windows/runner/main.cpp +++ b/windows/runner/main.cpp @@ -27,7 +27,7 @@ int APIENTRY wWinMain(_In_ HINSTANCE instance, _In_opt_ HINSTANCE prev, FlutterWindow window(project); Win32Window::Point origin(10, 10); Win32Window::Size size(1280, 720); - if (!window.Create(L"haveno_flutter_app", origin, size)) { + if (!window.Create(L"haveno", origin, size)) { return EXIT_FAILURE; } window.SetQuitOnClose(true);